Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Aug 14, 2024
1 parent c4aa0e8 commit 8983438
Show file tree
Hide file tree
Showing 11 changed files with 204 additions and 108 deletions.
4 changes: 2 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ body {
padding: 0;
}
h1, h2 {
h1,
h2 {
color: #1b335f;
}
</style>
2 changes: 1 addition & 1 deletion src/components/CSVReference.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ export default defineComponent({
#panels {
background-color: rgb(var(--v-theme-secondary));
}
</style>
</style>
6 changes: 2 additions & 4 deletions src/components/GeoconnexBackground.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<h2 class="text-center">Geoconnex Background Info </h2>
<h2 class="text-center">Geoconnex Background Info</h2>

<p class="text-center pa-4">
The <a href="https://geoconnex.us">geoconnex.us</a> project provides technical infrastructure
Expand Down Expand Up @@ -41,10 +41,8 @@
</template>

<style scoped>
/* remove highlighting for visited link */
a:visited {
color: inherit;
}
</style>
</style>
111 changes: 76 additions & 35 deletions src/components/MetadataGenerator.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,91 @@ import { fetchAllNamespaces } from '@/lib/helpers'
</script>

<template>

<p class="text-center pa-6 font-italic w-66 mx-auto">
A namespace is a short name or alias for your organization. It will be created upon
submission if it does not already exist. If the namespace already exists, your new
CSV file will be added to the existing namespace
A namespace is a short name or alias for your organization. It will be created upon submission
if it does not already exist. If the namespace already exists, your new CSV file will be added
to the existing namespace
</p>

<v-combobox label="Pick your organization if it exists, or create a new namespace" class="w-66 mx-auto" required
:items="existingNamespaces" v-model="namespace"></v-combobox>
<v-checkbox class="d-flex justify-center mb-4"
<v-combobox
label="Pick your organization if it exists, or create a new namespace"
class="w-66 mx-auto"
required
:items="existingNamespaces"
v-model="namespace"
></v-combobox>
<v-checkbox
class="d-flex justify-center mb-4"
label="I already have a readme file uploaded to my namespace and do not wish to update my contribution info"
v-model="readmeAlreadyUploaded">
v-model="readmeAlreadyUploaded"
>
</v-checkbox>

<div v-if="!readmeAlreadyUploaded">
<v-text-field v-model="homepage" label="Homepage for where redirects will point to" type="url" required
variant="outlined" hint="Example: https://waterdata.usgs.gov" persistent-hint class="pb-4"></v-text-field>

<v-textarea v-model="description" label="Description of data" required variant="outlined"
hint="Example: All monitoring locations used by the USGS Waterdata system" persistent-hint
class="pb-4"></v-textarea>

<v-text-field v-model="example_pid" label="Example PID" required variant="outlined"
hint="Example: https://geoconnex.us/usgs/monitoring-location/08383500" persistent-hint
class="pb-4"></v-text-field>

<v-text-field v-model="example_redirect_target" label="Example redirect target url" type="url" variant="outlined"
hint="Example: https://waterdata.usgs.gov/monitoring-location/08383500" persistent-hint
class="pb-4"></v-text-field>

<v-text-field v-model="contact_name" label="Contact name" hint="Example: John Smith" required variant="outlined"
class="pb-4"></v-text-field>

<v-text-field v-model="contact_email" label="Contact email" append-inner-icon="mdi-email" required
variant="outlined" type="email" hint="Example: [email protected]"></v-text-field>
<v-text-field
v-model="homepage"
label="Homepage for where redirects will point to"
type="url"
required
variant="outlined"
hint="Example: https://waterdata.usgs.gov"
persistent-hint
class="pb-4"
></v-text-field>

<v-textarea
v-model="description"
label="Description of data"
required
variant="outlined"
hint="Example: All monitoring locations used by the USGS Waterdata system"
persistent-hint
class="pb-4"
></v-textarea>

<v-text-field
v-model="example_pid"
label="Example PID"
required
variant="outlined"
hint="Example: https://geoconnex.us/usgs/monitoring-location/08383500"
persistent-hint
class="pb-4"
></v-text-field>

<v-text-field
v-model="example_redirect_target"
label="Example redirect target url"
type="url"
variant="outlined"
hint="Example: https://waterdata.usgs.gov/monitoring-location/08383500"
persistent-hint
class="pb-4"
></v-text-field>

<v-text-field
v-model="contact_name"
label="Contact name"
hint="Example: John Smith"
required
variant="outlined"
class="pb-4"
></v-text-field>

<v-text-field
v-model="contact_email"
label="Contact email"
append-inner-icon="mdi-email"
required
variant="outlined"
type="email"
hint="Example: [email protected]"
></v-text-field>
</div>

<v-alert type="error" class="w-50 mx-auto" v-if="!valid" icon="mdi-alert">
{{ error }}
</v-alert>

</template>

<script lang="ts">
Expand All @@ -56,7 +100,7 @@ export default defineComponent({
data() {
return {
homepage: '',
namespace: "",
namespace: '',
description: '',
example_pid: '',
example_redirect_target: '',
Expand All @@ -73,7 +117,6 @@ export default defineComponent({
},
computed: {
valid() {
if (this.namespace.length == 0) {
this.error = 'Namespace is required'
Expand Down Expand Up @@ -130,8 +173,6 @@ export default defineComponent({
this.error = ''
return true
}
},
}
)
}
})
</script>
17 changes: 12 additions & 5 deletions src/components/PageFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,25 @@
<v-footer class="footer pa-8" width="auto">
<div class="logo-container">
<a href="https://internetofwater.org" class="logo-link">
<img src="@/assets/logo-iow.png" alt="Internet of Water Logo" title="internetofwater.org" class="logo-img" />
<img
src="@/assets/logo-iow.png"
alt="Internet of Water Logo"
title="internetofwater.org"
class="logo-img"
/>
</a>
<a href="https://cgsearth.org" class="logo-link">
<img src="@/assets/logo-cgs.png" alt="CGS Earth Logo" title="cgsearth.org" class="logo-img" />
<img
src="@/assets/logo-cgs.png"
alt="CGS Earth Logo"
title="cgsearth.org"
class="logo-img"
/>
</a>
</div>
</v-footer>
</template>


<style scoped>
.footer {
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
Expand All @@ -33,7 +42,5 @@
.logo-img {
width: 180px;
padding: 0 16px;
}
</style>
17 changes: 10 additions & 7 deletions src/components/PageHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
<div class="header pa-6 mb-4">
<div class="logo-container">
<a href="https://geoconnex.us">
<img src="@/assets/logo-geoconnex.png" alt="Geoconnex Logo" title="geoconnex.us" class="logo-geoconnex" />
<img
src="@/assets/logo-geoconnex.png"
alt="Geoconnex Logo"
title="geoconnex.us"
class="logo-geoconnex"
/>
</a>
</div>

Expand All @@ -11,10 +16,8 @@
-->
<!-- <v-icon @click="toggleTheme" icon="mdi-theme-light-dark" class="theme-toggle-icon"></v-icon> -->
</div>

</template>


<!-- <script setup lang="ts">
import { useTheme } from 'vuetify'

Expand All @@ -25,7 +28,6 @@ function toggleTheme() {
}
</script> -->


<style scoped>
.header {
display: flex;
Expand Down Expand Up @@ -63,9 +65,10 @@ function toggleTheme() {
}

.logo-geoconnex {
-webkit-filter: drop-shadow(1px 1px 0 rgba(255, 255, 255, 0.594)) drop-shadow(-1px 1px 0 white) drop-shadow(1px -1px 0 white) drop-shadow(-1px -1px 0 white);

filter: drop-shadow(1px 1px 0 white) drop-shadow(-1px 1px 0.29 white) drop-shadow(1px -1px 0.29 white) drop-shadow(-1px -1px 0.29 white);
-webkit-filter: drop-shadow(1px 1px 0 rgba(255, 255, 255, 0.594)) drop-shadow(-1px 1px 0 white)
drop-shadow(1px -1px 0 white) drop-shadow(-1px -1px 0 white);

filter: drop-shadow(1px 1px 0 white) drop-shadow(-1px 1px 0.29 white)
drop-shadow(1px -1px 0.29 white) drop-shadow(-1px -1px 0.29 white);
}
</style>
Loading

0 comments on commit 8983438

Please sign in to comment.