Folder Refactor

src/components/BottomBar.vue → src/components/BottomBar/BottomBar.vue

@@ -28,9 +28,9 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue';
-import BottomBarCourse from '@/components/BottomBarCourse.vue';
-import BottomBarTabView from '@/components/BottomBarTabView.vue';
-import BottomBarTitle from '@/components/BottomBarTitle.vue';
+import BottomBarCourse from '@/components/BottomBar/BottomBarCourse.vue';
+import BottomBarTabView from '@/components/BottomBar/BottomBarTabView.vue';
+import BottomBarTitle from '@/components/BottomBar/BottomBarTitle.vue';
 import { AppBottomBarCourse } from '@/user-data';
 
 Vue.component('bottombarcourse', BottomBarCourse);

src/components/BottomBarTabView.vue → src/components/BottomBar/BottomBarTabView.vue

@@ -61,7 +61,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue';
-import BottomBarTab from '@/components/BottomBarTab.vue';
+import BottomBarTab from '@/components/BottomBar/BottomBarTab.vue';
 import { AppBottomBarCourse } from '@/user-data';
 
 Vue.component('bottombartab', BottomBarTab);

src/components/Modals/DeleteSemester.vue

@@ -33,7 +33,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import NewCourse from '@/components/Modals/NewCourse.vue';
+import NewCourse from '@/components/Modals/NewCourse/NewCourse.vue';
 import NewSemester from '@/components/Modals/NewSemester.vue';
 
 Vue.component('newCourse', NewCourse);

src/components/Modals/EditSemester.vue

@@ -41,7 +41,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue';
-import NewCourse from '@/components/Modals/NewCourse.vue';
+import NewCourse from '@/components/Modals/NewCourse/NewCourse.vue';
 import NewSemester from '@/components/Modals/NewSemester.vue';
 import { AppSemester } from '@/user-data';
 

src/components/Modals/Modal.vue

@@ -38,7 +38,7 @@
 
 <script>
 import Vue from 'vue';
-import NewCourse from '@/components/Modals/NewCourse.vue';
+import NewCourse from '@/components/Modals/NewCourse/NewCourse.vue';
 import NewSemester from '@/components/Modals/NewSemester.vue';
 import EditSemester from '@/components/Modals/EditSemester.vue';
 

src/components/BinaryButton.vue → src/components/Modals/NewCourse/BinaryButton.vue

@@ -8,12 +8,12 @@
       <img
         v-if="leftChosen"
         class="confirmation-icon binary-button-check"
-        src="../assets/images/check.svg"
+        src="@/assets/images/check.svg"
       />
       <div>
         {{ choices[0] }}
       </div>
-      <img v-if="leftChosen" class="confirmation-icon hidden" src="../assets/images/check.svg" />
+      <img v-if="leftChosen" class="confirmation-icon hidden" src="@/assets/images/check.svg" />
     </div>
     <div
       @click="onClick(false)"
@@ -23,12 +23,12 @@
       <img
         v-if="!leftChosen"
         class="confirmation-icon binary-button-check"
-        src="../assets/images/check.svg"
+        src="@/assets/images/check.svg"
       />
       <div>
         {{ choices[1] }}
       </div>
-      <img v-if="!leftChosen" class="confirmation-icon hidden" src="../assets/images/check.svg" />
+      <img v-if="!leftChosen" class="confirmation-icon hidden" src="@/assets/images/check.svg" />
     </div>
   </div>
 </template>

src/components/EditRequirement.vue → src/components/Modals/NewCourse/EditRequirement.vue

@@ -7,12 +7,12 @@
     <img
       v-if="selected"
       class="confirmation-icon edit-requirement-check"
-      src="../assets/images/check.svg"
+      src="@/assets/images/check.svg"
     />
     <div class="edit-requirement-text" :class="{ 'edit-requirement-multiline': multiline }">
       {{ name }}
     </div>
