From 70ad231072419810be226025c75a2cfbc40b57f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kan=C4=9Bra?= <marti.kanera@gmail.com>
Date: Wed, 2 Dec 2020 18:27:38 +0100
Subject: [PATCH] fix: year modal

---
 components/proposal-form/proposal-form.vue    |  2 --
 .../teacher-project/teacher-project.vue       |  4 +--
 components/ui/search-bar/search-bar.vue       |  2 +-
 keywords.js                                   | 34 +++----------------
 pages/index.vue                               | 23 ++++---------
 server/api/teacher/list.ts                    | 20 ++++++-----
 server/api/user/create-user.ts                |  3 +-
 7 files changed, 26 insertions(+), 62 deletions(-)

diff --git a/components/proposal-form/proposal-form.vue b/components/proposal-form/proposal-form.vue
index f9d6e552..53347f01 100644
--- a/components/proposal-form/proposal-form.vue
+++ b/components/proposal-form/proposal-form.vue
@@ -115,8 +115,6 @@ export default defineComponent({
             teacherId: selectedTeacherId.value,
           };
 
-          console.log(proposal);
-
           if (studentsProjectTitle.value !== '') proposal = { ...proposal, ...{ title: studentsProjectTitle.value } };
 
           const collectionRef = firebase.firestore().collection('proposals');
diff --git a/components/teacher-project/teacher-project.vue b/components/teacher-project/teacher-project.vue
index 063c5808..710a45be 100644
--- a/components/teacher-project/teacher-project.vue
+++ b/components/teacher-project/teacher-project.vue
@@ -208,9 +208,7 @@ export default defineComponent({
       reviewDelete.value = false;
     };
 
-    const unreviewed = computed(() => props.teacher && props.opponent && props.reviews.length < 4) || props.teacher || (props.opponent && props.reviews.length < 2);
-
-    console.log(unreviewed.value);
+    const unreviewed = computed(() => props.teacher && props.opponent && props.reviews.length < 4) || ((props.teacher || props.opponent) && props.reviews.length < 2);
 
     return {
       displayModal,
diff --git a/components/ui/search-bar/search-bar.vue b/components/ui/search-bar/search-bar.vue
index a96c63fc..ae0cf594 100644
--- a/components/ui/search-bar/search-bar.vue
+++ b/components/ui/search-bar/search-bar.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-input(type='text', @input='onChange($event.target.value)', placeholder='Zační psát...')
+input(type='text', @input='onChange($event.target.value)', placeholder='Jméno projektu')
 </template>
 
 <script lang="ts">
diff --git a/keywords.js b/keywords.js
index d18ce4d9..5b52d249 100644
--- a/keywords.js
+++ b/keywords.js
@@ -1,30 +1,11 @@
-const projectName = 'Úložiště maturitních projektů';
+const projectName = 'Úložiště maturitních projektů kekw';
 const displayName = 'Martin Kaněra';
 
 const fs = require('fs');
 
-const charLimit = 10;
-
-const generateKeywords = (string) => {
-  const resultArr = [];
-  let currentString = '';
-
-  string.split('').forEach((letter) => {
-    currentString += letter;
-    resultArr.push(currentString);
-  });
-
-  // for (let i = 0; i < charLimit; i++) {
-  //   currentString += string[i];
-  //   resultArr.push(currentString);
-  // }
-
-  return resultArr;
-};
-
 function permute(permutation) {
   const length = permutation.length;
-  const result = [permutation.slice()];
+  const result = permutation.slice();
   const c = new Array(length).fill(0);
   let i = 1;
   let k;
@@ -38,7 +19,7 @@ function permute(permutation) {
       permutation[k] = p;
       ++c[i];
       i = 1;
-      result.push(permutation.slice());
+      result.push(permutation.slice().join(' '));
     } else {
       c[i] = 0;
       ++i;
@@ -47,13 +28,8 @@ function permute(permutation) {
   return result;
 }
 
-let finalProduct = [];
 const names = `${displayName} ${projectName}`.split(' ');
 
-const cases = permute(names);
-cases.forEach((nameCase) => {
-  finalProduct = [...finalProduct, ...generateKeywords(nameCase.join(' '))];
-});
+fs.writeFileSync('keywords.txt', permute(names));
 
-// fs.writeFileSync('keywords.text', finalProduct);
-console.log(finalProduct);
+// console.log(permute(names).length);
diff --git a/pages/index.vue b/pages/index.vue
index c51fd21f..6c49493c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,12 +1,11 @@
 <template lang="pug">
 .page
-  ps-modal(:value='yearModalDisplay && !closeModal', :disabled='true')
+  ps-modal(:value='yearModalDisplay', :disabled='true')
     span.text-ps-white.text-2xl Kdy maturuješ?
     .form.mt-4
       ps-select.flex-grow.md-mr-6(v-model='currentYear', placeholder='Rok maturity', :options='graduationYears')
       ps-btn.mt-4.float-right(:disabled='btnLoading', :loading='btnLoading', @click='sumbitSchoolYear') 
         span.px-10 uložit
-  ps-search-bar(v-model='kekw')
 </template>
 
 <script lang="ts">
@@ -23,12 +22,12 @@ export default defineComponent({
   setup() {
     const mainStore = useMainStore();
 
-    const graduationYears = ref([] as Array<{ placeholder: Number; value: Number }>);
+    const graduationYears = ref([] as Array<{ placeholder: String; value: String }>);
 
-    const yearModalDisplay = computed(() => mainStore.state.user.currentYear === null && mainStore.isLoggedIn && mainStore.isStudent);
+    const yearModalDisplay = computed(() => mainStore.state.user.currentYear === null && mainStore.isLoggedIn.value && mainStore.isStudent.value);
 
     for (let i = 1; i < 5; i++) {
-      const year = new Date().getFullYear() + i;
+      const year = (new Date().getFullYear() + i).toString();
 
       graduationYears.value.push({
         placeholder: year,
@@ -36,7 +35,7 @@ export default defineComponent({
       });
     }
 
-    const currentYear = ref(0);
+    const currentYear = ref('');
 
     const btnDisabled = ref(false);
     const btnLoading = ref(false);
@@ -45,8 +44,6 @@ export default defineComponent({
       btnDisabled.value = !graduationYears.value.some((year) => Number(year.value) === Number(currentYear.value));
     });
 
-    const closeModal = ref(false);
-
     const sumbitSchoolYear = async () => {
       if (!graduationYears.value.some((year) => Number(year.value) === Number(currentYear.value))) return;
 
@@ -66,26 +63,18 @@ export default defineComponent({
         ).data;
 
         await mainStore.patch({ user: { currentYear: setTimestamp } });
-
-        closeModal.value = true;
       } catch (_) {}
 
       btnLoading.value = false;
     };
 
-    const kekw = ref('');
-
-    watchEffect(() => console.log(kekw.value));
-
     return {
-      yearModalDisplay: yearModalDisplay.value,
+      yearModalDisplay,
       currentYear,
       graduationYears,
       btnDisabled,
       sumbitSchoolYear,
       btnLoading,
-      closeModal,
-      kekw,
     };
   },
 });
diff --git a/server/api/teacher/list.ts b/server/api/teacher/list.ts
index dac48290..da80a18f 100644
--- a/server/api/teacher/list.ts
+++ b/server/api/teacher/list.ts
@@ -26,14 +26,18 @@ export default async (req: Request, res: Response) => {
   // Teacher cant submit proposal
   if (userData?.teacher) return res.status(403).send('Teacher cannot submit proposal');
 
-  const teachersData = (await admin.firestore().collection('users').where('teacher', '==', true).get()).docs;
+  try {
+    const teachersData = (await admin.firestore().collection('users').where('teacher', '==', true).where('extern', '==', false).where('deleted', '==', false).get()).docs;
 
-  const teachersList = teachersData.map((teacherDoc) => {
-    return {
-      placeholder: teacherDoc.data().displayName,
-      value: teacherDoc.id,
-    };
-  });
+    const teachersList = teachersData.map((teacherDoc) => {
+      return {
+        placeholder: teacherDoc.data().displayName,
+        value: teacherDoc.id,
+      };
+    });
 
-  return res.status(200).json(teachersList);
+    return res.status(200).json(teachersList);
+  } catch (e) {
+    return res.status(500).send(e);
+  }
 };
diff --git a/server/api/user/create-user.ts b/server/api/user/create-user.ts
index e4548a48..7e5f2fbd 100644
--- a/server/api/user/create-user.ts
+++ b/server/api/user/create-user.ts
@@ -52,6 +52,7 @@ export default async (req: Request, res: Response) => {
         profilePicture: await saveProfileImage(userData.uid),
         admin: false,
         deleted: false,
+        extern: false,
         student: userData.email?.includes('delta-studenti'),
         teacher: userData.email?.includes('delta-skola'),
         currentYear: null,
@@ -82,8 +83,6 @@ export default async (req: Request, res: Response) => {
       });
     } catch (_) {}
 
-    console.log(responseData);
-
     return res.status(200).send(responseData);
   } catch (e) {
     return res.status(400).send('Bad request');