Project revamp

klincoder · Jan 21, 2023 · 5a7320f · 5a7320f
1 parent ae97d9c
commit 5a7320f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 69 deletions.
diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js
@@ -4,8 +4,8 @@ import { FlatList, View } from "react-native";
 import tw from "twrnc";
 
 // Import custom files
-import twStyles from "../config/twStyles";
 import routes from "./routes";
+import twStyles from "../config/twStyles";
 import useAppSettings from "../hooks/useAppSettings";
 import CustomSafeView from "../components/CustomSafeView";
 import useAuthState from "../hooks/useAuthState";

diff --git a/src/screens/OnboardingScreen.js b/src/screens/OnboardingScreen.js
@@ -35,7 +35,7 @@ const OnboardingScreen = () => {
       <CustomBgImage isLink image={appImages?.onboarding}>
         {/** Overlay */}
         <View
-          style={tw`absolute top-0 right-0 bottom-0 left-0 bg-white opacity-99`}
+          style={tw`absolute top-0 right-0 bottom-0 left-0 bg-white opacity-95`}
         />
 
         {/** MAIN CONTAINER */}
@@ -48,25 +48,28 @@ const OnboardingScreen = () => {
           />
 
           {/** COL 2 - HEADING */}
-          <View style={tw`mb-6`}>
+          <View style={tw`mb-5`}>
             <CustomText style={[tw`text-4xl`, twStyles?.fontBold]}>
-              Shop gadgets at the best prices.
+              A faster way to launch any app.
             </CustomText>
           </View>
 
           {/** COL 3 - BUTTONS */}
-          <View style={tw`flex items-start mb-1`}>
+          <View style={tw`flex mb-1`}>
+            {/** Login */}
             <CustomButton
               isNormal
-              iconRight
-              title="Go Shopping"
-              icon={{ type: "ant-design", name: "arrowright", color: "white" }}
-              styleNormalButton={tw`py-4 px-6 mb-4`}
-              iconContainerStyle={tw`pl-3 text-white`}
-              onPress={async () => {
-                await AsyncStorage.setItem("show_onboarding", "false");
-                navigation.replace(routes.HOME_NAVIGATOR);
-              }}
+              title="Login"
+              onPress={() => navigation.navigate(routes.LOGIN)}
+              styleNormalButton={tw`w-45 mb-3`}
+            />
+
+            {/** Register */}
+            <CustomButton
+              isText
+              title="Not a member? Register"
+              onPress={() => navigation.navigate(routes.REGISTER)}
+              styleText={tw`mt-6`}
             />
           </View>
         </View>

diff --git a/src/screens/SettingsScreen.js b/src/screens/SettingsScreen.js
@@ -15,7 +15,7 @@ const SettingsScreen = () => {
   const { navigation, isMounted } = useAppSettings();
 
   // Define state
-  const { user } = useAuthState();
+  const { userID } = useAuthState();
 
   // Debug
   //console.log("Debug settingsScreen: ",);
@@ -25,7 +25,6 @@ const SettingsScreen = () => {
   useLayoutEffect(() => {
     // On mount
     isMounted.current = true;
-
     // Set screen options
     navigation.setOptions({
       headerTitleAlign: "left",
@@ -35,7 +34,6 @@ const SettingsScreen = () => {
         </View>
       ), // close header right
     }); // close navigation
-
     // Clean up
     return () => {
       isMounted.current = false;

diff --git a/src/screens/SupportScreen.js b/src/screens/SupportScreen.js
@@ -28,11 +28,11 @@ const SupportScreen = () => {
     // Set screen options
     navigation.setOptions({
       headerTitleAlign: "center",
-      // headerRight: () => (
-      //   <View style={tw`flex flex-row pr-5`}>
-      //     <CustomText>Right Text</CustomText>
-      //   </View>
-      // ), // close header right
+      headerRight: () => (
+        <View style={tw`flex flex-row pr-5`}>
+          <CustomText>Right Text</CustomText>
+        </View>
+      ), // close header right
     }); // close navigation
     // Clean up
     return () => {
@@ -44,9 +44,9 @@ const SupportScreen = () => {
   return (
     <CustomSafeView style={tw`px-4`}>
       {/** MAIN CONTAINER */}
-      {/* <View style={tw`flex-1 items-center justify-center`}>
+      <View style={tw`flex-1 items-center justify-center`}>
         <CustomText>SupportScreen</CustomText>
-      </View> */}
+      </View>
     </CustomSafeView>
   ); // close return
 }; // close component

diff --git a/yarn.lock b/yarn.lock
@@ -3773,11 +3773,6 @@ expo-constants@~14.0.0, expo-constants@~14.0.2:
     "@expo/config" "~7.0.2"
     uuid "^3.3.2"
 
-expo-eas-client@~0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/expo-eas-client/-/expo-eas-client-0.4.1.tgz#4ccdafb5faeac97394fb3fa4c777ec22b2017f1d"
-  integrity sha512-bIj2rm6lw/iZAOAW5CSAxshSXi2oY+ORpHRp4ZdqSDuwA0RIa9jGyMm1Jhostjjz5y9k2uur5vtVqq6P3Bwx/Q==
-
 expo-error-recovery@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/expo-error-recovery/-/expo-error-recovery-4.0.1.tgz#3e3333e134c992c234539d3773fe78915c883755"
@@ -3810,23 +3805,11 @@ expo-image-picker@~14.0.2:
     expo-image-loader "~4.0.0"
     uuid "7.0.2"
 
-expo-json-utils@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/expo-json-utils/-/expo-json-utils-0.4.0.tgz#47ae83a1cc973101d62371f94790e9ad39491751"
-  integrity sha512-lK6gjea72XTYafpKNNJaMrBK5dYAX8LFLXrp/M1MKJU4Zy7EHd2rKrLwop3GZts8VdwLHeVcMko79SAbhe3i5Q==
-
 expo-keep-awake@~11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-11.0.1.tgz#ee354465892a94040ffe09901b85b469e7d54fb3"
   integrity sha512-44ZjgLE4lnce2d40Pv8xsjMVc6R5GvgHOwZfkLYtGmgYG9TYrEJeEj5UfSeweXPL3pBFhXKfFU8xpGYMaHdP0A==
 
-expo-manifests@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-0.4.0.tgz#6fd44b6427e113f2eb9409ca46df95cbbea068df"
-  integrity sha512-IdZjIYDxx4nH0Gb3X4T4/2YknmR/jSLxymAS0m7SfJ9V7Vlu/y0p3lNwUys9/JzihxX9PDIuOi/Y4/uqL6TlXg==
-  dependencies:
-    expo-json-utils "~0.4.0"
-
 [email protected]:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-1.0.1.tgz#a82eaef2decd1d518458d64cb542c64fc23eacde"
@@ -3859,34 +3842,6 @@ expo-status-bar@~1.4.2:
   resolved "https://registry.yarnpkg.com/expo-status-bar/-/expo-status-bar-1.4.2.tgz#14f2b9a6dc7d550578421f07e0046f5fafc2b403"
   integrity sha512-ZWjO6D4ARGYfAd3SWDD3STNudHDhyBZDZjhhseqoEmsf7bS9ykny8KKOhlzJW24qIQNPhkgdvHhaw9fQwMJy3Q==
 
-expo-structured-headers@~3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-3.0.1.tgz#291596c61acd2a45839ad6c6798c3d5cfc1eb4e9"
-  integrity sha512-x6hkzuQL5HJoyB+xQyBf9M04ZUmrjFWqEW7gzIYWN/6LA+dgyaV4fF6U9++Re+GgGjF03vHJFqR1xYaosKKZYQ==
-
-expo-updates-interface@~0.8.0:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-0.8.1.tgz#baeeeb01a77439682432be83ba78bc2e00547c4e"
-  integrity sha512-1TPFCTQFHMZbltFGnxig3PbN/b6nO4T0RyL8XqdmYvQY0ElOCprZXQQ8vNDqeLYHgausG1lD4OyJwFzh2SNBSA==
-
-expo-updates@~0.15.6:
-  version "0.15.6"
-  resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.15.6.tgz#99e3faa3e38312ebddb77afb697863fa1f1f6a03"
-  integrity sha512-g5BuCmWdyiLqFaVkVz+m7r6U7MHJrLKvqybs04H6ArMNpTEf6FhUwSzmnCyOkSSP35KFNkC/I0dYlgW3Vcf1sw==
-  dependencies:
-    "@expo/code-signing-certificates" "0.0.5"
-    "@expo/config" "~7.0.2"
-    "@expo/config-plugins" "~5.0.3"
-    "@expo/metro-config" "~0.5.0"
-    arg "4.1.0"
-    expo-eas-client "~0.4.0"
-    expo-manifests "~0.4.0"
-    expo-structured-headers "~3.0.0"
-    expo-updates-interface "~0.8.0"
-    fbemitter "^3.0.0"
-    resolve-from "^5.0.0"
-    uuid "^3.4.0"
-
 expo@~47.0.6:
   version "47.0.11"
   resolved "https://registry.yarnpkg.com/expo/-/expo-47.0.11.tgz#4a907b5d6397056343781c46557505d5469b145b"