Merge pull request #56 from Diary-SPO/fix-mark

little fixes
Diary-SPO · Sep 13, 2023 · c68793f · c68793f
2 parents 1ee7998 + c93fa65
commit c68793f
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/frontend/index-b4.html → frontend/index-b5.html b/frontend/index-b4.html → frontend/index-b5.html
diff --git a/frontend/src/methods/bridge/appStorageSet.ts b/frontend/src/methods/bridge/appStorageSet.ts
@@ -10,6 +10,7 @@ export const appStorageSet = async (key: string, value: string): Promise<boolean
     if (data.result) {
       return data.result;
     }
+
     return false;
   } catch (error) {
     console.error(error);

diff --git a/frontend/src/methods/server/getLessons.ts b/frontend/src/methods/server/getLessons.ts
@@ -4,9 +4,13 @@ import { getUserId } from '../bridge/getUserId';
 import { getCookie } from '../bridge/getCookie';
 
 export const getLessons = async (startDate?: Date, endDate?: Date): Promise<Day[] | 418 | 429> => {
-  const cookie = await getCookie();
-  const id = await getUserId();
+  const cookie = await getCookie() || localStorage.getItem('cookie');
+  const id = await getUserId() || localStorage.getItem('id');
 
+  if (!id) {
+    return 418;
+  }
+
   if (!cookie) {
     return 418;
   }

diff --git a/frontend/src/methods/server/getPerformance.ts b/frontend/src/methods/server/getPerformance.ts
@@ -3,9 +3,8 @@ import { getCookie } from '../bridge/getCookie';
 import { getUserId } from '../bridge/getUserId';
 
 export const getPerformance = async (): Promise<PerformanceCurrent | 418 | 429> => {
-  const cookie = await getCookie();
-  const id = await getUserId();
-  console.log('getUserId', id);
+  const cookie = await getCookie() || localStorage.getItem('cookie');
+  const id = await getUserId() || localStorage.getItem('id');
 
   if (!cookie) {
     return 418;

diff --git a/frontend/src/utils/logOut.ts b/frontend/src/utils/logOut.ts
@@ -1,6 +1,8 @@
 import { clearVkStorage } from '../views/Settings';
 
 const logOut = async () => {
+  localStorage.setItem('savedMarks', '')
+  localStorage.setItem('lastRequestTime ', '')
   await clearVkStorage();
   location.reload();
 };

diff --git a/frontend/src/views/LoginForm.tsx b/frontend/src/views/LoginForm.tsx
@@ -85,11 +85,16 @@ const LoginForm: FC<{ id: string }> = ({ id }) => {
     setPopout(<ScreenSpinner state='loading' />);
     const response = await fetch(`${import.meta.env.VITE_SERVER_URL}/login`, {
       method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
       body: JSON.stringify({
         login,
         password: passwordHashed,
+        isRemember: true,
       }),
     });
+
     if (response.status === 401) {
       console.log('401');
       setIsLoading(false);
@@ -109,15 +114,16 @@ const LoginForm: FC<{ id: string }> = ({ id }) => {
     }
 
     try {
+      localStorage.setItem('id', String(dataResp.data.tenants.SPO_23.studentRole.id));
+      localStorage.setItem('cookie', dataResp.cookie);
+
       await appStorageSet('cookie', dataResp.cookie);
       await appStorageSet('id', String(dataResp.data.tenants.SPO_23.studentRole.id));
-
-      await appStorageSet('firstName', String(dataResp.data.tenants.SPO_23.firstName));
       await appStorageSet('lastName', String(dataResp.data.tenants.SPO_23.lastName));
+      await appStorageSet('firstName', String(dataResp.data.tenants.SPO_23.firstName));
       await appStorageSet('middleName', String(dataResp.data.tenants.SPO_23.middleName));
       await appStorageSet('org', String(dataResp.data.tenants.SPO_23.settings.organization.abbreviation));
       await appStorageSet('city', String(dataResp.data.tenants.SPO_23.settings.organization.address.settlement));
-
       await appStorageSet('group', String(dataResp.data.tenants.SPO_23.students[0].groupName));
 
       setIsLoading(false);

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -26,7 +26,7 @@ export default defineConfig({
     },
     rollupOptions: {
       logLevel: 'debug',
-      input: 'index-b4.html',
+      input: 'index-b5.html',
       output: {
         manualChunks: {
           react: ['react', 'react-dom'],
@@ -36,5 +36,5 @@ export default defineConfig({
   },
   // Указывать только для dev сборки.
   // Либо index'у вернуть его исходное имя, а переименовывать только при деплое
-  base: 'index-b4.html',
+  base: 'index-b5.html',
 })
diff --git a/frontend/vk-hosting-config.json b/frontend/vk-hosting-config.json
@@ -2,8 +2,8 @@
   "static_path": "dist",
   "app_id": 51723411,
   "endpoints": {
-    "mobile": "index-b4.html",
-    "mvk": "index-b4.html",
-    "web": "index-b4.html"
+    "mobile": "index-b5.html",
+    "mvk": "index-b5.html",
+    "web": "index-b5.html"
   }
 }