Merge pull request #10 from loqtek/upgrade/expo54AndLinting

gm852 · web-flow · commit 38fb695602f5 · 2025-10-22T10:52:15.000-04:00
upgrade to expo 54; added linting action
upgraded all deps
upgraded to expo 54
added github action for auto linting
diff --git a/.github/workflows/lint-check.yml b/.github/workflows/lint-check.yml
@@ -0,0 +1,67 @@
+name: Lint Auto Check
+
+on:
+  pull_request:
+    branches:
+      - main
+      - staging
+      - dev
+
+permissions:
+  contents: read
+  pull-requests: write
+  
+jobs:
+  lint:
+    name: Run Lint Auto Checks
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout to repo
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Install Bun
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      # Install deps
+      - name: Install dependencies
+        run: bun install
+
+      # Run ESLint check
+      - name: Run ESLint
+        id: lint
+        run: bun run lint
+
+      # Comment on PR if lint fails
+      - name: Comment on PR if lint fails
+        if: failure()
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          message: |
+            ```diff
+            ==================================================
+            ||       ⚠️  ESLint Checks Failed! ❌          ||
+            ==================================================
+            ```
+            Please review the errors and fix them **before requesting a review.**
+
+            **Tips:**
+            - Run `bun run lint` locally to see detailed issues.
+            - Commit fixes, push again, and this check will re-run automatically.
+
+      # Comment on PR if lint passes
+      - name: Comment on PR if lint passes
+        if: success()
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          message: |
+            ```ini
+            ==================================================
+            ||        ✅ ESLint Checks Passed! 🎉          ||
+            ==================================================
+            ```
+            All linting checks completed successfully. You can now request a review.
diff --git a/app.json b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "Scale Manager",
     "slug": "scaleManager",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "orientation": "portrait",
     "icon": "./assets/images/noBgScaleManagerLogo.png",
     "scheme": "myapp",
@@ -39,7 +39,9 @@
           "resizeMode": "contain",
           "backgroundColor": "#ffffff"
         }
