From 8b3939d49b5dbb892159e63ed276547198001592 Mon Sep 17 00:00:00 2001 From: Lorenzo Trujillo Date: Thu, 12 Sep 2024 19:46:08 -0600 Subject: [PATCH 1/4] prod --- backend/src/auth/user/authUserservice.ts | 1 + backend/src/route/index.html | 52 ++++++++++++++++++ mobile/app/_layout.tsx | 15 ++++++ mobile/app/about_us.tsx | 5 ++ mobile/src/common/contexts/data_context.tsx | 2 +- mobile/src/profile/screens/about_us_page.tsx | 57 ++++++++++++++++++++ mobile/src/profile/screens/account_page.tsx | 53 +++++++++--------- 7 files changed, 160 insertions(+), 25 deletions(-) create mode 100644 backend/src/route/index.html create mode 100644 mobile/app/about_us.tsx create mode 100644 mobile/src/profile/screens/about_us_page.tsx diff --git a/backend/src/auth/user/authUserservice.ts b/backend/src/auth/user/authUserservice.ts index 511ff34d..7f53e41b 100644 --- a/backend/src/auth/user/authUserservice.ts +++ b/backend/src/auth/user/authUserservice.ts @@ -83,6 +83,7 @@ export class AuthUserService { } async getResetPasswordCode(email: string) { + console.log(`Email: ${email}`); const user: User = await this.userService.findOne(email); if (!user) throw new UnauthorizedException('Invalid email'); const resetCode = randomInt(100000, 999999).toString(); diff --git a/backend/src/route/index.html b/backend/src/route/index.html new file mode 100644 index 00000000..35d7bb58 --- /dev/null +++ b/backend/src/route/index.html @@ -0,0 +1,52 @@ + + + + + + Document + + + +
+
+

+ +

+
+
+
+
+
+
+
+ +
+
+ + \ No newline at end of file diff --git a/mobile/app/_layout.tsx b/mobile/app/_layout.tsx index 3c94ed45..126debba 100644 --- a/mobile/app/_layout.tsx +++ b/mobile/app/_layout.tsx @@ -95,6 +95,21 @@ const MainLayout = () => { statusBarColor: LIGHT_THEME.color.primary, }} /> + ); +} \ No newline at end of file diff --git a/mobile/src/common/contexts/data_context.tsx b/mobile/src/common/contexts/data_context.tsx index e82b1959..9d547bb4 100644 --- a/mobile/src/common/contexts/data_context.tsx +++ b/mobile/src/common/contexts/data_context.tsx @@ -69,7 +69,7 @@ const getDevelopmentContext = (): DataContextType => { export const DataContextProvider = ({ children }: DataContextProviderProps) => { const { i18n:{ language } } = useTranslation(); - const value = getProductionContext(language); + const value = getDevelopmentContext(); return ( diff --git a/mobile/src/profile/screens/about_us_page.tsx b/mobile/src/profile/screens/about_us_page.tsx new file mode 100644 index 00000000..c13e342f --- /dev/null +++ b/mobile/src/profile/screens/about_us_page.tsx @@ -0,0 +1,57 @@ +import { View, Text, StyleSheet } from "react-native"; +import { LIGHT_THEME } from "../../common/const/theme"; +import { FontAwesome } from "@expo/vector-icons"; + +export const AboutUsPage = () => { + return ( + + Equipo de desarrollo + + + + + + + ); +}; + +interface ItemTeam { + name: string; + role: string; +} + +const ItemTeamList = ({name, role}: ItemTeam) => { + return ( + + + {name} + + {role} + + ); +}; + +const styles = StyleSheet.create({ + container: { + flex: 1, + width: "100%", + padding: 20, + backgroundColor: LIGHT_THEME.color.background, + }, + itemTeam: { + width: "100%", + flexDirection: "row", + backgroundColor: "red", + gap: 10, + alignItems: "center", + height: 30, + }, + nameTeam: { + fontSize: 18, + }, + roleTeamText: { + fontSize: 18, + fontWeight: "bold", + + } +}); \ No newline at end of file diff --git a/mobile/src/profile/screens/account_page.tsx b/mobile/src/profile/screens/account_page.tsx index f4878ced..670f936a 100644 --- a/mobile/src/profile/screens/account_page.tsx +++ b/mobile/src/profile/screens/account_page.tsx @@ -1,11 +1,4 @@ -import { - View, - Text, - Button, - StyleSheet, - Touchable, - TouchableOpacity, -} from "react-native"; +import { View, Text, StyleSheet, TouchableOpacity } from "react-native"; import { useAuth } from "../../auth/contexts/auth_context"; import { CircleAvatar } from "../../common/components/circle_avatar"; import { @@ -20,9 +13,9 @@ import { useRef, useState } from "react"; import Modal from "react-native-modal"; import { set } from "react-hook-form"; import { AntDesign } from "@expo/vector-icons"; -import RNPickerSelect from 'react-native-picker-select'; +import RNPickerSelect from "react-native-picker-select"; import { AvailableLanguages, Languages } from "../../lang/translations"; -import i18n from 'i18next'; +import i18n from "i18next"; import { useTranslation } from "react-i18next"; import { useLang } from "../../lang/hooks/useLang"; @@ -73,11 +66,22 @@ export const AccountPage = () => { onClose={() => setModalVisible(false)} /> } onPress={() => router.push("/profile/interests")} /> + router.push("/about_us")} + leadingIcon={ + + } + /> { const { changeLanguage } = useLang(); - const [selectedLanguage, setSelectedLanguage] = useState(null); + const [selectedLanguage, setSelectedLanguage] = useState( + null + ); const onSave = () => { changeLanguage(selectedLanguage || Languages.SPANISH); onClose(); - } + }; return ( @@ -115,16 +121,15 @@ const ChangeLanguageModal = ({ /> Select Language setSelectedLanguage(value)} - items={AvailableLanguages.map((lang) => ({ - label: lang.value, - value: lang.key, - })) - } - /> - - Save - + onValueChange={(value) => setSelectedLanguage(value)} + items={AvailableLanguages.map((lang) => ({ + label: lang.value, + value: lang.key, + }))} + /> + + Save + ); @@ -165,7 +170,7 @@ const modalStyles = StyleSheet.create({ saveBtnText: { color: "white", fontWeight: "bold", - } + }, }); const styles = StyleSheet.create({ -- GitLab From 50eded8ed73320d439628c75b02baceecdc23db1 Mon Sep 17 00:00:00 2001 From: Lorenzo Trujillo Date: Thu, 12 Sep 2024 19:49:04 -0600 Subject: [PATCH 2/4] prod --- mobile/src/common/const/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/common/const/api.ts b/mobile/src/common/const/api.ts index c4d4fe8d..09fb6f41 100644 --- a/mobile/src/common/const/api.ts +++ b/mobile/src/common/const/api.ts @@ -1 +1 @@ -export const API_URL = 'http://192.168.0.14:3005'; \ No newline at end of file +export const API_URL = 'https://c749-200-92-164-74.ngrok-free.app/'; \ No newline at end of file -- GitLab From ae93a041d6c818c5a61fdd4eb6c5a421e374d33c Mon Sep 17 00:00:00 2001 From: Lorenzo Trujillo Date: Thu, 12 Sep 2024 20:01:47 -0600 Subject: [PATCH 3/4] prod --- mobile/src/common/contexts/data_context.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/common/contexts/data_context.tsx b/mobile/src/common/contexts/data_context.tsx index 9d547bb4..e82b1959 100644 --- a/mobile/src/common/contexts/data_context.tsx +++ b/mobile/src/common/contexts/data_context.tsx @@ -69,7 +69,7 @@ const getDevelopmentContext = (): DataContextType => { export const DataContextProvider = ({ children }: DataContextProviderProps) => { const { i18n:{ language } } = useTranslation(); - const value = getDevelopmentContext(); + const value = getProductionContext(language); return ( -- GitLab From eda46232b3c8f6adb8949b3a3b7f392a7cff553c Mon Sep 17 00:00:00 2001 From: Lorenzo Trujillo Date: Thu, 12 Sep 2024 20:15:36 -0600 Subject: [PATCH 4/4] prod --- mobile/src/common/const/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/src/common/const/api.ts b/mobile/src/common/const/api.ts index 09fb6f41..24838169 100644 --- a/mobile/src/common/const/api.ts +++ b/mobile/src/common/const/api.ts @@ -1 +1 @@ -export const API_URL = 'https://c749-200-92-164-74.ngrok-free.app/'; \ No newline at end of file +export const API_URL = 'https://c749-200-92-164-74.ngrok-free.app'; \ No newline at end of file -- GitLab