-    <img v-if="selected" class="confirmation-icon hidden" src="../assets/images/check.svg" />
+    <img v-if="selected" class="confirmation-icon hidden" src="@/assets/images/check.svg" />
   </div>
 </template>
 

src/components/Modals/NewCourse.vue → src/components/Modals/NewCourse/NewCourse.vue

@@ -89,17 +89,17 @@
 
 <script>
 import Vue from 'vue';
-import coursesJSON from '../../assets/courses/courses.json';
-import EditRequirement from '@/components/EditRequirement.vue';
-import BinaryButton from '@/components/BinaryButton.vue';
+import coursesJSON from '@/assets/courses/courses.json';
+import EditRequirement from '@/components/Modals/NewCourse/EditRequirement.vue';
+import BinaryButton from '@/components/Modals/NewCourse/BinaryButton.vue';
 
 Vue.component('editRequirement', EditRequirement);
 Vue.component('binaryButton', BinaryButton);
 
-const fall = require('../../assets/images/fallEmoji.svg');
-const spring = require('../../assets/images/springEmoji.svg');
-const winter = require('../../assets/images/winterEmoji.svg');
-const summer = require('../../assets/images/summerEmoji.svg');
+const fall = require('@/assets/images/fallEmoji.svg');
+const spring = require('@/assets/images/springEmoji.svg');
+const winter = require('@/assets/images/winterEmoji.svg');
+const summer = require('@/assets/images/summerEmoji.svg');
 
 export default Vue.extend({
   props: {

src/components/Modals/OnboardingTransfer.vue

@@ -186,7 +186,7 @@
 import Vue, { PropType } from 'vue';
 import { examData as reqsData } from '@/requirements/data/exams/ExamCredit';
 import coursesJSON from '../../assets/courses/courses.json';
-import NewCourse from '@/components/Modals/NewCourse.vue';
+import NewCourse from '@/components/Modals/NewCourse/NewCourse.vue';
 import { clickOutside } from '@/utilities';
 import { AppUser, FirestoreTransferClass } from '@/user-data';
 // @ts-ignore

src/components/CompletedSubReqCourse.vue → src/components/Requirements/CompletedSubReqCourse.vue

@@ -37,7 +37,7 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue';
 import firebase from 'firebase/app';
-import ReqCourse from '@/components/ReqCourse.vue';
+import ReqCourse from '@/components/Requirements/ReqCourse.vue';
 import { DisplayableRequirementFulfillment, CourseTaken } from '@/requirements/types';
 import {
   AppCourse,

src/components/RequirementView.vue → src/components/Requirements/RequirementView.vue

@@ -83,8 +83,8 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue';
-import RequirementHeader from '@/components/RequirementHeader.vue';
-import SubRequirement from '@/components/SubRequirement.vue';
+import RequirementHeader from '@/components/Requirements/RequirementHeader.vue';
+import SubRequirement from '@/components/Requirements/SubRequirement.vue';
 
 import { SingleMenuRequirement } from '@/requirements/types';
 import {

src/components/Requirements.vue → src/components/Requirements/Requirements.vue

@@ -76,8 +76,8 @@ import introJs from 'intro.js';
 
 import Course from '@/components/Course.vue';
 import Modal from '@/components/Modals/Modal.vue';
-import RequirementView from '@/components/RequirementView.vue';
-import SubRequirement from '@/components/SubRequirement.vue';
+import RequirementView from '@/components/Requirements/RequirementView.vue';
+import SubRequirement from '@/components/Requirements/SubRequirement.vue';
 import DropDownArrow from '@/components/DropDownArrow.vue';
 import {
   BaseRequirement as Requirement,
@@ -127,7 +127,7 @@ type Data = {
   lastLoadedShowAllCourseId: number;
 };
 // emoji for clipboard
-const clipboard = require('../assets/images/clipboard.svg');
+const clipboard = require('@/assets/images/clipboard.svg');
 
 // This section will be revisited when we try to make first-time tooltips
 const tour = introJs().start();

src/components/SubRequirement.vue → src/components/Requirements/SubRequirement.vue

@@ -107,8 +107,8 @@
 <script lang="ts">
 import Vue, { PropType } from 'vue';
 import firebase from 'firebase/app';
-import CompletedSubReqCourse from '@/components/CompletedSubReqCourse.vue';
-import IncompleteSubReqCourse from '@/components/IncompleteSubReqCourse.vue';
+import CompletedSubReqCourse from '@/components/Requirements/CompletedSubReqCourse.vue';
+import IncompleteSubReqCourse from '@/components/Requirements/IncompleteSubReqCourse.vue';
 import DropDownArrow from '@/components/DropDownArrow.vue';
 
 import {

src/components/Semester.vue → src/components/Semester/Semester.vue

@@ -139,10 +139,10 @@ Vue.component('deletesemester', DeleteSemester);
 Vue.component('editsemester', EditSemester);
 Vue.component('addcoursebutton', AddCourseButton);
 
-const fall = require('../assets/images/fallEmoji.svg');
-const spring = require('../assets/images/springEmoji.svg');
-const winter = require('../assets/images/winterEmoji.svg');
-const summer = require('../assets/images/summerEmoji.svg');
+const fall = require('@/assets/images/fallEmoji.svg');
+const spring = require('@/assets/images/springEmoji.svg');
+const winter = require('@/assets/images/winterEmoji.svg');
+const summer = require('@/assets/images/summerEmoji.svg');
 
 const pageTour = introJs();
 pageTour.setOption('exitOnEsc', 'false');

src/components/SemesterCaution.vue → src/components/Semester/SemesterCaution.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="caution">
     <div class="caution-left">
-      <img class="caution-icon" src="../assets/images/caution-white.svg" />
+      <img class="caution-icon" src="@/assets/images/caution-white.svg" />
     </div>
     <div class="caution-text">{{ text }}</div>
     <div class="caution-right">

src/components/SemesterView.vue → src/components/Semester/SemesterView.vue

@@ -100,9 +100,9 @@ import Vue, { PropType } from 'vue';
 // @ts-ignore
 import clone from 'clone';
 import Course from '@/components/Course.vue';
-import Semester from '@/components/Semester.vue';
+import Semester from '@/components/Semester/Semester.vue';
 import Confirmation from '@/components/Confirmation.vue';
-import SemesterCaution from '@/components/SemesterCaution.vue';
+import SemesterCaution from '@/components/Semester/SemesterCaution.vue';
 import DeleteSemester from '@/components/Modals/DeleteSemester.vue';
 import EditSemester from '@/components/Modals/EditSemester.vue';
 

src/components/Dashboard.vue → src/containers/Dashboard.vue

@@ -91,9 +91,9 @@ import Vue from 'vue';
 
 import introJs from 'intro.js';
 import Course from '@/components/Course.vue';
-import SemesterView from '@/components/SemesterView.vue';
-import Requirements from '@/components/Requirements.vue';
-import BottomBar from '@/components/BottomBar.vue';
+import SemesterView from '@/components/Semester/SemesterView.vue';
+import Requirements from '@/components/Requirements/Requirements.vue';
+import BottomBar from '@/components/BottomBar/BottomBar.vue';
 import NavBar from '@/components/NavBar.vue';
 import Onboarding from '@/components/Modals/Onboarding.vue';
 import TourWindow from '@/components/Modals/TourWindow.vue';

src/router/index.ts

@@ -2,10 +2,10 @@ import Vue from 'vue';
 import Router from 'vue-router';
 import firebase from 'firebase/app';
 
-import Login from '@/components/Login.vue';
-import Dashboard from '@/components/Dashboard.vue';
-import Settings from '@/components/Settings.vue';
-import Page404 from '@/components/404.vue';
+import Login from '@/containers/Login.vue';
+import Dashboard from '@/containers/Dashboard.vue';
+import Settings from '@/containers/Settings.vue';
+import Page404 from '@/containers/404.vue';
 
 Vue.use(Router);