-      ]
+      ],
+      "expo-font",
+      "expo-web-browser"
     ],
     "experiments": {
       "typedRoutes": true
diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
@@ -12,7 +12,7 @@ export default function TabLayout() {
   useEffect(() => {
     async function checkVersion() {
       const serverConf = await getServerConfig();
-      if (serverConf?.version && serverConf.version == "0.26") {
+      if (serverConf?.version && serverConf.version === "0.26") {
         setHideRoutes(true);
       }
     }
diff --git a/app/(tabs)/acl.tsx b/app/(tabs)/acl.tsx
@@ -18,16 +18,13 @@ export default function ACLScreen() {
   const {
     // State
     policy,
-    originalPolicy,
     loading,
     saving,
     policyVersions,
     showVersions,
     editing,
     editText,
     showSetupGuide,
-    showErrorModal,
-    currentError,
 
     // Actions
     fetchPolicy,
@@ -41,8 +38,6 @@ export default function ACLScreen() {
     // Modal controls
     setShowVersions,
     setShowSetupGuide,
-    setShowErrorModal,
-    setCurrentError,
     setEditText,
   } = useACL();
 
diff --git a/app/(tabs)/apikeys.tsx b/app/(tabs)/apikeys.tsx
@@ -8,7 +8,7 @@ import { MaterialIcons } from "@expo/vector-icons";
 import Toast from "react-native-toast-message";
 import { useApiKeys } from "@/app/funcs/apikeys";
 
-export default function apiKeysScreen() {
+export default function ApiKeysScreen() {
   const {
     apiKeys,
     newKeyExpire,
@@ -26,7 +26,7 @@ export default function apiKeysScreen() {
 
   useEffect(() => {
     fetchApiKeys();
-  }, []);
+  }, [fetchApiKeys]);
 
   const handleCreateKeyWithDisplay = async () => {
     const result = await handleCreateKey();
@@ -69,8 +69,8 @@ export default function apiKeysScreen() {
       visible={showKeyModal}
       onRequestClose={closeKeyModal}
     >
-      <View className="flex-1 justify-center items-center px-4">
-        <View className="bg-zinc-800 rounded-2xl p-6 w-full max-w-md">
+      <View className="flex-1 justify-center items-center px-4 bg-black/50">
+        <View className="bg-zinc-800 rounded-2xl p-6 w-full max-w-md shadow-2xl">
           <View className="items-center mb-4">
             <MaterialIcons name="vpn-key" size={48} color="#10b981" />
             <Text className="text-white text-xl font-bold mt-2">
@@ -91,6 +91,7 @@ export default function apiKeysScreen() {
             <TouchableOpacity
               onPress={() => copyToClipboard(newApiKey!)}
               className="flex-1 bg-blue-600 py-3 rounded-lg flex-row items-center justify-center"
+              activeOpacity={0.7}
             >
               <MaterialIcons name="content-copy" size={18} color="white" />
               <Text className="text-white font-semibold ml-2">Copy Key</Text>
@@ -99,6 +100,7 @@ export default function apiKeysScreen() {
             <TouchableOpacity
               onPress={closeKeyModal}
               className="flex-1 bg-zinc-600 py-3 rounded-lg"
+              activeOpacity={0.7}
             >
               <Text className="text-white font-semibold text-center">Done</Text>
             </TouchableOpacity>
@@ -113,7 +115,7 @@ export default function apiKeysScreen() {
   );
 
   return (
-    <SafeAreaView className="flex-1 bg-zinc-900 px-4 pt-4">
+    <SafeAreaView className="flex-1 bg-zinc-900">
       {loading ? (
         <View className="flex-1 justify-center items-center">
           <ActivityIndicator size="large" color="#ffffff" />
@@ -129,7 +131,7 @@ export default function apiKeysScreen() {
           {/* Header */}
           <View className="mb-6 flex-row justify-between items-center">
             <Text className="text-white text-2xl font-bold">API Keys</Text>
-            <TouchableOpacity onPress={fetchApiKeys}>
+            <TouchableOpacity onPress={fetchApiKeys} activeOpacity={0.7}>
               <MaterialIcons name="refresh" size={24} color="white" />
             </TouchableOpacity>
           </View>
@@ -170,7 +172,7 @@ export default function apiKeysScreen() {
             <TouchableOpacity
               onPress={handleCreateKeyWithDisplay}
               className="bg-green-600 p-3 rounded-lg flex-row items-center justify-center"
-              activeOpacity={0.8}
+              activeOpacity={0.7}
             >
               <MaterialIcons name="add" size={18} color="white" />
               <Text className="text-white text-center font-semibold ml-1">
@@ -265,6 +267,7 @@ export default function apiKeysScreen() {
                       className={`p-3 rounded-lg flex-row items-center justify-center ${
                         expired ? "bg-zinc-600" : "bg-red-600"
                       }`}
+                      activeOpacity={0.7}
                     >
                       <MaterialIcons 
                         name={expired ? "block" : "delete"} 
diff --git a/app/(tabs)/devices.tsx b/app/(tabs)/devices.tsx
@@ -8,7 +8,6 @@ import {
   ActivityIndicator,
   RefreshControl,
   TextInput,
-  Modal,
 } from "react-native";
 import { MaterialIcons } from "@expo/vector-icons";
 import { useDevices } from "@/app/funcs/devices";
@@ -60,18 +59,6 @@ export default function DevicesScreen() {
     fetchDevices();
   };
 
-  const formatDate = (dateString: string) => {
-    try {
-      return new Date(dateString).toLocaleDateString('en-US', {
-        month: 'short',
-        day: 'numeric',
-        hour: '2-digit',
-        minute: '2-digit'
-      });
-    } catch {
-      return "Unknown";
-    }
-  };
 
   return (
     <SafeAreaView className="flex-1 bg-zinc-900">
diff --git a/app/(tabs)/preauthkeys.tsx b/app/(tabs)/preauthkeys.tsx
@@ -44,6 +44,7 @@ export default function PreAuthKeysScreen() {
         text1: "Copy Failed",
         text2: "Could not copy to clipboard",
       });
+      console.error(error)
     }
   };
 
diff --git a/app/(tabs)/routes.tsx b/app/(tabs)/routes.tsx
@@ -9,7 +9,6 @@ import {
   Alert,
   RefreshControl,
 } from "react-native";
-import Toast from "react-native-toast-message";
 import { MaterialIcons } from "@expo/vector-icons";
 import { useRoutes } from "@/app/funcs/routes";
 
@@ -22,9 +21,7 @@ export default function RoutesScreen() {
     handleDisableRoute,
     handleEnableRoute,
     routes,
-    setRoutes,
     loading,
-    setLoading,
     fetchRoutes
   } = useRoutes();
 
diff --git a/app/api/acl.ts b/app/api/acl.ts
@@ -1,4 +1,3 @@
-import { getServerConfig } from "../utils/getServer";
 import { getApiEndpoints, makeApiRequest } from "../utils/apiUtils";
 
 export async function getACLPolicy() {
diff --git a/app/customScreens/[id].tsx b/app/customScreens/[id].tsx
@@ -1,11 +1,10 @@
 import React, { useRef } from "react";
 import { 
   View, Text, TextInput, TouchableOpacity, SafeAreaView, 
-  ScrollView, Animated
+ Animated
 } from "react-native";
 import { MaterialIcons } from "@expo/vector-icons";
 import { useRouter, useLocalSearchParams } from "expo-router";
-import { Device } from "../types";
 import { useDeviceDetail } from "../funcs/deviceDetail";
 import { formatDate, getTimeAgo, copyToClipboard } from "../utils/deviceUtils";
 import { InfoRow } from "../components/InfoRow";
diff --git a/app/funcs/deviceDetail.ts b/app/funcs/deviceDetail.ts
@@ -89,6 +89,7 @@ export function useDeviceDetail(deviceData: string | undefined) {
         text1: "⚠️ Rename Error",
         text2: "An error occurred while renaming",
       });
+      console.error(error)
     }
   };
 
@@ -137,6 +138,7 @@ export function useDeviceDetail(deviceData: string | undefined) {
         text1: "⚠️ Change Error",
         text2: "An error occurred while changing user",
       });
+      console.error(error)
     }
   };
 
@@ -198,6 +200,7 @@ export function useDeviceDetail(deviceData: string | undefined) {
         text1: "⚠️ Add Error",
         text2: "An error occurred while adding tags",
       });
+      console.error(error)
     }
   };
 
@@ -239,6 +242,7 @@ export function useDeviceDetail(deviceData: string | undefined) {
         text1: "⚠️ Update Error",
         text2: "An error occurred while approving routes",
       });
+      console.error(error)
     }
   };
 
@@ -285,6 +289,7 @@ export function useDeviceDetail(deviceData: string | undefined) {
                 text1: "⚠️ Update Error",
                 text2: "An error occurred while removing route",
               });
+              console.error(error)
             }
           },
         },
@@ -337,6 +342,7 @@ export function useDeviceDetail(deviceData: string | undefined) {
                 text1: "Delete Error",
                 text2: "An error occurred while deleting",
               });
+              console.error(error)
             }
           },
         },
