diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100755 index 0000000..f53153e --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,40 @@ +name: CI/CD Workflow + +env: + EXPO_ASC_API_KEY_PATH: ../AuthKey_F7ZX3C8C69.p8 + EXPO_ASC_KEY_ID: F7ZX3C8C69 + EXPO_ASC_ISSUER_ID: f7d6175c-75fe-416c-b6d1-0bc9eaf87415 + EXPO_APPLE_TEAM_ID: MV9C3PHV87 + EXPO_APPLE_TEAM_TYPE: INDIVIDUAL + EXPO_TOKEN: qt2h_4xhuhFB-ArysIkzgpsBtWOrrZ-c_So_S9ch + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build: + name: Install and build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20.x + cache: npm + + - name: Setup Expo and EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} + + - name: Install dependencies + run: npm ci + + - name: Prebuild, Build and Submit + run: npm run prebuild-build-submit-cicd diff --git a/app.json b/app.json index 56ec6a4..ea56170 100644 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "expo": { - "name": "cally", + "name": "Cally - Planner", "slug": "cally", "version": "1.0.0", "orientation": "portrait", @@ -15,7 +15,8 @@ "ios": { "supportsTablet": true, "bundleIdentifier": "com.cally.app", - "googleServicesFile": "./ios/GoogleService-Info.plist" + "googleServicesFile": "./ios/GoogleService-Info.plist", + "buildNumber": "5" }, "android": { "adaptiveIcon": { diff --git a/components/pages/main/SignInPage.tsx b/components/pages/main/SignInPage.tsx index f6d79ac..165aa97 100644 --- a/components/pages/main/SignInPage.tsx +++ b/components/pages/main/SignInPage.tsx @@ -1,67 +1,69 @@ -import { View, Text, Button, TextField, ButtonSize } from "react-native-ui-lib"; -import React, { useState } from "react"; -import { useSignIn } from "@/hooks/firebase/useSignIn"; -import { StyleSheet } from "react-native"; +import {Button, ButtonSize, Text, TextField, View} from "react-native-ui-lib"; +import React, {useState} from "react"; +import {useSignIn} from "@/hooks/firebase/useSignIn"; +import {StyleSheet} from "react-native"; const SignInPage = (props: { setRegister: () => any }) => { - const [email, setEmail] = useState(""); - const [password, setPassword] = useState(""); + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); - const { mutateAsync: signIn, error, isError } = useSignIn(); + const {mutateAsync: signIn, error, isError} = useSignIn(); - const handleSignIn = async () => { - await signIn({ email, password }); - }; + const handleSignIn = async () => { + await signIn({email, password}); + }; - return ( - - - -