Skip to content

Commit b014f99

Browse files
Leonidas-makerLeonidas-maker
committed
Merge branch 'develop' into 'main'
Version 1.0.2 See merge request themastercollection/thestudentmaster!32
2 parents 1016d06 + bc53e2a commit b014f99

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2421
-1602
lines changed

‎Client/app.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"expo": {
3-
"entryPoint": "./src/App.tsx",
43
"name": "TheStudentMaster",
54
"slug": "TheStudentMaster",
6-
"version": "1.0.1",
7-
"orientation": "portrait",
5+
"version": "1.0.2",
6+
"orientation": "default",
87
"icon": "./public/logo/TheStudentMaster.png",
98
"userInterfaceStyle": "automatic",
109
"splash": {
@@ -16,15 +15,15 @@
1615
"ios": {
1716
"supportsTablet": true,
1817
"bundleIdentifier": "com.TheMasterCollection.TheStudentMaster",
19-
"buildNumber": "2"
18+
"buildNumber": "1"
2019
},
2120
"android": {
2221
"adaptiveIcon": {
2322
"foregroundImage": "./public/logo/TheStudentMaster.png",
2423
"backgroundColor": "#ffffff"
2524
},
26-
"package": "com.TheMasterCollection.TheStudentMaster",
27-
"versionCode": 4
25+
"package": "com.schuetze1000.TheStudentMaster",
26+
"versionCode": 1
2827
},
2928
"web": {
3029
"favicon": "./public/logo/TheStudentMaster.png"
@@ -34,6 +33,7 @@
3433
"projectId": "8a98a15b-dfe3-42d6-82fb-4526aecba223"
3534
}
3635
},
37-
"owner": "themastercollection"
36+
"owner": "themastercollection",
37+
"plugins": ["expo-secure-store"]
3838
}
3939
}

‎Client/package-lock.json‎

