From 54474602ae8ca396e2c0c81873b960b2faa0dccc Mon Sep 17 00:00:00 2001
From: "robinwilliam.hundt" <robinwilliam.hundt@stud.uni-goettingen.de>
Date: Tue, 5 Dec 2017 23:52:55 +0100
Subject: [PATCH] More experimental work on layout
Added BaseLayout component that will serve as bas for the layout of the app. It is modeled after https://next.vuetifyjs.com/examples/layouts/google-contacts . The gradySpeak has been moved to the front-end.
---
frontend/src/assets/logo.png | Bin 6849 -> 0 bytes
frontend/src/components/BaseLayout.vue | 34 ---------
frontend/src/components/Login.vue | 2 +-
frontend/src/components/base/BaseLayout.vue | 68 ++++++++++++++++++
.../src/components/student/StudentLayout.vue | 22 ++++++
.../src/components/student/StudentNav.vue | 38 ----------
.../src/components/student/StudentPage.vue | 25 +++----
.../components/student/SubmissionDetail.vue | 10 +++
frontend/src/router/index.js | 12 +++-
frontend/src/store/grady_speak.js | 25 +++++++
frontend/src/store/store.js | 27 ++++---
11 files changed, 165 insertions(+), 98 deletions(-)
delete mode 100644 frontend/src/assets/logo.png
delete mode 100644 frontend/src/components/BaseLayout.vue
create mode 100644 frontend/src/components/base/BaseLayout.vue
create mode 100644 frontend/src/components/student/StudentLayout.vue
delete mode 100644 frontend/src/components/student/StudentNav.vue
create mode 100644 frontend/src/components/student/SubmissionDetail.vue
create mode 100644 frontend/src/store/grady_speak.js
diff --git a/frontend/src/assets/logo.png b/frontend/src/assets/logo.png
deleted file mode 100644
index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6849
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
diff --git a/frontend/src/components/BaseLayout.vue b/frontend/src/components/BaseLayout.vue
deleted file mode 100644
index 494bed86..00000000
--- a/frontend/src/components/BaseLayout.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
- <v-navigation-drawer
- fixed
- clipped
- app
- v-model="drawer"
- >
- <v-list dense v-for="(item, i) in items">
- <v-list-tile>
- <router-link to="item.path" :key="i"></router-link>
- </v-list-tile>
- </v-list>
- </v-navigation-drawer>
-</template>
-
-
-<script>
- export default {
- name: 'base-layout',
- data () {
- return {
- drawer: true,
- items: [
- {
- path: 'grady-login'
- }
- ]
- }
- }
- }
-</script>
-
-<style>
-</style>
diff --git a/frontend/src/components/Login.vue b/frontend/src/components/Login.vue
index fddc17ee..92e3a906 100644
--- a/frontend/src/components/Login.vue
+++ b/frontend/src/components/Login.vue
@@ -49,7 +49,7 @@
methods: {
submit () {
this.$store.dispatch('getJWTToken', this.credentials).then(response => {
- this.$router.push('/reviewer/')
+ this.$router.push('/student/')
}).catch(_ => {
this.error = this.$store.state.error
})
diff --git a/frontend/src/components/base/BaseLayout.vue b/frontend/src/components/base/BaseLayout.vue
new file mode 100644
index 00000000..e29bbc50
--- /dev/null
+++ b/frontend/src/components/base/BaseLayout.vue
@@ -0,0 +1,68 @@
+<template>
+ <div>
+ <v-navigation-drawer
+ fixed
+ clipped
+ app
+ v-model="drawer"
+ >
+ <v-list dense>
+ <v-list-tile v-for="(item, i) in navItems" :key="i" :to="item.path">
+ {{ item.name }}
+ </v-list-tile>
+ </v-list>
+ </v-navigation-drawer>
+ <v-toolbar
+ app
+ clipped-left
+ fixed
+ color="deep-orange darken-4"
+ class="grady-toolbar"
+ >
+ <v-toolbar-title>
+ <!--<v-toolbar-side-icon v-icon="fa-bars"></v-toolbar-side-icon>-->
+ <span @click.stop="drawer = !drawer">Icon</span>
+ <v-avatar>
+ <img src="../../assets/brand.png">
+ </v-avatar>
+ </v-toolbar-title>
+ <span class="pl-2 grady-speak">{{ gradySpeak }}</span>
+ <h2 class="pl-5">{{ $store.state.examInstance }}</h2>
+ <div class="toolbar-content">
+ <span>Logged in as {{ $store.state.username }}</span>
+ </div>
+ </v-toolbar>
+ <v-content>
+ <slot></slot>
+ </v-content>
+ </div>
+</template>
+
+<script>
+ import { mapGetters } from 'vuex'
+ export default {
+ name: 'base-layout',
+ data () {
+ return {
+ drawer: true,
+ props: ['navItems']
+ }
+ },
+ computed: {
+ ...mapGetters([
+ 'gradySpeak'
+ ])
+ }
+ }
+</script>
+
+<style scoped>
+ .toolbar-content {
+ margin-left: auto;
+ }
+
+ .grady-toolbar {
+ font-weight: bold;
+ }
+
+</style>
diff --git a/frontend/src/components/student/StudentLayout.vue b/frontend/src/components/student/StudentLayout.vue
new file mode 100644
index 00000000..e6704128
--- /dev/null
+++ b/frontend/src/components/student/StudentLayout.vue
@@ -0,0 +1,22 @@
+<template>
+ <base-layout
+
+ ></base-layout>
+</template>
+
+<script>
+ import BaseLayout from '../base/BaseLayout'
+ export default {
+ components: {BaseLayout},
+ name: 'student-layout',
+ data () {
+ return {
+ navItems: [
+ {
+ route: '/'
+ }
+ ]
+ }
+ }
+ }
+</script>
diff --git a/frontend/src/components/student/StudentNav.vue b/frontend/src/components/student/StudentNav.vue
deleted file mode 100644
index 3b2484e9..00000000
--- a/frontend/src/components/student/StudentNav.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
- <v-navbar toggleable="md" type="light" variant="light">
- <v-navbar-toggle target="nav_collapse"></v-navbar-toggle>
-
- <v-navbar-brand>
- <img src="../../assets/brand.png" width="30" class="d-inline-block align-top">
- Grady
- </v-navbar-brand>
-
- <v-collapse is-nav id="nav_collapse">
-
- <v-navbar-nav id="nav-left">
- <v-nav-item class="active" href="#">Results</v-nav-item>
- <v-nav-item href="#">Statistics</v-nav-item>
- </v-navbar-nav>
-
- <!-- Right aligned nav items -->
- <v-navbar-nav class="ml-auto">
- <v-nav-item>{{ this.$store.state.username }}</v-nav-item>
- <router-link to="/">
- <v-button class="btn-dark" @click="logout()" >Signout</v-button>
- </router-link>
- </v-navbar-nav>
- </v-collapse>
- </v-navbar>
-</template>
-
-
-<script>
- export default {
- name: 'grady-nav',
- methods: {
- logout () {
- this.$store.dispatch('logout')
- }
- }
- }
-</script>
diff --git a/frontend/src/components/student/StudentPage.vue b/frontend/src/components/student/StudentPage.vue
index b1e92496..5a9e9a83 100644
--- a/frontend/src/components/student/StudentPage.vue
+++ b/frontend/src/components/student/StudentPage.vue
@@ -1,25 +1,22 @@
<template>
- <div>
- <grady-nav></grady-nav>
- <div class="container-fluid">
- <div class="row justify-content-center my-3">
- <div class="col-md-3">
- <h2 class="my-5">Exam Overview</h2>
+ <v-container fluid>
+ <v-layout justify center>
+ <v-flex md5>
+ <h2>Exam Overview</h2>
<exam-information v-if="doneLoading" :exam="exam"></exam-information>
- </div>
- <div class="col-md-6 offset-md-1" v-if="doneLoading">
- <h2 class="my-5">Submissions of {{ this.studentData.name }}</h2>
+ </v-flex>
+ <div md6 offset-md1 v-if="doneLoading">
+ <h2>Submissions of {{ this.studentData.name }}</h2>
<submission-list :submissions="submissions"></submission-list>
</div>
- </div>
- </div>
- </div>
+ </v-layout>
+ </v-container>
</template>
<script>
import ax from '@/store/api'
- import GradyNav from './StudentNav.vue'
+ import GradyNav from './StudentLayout.vue'
import SubmissionList from './SubmissionList.vue'
import ExamInformation from './ExamInformation.vue'
@@ -37,7 +34,7 @@
},
created: function () {
this.doneLoading = false
- ax.get('api/student/').then(response => {
+ ax.get('api/student-page/').then(response => {
this.studentData = response.data
this.doneLoading = true
})
diff --git a/frontend/src/components/student/SubmissionDetail.vue b/frontend/src/components/student/SubmissionDetail.vue
new file mode 100644
index 00000000..56f6dc74
--- /dev/null
+++ b/frontend/src/components/student/SubmissionDetail.vue
@@ -0,0 +1,10 @@
+<template>
+ <p>Test</p>
+</template>
+
+
+<script>
+ export default {
+ name: 'submission-detail'
+ }
+</script>
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index 133fb7fc..3e5f67cc 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -2,9 +2,10 @@ import Vue from 'vue'
import Router from 'vue-router'
import Login from '@/components/Login'
import StudentPage from '@/components/student/StudentPage'
+import SubmissionDetail from '@/components/student/SubmissionDetail'
import ReviewerPage from '@/components/reviewer/ReviewerPage'
import StudentListOverview from '@/components/reviewer/StudentListOverview'
-import BaseLayout from '@/components/BaseLayout'
+import BaseLayout from '@/components/base/BaseLayout'
Vue.use(Router)
@@ -18,7 +19,14 @@ export default new Router({
{
path: '/student/',
name: 'student-page',
- component: StudentPage
+ component: StudentPage,
+ children: [
+ {
+ path: 'submission:id/',
+ component: SubmissionDetail
+ }
+ ]
+
},
{
path: '/reviewer/',
diff --git a/frontend/src/store/grady_speak.js b/frontend/src/store/grady_speak.js
new file mode 100644
index 00000000..9c8e1952
--- /dev/null
+++ b/frontend/src/store/grady_speak.js
@@ -0,0 +1,25 @@
+const gradySays = [
+ 'Now let\'s see if we can improve this with a little water, sir.',
+ 'Won\'t keep you a moment, sir.',
+ 'Grady, sir. Delbert Grady.',
+ 'Yes, sir.',
+ 'That\'s right, sir.',
+ 'Why no, sir. I don\'t believe so.',
+ 'Ah ha, it\'s coming off now, sir.',
+ 'Why no, sir. I don\'t believe so.',
+ 'Yes, sir. I have a wife and two daughters, sir.',
+ 'Oh, they\'re somewhere around. I\'m not quite sure at the moment, sir.',
+ 'That\'s strange, sir. I don\'t have any recollection of that at all.',
+ 'I\'m sorry to differ with you, sir, but you are the caretaker.',
+ 'You have always been the caretaker, I should know, sir.',
+ 'I\'ve always been here.',
+ 'Indeed, he is, Mr. Torrance. Avery willful boy. ',
+ 'A rather naughty boy, if I may be so bold, sir.',
+ 'Perhaps they need a good talking to, if you don\'t mind my saying so. Perhaps a bit more.',
+ 'My girls, sir, they didn\'t care for the Overlook at first.',
+ 'One of them actually stole a packet of matches and tried to burn it down.',
+ 'But I corrected them, sir.',
+ 'And when my wife tried to prevent me from doing my duty... I corrected her.'
+]
+
+export default gradySays
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 3eb032bf..fe3e31c4 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -2,6 +2,8 @@ import Vuex from 'vuex'
import Vue from 'vue'
import ax from './api'
+import gradySays from './grady_speak'
+
Vue.use(Vuex)
const store = new Vuex.Store({
@@ -9,19 +11,27 @@ const store = new Vuex.Store({
token: '',
loggedIn: false,
username: '',
- error: ''
+ error: '',
+ examInstance: 'B.Inf 1301 Kohorte 2'
+ },
+ getters: {
+ gradySpeak: state => {
+ return gradySays[Math.floor(Math.random() * gradySays.length)]
+ }
},
mutations: {
'API_FAIL': function (state, error) {
state.error = error
},
- 'LOGIN': function (state, creds) {
- state.token = creds.token
+ 'SET_JWT_TOKEN': function (state, token) {
+ state.token = token
+ ax.defaults.headers.common['Authorization'] = 'JWT ' + token
+ },
+ 'LOGIN': function (state, username) {
state.loggedIn = true
- state.username = creds.username
+ state.username = username
},
'LOGOUT': function (state) {
- state.token = ''
state.loggedIn = false
}
},
@@ -29,10 +39,8 @@ const store = new Vuex.Store({
async getJWTToken (context, credentials) {
try {
const response = await ax.post('api-token-auth/', credentials)
- context.commit('LOGIN', {
- token: response.data.token,
- username: credentials.username
- })
+ context.commit('LOGIN', credentials.username)
+ context.commit('SET_JWT_TOKEN', response.data.token)
} catch (error) {
if (error.response) {
const errorMsg = 'Unable to log in with provided credentials.'
@@ -47,6 +55,7 @@ const store = new Vuex.Store({
},
logout (store) {
store.commit('LOGOUT')
+ store.commit('SET_JWT_TOKEN', '')
}
}
})
--
GitLab