Merge pull request #251 from ChristofferHolmesland/dev

Last version
ChristofferHolmesland · May 12, 2019 · 4ec3b45 · 4ec3b45
2 parents 132e6f7 + b241195
commit 4ec3b45
Show file tree

Hide file tree

Showing 266 changed files with 9,903 additions and 3,772 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,6 +110,13 @@ package-lock.json
 Rapport/*.fls
 Rapport/*.fdb_latexmk
 Rapport/*.log
+Rapport/*.bbl
+Rapport/*.bcf
+Rapport/*.blg
+Rapport/*.run.tex
+Rapport/*-blx.bib
+Rapport/*.run.xml
+Rapport/*.lof
 
 # PyCharm
 .idea
@@ -130,6 +137,7 @@ App/server/images
 *.pdf
 *.gz
 *.toc
+*.dvi
 
 # cypress
 cypress/screenshots

diff --git a/App/client/package.json b/App/client/package.json
@@ -6,7 +6,7 @@
     "serve": "vue-cli-service serve",
     "buildDevWatch": "vue-cli-service build --mode \"dev\" --watch",
     "build": "vue-cli-service build",
-    "buildUnix": "NODE_ENV=unix-production vue-cli-service build --mode \"dev\"",
+    "buildUnix": "NODE_ENV=unix-production vue-cli-service build",
     "buildDev": "vue-cli-service build --mode \"dev\"",
     "buildTest": "vue-cli-service build --mode \"test\"",
     "lint": "vue-cli-service lint"

diff --git a/App/client/public/index.html b/App/client/public/index.html
@@ -4,9 +4,10 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <meta name="Description" content="Interaktiv Undervisning er et verktøy for forelesere og studenter ve UIS, hvor studentene deltar i quizzer for å danne et bilde over hvilken del av pensum de kan.">
+    <meta name="Description" content="Interaktiv Undervisning er et verktøy for forelesere og studenter ved UIS, hvor studentene deltar i økter for å danne et bilde over hvilken del av pensum de kan.">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>client</title>
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
+    <title>Interaktiv Undervisning</title>
   </head>
   <body style="background-color: #ccc;">
     <noscript>

diff --git a/App/client/src/App.vue b/App/client/src/App.vue
@@ -12,6 +12,18 @@
 <script>
 import Navbar from "./components/Navbar.vue";
 
+// https://stackoverflow.com/a/24103596/3407591
+function getCookie(name) {
+    var nameEQ = name + "=";
+    var ca = document.cookie.split(';');
+    for(var i=0;i < ca.length;i++) {
+        var c = ca[i];
+        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+    }
+    return null;
+}
+
 export default {
 	name: "App",
 	data() {
@@ -23,7 +35,12 @@ export default {
 		Navbar
 	},
 	created() {
-		this.$socket.emit("getLocaleRequest", "no");
+		let locale = "no"
+
+		let localeCookie = getCookie("localization")
+		if (localeCookie !== null) locale = localeCookie;
+
+		this.$socket.emit("getLocaleRequest", locale);
 		this.$socket.emit("getQuestionTypeRequest");
 		this.$socket.emit("clientLoginInfoRequest");
 	},
@@ -37,6 +54,7 @@ export default {
 		},
 		deleteCookie(cookieId) {
 			document.cookie = "sessionId=; Max-Age=0;";
+			document.cookie = "localization=; Max-Age=0;";
 		},
 		clientLoginInfoResponse(userData) {
 			this.$store.commit("userChange", userData);
@@ -57,3 +75,33 @@ export default {
 	}
 };
 </script>
+
+<style>
+/* Custom Scrollbars */
+/* width */
+::-webkit-scrollbar {
+  width: 10px;
+  height: 10px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+  opacity: 0; 
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+  background: #888;
+  border-radius: 5px;
+}
+
+/* Handle on hover */
+::-webkit-scrollbar-thumb:hover {
+  background: #555; 
+}
+
+/* Corner */
+::-webkit-scrollbar-corner {
+	opacity: 0;
+}
+</style>
diff --git a/App/client/src/components/Navbar.vue b/App/client/src/components/Navbar.vue
@@ -9,7 +9,7 @@
 				<b-navbar-nav class="ml-auto" v-if="getUser.loggedIn" data-cy="adminOptions">
 					<b-nav-item center @click="clientRedirect">{{getLocale.dashboard}}</b-nav-item>
 
-					<b-nav-item center @click="adminRedirect" v-if="getUser.userRights == 4 && getUser.loggedIn">{{getLocale.admin}}</b-nav-item>
+					<b-nav-item center @click="adminRedirect" v-if="getUser.userRights >= 3 && getUser.loggedIn">{{getLocale.admin}}</b-nav-item>
 
 					<b-nav-item center @click="questionsRedirect" v-if="getUser.userRights >= 3 && getUser.loggedIn">{{getLocale.questions}}</b-nav-item>
 
@@ -23,7 +23,9 @@
 						<b-dropdown-item-button @click="localeChange($event)" :id="localeItem" :key="localeItem" v-for="localeItem in getLocaleList"  :value="localeItem">{{localeItem}}</b-dropdown-item-button>
 					</b-nav-item-dropdown>
 
