Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(#155): Fixes #211

Merged
merged 13 commits into from
Jun 2, 2022
Merged

chore(#155): Fixes #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
23047c9
#155: add backup to git ignore
tholulomo May 24, 2022
8407af4
#155: Add node modules to ignore
tholulomo May 24, 2022
c559460
#155: Add a new library for pixel unit testing
tholulomo May 24, 2022
e4a2e0e
#155: Re-enable pixel unit test
tholulomo May 24, 2022
5f9cebb
#155: Re-enable pixel unit test
tholulomo May 24, 2022
f081ff3
#177: Add 404 page and updated app router
tholulomo May 24, 2022
9a0de6f
#177: Styling 404 page
tholulomo May 24, 2022
844e614
#155: updated search, testing and dv link
tholulomo May 24, 2022
5c4ff07
#155: fix typos and update creation page to use curate
tholulomo May 31, 2022
df8384f
#155: Add header to page not found
tholulomo May 31, 2022
a3c18ea
#155: update unit test for page-not-found
tholulomo May 31, 2022
cb7ea8f
#155: Updated code owners
tholulomo May 31, 2022
a501420
#155: Update home link
tholulomo Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* @tholulomo @aswallace @stouffers
/whyis/ @jpmccu @roryschadler
/whyis/ @jpmccu @tholulomo
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ mockDB/fuseki/log4j2.properties

#Sync DB
mockDB/restore/mongodump/
mockDB/materialsmine_backup/

#Elastic Search
mockDB/es/
Expand Down
1 change: 1 addition & 0 deletions app/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#155 mentions ignoring package-lock.json as well. I'm not sure exactly why, since we are committing package-lock in this repo

65 changes: 65 additions & 0 deletions app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^6.2.2",
"jest-canvas-mock": "^2.4.0",
"jest-raw-loader": "^1.0.1",
"jest-serializer-vue": "^2.0.2",
"lint-staged": "^9.5.0",
Expand Down
28 changes: 28 additions & 0 deletions app/src/assets/css/modules/_pages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,3 +358,31 @@
border-bottom: .1rem solid $primary;
}
}


