From 48b3ae2dbfaaf567823a85e664f83927d5ffb9c2 Mon Sep 17 00:00:00 2001 From: TenType <55125103+TenType@users.noreply.github.com> Date: Tue, 18 Jun 2024 13:41:50 -0700 Subject: [PATCH 1/7] Add GitHub CI (to be tested) --- .github/workflows/preview.yml | 33 +++++++++++++++++++++ .github/workflows/style.yml | 27 ++++++++++++++++++ .github/workflows/update.yml | 31 ++++++++++++++++++++ package-lock.json | 54 +++++++++++++++++++++++------------ package.json | 11 ++++--- 5 files changed, 133 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/preview.yml create mode 100644 .github/workflows/style.yml create mode 100644 .github/workflows/update.yml diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml new file mode 100644 index 0000000..2e371c3 --- /dev/null +++ b/.github/workflows/preview.yml @@ -0,0 +1,33 @@ +name: preview +on: [pull_request, workflow_dispatch] + +jobs: + update: + name: EAS Update + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20.x + cache: npm + + - name: Set up EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} + + - name: Install dependencies + run: npm ci + + - name: Create preview + uses: expo/expo-github-action/preview@v8 + with: + command: eas update --auto diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml new file mode 100644 index 0000000..c323ea2 --- /dev/null +++ b/.github/workflows/style.yml @@ -0,0 +1,27 @@ +name: style +on: + pull_request: + branches: [main] + push: + branches: [main] + workflow_dispatch: + +jobs: + style: + name: Check style + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20.x + cache: npm + + - name: Install dependencies + run: npm ci + + - name: Check style + run: npm run check diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 0000000..987071f --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,31 @@ +name: update +on: + push: + branches: [main] + workflow_dispatch: + +jobs: + update: + name: EAS Update + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20.x + cache: npm + + - name: Set up EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} + + - name: Install dependencies + run: npm ci + + - name: Publish update + run: eas update --auto diff --git a/package-lock.json b/package-lock.json index 5c20ecf..aee3b64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,8 @@ }, "devDependencies": { "@babel/core": "^7.20.0", - "@expo/metro-runtime": "^3.2.1" + "@expo/metro-runtime": "^3.2.1", + "prettier": "^3.3.2" } }, "node_modules/@ampproject/remapping": { @@ -2272,9 +2273,9 @@ } }, "node_modules/@expo/cli/node_modules/ws": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", - "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, @@ -5288,9 +5289,9 @@ } }, "node_modules/@react-native-community/cli-server-api/node_modules/ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", "dependencies": { "async-limiter": "~1.0.0" } @@ -6183,9 +6184,9 @@ } }, "node_modules/@react-native/community-cli-plugin/node_modules/ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", "dependencies": { "async-limiter": "~1.0.0" } @@ -6250,9 +6251,9 @@ } }, "node_modules/@react-native/dev-middleware/node_modules/ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", "dependencies": { "async-limiter": "~1.0.0" } @@ -11991,6 +11992,21 @@ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, + "node_modules/prettier": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -12824,9 +12840,9 @@ } }, "node_modules/react-native/node_modules/ws": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", - "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", "dependencies": { "async-limiter": "~1.0.0" } @@ -14596,9 +14612,9 @@ } }, "node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", "engines": { "node": ">=8.3.0" }, diff --git a/package.json b/package.json index e4e3c41..c05e0e3 100644 --- a/package.json +++ b/package.json @@ -6,22 +6,25 @@ "start": "expo start", "android": "expo start --android", "ios": "expo start --ios", - "web": "expo start --web" + "web": "expo start --web", + "format": "prettier --write src/**/*.js App.js", + "check": "prettier --check src/**/*.js App.js" }, "dependencies": { "@react-native-community/cli": "^13.6.9", "expo": "~51.0.11", "expo-constants": "^16.0.2", "expo-status-bar": "~1.12.1", + "expo-updates": "~0.25.17", "react": "^18.2.0", "react-dom": "18.2.0", "react-native": "0.74.2", - "react-native-web": "~0.19.10", - "expo-updates": "~0.25.17" + "react-native-web": "~0.19.10" }, "devDependencies": { "@babel/core": "^7.20.0", - "@expo/metro-runtime": "^3.2.1" + "@expo/metro-runtime": "^3.2.1", + "prettier": "^3.3.2" }, "private": true } From f375a3c3de9f41b4426fea500fc42e2c5c740cbd Mon Sep 17 00:00:00 2001 From: Pramad712 Date: Sun, 16 Jun 2024 19:14:52 -0700 Subject: [PATCH 2/7] Add back img and edit files --- App.js | 4 ++-- src/assets/back.png | Bin 0 -> 1837 bytes src/screens/SignInScreen.js | 28 ++++++++++++++++++++++------ 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 src/assets/back.png diff --git a/App.js b/App.js index 812d1ca..13cd532 100644 --- a/App.js +++ b/App.js @@ -1,8 +1,8 @@ import "@expo/metro-runtime"; import React from "react"; -import HomeScreen from "./src/screens/HomeScreen"; +import SignInScreen from "./src/screens/SignInScreen"; export default function App() { - return ; + return ; } diff --git a/src/assets/back.png b/src/assets/back.png new file mode 100644 index 0000000000000000000000000000000000000000..da1e16879baf4daf8a6d7e4f46e1dec1026b4d61 GIT binary patch literal 1837 zcmV+|2h#Y7P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L2Es{1K~!i%?OIJp zR8bT@nx&>zq_pTqEJ~suDsq*gVJ_4HTSP&d3M+!778R9Zk}WD~VMtNAkPx(lqD}6C z7G;sxk4BM_S*FmBm09-R?R;nMd%l@@^X84{B;f}SXU@6zzWcs=?sv|8V}xSR7{Y=` z{dWvuK*(hO`SXW9e*8#%eSO+82Db=FMt=YPO^+Wxru_VTdiU-fm6eszfddD$H!yzw z{7KiZU#Cl#E@_K5A|fJa%9JTIckWzTvt|t?Cnsyq=l}w%w6s*7qoAOGa&vRFCq#g3 zH~97ImuhKgQ8Q=G#Nx=s1Zl4`zJC3xDl03^eoj|xY^*wd{J8EpI`I1SYc*rW3>6Im5e|-jEH{q>Xq1{qM|50JzYMB0wz;-g!Mwy?AWn`cp-@wMrf~Gj*N^{ixw?XFJ8RRt(;+v?5R_yYO6o``}@`Q?c1eYVq&7=+@L-G z7Ga5OyNG6@X~BX8bnV);Vb|7)6DQLC{rhRsq)GJc+c&y+@uK$p9|%acmFTXnF0qXy z(E!Hhh^EDh7h}f-ta!eE|4wyvb&^bH&z?gCIqx@Tar zL3C47llWp{V$_x`TeQa>UStO%df~!_LnaysMmC6e^5luyw{M@cu`B=3=KlTrLRLaT zf*+Xx%Z^&Ve!Ut$e!N<{cCEI0fMg4w5xrJ20gR6b#X?~rxkAz&d$O%Wb7iJhty&c{ zp_^on6w!c{Y^Mv8X6;lrZ{E~B{Q*(}%?CT<)TvVvo%80+)7C*EaSxEmx~@Im`10k8 zNZ01gn;pp>3ekW`Hp;Gyj12R^hl^;yE!nsX$#Nn*5I|OWdAW=;ZQ3+#_1wR@x>^ceS;((dpBtY5Mf(^ytwe$?CUm z-O|0hfr{eIn>Td%@?|=4;skBlv`H$H`Sa(~p+kpst3hyN%a}NbaR6y+=-}NiRR>EH z_4M>e6?Emw6`DMGvThLs9?rujBTfktbLi~slzT#3SFT*CJsv;~oT?Gb*GQn&$TsvE zNo?1yUE1m%Mr8Zm&#pRg!l+1)R{Z$!LtVXk)og3r7ewE?cTY4IJ|w}MoE&xd@L^R` zQzMJO(XKes#BU}0)2B~r+qP{gIyzeMF3?u@u#ydeq34B#h4LLIUEYDZr8B(91_BWt zj?&M-+qZ9}EpJa#yHRQIp+)AhWXTfSx$t4fmh8`;KZ};5Z(3TKwz`KwHmW3}j)o28 zqmhh#s~bD`ogjHaa!PDyXdotBY{qF4I?98JZKMEQw7Uo9fYTjI0d3s4(e?yuXtOVP z7l>A44CDv9HURv*&~)R*4Qgy`)Yd_;w3(c6(9neo7bM4EOs=tmzT>w&uK!EIaTGU> z+(>A=qvW#z4v>Hk#ibveKYw0-8^nYO6DTVyOP+}(#Wslo@a^2WQ{GosRaI%LJuo-C zR;Z|`kVU?I`?kETbc83s?J-=EVwDlR1LsKayV~2^rT&FfpdGesadEL8!6OAYA!6I6 zq@;M=AM?a_Cdr(qRYm|v3|BAW!=dHi!Gq@3M}OWmYU|dm;)m2(b=X?^`6fh^%uKTM zgY5BQYmYx1$p#F5*aAe75V-NOSXvVr&S->Y@&)=B@Qq@;ieGbq^r9@O_& z8Wi*_DY}I-+>nh0v}5c)qQVHr-yp{@ boFMuO1?(PD=Js*x00000NkvXXu0mjfwX~GK literal 0 HcmV?d00001 diff --git a/src/screens/SignInScreen.js b/src/screens/SignInScreen.js index 5f94b99..6d06417 100644 --- a/src/screens/SignInScreen.js +++ b/src/screens/SignInScreen.js @@ -1,13 +1,29 @@ -import React from "react"; -import { StyleSheet, Text } from "react-native"; +import React, {useState} from "react"; +import { StatusBar } from "expo-status-bar"; +import { StyleSheet, Text, View, SafeAreaView, Linking, Pressable } from "react-native"; export default function SignInScreen() { return ( - // TODO - Sign In + + + + + + Sign in + + ); } const styles = StyleSheet.create({ - // TODO -}); + container: { + backgroundColor: "#fff", + alignItems: "center", + justifyContent: "center", + }, + + title: { + fontWeight: "bold", + fontSize: 24, + } +}); \ No newline at end of file From 4527c8378f9ce2a351a643cf4a8b5066909e4d0e Mon Sep 17 00:00:00 2001 From: Pramad712 Date: Mon, 17 Jun 2024 11:14:57 -0700 Subject: [PATCH 3/7] Add Back Button --- src/components/BackButton.js | 12 ++++++++++++ src/screens/SignInScreen.js | 35 +++++++++++++++++++++++++++++------ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 src/components/BackButton.js diff --git a/src/components/BackButton.js b/src/components/BackButton.js new file mode 100644 index 0000000..4e19d07 --- /dev/null +++ b/src/components/BackButton.js @@ -0,0 +1,12 @@ +import React from "react"; +import { Text, View, Image} from "react-native"; + +export default function BackButton() { + return ( + + {"\n\n\n"} + + Back + + ); +} \ No newline at end of file diff --git a/src/screens/SignInScreen.js b/src/screens/SignInScreen.js index 6d06417..adf4416 100644 --- a/src/screens/SignInScreen.js +++ b/src/screens/SignInScreen.js @@ -1,15 +1,20 @@ import React, {useState} from "react"; import { StatusBar } from "expo-status-bar"; -import { StyleSheet, Text, View, SafeAreaView, Linking, Pressable } from "react-native"; +import { StyleSheet, Text, View, SafeAreaView, Linking, Pressable, Image} from "react-native"; + +import BackButton from "../components/BackButton"; export default function SignInScreen() { return ( - + - + - + Sign in + + {} + ); @@ -18,12 +23,30 @@ export default function SignInScreen() { const styles = StyleSheet.create({ container: { backgroundColor: "#fff", + padding: "1%" + }, + + back: { + flexDirection: "row", + alignItems: "center", + }, + + backText: { + fontWeight: "bold", + fontSize: 25, + }, + + body: { alignItems: "center", justifyContent: "center", }, title: { fontWeight: "bold", - fontSize: 24, - } + fontSize: 45, + }, + + paragraph: { + fontSize: 30, + }, }); \ No newline at end of file From 9b221f83e34a378c36f7dbe06ad0de80ddb1fef1 Mon Sep 17 00:00:00 2001 From: Pramad712 Date: Mon, 17 Jun 2024 14:47:11 -0700 Subject: [PATCH 4/7] Sign In Screen UI Completion --- src/components/BackButton.js | 20 ++++++++++++---- src/screens/SignInScreen.js | 45 +++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/src/components/BackButton.js b/src/components/BackButton.js index 4e19d07..f333788 100644 --- a/src/components/BackButton.js +++ b/src/components/BackButton.js @@ -1,12 +1,24 @@ import React from "react"; -import { Text, View, Image} from "react-native"; +import { StyleSheet, Text, View, Image } from "react-native"; export default function BackButton() { return ( - + {"\n\n\n"} - Back + Back ); -} \ No newline at end of file +} + +const styles = StyleSheet.create({ + back: { + flexDirection: "row", + alignItems: "center", + }, + + backText: { + fontWeight: "bold", + fontSize: 25, + }, +}); diff --git a/src/screens/SignInScreen.js b/src/screens/SignInScreen.js index adf4416..a7ca423 100644 --- a/src/screens/SignInScreen.js +++ b/src/screens/SignInScreen.js @@ -13,8 +13,17 @@ export default function SignInScreen() { Sign in - {} + {"\n"} + {"Thank you for choosing to help\n"} + {"make our volunteer concerts a\n"} + {"success! To begin, please sign\n"} + {"in using your Google account.\n"} + + + + Sign in with Google + ); @@ -26,27 +35,41 @@ const styles = StyleSheet.create({ padding: "1%" }, - back: { - flexDirection: "row", + body: { alignItems: "center", + justifyContent: "center", }, - backText: { + title: { fontWeight: "bold", - fontSize: 25, + fontSize: 45, }, - body: { + paragraph: { + fontSize: 18, + }, + + OAuth: { + flexDirection: "row", alignItems: "center", justifyContent: "center", + width: 300, + height: 50, + borderRadius: 10, }, - title: { - fontWeight: "bold", - fontSize: 45, + OAuthLogo: { + width: 40, + height: 40, }, - paragraph: { - fontSize: 30, + OAuthText: { + color: "#fff", + fontSize: 25, + }, + + GoogleOAuth: { + backgroundColor: "#000", + color: "#fff", }, }); \ No newline at end of file From d90ce50d0cf8b2b8124587333e0df42047669e01 Mon Sep 17 00:00:00 2001 From: Pramad712 Date: Mon, 17 Jun 2024 15:01:54 -0700 Subject: [PATCH 5/7] UI --- src/components/BackButton.js | 1 - src/screens/SignInScreen.js | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/BackButton.js b/src/components/BackButton.js index f333788..151ddac 100644 --- a/src/components/BackButton.js +++ b/src/components/BackButton.js @@ -18,7 +18,6 @@ const styles = StyleSheet.create({ }, backText: { - fontWeight: "bold", fontSize: 25, }, }); diff --git a/src/screens/SignInScreen.js b/src/screens/SignInScreen.js index a7ca423..546e26e 100644 --- a/src/screens/SignInScreen.js +++ b/src/screens/SignInScreen.js @@ -11,7 +11,7 @@ export default function SignInScreen() { - Sign in + Sign In {"\n"} {"Thank you for choosing to help\n"} @@ -55,7 +55,7 @@ const styles = StyleSheet.create({ justifyContent: "center", width: 300, height: 50, - borderRadius: 10, + borderRadius: 15, }, OAuthLogo: { @@ -69,7 +69,7 @@ const styles = StyleSheet.create({ }, GoogleOAuth: { - backgroundColor: "#000", + backgroundColor: "#353535", color: "#fff", }, }); \ No newline at end of file From 06f101f1e9fc6d9e13b1e9608916842755841cee Mon Sep 17 00:00:00 2001 From: Pramad712 Date: Tue, 18 Jun 2024 11:04:12 -0700 Subject: [PATCH 6/7] Code Cleanup --- src/assets/back.png | Bin 1837 -> 0 bytes src/screens/SignInScreen.js | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 src/assets/back.png diff --git a/src/assets/back.png b/src/assets/back.png deleted file mode 100644 index da1e16879baf4daf8a6d7e4f46e1dec1026b4d61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1837 zcmV+|2h#Y7P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L2Es{1K~!i%?OIJp zR8bT@nx&>zq_pTqEJ~suDsq*gVJ_4HTSP&d3M+!778R9Zk}WD~VMtNAkPx(lqD}6C z7G;sxk4BM_S*FmBm09-R?R;nMd%l@@^X84{B;f}SXU@6zzWcs=?sv|8V}xSR7{Y=` z{dWvuK*(hO`SXW9e*8#%eSO+82Db=FMt=YPO^+Wxru_VTdiU-fm6eszfddD$H!yzw z{7KiZU#Cl#E@_K5A|fJa%9JTIckWzTvt|t?Cnsyq=l}w%w6s*7qoAOGa&vRFCq#g3 zH~97ImuhKgQ8Q=G#Nx=s1Zl4`zJC3xDl03^eoj|xY^*wd{J8EpI`I1SYc*rW3>6Im5e|-jEH{q>Xq1{qM|50JzYMB0wz;-g!Mwy?AWn`cp-@wMrf~Gj*N^{ixw?XFJ8RRt(;+v?5R_yYO6o``}@`Q?c1eYVq&7=+@L-G z7Ga5OyNG6@X~BX8bnV);Vb|7)6DQLC{rhRsq)GJc+c&y+@uK$p9|%acmFTXnF0qXy z(E!Hhh^EDh7h}f-ta!eE|4wyvb&^bH&z?gCIqx@Tar zL3C47llWp{V$_x`TeQa>UStO%df~!_LnaysMmC6e^5luyw{M@cu`B=3=KlTrLRLaT zf*+Xx%Z^&Ve!Ut$e!N<{cCEI0fMg4w5xrJ20gR6b#X?~rxkAz&d$O%Wb7iJhty&c{ zp_^on6w!c{Y^Mv8X6;lrZ{E~B{Q*(}%?CT<)TvVvo%80+)7C*EaSxEmx~@Im`10k8 zNZ01gn;pp>3ekW`Hp;Gyj12R^hl^;yE!nsX$#Nn*5I|OWdAW=;ZQ3+#_1wR@x>^ceS;((dpBtY5Mf(^ytwe$?CUm z-O|0hfr{eIn>Td%@?|=4;skBlv`H$H`Sa(~p+kpst3hyN%a}NbaR6y+=-}NiRR>EH z_4M>e6?Emw6`DMGvThLs9?rujBTfktbLi~slzT#3SFT*CJsv;~oT?Gb*GQn&$TsvE zNo?1yUE1m%Mr8Zm&#pRg!l+1)R{Z$!LtVXk)og3r7ewE?cTY4IJ|w}MoE&xd@L^R` zQzMJO(XKes#BU}0)2B~r+qP{gIyzeMF3?u@u#ydeq34B#h4LLIUEYDZr8B(91_BWt zj?&M-+qZ9}EpJa#yHRQIp+)AhWXTfSx$t4fmh8`;KZ};5Z(3TKwz`KwHmW3}j)o28 zqmhh#s~bD`ogjHaa!PDyXdotBY{qF4I?98JZKMEQw7Uo9fYTjI0d3s4(e?yuXtOVP z7l>A44CDv9HURv*&~)R*4Qgy`)Yd_;w3(c6(9neo7bM4EOs=tmzT>w&uK!EIaTGU> z+(>A=qvW#z4v>Hk#ibveKYw0-8^nYO6DTVyOP+}(#Wslo@a^2WQ{GosRaI%LJuo-C zR;Z|`kVU?I`?kETbc83s?J-=EVwDlR1LsKayV~2^rT&FfpdGesadEL8!6OAYA!6I6 zq@;M=AM?a_Cdr(qRYm|v3|BAW!=dHi!Gq@3M}OWmYU|dm;)m2(b=X?^`6fh^%uKTM zgY5BQYmYx1$p#F5*aAe75V-NOSXvVr&S->Y@&)=B@Qq@;ieGbq^r9@O_& z8Wi*_DY}I-+>nh0v}5c)qQVHr-yp{@ boFMuO1?(PD=Js*x00000NkvXXu0mjfwX~GK diff --git a/src/screens/SignInScreen.js b/src/screens/SignInScreen.js index 546e26e..dcea5c0 100644 --- a/src/screens/SignInScreen.js +++ b/src/screens/SignInScreen.js @@ -1,6 +1,5 @@ -import React, {useState} from "react"; -import { StatusBar } from "expo-status-bar"; -import { StyleSheet, Text, View, SafeAreaView, Linking, Pressable, Image} from "react-native"; +import React from "react"; +import { StyleSheet, Text, View, SafeAreaView, Pressable, Image} from "react-native"; import BackButton from "../components/BackButton"; From 832cde955ff422eeb8375ef44d0f5f3b719db937 Mon Sep 17 00:00:00 2001 From: TenType <55125103+TenType@users.noreply.github.com> Date: Tue, 18 Jun 2024 18:46:28 -0700 Subject: [PATCH 7/7] Fix GitHub CI --- .github/workflows/preview.yml | 44 ++++++++++++++++++++--------------- .github/workflows/style.yml | 7 +++--- .github/workflows/update.yml | 36 ++++++++++++++-------------- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 2e371c3..a2a8a7d 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,33 +1,39 @@ name: preview -on: [pull_request, workflow_dispatch] +on: + # This workflow should only be run on trusted pull requests + pull_request_target: + types: [opened, synchronize] jobs: update: name: EAS Update + if: | + github.event.pull_request.author_association == 'MEMBER' || + github.event.pull_request.author_association == 'COLLABORATOR' runs-on: ubuntu-latest permissions: contents: read pull-requests: write steps: - - name: Checkout repository - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20.x - cache: npm + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20.x + cache: npm - - name: Set up EAS - uses: expo/expo-github-action@v8 - with: - eas-version: latest - token: ${{ secrets.EXPO_TOKEN }} + - name: Set up EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} - - name: Install dependencies - run: npm ci + - name: Install dependencies + run: npm ci - - name: Create preview - uses: expo/expo-github-action/preview@v8 - with: - command: eas update --auto + - name: Create preview + uses: expo/expo-github-action/preview@v8 + with: + command: eas update --auto diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index c323ea2..1fabc5c 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -1,10 +1,11 @@ name: style on: pull_request: - branches: [main] + branches: + - main push: - branches: [main] - workflow_dispatch: + branches: + - main jobs: style: diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 987071f..986d613 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -1,31 +1,31 @@ name: update on: push: - branches: [main] - workflow_dispatch: + branches: + - main jobs: update: name: EAS Update runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@v4 - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20.x - cache: npm + - name: Set up Node.js + uses: actions/setup-node@v4 + with: + node-version: 20.x + cache: npm - - name: Set up EAS - uses: expo/expo-github-action@v8 - with: - eas-version: latest - token: ${{ secrets.EXPO_TOKEN }} + - name: Set up EAS + uses: expo/expo-github-action@v8 + with: + eas-version: latest + token: ${{ secrets.EXPO_TOKEN }} - - name: Install dependencies - run: npm ci + - name: Install dependencies + run: npm ci - - name: Publish update - run: eas update --auto + - name: Publish update + run: eas update --auto