From 069ff795bc3d1e44f6e6a8deddb0363d1ec3168f Mon Sep 17 00:00:00 2001
From: Patryk <43276401+Zaptyp@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:59:38 +0100
Subject: [PATCH] Fix login page (#80)

Co-authored-by: Marioneq <marioneq4958@gmail.com>
Co-authored-by: Zaptyp <43276401+Zaptyp@users.noreply.github.com>
---
 frontend/src/api/login.ts                   | 10 +--
 frontend/src/components/Login/UserLogin.vue | 80 ++++++++++-----------
 frontend/tsconfig.json                      |  1 +
 3 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/frontend/src/api/login.ts b/frontend/src/api/login.ts
index db22654..1d98d35 100644
--- a/frontend/src/api/login.ts
+++ b/frontend/src/api/login.ts
@@ -2,21 +2,23 @@ import axios, { AxiosResponse } from 'axios';
 import Cookies from 'universal-cookie';
 
 export default {
-  register: async (email: string, password: string, symbol: string): Promise<AxiosResponse> => {
+  login: async (email: string, password: string, symbol: string, diaryUrl: string)
+    : Promise<AxiosResponse> => {
     const cookies = new Cookies();
     const response = await axios({
-      method: 'post',
+      method: 'POST',
       url: 'http://localhost:8000/api/login',
       headers: {
         'Content-Type': 'application/json',
-        'X-CSRFToken': cookies.get('csrf-token'),
+        'X-CSRFToken': cookies.get('csrftoken'),
       },
       data: {
         loginName: email,
         Password: password,
         Symbol: symbol,
-        diaryUrl: 'http://cufs.fakelog.tk/',
+        diaryUrl,
       },
+      withCredentials: true,
     });
 
     document.cookie = response.headers['Set-Cookie'];
diff --git a/frontend/src/components/Login/UserLogin.vue b/frontend/src/components/Login/UserLogin.vue
index cc2c0c7..b2e65dd 100644
--- a/frontend/src/components/Login/UserLogin.vue
+++ b/frontend/src/components/Login/UserLogin.vue
@@ -30,12 +30,14 @@
       />
       <v-select
         color="red"
-        v-model="selectedSymbol"
+        :items="diaryNames"
+        v-model="selectedDiary"
+        item-value=""
+        v-on:change="itemSelected()"
+        label="Symbol"
+        selection="index"
         :disabled="inputDisabled"
-        label="Wybierz odmianę dziennika UONET+"
         outlined
-        :items="domains"
-        v-on:change="fakelog()"
         item-color="red"
       />
     </v-col>
@@ -50,64 +52,54 @@
     </v-col>
   </div>
 </template>
-<script>
+
+<script lang="ts">
 import Vue from 'vue';
 import login from '../../api/login';
+import diary from '../../assets/data/diary.json';
 
-export default {
+interface Login {
+  login: string
+  password: string
+  symbol: string
+  diaryNames: Array<string>
+  selectedDiary: string
+  inputDisabled: boolean
+}
+export default Vue.extend({
   name: 'UserLogin',
-  data() {
-    return {
-      inputDisabled: false,
-      login: '',
-      password: '',
-      selectedSymbols: '',
-      symbols: '',
-      domains: [
-        'Vulcan',
-        'Fakelog',
-      ],
-    };
+  data: (): Login => ({
+    login: '',
+    password: '',
+    symbol: '',
+    diaryNames: [],
+    selectedDiary: '',
+    inputDisabled: false,
+  }),
+  created() {
+    this.diaryNames = diary.diaries.map((item): string => item.name);
   },
   methods: {
     async loginUser() {
-      this.inputDisabled = true;
       Vue.set(this.$store.state, 'isLoading', true);
-      const index = diary.diaries.findIndex((item) => item.name === this.selectedSymbol);
+      const index = diary.diaries.findIndex((item) => item.name === this.selectedDiary);
       const response = await login.login(this.login, this.password,
         'powiatwulkanowy', diary.diaries[index].url);
       this.$store.state.loginData = response.data;
-
       if (this.$store.state.loginData.data.students.data.length > 1) {
-        this.$store.state.showStudentsList = true;
         this.$store.state.isLoading = false;
+        this.$store.state.showStudentsList = true;
+      } else {
+        alert('Dane logowania są nie prawidłowe!');
       }
     },
-
-    fakelog() {
-      if (this.selectedSymbol === 'Fakelog') {
-        this.login = 'jan@fakelog.cf';
+    itemSelected() {
+      if (this.selectedDiary === 'Fakelog') {
+        this.login = 'jan@fakelog.tk';
         this.password = 'jan123';
         this.symbol = 'powiatwulkanowy';
       }
     },
   },
-};
+});
 </script>
-<style>
-  #App{
-    padding: 10px;
-  }
-  #nag{
-    text-align: center;
-    font-weight: 300;
-    font-size: 1.3pc;
-    margin-bottom: 1pc;
-  }
-
-  #buttonOne{
-    margin-right: auto;
-    display: block;
-    float: left;
-  }
-</style>
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 25566f5..78fd4a9 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -7,6 +7,7 @@
     "importHelpers": true,
     "moduleResolution": "node",
     "skipLibCheck": true,
+    "resolveJsonModule": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,