v1.1.2 (#95)

Author: Damego

app.config.js

@@ -4,7 +4,7 @@ export default {
   expo: {
     name: 'ЕТИС мобайл' + (IS_DEV ? ' (DEV)' : ''),
     slug: 'etis-mobile',
-    version: '1.1.1',
+    version: '1.1.2',
     owner: 'damego',
     orientation: 'portrait',
     icon: './assets/icon.png',
@@ -23,7 +23,7 @@ export default {
       supportsTablet: true,
     },
     android: {
-      versionCode: 10101000,
+      versionCode: 10102000,
       adaptiveIcon: {
         foregroundImage: './assets/adaptive-icon.png',
         backgroundColor: '#FFFFFF',
@@ -53,7 +53,7 @@ export default {
       ]
     },
     plugins: [
-      ['./src/plugins/copyDrawable.js', './assets/tab_icons'],
+      ['./src/plugins/copyDrawable.ts', './assets/tab_icons'],
       ['./src/plugins/disabledForcedDarkModeAndroid.ts', {}],
       '@config-plugins/react-native-quick-actions',
       'sentry-expo',

src/components/LoadingScreen.tsx

@@ -27,13 +27,8 @@ const EmptyCard = () => {
   );
 };
 
-interface LoadingScreenProps {
-  headerText?: string;
-  onRefresh?(): Promise<void>;
-}
-
-const LoadingScreen = ({ headerText, onRefresh }: LoadingScreenProps) => (
-  <Screen headerText={headerText} onUpdate={onRefresh}>
+const LoadingScreen = ({ onRefresh }: { onRefresh?(): Promise<void> }) => (
+  <Screen onUpdate={onRefresh}>
     <View style={{ marginTop: '10%' }} />
     <EmptyCard />
     <EmptyCard />

src/data/base.ts

@@ -26,6 +26,7 @@ import { ITimeTable, ITimeTableGetProps } from '../models/timeTable';
 import { StudentInfo } from '../parser/menu';
 import { isLoginPage } from '../parser/utils';
 import { Response } from '../utils/http';
+import { reportParserError } from '../utils/sentry';
 
 export interface BaseClient {
   getAnnounceData(payload: IGetPayload): Promise<IGetResult<string[]>>;
@@ -97,6 +98,7 @@ export class BasicClient<P extends IGetPayload, T> {
     } catch (e) {
       console.warn(`[PARSER] Ignoring a error from ${this.name}`);
       console.trace(e);
+      reportParserError(e);
     }
     if (!parsedData) return failedResult;
 
@@ -112,6 +114,8 @@ export class BasicClient<P extends IGetPayload, T> {
     if (cached?.data) {
       console.log(`[DATA] Retrieved ${this.name} from cache`);
       return cached;
+    } else if (payload.requestType === RequestType.forceCache) {
+      return errorResult;
     }
     const fetched = await this.tryFetch(payload);
 

src/data/demoClient.ts

@@ -3,7 +3,7 @@ import { ICertificateTable } from '../models/certificate';
 import { IMessagesData, MessageType } from '../models/messages';
 import { IOrder } from '../models/order';
 import { ISessionRating } from '../models/rating';
-import { GetResultType, IGetPayload, IGetResult } from '../models/results';
+import { GetResultType, IGetResult } from '../models/results';
 import { ISessionMarks } from '../models/sessionMarks';
 import { ISessionPoints } from '../models/sessionPoints';
 import { ISessionQuestionnaire, ISessionQuestionnaireLink } from '../models/sessionQuestionnaire';
@@ -32,11 +32,12 @@ export default class DemoClient implements BaseClient {
   }
   async getSessionQuestionnaire(): Promise<IGetResult<ISessionQuestionnaire>> {
     const data: ISessionQuestionnaire =
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
       require('./demo-questionnaire.json') as ISessionQuestionnaire;
     return this.toResult(data);
   }
 
-  async getCertificateData(payload: IGetPayload): Promise<IGetResult<ICertificateTable>> {
+  async getCertificateData(): Promise<IGetResult<ICertificateTable>> {
     return toResult({
       certificates: [
         {
@@ -109,8 +110,8 @@ export default class DemoClient implements BaseClient {
                     {
                       audienceText: 'ауд. 411/2 (2 корпус, 3 этаж)',
                       audience: '411/2',
-                      floor: 3,
-                      building: 2,
+                      floor: '3',
+                      building: '2',
                       isDistance: false,
                       subject: 'Математический анализ (лек)',
                     },
@@ -123,8 +124,8 @@ export default class DemoClient implements BaseClient {
                     {
                       audienceText: 'ауд. 411/2 (2 корпус, 3 этаж)',
                       audience: '411/2',
-                      floor: 3,
-                      building: 2,
+                      floor: '3',
+                      building: '2',
                       isDistance: false,
                       subject: 'Комплексный анализ (лек)',
                     },
@@ -137,8 +138,8 @@ export default class DemoClient implements BaseClient {
                     {
                       audienceText: 'ауд. 411/2 (2 корпус, 3 этаж)',
                       audience: '411/2',
-                      floor: 3,
-                      building: 2,
+                      floor: '3',
+                      building: '2',
                       isDistance: false,
                       subject: 'Функциональный анализ (лек)',
                     },
@@ -206,7 +207,7 @@ export default class DemoClient implements BaseClient {
     return this.toResult(data);
   }
 
-  async getOrdersData(payload: IGetPayload): Promise<IGetResult<IOrder[]>> {
+  async getOrdersData(): Promise<IGetResult<IOrder[]>> {
     const data: IOrder[] = [
       {
         id: '1',

src/navigation/TabNavigation.tsx

@@ -52,7 +52,9 @@ const TabNavigator = () => {
 
     const data = result.data;
 
-    dispatch(setStudentState(data));
+    if (data) {
+      dispatch(setStudentState(data));
+    }
   };
 
   useEffect(() => {

src/parser/timeTable.ts

@@ -53,20 +53,17 @@ export default function parseTimeTable(html) {
     weekInfo,
     days: [],
   };
-
   const { days } = data;
 
   $('.day', html).each((el, day) => {
     const daySelector = $(day);
     const pairs: IPair[] = [];
     const date = getTextField(daySelector.find('h3'));
-
     if (!daySelector.children().last().hasClass('no_pairs')) {
       $('tr', day).each((index, tr) => {
         const lessons: ILesson[] = [];
         const pair = $(tr);
         const pairInfo = pair.find('.pair_info');
-
         pairInfo.children().each((lessonIndex, lessonElement) => {
           const lesson = pairInfo.find(lessonElement);
           const subject = getTextField(lesson.find('.dis'));
@@ -79,17 +76,16 @@ export default function parseTimeTable(html) {
             building,
             floor,
             subject,
-            isDistance: audience === 'Дистанционно'
+            isDistance: audience === 'Дистанционно',
           });
-        })
+        });
 
         const pairTime = getTextField(pair.find('.pair_num').find('.eval'));
         pairs.push({
           time: pairTime,
           position: index + 1,
-          lessons
-        })
-
+          lessons,
+        });
       });
     }
     days.push({

src/plugins/copyDrawable.js

@@ -1,16 +1,15 @@
-import type { ConfigPlugin } from '@expo/config-plugins';
-import { withDangerousMod } from '@expo/config-plugins';
-import { copyFileSync, existsSync, lstatSync, mkdirSync, readdirSync } from 'fs';
-import { basename, join } from 'path';
+const { withDangerousMod } = require('@expo/config-plugins');
+const { copyFileSync, existsSync, lstatSync, mkdirSync, readdirSync } = require('fs');
+const { basename, join } = require('path');
 
 const androidFolderPath = ['app', 'src', 'main', 'res', 'drawable'];
 
-const withDrawableAssets: ConfigPlugin<string | string[]> = (expoConfig, files) =>
+const withDrawableAssets = (expoConfig, files) =>
   withDangerousMod(expoConfig, [
     'android',
     (modConfig) => {
       if (modConfig.modRequest.platform === 'android') {
-        const androidDwarablePath = join(
+        const androidDrawablePath = join(
           modConfig.modRequest.platformProjectRoot,
           ...androidFolderPath
         );
@@ -21,17 +20,17 @@ const withDrawableAssets: ConfigPlugin<string | string[]> = (expoConfig, files)
         files.forEach((file) => {
           const isFile = lstatSync(file).isFile();
           if (isFile) {
-            copyFileSync(file, join(androidDwarablePath, basename(file)));
+            copyFileSync(file, join(androidDrawablePath, basename(file)));
           } else {
-            copyFolderRecursiveSync(file, androidDwarablePath);
+            copyFolderRecursiveSync(file, androidDrawablePath);
           }
         });
       }
       return modConfig;
     },
   ]);
 
-async function copyFolderRecursiveSync(source: string, target: string) {
+async function copyFolderRecursiveSync(source, target) {
   if (!existsSync(target)) mkdirSync(target);
 
   const files = readdirSync(source);
@@ -48,4 +47,4 @@ async function copyFolderRecursiveSync(source: string, target: string) {
   }
 }
 
-export default withDrawableAssets;
+module.exports = withDrawableAssets;

src/plugins/copyDrawable.ts

@@ -31,7 +31,7 @@ const AuthFooter = () => {
   return (
     <View style={styles.view}>
       <Text style={[styles.infoText, globalStyles.textColor]}>
-        Приложение ЕТИС мобайл является неоффициальным мобильным приложением для ЕТИС ПГНИУ
+        Приложение ЕТИС мобайл является неофициальным мобильным приложением для ЕТИС ПГНИУ
       </Text>
       <TouchableOpacity onPress={() => Linking.openURL(PRIVACY_POLICY_URL)}>
         <Text style={styles.privacyPolicyText}>Политика конфиденциальности</Text>

src/redux/reducers/sessionTest.ts

@@ -50,7 +50,7 @@ const Recovery = ({ setShowModal }) => {
   };
 
   return (
-    <Screen headerText={'Восстановление доступа'}>
+    <Screen>
       {!recaptchaToken && (
         <CustomReCaptcha
           onReceiveToken={onReceiveRecaptchaToken}

src/screens/auth/AuthFooter.tsx

@@ -71,13 +71,16 @@ export default function RatingPage() {
     }
     if (!result.data) {
       if (!data) {
-        const cached = await client.getRatingData({
-          session: (await cache.getStudent()).currentSession,
-          requestType: RequestType.forceCache,
-        });
-        if (cached.data) {
-          setData(cached.data);
-        }
+        const student = await cache.getStudent();
+        if (student?.currentSession) {
+          const cached = await client.getRatingData({
+            session: (await cache.getStudent()).currentSession,
+            requestType: RequestType.forceCache,
+          });
+          if (cached.data) {
+            setData(cached.data);
+          }
+        } else ToastAndroid.show('Нет данных для отображения', ToastAndroid.LONG);
       } else ToastAndroid.show('Нет данных для отображения', ToastAndroid.LONG);
       setLoading(false);
       return;