Landing page and routing revamp

README.md

@@ -7,10 +7,20 @@ This pilot project will prototype a new process that automates data collection f
 
 ## Starting from scratch
 
+    clone from git into target machine
+    cd pace-admin
     cp .env.template .env
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
+    Logout of terminal and log back in
+    nvm install 13.14.0
+    nvm use 13.14.0
+
+    Follow steps here to install docker: https://docs.docker.com/compose/install/
+
     make install
-    make cleardb
-    make start_docker
+    sudo snap install docker
+    sudo make cleardb
+    sudo make start_docker
     make migrate
     make newdb
 

client/src/components/CenterReviewPubFilter.vue

@@ -18,7 +18,7 @@
           <q-icon name="search" />
         </template>
       </q-input>
-      <q-select
+      <!--<q-select
         name="institution_review"
         v-model="selectedInstitutionReviewState"
         :options="institutionReviewStateOptions"
@@ -27,7 +27,7 @@
         style="width:325px"
         label="ND Author Review:"
         class="fullSelect"
-      />
+      />-->
       <q-select
         name="sort_center_pub"
         v-model="selectedCenterPubSort"
@@ -61,7 +61,6 @@ export default {
   data () {
     return {
       sortCenterPubOptions: [
-        'Confidence',
         'Title',
         'Authors'
       ],

client/src/components/MainFilter.vue

@@ -28,8 +28,6 @@
           <div>
             <YearFilter />
           </div>
-        </div>
-        <div class="row">
           <div>
             <PeopleFilter />
           </div>
@@ -97,7 +95,20 @@ export default {
     selectedCenterPubSort: sync('filter/selectedCenterPubSort'),
     selectedCenterAuthor: sync('filter/selectedCenterAuthor'),
     centerAuthorOptions: sync('filter/centerAuthorOptions'),
-    pubSearch: sync('filter/pubSearch')
+    selectedMemberYears: sync('filter/selectedMemberYears'),
+    selectedInstitutions: sync('filter/selectedInstitutions'),
+    institutionOptions: sync('filter/institutionOptions'),
+    selectedPubYears: sync('filter/selectedPubYears'),
+    selectedPersonConfidence: sync('filter/selectedPersonConfidence'),
+    pubSearch: sync('filter/pubSearch'),
+    preferredPersonTotal: sync('filter/preferredPersonTotal'),
+    preferredPersonConfidence: sync('filter/preferredPersonConfidence'),
+    yearPubStaticMin: sync('filter/yearPubStaticMin'),
+    yearPubStaticMax: sync('filter/yearPubStaticMax'),
+    yearMemberStaticMin: sync('filter/yearMemberStaticMin'),
+    yearMemberStaticMax: sync('filter/yearMemberStaticMax'),
+    changedPubYears: sync('filter/changedPubYears'),
+    changedMemberYears: sync('filter/changedMemberYears')
   },
   async created () {
     this.fetchData()
@@ -123,6 +134,22 @@ export default {
         // console.log(`Current type review is: ${JSON.stringify(typeReview, null, 2)}`)
         return typeReview.value
       })
+    },
+    resetFilters () {
+      this.selectedPersonPubSort = this.preferredPersonPubSort
+      this.selectedCenterPubSort = this.selectedCenterPubSort
+      this.selectedPersonSort = this.preferredPersonSort
+      this.selectedPersonTotal = this.preferredPersonTotal
+      this.selectedPersonConfidence = this.preferredPersonConfidence
+      this.selectedPubYears = {
+        min: this.yearPubStaticMin,
+        max: this.yearPubStaticMax
+      }
+      this.selectedInstitutions = _.clone(this.institutionOptions)
+      this.selectedMemberYears = {
+        min: this.yearMemberStaticMin,
+        max: this.yearMemberStaticMax
+      }
     }
   }
 }

client/src/components/PeopleAuthorReviewFilter.vue → client/src/components/PeopleAuthorSortFilter.vue

@@ -1,15 +1,6 @@
 <template>
   <div class="row">
   <div class="q-pa-md"  style="min-width:200px">
-    <q-select
-      filled
-      v-model="selectedInstitutions"
-      multiple
-      :options="institutionOptions"
-      use-chips
-      stack-label
-      label="Institutions"
-      />
     <q-select
       name="sort_person"
       :key="personSortKey"
