@imksh/create 1.0.31 → 1.0.33

package/templates/layers/react/typescript/src/store/useAuthStore.ts

@@ -7,6 +7,7 @@ export interface User {
   email: string;
   phone?: string;
   role: string;
+  orgRole?: string;
   avatar?: {
     url?: string;
     publicId?: string;
@@ -15,6 +16,20 @@ export interface User {
   updatedAt?: string;
 }
 
+interface ApiErrorResponse {
+  response?: {
+    data?: {
+      message?: string;
+    };
+  };
+  message?: string;
+}
+
+const getErrorMessage = (err: unknown): string => {
+  const apiErr = err as ApiErrorResponse;
+  return apiErr.response?.data?.message || apiErr.message || "An unexpected error occurred";
+};
+
 export interface AuthState {
   user: User | null;
   loading: boolean;
@@ -39,9 +54,9 @@ export const useAuthStore = create<AuthState>((set) => ({
     try {
       await authService.sendOtp(email);
       return true;
-    } catch (err: any) {
+    } catch (err: unknown) {
       set({
-        error: err.response?.data?.message || err.message,
+        error: getErrorMessage(err),
         loading: false,
       });
       return false;
@@ -62,9 +77,9 @@ export const useAuthStore = create<AuthState>((set) => ({
         loading: false,
       });
       return true;
-    } catch (err: any) {
+    } catch (err: unknown) {
       set({
-        error: err.response?.data?.message || err.message,
+        error: getErrorMessage(err),
         loading: false,
       });
       return false;
@@ -85,9 +100,9 @@ export const useAuthStore = create<AuthState>((set) => ({
         loading: false,
       });
       return true;
-    } catch (err: any) {
+    } catch (err: unknown) {
       set({
-        error: err.response?.data?.message || err.message,
+        error: getErrorMessage(err),
         loading: false,
       });
       return false;
@@ -101,7 +116,7 @@ export const useAuthStore = create<AuthState>((set) => ({
     try {
       const { data } = await authService.getMe();
       set({ user: data.data, isCheckingAuth: false });
-    } catch (err: any) {
+    } catch {
       set({ isCheckingAuth: false });
     } finally {
       set({ isCheckingAuth: false });
@@ -114,9 +129,9 @@ export const useAuthStore = create<AuthState>((set) => ({
       const { data } = await authService.updateMe(updates);
       set({ user: data.data, loading: false });
       return true;
-    } catch (err: any) {
+    } catch (err: unknown) {
       set({
-        error: err.response?.data?.message || err.message,
+        error: getErrorMessage(err),
         loading: false,
       });
       return false;

package/templates/layers/react-native/base/app.json

@@ -4,47 +4,39 @@
     "slug": "mobile",
     "version": "1.0.0",
     "orientation": "portrait",
-    "icon": "./assets/images/logo/logoWithBg.png",
+    "icon": "./assets/images/logo/icon.png",
     "scheme": "mobile",
     "userInterfaceStyle": "automatic",
     "ios": {
-      "icon": "./assets/images/logo/logoWithBg.png",
+      "icon": "./assets/images/logo/icon.png",
       "bundleIdentifier": "com.anonymous.mobile"
     },
     "android": {
       "adaptiveIcon": {
         "backgroundColor": "#E6F4FE",
-        "foregroundImage": "./assets/images/logo/logoWithBg.png",
-        "backgroundImage": "./assets/images/logo/logoWithBg.png",
-        "monochromeImage": "./assets/images/logo/logoWithBg.png"
+        "foregroundImage": "./assets/images/logo/icon.png",
+        "backgroundImage": "./assets/images/logo/icon.png",
+        "monochromeImage": "./assets/images/logo/icon.png"
       },
       "predictiveBackGestureEnabled": false,
       "package": "com.anonymous.mobile",
       "permissions": [
         "android.permission.CAMERA",
-        "android.permission.RECORD_AUDIO",
         "android.permission.ACCESS_FINE_LOCATION",
-        "android.permission.ACCESS_COARSE_LOCATION",
-        "android.permission.READ_CONTACTS",
-        "android.permission.READ_CALENDAR",
-        "android.permission.READ_EXTERNAL_STORAGE",
-        "android.permission.WRITE_EXTERNAL_STORAGE",
-        "android.permission.BLUETOOTH_CONNECT",
-        "android.permission.BLUETOOTH_SCAN",
-        "android.permission.CALL_PHONE"
+        "android.permission.ACCESS_COARSE_LOCATION"
       ]
     },
     "web": {
       "bundler": "metro",
       "output": "static",
-      "favicon": "./assets/images/logo/logoWithBg.png"
+      "favicon": "./assets/images/logo/icon.png"
     },
     "plugins": [
       "expo-router",
       [
         "expo-splash-screen",
         {
-          "image": "./assets/images/logo/logoWithBg.png",
+          "image": "./assets/images/logo/icon.png",
           "imageWidth": 200,
           "resizeMode": "contain",
           "backgroundColor": "#FFFFFF",
@@ -58,14 +50,9 @@
         {
           "iosPermissions": [
             "Camera",
-            "Microphone",
-            "LocationAlways",
             "LocationWhenInUse",
             "Notifications",
-            "PhotoLibrary",
-            "Contacts",
-            "Calendars",
-            "BluetoothPeripheral"
+            "PhotoLibrary"
           ]
         }
       ]

package/templates/layers/react-native/base/eslint.config.js

@@ -6,5 +6,9 @@ module.exports = defineConfig([
   expoConfig,
   {
     ignores: ["dist/*"],
-  }
+    rules: {
+      "@typescript-eslint/no-explicit-any": "error",
+      "no-console": "error",
+    },
+  },
 ]);

package/templates/layers/react-native/base/package.json

@@ -1,62 +1,62 @@
 {
-  "name": "shivAi",
+  "name": "Mobile",
   "main": "expo-router/entry",
   "version": "1.0.0",
   "dependencies": {
-    "@expo/ui": "~57.0.7",
+    "@expo/ui": "~57.0.22",
     "@expo/vector-icons": "^15.1.1",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@react-native-community/slider": "^5.2.0",
+    "@react-native-google-signin/google-signin": "^13.1.0",
     "@react-native-picker/picker": "^2.11.4",
     "@react-navigation/bottom-tabs": "^7.18.10",
     "axios": "^1.18.1",
     "babel-preset-expo": "^57.0.3",
+    "dayjs": "^1.11.13",
     "drizzle-orm": "^0.45.2",
-    "expo": "~57.0.7",
-    "expo-blur": "~57.0.2",
+    "expo": "~57.0.27",
+    "expo-blur": "~57.0.3",
     "expo-constants": "~57.0.6",
-    "expo-device": "~57.0.1",
-    "expo-file-system": "~18.0.7",
+    "expo-device": "~57.0.2",
+    "expo-file-system": "~57.0.7",
     "expo-font": "~57.0.1",
-    "expo-glass-effect": "~57.0.1",
-    "expo-image": "~57.0.1",
-    "expo-image-picker": "^57.0.6",
-    "expo-linear-gradient": "^57.0.1",
-    "expo-linking": "~57.0.3",
-    "expo-local-authentication": "~15.0.2",
-    "expo-location": "~18.0.5",
-    "expo-notifications": "~57.0.6",
-    "dayjs": "^1.11.13",
-    "expo-router": "~57.0.7",
-    "expo-splash-screen": "~57.0.4",
-    "expo-sqlite": "^57.0.1",
+    "expo-glass-effect": "~57.0.4",
+    "expo-image": "~57.0.5",
+    "expo-image-picker": "~57.0.20",
+    "expo-linear-gradient": "~57.0.2",
+    "expo-linking": "~57.0.12",
+    "expo-local-authentication": "~57.0.3",
+    "expo-location": "~57.0.20",
+    "expo-notifications": "~57.0.22",
+    "expo-router": "~57.0.25",
+    "expo-sharing": "~57.0.22",
+    "expo-splash-screen": "~57.0.9",
+    "expo-sqlite": "~57.0.4",
     "expo-status-bar": "~57.0.1",
-    "expo-symbols": "~57.0.1",
-    "expo-system-ui": "~57.0.1",
-    "expo-web-browser": "~57.0.1",
-    "lottie-react": "^2.4.1",
+    "expo-symbols": "~57.0.3",
+    "expo-system-ui": "~57.0.4",
+    "expo-web-browser": "~57.0.3",
     "lottie-react-native": "^7.3.8",
     "nativewind": "^4.2.6",
     "prettier-plugin-tailwindcss": "^0.5.14",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "react-native": "0.86.0",
+    "react-native": "0.86.3",
+    "react-native-blob-util": "^0.19.11",
     "react-native-gesture-handler": "~2.32.0",
     "react-native-image-viewing": "^0.2.2",
-    "react-native-maps": "^1.18.0",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-otp-entry": "^1.8.6",
     "react-native-paper": "^5.15.3",
-    "react-native-pdf": "^6.7.5",
-    "react-native-blob-util": "^0.19.11",
+    "react-native-pdf": "^7.0.5",
     "react-native-permissions": "^5.6.0",
-    "react-native-reanimated": "^4.5.2",
-    "react-native-safe-area-context": "^5.8.0",
-    "react-native-screens": "4.25.2",
+    "react-native-reanimated": "4.5.1",
+    "react-native-safe-area-context": "~5.7.0",
+    "react-native-screens": "~4.26.0",
     "react-native-toast-message": "^2.4.0",
     "react-native-web": "~0.21.0",
-    "react-native-webview": "^13.12.5",
-    "react-native-worklets": "0.10.0",
+    "react-native-webview": "13.16.1",
+    "react-native-worklets": "0.10.1",
     "socket.io-client": "^4.8.3",
     "tailwindcss": "^3.4.19",
     "zustand": "^5.0.14"
@@ -64,9 +64,12 @@
   "devDependencies": {
     "@types/react": "~19.2.2",
     "babel-plugin-inline-import": "^3.0.0",
+    "dpdm": "^3.14.0",
     "drizzle-kit": "^0.31.10",
     "eslint": "^9.0.0",
-    "eslint-config-expo": "~57.0.0",
+    "eslint-config-expo": "~57.0.2",
+    "prettier": "^3.4.2",
+    "ts-prune": "^0.10.3",
     "typescript": "~6.0.3"
   },
   "scripts": {
@@ -77,7 +80,11 @@
     "ios": "expo run:ios",
     "web": "expo start --web",
     "lint": "expo lint",
-    "format": "expo lint --fix",
+    "lint:fix": "expo lint --fix",
+    "format": "prettier --write \"src/**/*.{ts,tsx,json}\"",
+    "format:check": "prettier --check \"src/**/*.{ts,tsx,json}\"",
+    "circular-check": "dpdm --circular --no-warning --no-tree --exit-code circular:1 \"src/**/*.{ts,tsx}\"",
+    "prune:unused": "ts-prune",
     "ts:check": "tsc --noEmit",
     "build": "eas build",
     "build:android": "eas build -p android",

package/templates/layers/react-native/base/src/app/(auth)/edit-profile.tsx

@@ -45,13 +45,14 @@ export default function EditProfileScreen() {
           uri: avatarUri,
           name: filename,
           type,
-        } as any);
+        } as unknown as Blob);
       }
 
       // Only update if something changed
+      const rnFormData = formData as unknown as { getParts?: () => unknown[] };
       if (
-        (formData as any).getParts &&
-        (formData as any).getParts().length === 0
+        rnFormData.getParts &&
+        rnFormData.getParts().length === 0
       ) {
         router.back();
         return;
@@ -65,10 +66,9 @@ export default function EditProfileScreen() {
       } else {
         toast.error(res.data.message);
       }
-
-      console.log(res.data.data);
-    } catch (error: any) {
-      toast.error(error.response?.data?.message || error.message);
+    } catch (error: unknown) {
+      const err = error as { response?: { data?: { message?: string } }; message?: string };
+      toast.error(err.response?.data?.message || err.message || "Failed to update profile");
     } finally {
       setLoading(false);
     }

package/templates/layers/react-native/base/src/app/(auth)/login.tsx

@@ -2,13 +2,17 @@ import React, { useState, useCallback } from "react";
 import { View } from "react-native";
 import { useAuthStore } from "../../store/useAuthStore";
 import { Txt } from "../../components/common/Typography";
-import { Redirect, router, useFocusEffect } from "expo-router";
+import { router, useFocusEffect } from "expo-router";
 import ScrollContainer from "../../components/ui/layout/ScrollContainer";
 import Input from "../../components/ui/inputs/Input";
 import Button from "../../components/ui/buttons/Button";
 import Tabs from "../../components/ui/navigation/Tabs";
 import Image from "@/components/ui/data-display/Image";
 import logo from "../../../assets/images/logo/logo.png";
+import GoogleAuthButton from "../../components/common/GoogleAuthButton";
+import { ActivityIndicator } from "react-native-paper";
+import { useColorScheme } from "nativewind";
+import { Colors } from "@/constants/Colors";
 
 export default function LoginScreen() {
   const {
@@ -22,6 +26,9 @@ export default function LoginScreen() {
     clearError,
     demoLogin,
   } = useAuthStore();
+  const { colorScheme } = useColorScheme();
+  const colors = Colors[colorScheme ?? "light"];
+  const [isNavigating, setIsNavigating] = useState(false);
 
   useFocusEffect(
     useCallback(() => {
@@ -55,13 +62,13 @@ export default function LoginScreen() {
   };
 
   const handleSubmit = async () => {
-    let ok;
+    let ok = false;
     if (mode === "login") {
       ok = await login(form.email, form.password);
     } else {
       if (!otpSent) {
-        ok = await sendOtp(form.email);
-        if (ok) {
+        const sent = await sendOtp(form.email);
+        if (sent) {
           setOtpSent(true);
           setTimer(60);
         }
@@ -69,10 +76,17 @@ export default function LoginScreen() {
         ok = await signup(form.name, form.email, form.password, form.otp);
       }
     }
+    if (ok && (mode === "login" || otpSent)) {
+      setIsNavigating(true);
+    }
   };
 
-  if (!isCheckingAuth && user) {
-    return <Redirect href="/(tabs)" />;
+  if (isNavigating || (!isCheckingAuth && user)) {
+    return (
+      <View className="flex-1 bg-base-100 items-center justify-center">
+        <ActivityIndicator size="large" color={colors.primary} />
+      </View>
+    );
   }
 
   return (
@@ -204,7 +218,10 @@ export default function LoginScreen() {
             <View className="mt-2">
               <Button
                 label="Demo Login"
-                onPress={() => demoLogin()}
+                onPress={async () => {
+                  await demoLogin();
+                  setIsNavigating(true);
+                }}
                 isLoading={loading}
                 variant="outline"
                 isFullWidth
@@ -212,6 +229,13 @@ export default function LoginScreen() {
             </View>
           )}
 
+          <GoogleAuthButton
+            isLogin={mode === "login"}
+            onSuccess={() => {
+              setIsNavigating(true);
+            }}
+          />
+
           {mode === "signup" && otpSent && (
             <View className="mt-2">
               <Button

package/templates/layers/react-native/base/src/app/(tabs)/_layout.tsx

@@ -1,4 +1,4 @@
-import { Tabs, Redirect } from "expo-router";
+import { Tabs } from "expo-router";
 import { useColorScheme } from "nativewind";
 import { Colors } from "../../constants/Colors";
 import CustomTabBar from "../../components/ui/CustomTabBar";
@@ -10,7 +10,7 @@ const TabLayout = () => {
   const { user, isCheckingAuth } = useAuthStore();
 
   if (!isCheckingAuth && !user) {
-    return <Redirect href="/login" />;
+    return null;
   }
 
   return (
@@ -19,7 +19,7 @@ const TabLayout = () => {
         <CustomTabBar
           {...props}
           showCenterButton={false}
-          onCenterButtonPress={() => console.log("Create button pressed!")}
+          onCenterButtonPress={() => {}}
         />
       )}
       screenOptions={{

package/templates/layers/react-native/base/src/app/(tabs)/index.tsx

@@ -38,7 +38,7 @@ import CircularProgress from "@/components/ui/feedback/CircularProgress";
 import Skeleton from "@/components/ui/feedback/Skeleton";
 import { GestureWrapper } from "@/components/ui/feedback/GestureWrapper";
 
-import BottomModal from "@/components/ui/BottomModal";
+import Drawer from "@/components/ui/Drawer";
 import Tabs from "@/components/ui/navigation/Tabs";
 import { useColorScheme } from "nativewind";
 import { Colors } from "@/constants/Colors";
@@ -424,11 +424,12 @@ const Index = () => {
         <FloatingActionButton icon="add" onPress={() => setIsModalOpen(true)} />
       </View>
 
-      {/* Interactive Bottom Modal */}
-      <BottomModal
+      {/* Interactive Drawer */}
+      <Drawer
         isOpen={isModalOpen}
         onClose={() => setIsModalOpen(false)}
-        heightPercent={0.45}
+        position="bottom"
+        sizePercent={0.45}
       >
         <VStack spacing={20} className="px-4 py-2">
           <View className="h-16 w-16 bg-primary/10 rounded-full items-center justify-center self-center mb-2">
@@ -456,7 +457,7 @@ const Index = () => {
             onPress={() => setIsModalOpen(false)}
           />
         </VStack>
-      </BottomModal>
+      </Drawer>
     </View>
   );
 };

package/templates/layers/react-native/base/src/app/_layout.tsx

@@ -30,7 +30,7 @@ export default function RootLayout() {
   const { getMe, isCheckingAuth, loadCachedUser, user } = useAuthStore();
   const { colorScheme, setColorScheme } = useColorScheme();
   const colors = Colors[colorScheme ?? "light"];
-  
+
   const segments = useSegments();
   const router = useRouter();
 
@@ -63,8 +63,8 @@ export default function RootLayout() {
     if (!user && !inAuthGroup) {
       // Redirect to the auth group
       router.replace("/(auth)/login");
-    } else if (user && inAuthGroup) {
-      // Redirect away from auth
+    } else if (user && (inAuthGroup || !segments[0])) {
+      // Redirect away from auth or root to main app tabs
       router.replace("/(tabs)");
     }
   }, [user, isCheckingAuth, segments]);
@@ -93,14 +93,10 @@ export default function RootLayout() {
               name="(auth)"
               options={{ headerShown: false, animation: "fade" }}
             />
-            <Stack.Screen
-              name="doc-viewer"
-              options={{ presentation: "fullScreenModal" }}
-            />
           </Stack>
         </BiometricLock>
-        <Toast />
       </PaperProvider>
+      <Toast />
     </GestureHandlerRootView>
   );
 }