Merge pull request #183 from bounswe/new-mobile

Merge final mobile branch into main
bounswe · May 17, 2024 · d1dbb69 · d1dbb69
2 parents d64bc28 + a72dfe1
commit d1dbb69
Show file tree

Hide file tree

Showing 24 changed files with 3,079 additions and 2,249 deletions.
diff --git a/application/mobile/.env.example b/application/mobile/.env.example
@@ -1 +1 @@
-VITE_API_URL=http://localhost:8080
+VITE_API_URL="https://fanatic-backend-bjbpof6jaq-oa.a.run.app"
diff --git a/application/mobile/App.js b/application/mobile/App.js
@@ -3,10 +3,14 @@ import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import LoginScreen from "./App/Screens/LoginScreen";
 import RegisterScreen from "./App/Screens/RegisterScreen";
 import FeedScreen from "./App/Screens/FeedScreen";
-import ProfileScreen from "./App/Screens/ProfileScreen";
+import SettingsScreen from "./App/Screens/SettingsScreen";
 import PostCreationScreen from "./App/Screens/PostCreationScreen";
 import SearchResultScreen from "./App/Screens/SearchResultScreen";
-
+import PostScreen from "./App/Screens/PostScreen";
+import ChangePassword from "./App/Screens/ChangePassword";
+import DeleteAccount from "./App/Screens/DeleteAccount";
+import ProfileScreen from "./App/Screens/ProfileScreen";
+import CommunityScreen from "./App/Screens/CommunityScreen";
 const Stack = createNativeStackNavigator();
 
 export default function App() {
@@ -29,10 +33,15 @@ export default function App() {
  options={{ headerShown: false }}
  />
  <Stack.Screen
- name="Profile"
+ name="ProfileScreen"
  component={ProfileScreen}
  options={{ headerShown: false }}
  />
+ <Stack.Screen
+ name="Settings"
+ component={SettingsScreen}
+ options={{ headerShown: false }}
+ />
  <Stack.Screen
  name="Post"
  component={PostCreationScreen}
@@ -43,6 +52,26 @@ export default function App() {
  component={SearchResultScreen}
  options={{ headerShown: false }}
  />
+ <Stack.Screen
+ name="ChangePassword"
+ component={ChangePassword}
+ options={{ headerShown: false }}
+ />
+ <Stack.Screen
+ name="DeleteAccount"
+ component={DeleteAccount}
+ options={{ headerShown: false }}
+ />
+ <Stack.Screen
+ name="PostScreen"
+ component={PostScreen}
+ options={{ headerShown: false }}
+ />
+ <Stack.Screen
+ name="Community"
+ component={CommunityScreen}
+ options={{ headerShown: false }}
+ />
  </Stack.Navigator>
  </NavigationContainer>
  );

diff --git a/application/mobile/App/Screens/ChangePassword.js b/application/mobile/App/Screens/ChangePassword.js
@@ -0,0 +1,121 @@
+import React, { useState, useRef } from "react";
+import {
+ Alert,
+ Text,
+ View,
+ StyleSheet,
+ TextInput,
+ StatusBar,
+ Image,
+ FlatList,
+ Dimensions,
+ TouchableOpacity,
+ Modal,
+} from "react-native";
+
+
+export default function ChangePassword({navigation}){
+ const [oldPass, setOld] = useState("");
+ const [newPass, setNew] = useState("");
+ const [newPass_, setNew_] = useState("");
+ const backButton = () => {
+ navigation.goBack();
+ }
+
+ const changePass = () => {
+ if(newPass.length < 8){
+ alert("Password length is too short")
+ return;
+ }
+ if(newPass != newPass_){
+ alert("Passwords Are Not Matching")
+ return;
+ }
+ navigation.goBack();
+ }
+
+ return(
+ <View style={styles.backgroundContainer}>
+ <View style={styles.headerContainer}>
+ <TouchableOpacity onPress={backButton}>
+ <Image style={styles.backIcon} source={require("../assets/back.png")}/>
+ </TouchableOpacity>
+ <Image style={{marginLeft: "12%"}} source={require("../assets/favicon.jpeg")}></Image>
+ <Text style={styles.header}>appFanatic.</Text>
+ <View style={{marginLeft: "20%"}}></View>
+ </View>
+ <View style={[styles.inputView, {marginTop: "5%"}]}>
+ <Text>Your Old Password: </Text>
+ <TextInput autoCapitalize="none"
+ secureTextEntry style={styles.textInContainer} value={oldPass} onChange={(val) => {setOld(val)}}/>
+ </View>
+ <View style={styles.inputView}>
+ <Text>Your New Password: </Text>
+ <TextInput autoCapitalize="none"
+ secureTextEntry style={styles.textInContainer} value={newPass} onChange={(val) => {setNew(val)}}/>
+ </View>
+ <View style={styles.inputView}>
+ <View>
+ <Text>Your New Password: </Text>
+ <Text>(Enter Again)</Text>
+ </View>
+
+ <TextInput autoCapitalize="none"
+ secureTextEntry style={styles.textInContainer} value={newPass_} onChange={(val) => {setNew_(val)}}/>
+ </View>
+ <TouchableOpacity onPress={changePass} style={styles.button}>
+ <Text style={{fontSize: 16, color: "white"}}>Change Password</Text>
+ </TouchableOpacity>
+ </View>
+ )
+}
+
+const styles = StyleSheet.create({
+ backgroundContainer: {
+ flex: 1,
+ backgroundColor: "white",
+ paddingTop: StatusBar.currentHeight,
+ justifyContent: "flex-start",
+ minHeight: Math.round(Dimensions.get("window").height),
+ },
+ headerContainer: {
+ marginTop: "5%",
+ flexDirection: "row",
+ justifyContent: "center",
+ alignItems: "center",
+ },
+ backIcon: {
+ width: 40,
+ height: 50,
+ resizeMode:"stretch",
+ },
+ header: {
+ color: "blue",
+ fontSize: 25,
+ fontWeight: "600",
+ },
+ textInContainer: {
+ height: "50%",
+ width: "80%",
+ marginTop: "2%",
+ marginLeft: "5%",
+ marginBottom: "5%",
+ borderWidth: 2,
+ padding: 5,
+ borderRadius: 5,
+ borderColor: "#0001",
+ },
+ button: {
+ backgroundColor: 'blue',
+ padding: 10,
+ borderRadius: 5,
+ alignItems: 'center',
+ marginBottom: "5%",
+ },
+ inputView: {
+ flexDirection: "row",
+ marginBottom: "5%",
+ marginLeft: "5%",
+ width: "60%",
+ }
+})