@@ -20,7 +11,7 @@
       label="Sort Person By:"
     />
   </div>
-  <div class="q-pa-md"  style="min-width:250px">
+  <div class="q-pa-md"  style="min-width:200px">
     <q-select
       name="person_total"
       v-model="selectedPersonTotal"
@@ -30,38 +21,22 @@
       label="Show Total Counts:"
       class="fullSelect"
     />
-    <q-select
-      name="person_confidence"
-      v-model="selectedPersonConfidence"
-      :options="personConfidenceOptions"
-      color="primary"
-      filled
-      label="Minimum Confidence:"
-      class="fullSelect"
-    />
   </div>
   </div>
 </template>
 
 <script>
 import { sync } from 'vuex-pathify'
-import _ from 'lodash'
-
-import readInstitutions from '../../../gql/readInstitutions.gql'
 
 export default {
   data () {
     return {
       sortPersonOptions: [
-        'Total',
+        'Total Counts',
         'Name'
       ],
       personTotalOptions: [
-        'Pending',
-        'All'
-      ],
-      personConfidenceOptions: [
-        '50%',
+        'Pending Only',
         'All'
       ],
       filterMenuIcons: {
@@ -76,13 +51,10 @@ export default {
   },
   computed: {
     personSortKey: sync('filter/personSortKey'),
-    institutionOptions: sync('filter/institutionOptions'),
     preferredPersonTotal: sync('filter/preferredPersonTotal'),
     preferredPersonSort: sync('filter/preferredPersonSort'),
-    selectedInstitutions: sync('filter/selectedInstitutions'),
     selectedPersonSort: sync('filter/selectedPersonSort'),
-    selectedPersonTotal: sync('filter/selectedPersonTotal'),
-    selectedPersonConfidence: sync('filter/selectedPersonConfidence')
+    selectedPersonTotal: sync('filter/selectedPersonTotal')
   },
   async created () {
     this.fetchData()
@@ -92,14 +64,8 @@ export default {
   },
   methods: {
     async fetchData () {
-      const results = await this.$apollo.query({
-        query: readInstitutions
-      })
-      this.institutionOptions = _.compact(_.map(results.data.institutions, 'name'))
-      this.selectedInstitutions = (this.selectedInstitutions && this.selectedInstitutions.length > 0) ? this.selectedInstitutions : _.clone(this.institutionOptions)
       this.selectedPersonSort = (this.selectedPersonSort) ? this.selectedPersonSort : this.preferredPersonSort
       this.selectedPersonTotal = (this.selectedPersonTotal) ? this.selectedPersonTotal : this.preferredPersonTotal
-      this.selectedPersonConfidence = (this.selectedPersonConfidence) ? this.selectedPersonConfidence : this.preferredPersonConfidence
     }
   }
 }

client/src/gql/readAllPublicationsCSL.js

@@ -0,0 +1,14 @@
+import gql from 'graphql-tag'
+import _ from 'lodash'
+
+export default function readAllPublicationsCSL () {
+  return gql`
+    query MyQuery {
+    publications {
+      id
+      doi
+      csl
+    }
+  }
+  `
+}

client/src/gql/readAuthorsByPublications.js

@@ -20,6 +20,7 @@ export default function readAuthorsByPublications (publicationIds) {
     ){
       id
       doi
+      title
       authors: csl(path: "author")
     }
   }

client/src/gql/readCenterMembers.js

@@ -16,7 +16,7 @@ export default function readCenterMembers () {
             family_name
             start_date
             end_date
-            semantic_scholar_id
+            semantic_scholar_ids
             institution {
               name
             }

client/src/gql/readPersonPublicationsConfSets.js

@@ -19,6 +19,7 @@ export default function readPersonPublicationsConfSets (personPubIds) {
           person_id
           publication_id
           doi
+          title
           value
           datetime
         }

client/src/gql/readPersonPublicationsReviews.js

@@ -19,6 +19,7 @@ export default function readPersonPublicationsReviews (personPubIds, reviewOrgVa
           person_id
           publication_id
           doi
+          title
           review_type
           datetime
         }

client/src/gql/readPersons.js

@@ -10,7 +10,7 @@ export default function readPersons () {
           family_name
           start_date
           end_date
-          semantic_scholar_id
+          semantic_scholar_ids
           institution {
             name
           }