-					<b-nav-item-dropdown right v-if="getUser.loggedIn" :text="getUser.username" data-cy="loginButton">
+					<b-nav-item-dropdown right v-if="getUser.loggedIn"
+										:text="getUser.userRights === 1 ? getAnonymousName : getUser.username"
+										data-cy="loginButton">
 						<b-dropdown-item v-if="getUser.userRights > 1" @click="userProfileRedirect">
 							{{getLocale.profile}}
 						</b-dropdown-item>
@@ -65,7 +67,14 @@ export default {
 	},
 	methods: {
 		localeChange(event) {
-			this.$socket.emit("getLocaleRequest", event.target.id);
+			let newLocale = event.target.id;
+			if (newLocale == undefined || newLocale == null || newLocale == "")
+				newLocale = event.target.innerHTML;
+
+			this.$socket.emit("getLocaleRequest", newLocale);
+			if (this.$store.getters.getUser({userRights: true}).userRights > 1) {
+				document.cookie = `localization=${newLocale}; Max-Age=1576800000;`;
+			}
 		},
 		signInRedirect() {
 			this.$router.push("/login");
@@ -110,6 +119,9 @@ export default {
 				loggedIn: true
 			});
 			return user;
+		},
+		getAnonymousName: function() {
+			return `${this.getLocale.anonymous} ${this.getLocale.anonymousNames[this.getUser.username]}`;
 		}
 	}
 };

diff --git a/App/client/src/components/admin/AddNewCourse.vue b/App/client/src/components/admin/AddNewCourse.vue
@@ -4,7 +4,12 @@
 			:no-close-on-backdrop="true"
 			:title="getLocale.title"
 			@ok="addCourse"
-			style="text-align: left;">
+			style="text-align: left;"
+			cancel-variant="danger"
+			:hide-header-close="true"
+			:cancel-title="getLocale.cancelBtn"
+			:ok-title="getLocale.okBtn"
+			>
 
 	<b-alert :show="showError" variant="danger" dismissible>
 		<p>{{getLocale.errorMessage[errorText]}}</p>
@@ -21,7 +26,9 @@
 		<b-form-select  :options="getCourseCodes"
 						v-model="newCourse.code"
 						id="courseCodeSelect">
-
+			<template slot="first" v-if="getCourseCodes.length === 0">
+				<option value="" disabled>{{ getLocale.noCourseCodeText }}</option>
+			</template>
 		</b-form-select>
 		&nbsp;
 		<b-container class="px-0">
@@ -30,20 +37,26 @@
 					<h6>{{ getLocale.addNewCourseCode }}</h6>
 				</b-col>
 				<b-col cols="4" style="text-align: right;">
-					<p v-if="showAddNewCourseCode">^</p>
-					<p v-else>V</p>
+                    <p><i :class="showAddNewCourseCode ? 'fas fa-angle-up' : 'fas fa-angle-down'"></i></p>
 				</b-col>
 			</b-row>
 			<b-row v-if="showAddNewCourseCode">
-				<b-col cols="9">                   
-					<b-form-input 	id="addCourseCodeInput"
-									type="text"
-									v-model="newCourseCode">
-					</b-form-input>
-				</b-col>
-				<b-col cols="3" style="text-align: right;">
-					<b-button @click="addNewCourseCode">{{getLocale.add}}</b-button>
-				</b-col>
+				<b-container>
+					<b-row>
+						<b-col cols="12">                   
+							<b-form-input 	id="addCourseCodeInput"
+											type="text"
+											v-model="newCourseCode">
+							</b-form-input>
+						</b-col>
+					</b-row>
+					&nbsp;
+					<b-row>
+						<b-col cols="12" style="text-align: center;">
+							<b-button @click="addNewCourseCode" class="addSemesterBtn" variant="success" data-cy="NewCourseCodeBtn">{{getLocale.addCourseCode}}</b-button>
+						</b-col>
+					</b-row>
+				</b-container>
 			</b-row>
 		</b-container>
 	</b-form-group>									
@@ -52,7 +65,9 @@
 		<b-form-select  :options="getSemesters"
 						v-model="newCourse.semester"
 						id="courseSemesterSelect">
-
+			<template slot="first" v-if="getSemesters.length === 0">
+				<option value="" disabled>{{ getLocale.noSemesterText }}</option>
+			</template>
 		</b-form-select>
 		&nbsp;
 		<b-container class="px-0">
@@ -61,8 +76,7 @@
 					<h6>{{ getLocale.addNewSemester }}</h6>
 				</b-col>
 				<b-col cols="4" style="text-align: right;">
-					<p v-if="showAddNewCourseCode">^</p>
-					<p v-else>V</p>
+                    <p><i :class="showAddNewCourseCode ? 'fas fa-angle-up' : 'fas fa-angle-down'"></i></p>
 				</b-col>
 			</b-row>
 			<b-row v-if="showAddNewSemester">
@@ -98,7 +112,7 @@
 			&nbsp;
 			<b-row v-if="showAddNewSemester">
 				<b-col cols="12" style="text-align: center;">
-					<b-button @click="addNewSemester" class="addSemesterBtn">{{getLocale.add}}</b-button>
+					<b-button @click="addNewSemester" class="addSemesterBtn" variant="success" data-cy="NewSemesterBtn">{{getLocale.addSemester}}</b-button>
 				</b-col>
 			</b-row>
 		</b-container>