Merge pull request #42 from The-Creative-Programming-Group/add-button

enhancement: add button component

Author: FleetAdmiralJakob

.env.example

@@ -1,3 +1,6 @@
 EXPO_PUBLIC_API_URL="http://localhost:8081"
 EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY="Your Expo Public Clerk Publishable Key Here"
+# keep Clerk secret key secure: do not expose it to client-side code
+CLERK_SECRET_KEY="<YOUR_CLERK_SECRET_KEY>"
+# keep Neon credentials secure: do not expose them to client-side code
 DATABASE_URL="postgresql://<USERNAME>:<PASSWORD>@<HOST>/<DATABASE>?sslmode=require"

.github/workflows/expo-build.yml

@@ -28,7 +28,9 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 10.12.1
+          # Keep in sync with pnpm version in package.json etc.
+          # Can we use corepack to init pnpm? That would reduce maintenance.
+          version: 10.15.0
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: ESLint check
@@ -46,7 +48,9 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 10.12.1
+          # Keep in sync with pnpm version in package.json etc.
+          # Can we use corepack to init pnpm? That would reduce maintenance.
+          version: 10.15.0
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: Prettier formatting check
@@ -64,8 +68,10 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 10.12.1
+          # Keep in sync with pnpm version in package.json etc.
+          # Can we use corepack to init pnpm? That would reduce maintenance.
+          version: 10.15.0
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
       - name: TypeScript type check
-        run: npx tsc --noEmit
+        run: pnpm typecheck

eslint.config.js

@@ -17,7 +17,19 @@ module.exports = defineConfig([
               name: "react-native",
               importNames: ["Text"],
               message:
-                "Use <AppText> instead of <Text>. The <AppText> component is located in 'components/AppText'. We are using this because it has a custom font and some other features.",
+                "Use <AppText> instead of <Text>. The <AppText> component is located in 'components/ui/AppText'. We are using this because it has a custom font and some other features.",
+            },
+            {
+              name: "expo-image",
+              importNames: ["Image"],
+              message:
+                "Use <AppImage> instead of <Image>. The <AppImage> component is located in 'components/ui/AppImage'. We are using this because it can be styled with NativeWind and has some other features.",
+            },
+            {
+              name: "react-native",
+              importNames: ["Image"],
+              message:
+                "Use <AppImage> instead of <Image>. The <AppImage> component is located in 'components/ui/AppImage'. We are using this because it can be styled with NativeWind and has some other features.",
             },
           ],
         },
@@ -28,14 +40,19 @@ module.exports = defineConfig([
         {
           selector: "JSXOpeningElement[name.name='Text']",
           message:
-            "Use <AppText> instead of <Text>. The <AppText> component is located in 'components/AppText'. We are using this because it has a custom font and some other features.",
+            "Use <AppText> instead of <Text>. The <AppText> component is located in 'components/ui/AppText'. We are using this because it has a custom font and some other features.",
+        },
+        {
+          selector: "JSXOpeningElement[name.name='Image']",
+          message:
+            "Use <AppImage> instead of <Image>. The <AppImage> component is located in 'components/ui/AppImage'. We are using this because it can be styled with NativeWind and has some other features.",
         },
       ],
     },
   },
 
   {
-    files: ["src/components/AppText.tsx"],
+    files: ["src/components/ui/AppText.tsx", "src/components/ui/AppImage.ts"],
     rules: {
       "no-restricted-imports": "off",
       "no-restricted-syntax": "off",

localization/de.json

@@ -80,13 +80,6 @@
 
   "resetLanguage": "Auf Gerätesprache zurücksetzen",
 
-  "invalidEmail": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
-  "passwordRequired": "Passwort ist erforderlich",
-  "signInFailed": "Anmeldung fehlgeschlagen. Bitte überprüfen Sie Ihre Zugangsdaten",
-  "userDoesNotExist": "Benutzer existiert nicht",
-  "incorrectPassword": "Ihr Passwort ist falsch",
-  "unknownError": "Ein unbekannter Fehler ist aufgetreten",
-
   "appName": "Finance.io",
   "bankNamePlaceholder": "Revolut",
 

localization/en.json

@@ -3,8 +3,8 @@
   "password": "Password",
   "signIn": "Sign In",
   "signingIn": "Signing In...",
-  "dontHaveAccount": "Don't have an account?",
-  "signUp": "Sign up",
+  "dontHaveAccount": "Don't have an account yet?",
+  "signUp": "Sign Up",
   "goToHome": "Go to Home",
   "firstName": "First Name",
   "lastName": "Last Name",
@@ -55,6 +55,7 @@
   "accountCreationFailed": "Failed to create account",
   "resetLanguage": "Reset to Device Language",
   "invalidEmail": "Please enter a valid email address",
+  "emailRequired": "Please enter a valid email address",
   "firstNameRequired": "First name is required",
   "lastNameRequired": "Last name is required",
   "passwordRequired": "Password is required",

localization/es.json

@@ -68,11 +68,6 @@
   "accountCreationFailed": "Error al crear la cuenta",
   "resetLanguage": "Volver al idioma del dispositivo",
 
-  "invalidEmail": "Por favor, ingresa un correo electrónico válido",
-  "signInFailed": "Error al iniciar sesión. Por favor, verifica tus credenciales",
-  "userDoesNotExist": "El usuario no existe",
-  "incorrectPassword": "Tu contraseña es incorrecta",
-  "unknownError": "Ocurrió un error desconocido",
   "appName": "Finance.io",
   "bankNamePlaceholder": "Revolut",
 

localization/it.json

@@ -67,12 +67,6 @@
   "accountCreated": "Conto creato con successo!",
   "accountCreationFailed": "Creazione del conto fallita",
   "resetLanguage": "Ripristina lingua del dispositivo",
-
-  "invalidEmail": "Inserisci un indirizzo email valido",
-  "signInFailed": "Accesso fallito. Verifica le tue credenziali",
-  "userDoesNotExist": "L'utente non esiste",
-  "incorrectPassword": "La tua password non è corretta",
-  "unknownError": "Si è verificato un errore sconosciuto",
   "appName": "Finance.io",
   "bankNamePlaceholder": "Revolut",
 

package.json

@@ -9,15 +9,16 @@
     "web": "expo start --web",
     "test": "jest --watchAll",
     "lint": "expo lint",
+    "typecheck": "tsc --noEmit",
     "format:check": "prettier --check .",
     "format:write": "prettier --write ."
   },
   "jest": {
     "preset": "jest-expo"
   },
   "dependencies": {
+    "@clerk/backend": "^2.9.4",
     "@clerk/clerk-expo": "^2.13.0",
-    "@clerk/clerk-sdk-node": "^5.1.6",
     "@expo/server": "^0.5.3",
     "@expo/vector-icons": "^14.0.2",
     "@hookform/resolvers": "^5.1.1",
@@ -70,6 +71,7 @@
     "react-native-web": "~0.20.0",
     "react-native-webview": "13.13.5",
     "superjson": "^2.2.2",
+    "tailwind-merge": "^3.3.1",
     "tailwind-variants": "^1.0.0",
     "tailwindcss": "^3.4.17",
     "zod": "^3.25.46"
@@ -92,5 +94,5 @@
     "typescript": "^5.3.3"
   },
   "private": true,
-  "packageManager": "pnpm@10.12.1+sha512.f0dda8580f0ee9481c5c79a1d927b9164f2c478e90992ad268bbb2465a736984391d6333d2c327913578b2804af33474ca554ba29c04a8b13060a717675ae3ac"
+  "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
 }