From 9ed06c9754f9c5ab9d187100ae8cce179abdad50 Mon Sep 17 00:00:00 2001
From: "robinwilliam.hundt" <robinwilliam.hundt@stud.uni-goettingen.de>
Date: Fri, 3 Aug 2018 18:50:59 +0200
Subject: [PATCH] removed babel plugin due to promise bug
---
frontend/babel.config.js | 5 ----
frontend/package.json | 1 -
frontend/src/main.ts | 3 +--
frontend/src/router.ts | 23 ------------------
frontend/src/router/{index.js => index.ts} | 28 +++++++++++-----------
frontend/src/store/{store.js => store.ts} | 0
frontend/src/views/About.vue | 5 ----
frontend/src/views/Home.vue | 11 ---------
frontend/vue.config.js | 13 ++++++++++
9 files changed, 28 insertions(+), 61 deletions(-)
delete mode 100644 frontend/babel.config.js
delete mode 100644 frontend/src/router.ts
rename frontend/src/router/{index.js => index.ts} (90%)
rename frontend/src/store/{store.js => store.ts} (100%)
delete mode 100644 frontend/src/views/About.vue
delete mode 100644 frontend/src/views/Home.vue
create mode 100644 frontend/vue.config.js
diff --git a/frontend/babel.config.js b/frontend/babel.config.js
deleted file mode 100644
index ba179669..00000000
--- 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 abb3cb69..ab0d228b 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 812dbaae..5576736f 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 b4a893fe..00000000
--- 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 15701cfe..e780522f 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 3fa28070..00000000
--- 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 3f3497ec..00000000
--- 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 00000000..78bc4df2
--- /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`
+ }
+ }
+ }
+}
--
GitLab