diff --git a/src/main/frontend/client/about-modal.vue b/src/main/frontend/client/about-modal.vue index e7a48a0..c8312bb 100644 --- a/src/main/frontend/client/about-modal.vue +++ b/src/main/frontend/client/about-modal.vue @@ -26,6 +26,7 @@
  • "molecule" icon made by Freepik from www.flaticon.com is licensed by CC 3.0 BY
    +
    Splash screen photo by Drew Hays on Unsplash
  • diff --git a/src/main/frontend/client/home.vue b/src/main/frontend/client/home.vue new file mode 100644 index 0000000..e5ae57e --- /dev/null +++ b/src/main/frontend/client/home.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/main/frontend/client/index.ts b/src/main/frontend/client/index.ts index f29c05f..f4e51b9 100644 --- a/src/main/frontend/client/index.ts +++ b/src/main/frontend/client/index.ts @@ -31,6 +31,7 @@ import VToolbar from 'vuetify/es5/components/VToolbar'; import VTooltip from 'vuetify/es5/components/VTooltip'; import transitions from 'vuetify/es5/components/transitions'; +import Home from './home.vue'; import Search from './search.vue'; import Compound from './compound.vue'; import Admin from './admin/admin.vue'; @@ -70,6 +71,11 @@ window.onload = () => { { path: '/', name: 'home', + component: Home + }, + { + path: '/search', + name: 'search', component: Search }, { diff --git a/src/main/frontend/client/lazy-dropdown.vue b/src/main/frontend/client/lazy-dropdown.vue index 41a665d..08b1492 100644 --- a/src/main/frontend/client/lazy-dropdown.vue +++ b/src/main/frontend/client/lazy-dropdown.vue @@ -7,6 +7,7 @@ :placeholder="placeholder" :loading="loading" :prepend-icon="icon" + :clearable="true" autocomplete browser-autocomplete="off" :items="items" @@ -128,7 +129,6 @@ export default class LazyDropdown extends Vue { * Fires an "input" event stating our value has changed. Part of implementing v-model for this component. */ fireUpdateEvent(newValue: any) { - console.log('Value updated to: ' + JSON.stringify(newValue)); this.$emit('input', newValue); } diff --git a/src/main/frontend/client/navbar-pill.vue b/src/main/frontend/client/navbar-pill.vue index 172113f..a165300 100644 --- a/src/main/frontend/client/navbar-pill.vue +++ b/src/main/frontend/client/navbar-pill.vue @@ -36,49 +36,48 @@ export default class NavbarPill extends Vue { diff --git a/src/main/frontend/client/navbar.vue b/src/main/frontend/client/navbar.vue index 320a955..8ea6787 100644 --- a/src/main/frontend/client/navbar.vue +++ b/src/main/frontend/client/navbar.vue @@ -2,16 +2,16 @@ - - + + - + Search - Admin @@ -71,18 +71,7 @@ export default class Navbar extends Vue { } private setActiveTab(tabName: string) { - - switch (tabName) { - - case 'home': - default: - this.$router.push({ name: 'home' }); - break; - - case 'admin': - this.$router.push({ name: 'admin' }); - break; - } + this.$router.push({ name: tabName }); } private close($event: string) { @@ -129,8 +118,20 @@ export default class Navbar extends Vue { diff --git a/src/main/frontend/client/search-filters.vue b/src/main/frontend/client/search-filters.vue index 2d665c9..cee03e9 100644 --- a/src/main/frontend/client/search-filters.vue +++ b/src/main/frontend/client/search-filters.vue @@ -22,7 +22,7 @@ - @@ -73,7 +73,7 @@ export default class SearchFilters extends Vue { const discoverx: string = kinase.discoverxGeneSymbol; return { discoverxGeneSymbol: discoverx, responseValueField: discoverx }; }); - choices.unshift({ discoverxGeneSymbol: '', responseValueField: null }); + //choices.unshift({ discoverxGeneSymbol: '', responseValueField: '' }); return choices; } } diff --git a/src/main/frontend/img/drew-hays-206414-unsplash.jpg b/src/main/frontend/img/drew-hays-206414-unsplash.jpg new file mode 100644 index 0000000..3614b9c Binary files /dev/null and b/src/main/frontend/img/drew-hays-206414-unsplash.jpg differ