Lines changed: 1712 additions & 1250 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client/package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "test",
3-
"version": "1.0.1",
3+
"version": "1.0.2",
44
"main": "./src/App.tsx",
55
"scripts": {
66
"start": "expo start",
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@expo/config-plugins": "~8.0.0",
13-
"@expo/metro-runtime": "~3.2.1",
13+
"@expo/metro-runtime": "~3.2.3",
1414
"@expo/ngrok": "^4.1.3",
1515
"@react-native-async-storage/async-storage": "^1.23.1",
1616
"@react-native-community/masked-view": "^0.1.11",
@@ -20,9 +20,10 @@
2020
"axios": "^1.6.8",
2121
"axios-jwt": "^4.0.2",
2222
"date-fns": "^3.4.0",
23-
"expo": "^51.0.14",
23+
"expo": "~51.0.28",
2424
"expo-constants": "~16.0.2",
25-
"expo-secure-store": "^13.0.1",
25+
"expo-screen-orientation": "~7.0.5",
26+
"expo-secure-store": "~13.0.2",
2627
"expo-status-bar": "~1.12.1",
2728
"i18next-chained-backend": "^4.6.2",
2829
"i18next-http-backend": "^2.5.0",
@@ -32,13 +33,13 @@
3233
"react": "18.2.0",
3334
"react-dom": "18.2.0",
3435
"react-i18next": "^14.1.0",
35-
"react-native": "^0.74.2",
36+
"react-native": "0.74.5",
3637
"react-native-dropdown-select-list": "^2.0.5",
3738
"react-native-gesture-handler": "~2.16.1",
3839
"react-native-progress": "^5.0.1",
3940
"react-native-qrcode-svg": "^6.3.1",
4041
"react-native-reanimated": "~3.10.1",
41-
"react-native-safe-area-context": "4.10.1",
42+
"react-native-safe-area-context": "4.10.5",
4243
"react-native-screens": "3.31.1",
4344
"react-native-svg": "15.2.0",
4445
"react-native-vector-icons": "^10.0.3",

‎Client/src/App.tsx‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// ~~~~~~~~~~~~~~~ Imports ~~~~~~~~~~~~~~~ //
22
import { registerRootComponent } from "expo";
3+
import { useEffect } from "react";
4+
import { Dimensions, Platform } from "react-native";
5+
import * as ScreenOrientation from "expo-screen-orientation";
36
import "react-native-gesture-handler";
47
import { NavigationContainer } from "@react-navigation/native";
58
import "../global.css";
@@ -8,7 +11,7 @@ import { SafeAreaProvider } from "react-native-safe-area-context";
811

912
// ~~~~~~~~~~ Import translation ~~~~~~~~~ //
1013
// Import i18next for localisation
11-
import "./translations/TranslationConfig";
14+
import "./translations/translationConfig";
1215

1316
// ~~~~~~~~~~ Import first stack ~~~~~~~~~ //
1417
import LoadingStack from "./routes/LoadingStack";
@@ -17,7 +20,7 @@ import LoadingStack from "./routes/LoadingStack";
1720
import { ThemeProvider } from "./provider/ThemeProvider";
1821

1922
// ~~~~~~~~~~~ Service imports ~~~~~~~~~~~ //
20-
import ApplyInterceptor from "./services/ApplyInterceptor";
23+
import ApplyInterceptor from "./services/applyInterceptor";
2124

2225
// ====================================================== //
2326
// ===================== Export App ===================== //
@@ -26,6 +29,21 @@ export default function App() {
2629
// Apply the interceptor
2730
ApplyInterceptor();
2831

32+
useEffect(() => {
33+
const { height, width } = Dimensions.get("window");
34+
const isTablet =
35+
(Platform.OS === "ios" && (height > 800 || width > 800)) ||
36+
(Platform.OS === "android" && (height > 800 || width > 800));
37+
38+
if (isTablet) {
39+
ScreenOrientation.unlockAsync();
40+
} else {
41+
ScreenOrientation.lockAsync(
42+
ScreenOrientation.OrientationLock.PORTRAIT_UP,
43+
);
44+
}
45+
}, []);
46+
2947
// ====================================================== //
3048
// ================ Return App component ================ //
3149
// ====================================================== //

‎Client/src/components/accountManagement/otpInput/OTPInput.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import TextFieldInput from "../../textInputs/TextFieldInput";
1212

1313
// ~~~~~~~~~~ Interfaces imports ~~~~~~~~~ //
14-
import { OTPInputProps } from "../../../interfaces/AuthInterfaces";
14+
import { OTPInputProps } from "../../../interfaces/authInterfaces";
1515

1616
// TODO Implement paste functionality
1717
// TODO Block non-numeric characters

‎Client/src/components/buttons/DefaultButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from "react";
33
import { Pressable, Text } from "react-native";
44

55
// ~~~~~~~~~~ Interfaces imports ~~~~~~~~~ //
6-
import { DefaultButtonProps } from "../../interfaces/ComponentInterfaces";
6+
import { DefaultButtonProps } from "../../interfaces/componentInterfaces";
77

88
// ====================================================== //
99
// ====================== Component ===================== //

‎Client/src/components/buttons/EditButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Pressable, useColorScheme } from "react-native";
44
import Icon from "react-native-vector-icons/MaterialIcons";
55

66
// ~~~~~~~~~~ Interfaces imports ~~~~~~~~~ //
7-
import { EditButtonProps } from "../../interfaces/ComponentInterfaces";
7+
import { EditButtonProps } from "../../interfaces/componentInterfaces";
88

99
// ====================================================== //
1010
// ====================== Component ===================== //

‎Client/src/components/buttons/OnboardingButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Dimensions } from "react-native";
1010
import Icon from "react-native-vector-icons/MaterialIcons";
1111

1212
// ~~~~~~~~~~ Interfaces imports ~~~~~~~~~ //
13-
import { OnboardingButtonProps } from "../../interfaces/ComponentInterfaces";
13+
import { OnboardingButtonProps } from "../../interfaces/componentInterfaces";
1414

1515
const { width } = Dimensions.get("window");
1616

‎Client/src/components/buttons/TextButton.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import React from "react";
33
import { Text } from "react-native";
44

55
// ~~~~~~~~~~ Interfaces imports ~~~~~~~~~ //
6-
import { TextButtonProps } from "../../interfaces/ComponentInterfaces";
6+
import { TextButtonProps } from "../../interfaces/componentInterfaces";
77

88
// ====================================================== //
99
// ====================== Component ===================== //

‎Client/src/components/calendar/CalendarCalculations.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
CalculationTopPositionProps,
55
CalculationLeftPositionProps,
66
CalculationMarkerPositionProps,
7-
} from "../../interfaces/CalendarInterfaces";
7+
} from "../../interfaces/calendarInterfaces";
88

99
// ====================================================== //
1010
// ================== Helper functions ================== //

0 commit comments

Comments
 (0)