diff --git a/app/funcs/devices.ts b/app/funcs/devices.ts
@@ -1,5 +1,4 @@
 import { useEffect, useState } from "react";
-import { Alert } from "react-native";
 import { getDevices, registerDevice } from "../api/devices";
 import { getUsers } from "../api/users";
 import Toast from "react-native-toast-message";
@@ -194,7 +193,7 @@ export function useDevices() {
     );
   
     if (fullCommandMatch) {
-      const username = fullCommandMatch[1];
+      //const username = fullCommandMatch[1];
       const preAuthKey = fullCommandMatch[2];
       if (preAuthKey) {
         setDeviceKey(preAuthKey);
diff --git a/app/funcs/routes.ts b/app/funcs/routes.ts
@@ -1,5 +1,5 @@
 
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { getServerRoutes, disableRoute, enableRoute } from "../api/routes";
 import Toast from "react-native-toast-message";
 
diff --git a/app/funcs/users.ts b/app/funcs/users.ts
@@ -120,6 +120,7 @@ export function useUsers() {
                 text1: "⚠️ Add Failed",
                 text2: "An error occurred while adding the user.",
               });
+              console.error(error)
             }
           },
         },
@@ -205,6 +206,7 @@ export function useUsers() {
                 text1: "⚠️ Rename Failed",
                 text2: "An error occurred while renaming the user.",
               });
+              console.error(error)
             }
           },
         },
@@ -262,6 +264,7 @@ export function useUsers() {
         text1: "⚠️ Delete Failed",
         text2: "An error occurred while deleting the user.",
       });
+      console.error(error)
     }
   };
 
diff --git a/app/index.tsx b/app/index.tsx
@@ -8,7 +8,6 @@ import {
   Platform,
   ActivityIndicator,
   Image,
-  Modal,
   ScrollView
 } from "react-native";
 import { MaterialIcons } from "@expo/vector-icons";
diff --git a/app/utils/apiUtils.ts b/app/utils/apiUtils.ts
@@ -53,7 +53,8 @@ export async function makeApiRequest(url: string, options: RequestInit = {}) {
       try {
         const errorData = JSON.parse(errorText);
         return errorData; // Return the error data instead of null
-      } catch (parseError) {
+      } catch (error) {
+        console.error(error)
         // If parsing fails, return a generic error object
         return {
           code: response.status,
diff --git a/app/utils/deviceUtils.ts b/app/utils/deviceUtils.ts
@@ -47,6 +47,7 @@ export const copyToClipboard = async (text: string, label: string) => {
       text1: "Copy Failed",
       text2: "Could not copy to clipboard",
     });
+    console.error(error)
   }
 };
 
diff --git a/components/SetupGuideModal.tsx b/components/SetupGuideModal.tsx
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ export default function TabLayout() {`
`12`	`12`	`useEffect(() => {`
`13`	`13`	`async function checkVersion() {`
`14`	`14`	`const serverConf = await getServerConfig();`
`15`		`- if (serverConf?.version && serverConf.version == "0.26") {`
	`15`	`+ if (serverConf?.version && serverConf.version === "0.26") {`
`16`	`16`	`setHideRoutes(true);`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export default function PreAuthKeysScreen() {`
`44`	`44`	`text1: "Copy Failed",`
`45`	`45`	`text2: "Could not copy to clipboard",`
`46`	`46`	`});`
	`47`	`+ console.error(error)`
`47`	`48`	`}`
`48`	`49`	`};`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import { getServerConfig } from "../utils/getServer";`
`2`	`1`	`import { getApiEndpoints, makeApiRequest } from "../utils/apiUtils";`
`3`	`2`
`4`	`3`	`export async function getACLPolicy() {`