Merge pull request #123 from anderm18/yearSelectionHeader

Moved year selection button to header
Bram-Hub · Jul 19, 2022 · c2ba83e · c2ba83e
2 parents 74040b9 + 5cc4c62
commit c2ba83e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 23 deletions.
diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
@@ -8,23 +8,26 @@
                 :src="this.$vuetify.theme.dark ? require('../assets/dark-mode-logo.png') : require('../assets/light-mode-logo.png')"
             />
         </router-link>
-
         <v-container fluid>
             <v-layout row align-center justify-end>
+                <YearSelection />
                 <DarkLightModeButton />
                 <HeaderNav />
             </v-layout>
         </v-container>
     </v-app-bar>
-</template>
+</template>       
 
 <script>
 import DarkLightModeButton from './DarkLightModeButton.vue'
 import HeaderNav from './HeaderNav.vue'
+import YearSelection from '../components/YearSelection.vue'
 
 export default {
     name: 'Header',
-    components: { DarkLightModeButton, HeaderNav }
+    components: { DarkLightModeButton, 
+    HeaderNav,
+    YearSelection }
 }
 </script>
 

diff --git a/frontend/src/components/YearSelection.vue b/frontend/src/components/YearSelection.vue
@@ -38,9 +38,10 @@ export default {
 }
 </script>
 
-
 <style>
 .yeardropdown {
+    padding-top: 20px;
+    padding-right: 10px;
     max-width: 200px;
     float: right;
 }

diff --git a/frontend/src/pages/FromClasses/FromClassesPage.vue b/frontend/src/pages/FromClasses/FromClassesPage.vue
@@ -2,7 +2,6 @@
     <div>
         <v-container>
             <Breadcrumbs :breadcrumbs="breadcrumbs" />
-            <YearSelection />
 
             <h1>HASS Pathways From Classes</h1>
             <p>Search for the classes you have taken and then continue to the next page to display the computed pathways for you!</p>
@@ -138,7 +137,6 @@
 import Breadcrumbs from '../../components/Breadcrumbs'
 import breadcrumbs from '../../data/breadcrumbs.js'
 import { courses } from '../../data/data.js'
-import YearSelection from '../../components/YearSelection.vue'
 
 const TABLE_HEADERS = [
     {
@@ -154,7 +152,7 @@ const TABLE_HEADERS = [
 
 export default {
     components: {
-        Breadcrumbs, YearSelection
+        Breadcrumbs
     },
     data() {
         const courseList = Object.values(courses).map(course => {

diff --git a/frontend/src/pages/FromClasses/FromClassesPathways.vue b/frontend/src/pages/FromClasses/FromClassesPathways.vue
@@ -2,7 +2,6 @@
     <div>
         <v-container>
             <Breadcrumbs :breadcrumbs="breadcrumbs" />
-            <YearSelection />
             <h1>Matching Pathways</h1>
             <p>
                 Here are the pathways that match the selected courses!
@@ -43,13 +42,11 @@ import Breadcrumbs from '../../components/Breadcrumbs'
 import MyPathway from '../../components/MyPathway'
 import breadcrumbs from '../../data/breadcrumbs.js'
 import { pathways } from '../../data/data.js'
-import YearSelection from '../../components/YearSelection.vue'
 
 export default {
     components: {
         Breadcrumbs,
-        MyPathway,
-        YearSelection
+        MyPathway
     },
     data() {
         return {

diff --git a/frontend/src/pages/HomePage.vue b/frontend/src/pages/HomePage.vue
@@ -2,7 +2,6 @@
     <div style="width: 75%; margin: 0 auto;">
         <v-container fluid>
             <Breadcrumbs :breadcrumbs="breadcrumbs" />
-            <YearSelection />
             <h1 style="text-align: center;">
                 Welcome to HASS Pathways!
             </h1>
@@ -65,11 +64,10 @@
 <script>
 import Breadcrumbs from '../components/Breadcrumbs'
 import breadcrumbs from '../data/breadcrumbs.js'
-import YearSelection from '../components/YearSelection.vue'
 
 export default {
     components: {
-        Breadcrumbs, YearSelection
+        Breadcrumbs
     },
     data() {
         return {

diff --git a/frontend/src/pages/MyPathways/MyPathwaysPage.vue b/frontend/src/pages/MyPathways/MyPathwaysPage.vue
@@ -2,7 +2,6 @@
     <div>
         <v-container>
             <Breadcrumbs :breadcrumbs="breadcrumbs" />
-            <YearSelection />
             <!-- <v-btn @click="debug()">click me</v-btn> -->
 
             <h1>My HASS Pathways</h1>
@@ -35,11 +34,10 @@
 import MyPathway from '../../components/MyPathway'
 import Breadcrumbs from '../../components/Breadcrumbs'
 import breadcrumbs from '../../data/breadcrumbs.js'
-import YearSelection from '../../components/YearSelection.vue'
 
 export default {
     components: {
-        MyPathway, Breadcrumbs, YearSelection
+        MyPathway, Breadcrumbs
     },
     props: {
         path: {

diff --git a/frontend/src/pages/Pathway/PathwayPage.vue b/frontend/src/pages/Pathway/PathwayPage.vue
@@ -1,7 +1,6 @@
 <template>
     <v-container>
         <Breadcrumbs :breadcrumbs="breadcrumbs" />
-        <YearSelection />
         <div class="header">
             <h1>{{ pathway.name }}</h1>
 
@@ -115,11 +114,10 @@ import CourseTable from '../../components/CourseTable'
 import Breadcrumbs from '../../components/Breadcrumbs'
 import Bookmark from '../../components/Bookmark'
 import breadcrumbs from '../../data/breadcrumbs.js'
-import YearSelection from '../../components/YearSelection.vue'
 
 export default {
     components: {
-        CourseTable, Breadcrumbs, YearSelection, Bookmark
+        CourseTable, Breadcrumbs, Bookmark
     },
     data() {
         return {

diff --git a/frontend/src/pages/Pathway/PathwaysPage.vue b/frontend/src/pages/Pathway/PathwaysPage.vue
@@ -2,7 +2,6 @@
     <div>
         <v-container>
             <Breadcrumbs :breadcrumbs="breadcrumbs" />
-            <YearSelection />
             <h1>HASS Pathways</h1>
             <p>
                 Select a pathway below to get started, or <router-link to="/search-classes">
@@ -31,10 +30,9 @@ import PathwayCategory from '../../components/PathwayCategory'
 import Breadcrumbs from '../../components/Breadcrumbs'
 import { pathwayCategories } from '../../data/data.js'
 import breadcrumbs from '../../data/breadcrumbs.js'
-import YearSelection from '../../components/YearSelection.vue'
 
 export default {
-    components: { PathwayCategory, Breadcrumbs, YearSelection },
+    components: { PathwayCategory, Breadcrumbs },
     data: () => {
         return {
             pathwayCategories,