diff --git a/frontend/babel.config.js b/frontend/babel.config.js deleted file mode 100644 index ba179669a123909a9728283fd9c004c65adb90c5..0000000000000000000000000000000000000000 --- a/frontend/babel.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - presets: [ - '@vue/app' - ] -} diff --git a/frontend/package.json b/frontend/package.json index abb3cb6938946f88ded68cf11c79162d2b154bdb..ab0d228b29018576e902cbceb14cc73f50cb2969 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -27,7 +27,6 @@ "devDependencies": { "@types/chai": "^4.1.0", "@types/mocha": "^5.2.4", - "@vue/cli-plugin-babel": "^3.0.0-rc.10", "@vue/cli-plugin-e2e-nightwatch": "^3.0.0-rc.10", "@vue/cli-plugin-eslint": "^3.0.0-rc.10", "@vue/cli-plugin-typescript": "^3.0.0-rc.10", diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 812dbaae0acff8b32db2ff387658d28209883790..5576736f60685a98f689a1ee5caea62c9a2c278a 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -1,6 +1,6 @@ import Vue from 'vue' import App from './App.vue' -import router from './router' +import router from './router/index' import store from './store/store' import Vuetify from 'vuetify' import Notifications from 'vue-notification' @@ -13,7 +13,6 @@ Vue.use(Vuetify) Vue.use(Cliboard) Vue.use(Notifications) - Vue.config.productionTip = false export default new Vue({ diff --git a/frontend/src/router.ts b/frontend/src/router.ts deleted file mode 100644 index b4a893feed2e89cb00411b7c2c5392cab4a4879a..0000000000000000000000000000000000000000 --- a/frontend/src/router.ts +++ /dev/null @@ -1,23 +0,0 @@ -import Vue from 'vue' -import Router from 'vue-router' -import Home from './views/Home.vue' - -Vue.use(Router) - -export default new Router({ - routes: [ - { - path: '/', - name: 'home', - component: Home - }, - { - path: '/about', - name: 'about', - // route level code-splitting - // this generates a separate chunk (about.[hash].js) for this route - // which is lazy-loaded when the route is visited. - component: () => import(/* webpackChunkName: "about" */ './views/About.vue') - } - ] -}) diff --git a/frontend/src/router/index.js b/frontend/src/router/index.ts similarity index 90% rename from frontend/src/router/index.js rename to frontend/src/router/index.ts index 15701cfe18c2c908ec4d580d4fad0933a672826e..e780522f3cb6e3a2723bb573f3b59c3304a3e7ec 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.ts @@ -1,19 +1,19 @@ import Vue from 'vue' import Router from 'vue-router' -import Login from '@/pages/Login' -import StudentSubmissionPage from '@/pages/student/StudentSubmissionPage' -import StudentOverviewPage from '@/pages/reviewer/StudentOverviewPage' -import TutorOverviewPage from '@/pages/reviewer/TutorOverviewPage' -import SubscriptionWorkPage from '@/pages/SubscriptionWorkPage' -import SubscriptionEnded from '@/components/subscriptions/SubscriptionEnded' -import PageNotFound from '@/pages/PageNotFound' -import StartPageSelector from '@/pages/StartPageSelector' -import LayoutSelector from '@/pages/LayoutSelector' -import StudentSubmissionSideView from '@/pages/StudentSubmissionSideView' -import StudentListHelpCard from '@/components/student_list/StudentListHelpCard' -import FeedbackHistoryPage from '@/pages/base/FeedbackHistoryPage' -import FeedbackTable from '@/components/feedback_list/FeedbackTable' -import FeedbackListHelpCard from '@/components/feedback_list/FeedbackListHelpCard' +import Login from '@/pages/Login.vue' +import StudentSubmissionPage from '@/pages/student/StudentSubmissionPage.vue' +import StudentOverviewPage from '@/pages/reviewer/StudentOverviewPage.vue' +import TutorOverviewPage from '@/pages/reviewer/TutorOverviewPage.vue' +import SubscriptionWorkPage from '@/pages/SubscriptionWorkPage.vue' +import SubscriptionEnded from '@/components/subscriptions/SubscriptionEnded.vue' +import PageNotFound from '@/pages/PageNotFound.vue' +import StartPageSelector from '@/pages/StartPageSelector.vue' +import LayoutSelector from '@/pages/LayoutSelector.vue' +import StudentSubmissionSideView from '@/pages/StudentSubmissionSideView.vue' +import StudentListHelpCard from '@/components/student_list/StudentListHelpCard.vue' +import FeedbackHistoryPage from '@/pages/base/FeedbackHistoryPage.vue' +import FeedbackTable from '@/components/feedback_list/FeedbackTable.vue' +import FeedbackListHelpCard from '@/components/feedback_list/FeedbackListHelpCard.vue' import VueInstance from '@/main' import store from '@/store/store' diff --git a/frontend/src/store/store.js b/frontend/src/store/store.ts similarity index 100% rename from frontend/src/store/store.js rename to frontend/src/store/store.ts diff --git a/frontend/src/views/About.vue b/frontend/src/views/About.vue deleted file mode 100644 index 3fa28070de24f2055171ca2e20543881cb7fdf1c..0000000000000000000000000000000000000000 --- a/frontend/src/views/About.vue +++ /dev/null @@ -1,5 +0,0 @@ -<template> - <div class="about"> - <h1>This is an about page</h1> - </div> -</template> diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue deleted file mode 100644 index 3f3497ec2d269108dbcd1b5b83e6f28ade906cca..0000000000000000000000000000000000000000 --- a/frontend/src/views/Home.vue +++ /dev/null @@ -1,11 +0,0 @@ -<template> - <div class="home"> - </div> -</template> - -<script lang="ts"> -import { Component, Vue } from 'vue-property-decorator' - -@Component({}) -export default class Home extends Vue {} -</script> diff --git a/frontend/vue.config.js b/frontend/vue.config.js new file mode 100644 index 0000000000000000000000000000000000000000..78bc4df2ae1e5ca245453ca7b8c389cee5e513c8 --- /dev/null +++ b/frontend/vue.config.js @@ -0,0 +1,13 @@ +const path = require('path') + +const projectRoot = path.resolve(__dirname) + +module.exports = { + configureWebpack: { + resolve: { + alias: { + '@': `${projectRoot}/src` + } + } + } +}