.page-not-found {
padding: 5rem;
height: 100vh;
text-align: center;
@include respond(tab-port) {
padding: 1rem;
}

&-header {
padding: 1.5em 0 .3em;
font-size: 6em;
color: $primary;
}

p {
padding: 0 20em;

@include respond(tab-port) {
padding: 0 5em;
}

@include respond(phone) {
padding: 0;
}
}
}
8 changes: 4 additions & 4 deletions app/src/assets/css/modules/_utility.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,10 @@
margin: 0 0 2.5rem 0;
padding: 1rem;
}
&-bckg {
background-color: $primary !important;
font-size: .8rem !important;
}
// &-bckg {
// background-color: $primary !important;
// font-size: .8rem !important;
// }
&-roverflow {
overflow: hidden !important;
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/components/explorer/Header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<div class="md-toolbar-row u_margin-top-med">
<md-tabs class="md-primary" id="reset_tab_bg">
<router-link class="tabs" to="/explorer" v-slot="{navigate, href}" custom>
<md-tab :href="href" @click="navigate" id="tab-home" md-label="Search"> </md-tab>
<md-tab :href="href" @click="href === '/explorer' ? setSearching : navigate" id="tab-home" md-label="Search"> </md-tab>
</router-link>
<router-link class="tabs" to="/explorer/visualization" v-slot="{navigate, href}" custom>
<md-tab :href="href" @click="navigate" id="tab-pages" md-label="Visualization"> </md-tab>
</router-link>
<router-link class="tabs" to="/explorer/create" v-slot="{navigate, href}" custom>
<md-tab :href="href" @click="navigate" id="tab-posts" md-label="Create"> </md-tab>
<router-link class="tabs" to="/explorer/curate" v-slot="{navigate, href}" custom>
<md-tab :href="href" @click="navigate" id="tab-posts" md-label="Curate"> </md-tab>
</router-link>
</md-tabs>
</div>
Expand Down
20 changes: 11 additions & 9 deletions app/src/components/explorer/SearchHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<template>
<div class="explorer_page_header">
<md-card style="padding:2rem; margin:2rem; z-index: 10">
<div class="search_box_form">
<div class="form__group search_box_form-item-1">
<input type="text" ref="search_input" class="form__input form__input--adjust" placeholder="Search" name="search" id="search" required v-model="searchWord" />
<label htmlFor="search" class="form__label search_box_form_label">Search</label>
</div>
<div class="form__group search_box_form-item-2">
<button type="submit" class="btn btn--primary btn--noradius search_box_form_btn">Search</button>
</div>
</div>
<form class="form" @submit.prevent="submitSearch">
<div class="search_box_form">
<div class="form__group search_box_form-item-1">
<input type="text" ref="search_input" class="form__input form__input--adjust" placeholder="Search" name="search" id="search" required v-model="searchWord" />
<label htmlFor="search" class="form__label search_box_form_label">Search</label>
</div>
<div class="form__group search_box_form-item-2">
<button type="submit" class="btn btn--primary btn--noradius search_box_form_btn">Search</button>
</div>
</div>
</form>
<div class="search-dropdown-menu_parent" v-if="!!suggestions.length">
<ul class="search-dropdown-menu">
<li v-for="(suggestion, index) in suggestions" :key="index" class="" @click.prevent="submitSearch(suggestion)">
Expand Down
6 changes: 6 additions & 0 deletions app/src/mixins/explorerSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,18 @@ import { mapMutations, mapGetters } from 'vuex'
* Both: 'Keyword Search' & 'Autosuggest'
*/
export default {
data () {
return {
enableAutosuggest: true
}
},
computed: {
searchWord: {
get () {
return this.$store.getters['explorer/getSearchKeyword']
},
async set (payload) {
this.enableAutosuggest = true
await this.$store.commit('explorer/setSearchKeyword', payload)
await this.requestSearch(payload)
}
Expand Down
42 changes: 42 additions & 0 deletions app/src/pages/NotFound.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<template>
<div>
<header class="header">
<div class="wrapper">
<router-link to="/" class="header-logo">
<div class="">
<img src="@/assets/img/materialsmine_logo.png" alt="MaterialsMine Logo">
</div>
</router-link>
<div class="nav_mobile-icon">
<div class="nav_mobile-icon-menu"></div>
</div>
<div class="header_nav">
<div class="nav nav_menu u--inline">
<ul>
<li><a href="/nm">NanoMine</a></li>
<li><a href="/mm">MetaMine</a></li>
</ul>
</div>
<div class="u--inline">
<div v-if="$store.getters.isAuthenticated" class="nav_menu--container">
<a class="u--default-size nav_menu--handler" style="color:#fff; font-size:1.2rem !important;">
<i class="material-icons" style="vertical-align: middle;">perm_identity</i>
</a>
<div class="nav_menu--siblings nav_menu--sibheader">
<span class="nav_menu--siblings-lists" @click="$store.dispatch('logout')"><a>Logout</a></span>
</div>
</div>
<div v-else>
<a class="btn btn--tertiary btn--noradius">Login/Register</a>
</div>
</div>
</div>
</div>
</header>
<div class="page-not-found">
<h1 class="page-not-found-header u_margin-bottom-small">Oops!</h1>
<h2 class="u_margin-top-med u_margin-bottom-small">404 - Page Not Found</h2>
<p>The page you are looking for might have been removed, had its name changed or is temporarily unavailable. Would you like to go back to <router-link to=""><a @click="$router.go(-1)">previous page</a></router-link>?</p>
</div>
</div>
</template>
14 changes: 11 additions & 3 deletions app/src/pages/explorer/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<div @click="disableRender">
<!-- <facet-panel :searchEnabled="searchEnabled" class="facet_panel" /> -->
<facet-panel class="facet_panel" />
<div class="section_teams" v-if="!searchEnabled">
Expand All @@ -16,7 +16,7 @@
</div>
</div>
</form>
<div class="search-dropdown-menu_parent" v-if="!!suggestions.length">
<div class="search-dropdown-menu_parent" v-if="!!suggestions.length && enableAutosuggest">
<ul class="search-dropdown-menu" style="width:100%">
<li v-for="(suggestion, index) in suggestions" :key="index" class="" @click.prevent="submitSearch(suggestion)">
<a href="#">{{ suggestion }}</a>
Expand Down Expand Up @@ -66,7 +66,7 @@ export default {
return {
pageNavLinks: [
{ icon: 'grid_view', text: 'Gallery', link: 'explorer/visualization' },
{ icon: 'cloud_upload', text: 'Curate', link: 'explorer/create' },
{ icon: 'cloud_upload', text: 'Curate', link: 'explorer/curate' },
{ icon: 'help', text: 'Help', link: 'nm/how' }
]
}
Expand All @@ -78,6 +78,14 @@ export default {
},
async mounted () {
await this.$store.dispatch('explorer/facetFilterMaterials')
},
methods: {
async disableRender (e) {
const selected = e.target.closest('.search_box')
if (!selected) {
this.enableAutosuggest = false
}
}
}
}
</script>
34 changes: 14 additions & 20 deletions app/src/pages/explorer/parameterized-query/parameterized-query-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,6 @@
<p>No templates were loaded</p>
</div>
<div v-else>
<div class="button-row">
<div>
<router-link :to="{ name: 'NewChartDataVoyager' }">
<md-button
class="md-icon-button"
@click="selectQueryForVizEditor()"
>
<md-tooltip
class="utility-bckg"
md-direction="bottom"
>
Open Current Query in DataVoyager
</md-tooltip>
<md-icon>check</md-icon>
</md-button>
</router-link>
</div>
</div>
<md-toolbar>
<h3 class="md-title">Query Template</h3>
</md-toolbar>
Expand Down Expand Up @@ -96,14 +78,26 @@
:disabled="autoRefresh || !newQuery"
@click="execQuery"
>
Refresh Results
Search Query
</button>
<md-switch
class="md-primary"
v-model="autoRefresh"
>
Auto Refresh
</md-switch>
<div class="button-row">
<div>
<router-link :to="{ name: 'NewChartDataVoyager' }" target="_blank">
<button
class="btn btn--primary"
@click="selectQueryForVizEditor()"
>
Open in Datavoyager
</button>
</router-link>
</div>
</div>
</div>
<div
class="results-progress"
Expand Down Expand Up @@ -334,7 +328,7 @@ export default {
.results-controls {
margin: 20px 10px;
display: flex;
justify-content: flex-start;
justify-content: space-between;
align-items: center;

> * {
Expand Down
Loading