From d0867bfc474f008dae7e8e9a64ea0ad447ea534f Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 18:05:03 -0500 Subject: [PATCH 01/18] Add this to workflows to test new pull request --- .github/workflows/main.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d20bb00ec..01bd7236f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,3 +51,19 @@ jobs: - name: Run tests run: npm test working-directory: server/ + + file_existence: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Check for private.json and .env files + run: | + if [ -e ".env" ] || [ -e "firebase-secret.json" ]; then + echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; + exit 1; + fi + + + From a5793b18265ab3070b15346ec3e28b54be7ed414 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:04:47 -0500 Subject: [PATCH 02/18] Testing new workflows with firebase-secret.json file. --- server/firebase-secret.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 server/firebase-secret.json diff --git a/server/firebase-secret.json b/server/firebase-secret.json new file mode 100644 index 000000000..e69de29bb From 911032b0c9bafbee40bb3380f1497052f362b589 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:12:34 -0500 Subject: [PATCH 03/18] Updated workflows to make the check detect firebase-secret.json --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01bd7236f..178bc0540 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e ".env" ] || [ -e "firebase-secret.json" ]; then + if [ -e ".env" ] || [ -e "server/firebase-secret.json" ]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From d6baa25aaa04b18f4be096fa38c7221e5a980d47 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:19:59 -0500 Subject: [PATCH 04/18] Testing checks with .env files --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 178bc0540..fc776c024 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e ".env" ] || [ -e "server/firebase-secret.json" ]; then + if [ -e "server/.env" ] || [ -e "server/firebase-secret.json" ] || [ -e "client/.env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From 4061db6bbb2d213f588dc8f3ed4dd0993d8b44a3 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:24:46 -0500 Subject: [PATCH 05/18] Testing checks with .env files --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc776c024..6c13ab7ed 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/.env" ] || [ -e "server/firebase-secret.json" ] || [ -e "client/.env"]; then + if [ -e "server/.env" ] || [ -e "server/firebase-secret.json" ]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From d7f2bb3ed0d02af9cecc48272a63abb64f8951a3 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:34:38 -0500 Subject: [PATCH 06/18] Testing checks with .env files --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c13ab7ed..fc776c024 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/.env" ] || [ -e "server/firebase-secret.json" ]; then + if [ -e "server/.env" ] || [ -e "server/firebase-secret.json" ] || [ -e "client/.env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From a2764d64105cfd5d5c7ef3a4e974448ed84d4b48 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:35:51 -0500 Subject: [PATCH 07/18] Testing checks with .env files --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc776c024..6c974f3e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/.env" ] || [ -e "server/firebase-secret.json" ] || [ -e "client/.env"]; then + if [ -e "server/.env" ] || [ -e "client/.env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From 0f8628c80c64029e5e92cde0556b03df950cb6d9 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Wed, 6 Mar 2024 22:42:34 -0500 Subject: [PATCH 08/18] Testing checks with .env files --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c974f3e2..cab9b430c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/.env" ] || [ -e "client/.env"]; then + if [ -e "server/firebase-secret.json" ] || [ -e ".env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From 47a23ab6e09b6a0949d372c17fc943ec4b66ba1b Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Thu, 7 Mar 2024 18:05:46 -0500 Subject: [PATCH 09/18] Testing check for .env files --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cab9b430c..6e720c063 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/firebase-secret.json" ] || [ -e ".env"]; then + if [ -e "server/firebase-secret.json" ] || [ -e "*/.env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi From 1e3fcf2964e28e57fc902499c93de0469bef50b8 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Thu, 7 Mar 2024 18:08:23 -0500 Subject: [PATCH 10/18] deleted firebase-secret.json --- server/firebase-secret.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 server/firebase-secret.json diff --git a/server/firebase-secret.json b/server/firebase-secret.json deleted file mode 100644 index e69de29bb..000000000 From 3862017bf7e766a7440344f7219162c224ec5b17 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Thu, 7 Mar 2024 18:10:22 -0500 Subject: [PATCH 11/18] testing alternative for checking firebase-secret.json --- .github/workflows/main.yml | 2 +- server/firebase-secret.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 server/firebase-secret.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e720c063..ffddd6492 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/firebase-secret.json" ] || [ -e "*/.env"]; then + if [ -e "*/firebase-secret.json" ] || [ -e "server/.env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi diff --git a/server/firebase-secret.json b/server/firebase-secret.json new file mode 100644 index 000000000..e69de29bb From 201c5ce0efe6635a21b82224ca363e7b23bd90d9 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Thu, 7 Mar 2024 18:12:17 -0500 Subject: [PATCH 12/18] testing .env files --- .github/workflows/main.yml | 2 +- server/firebase-secret.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 server/firebase-secret.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffddd6492..c95164897 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "*/firebase-secret.json" ] || [ -e "server/.env"]; then + if [ -e "server/firebase-secret.json" ] || [ -e "/.env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi diff --git a/server/firebase-secret.json b/server/firebase-secret.json deleted file mode 100644 index e69de29bb..000000000 From 13fe97bdd5b2ab003fd17bd2cb1deda0d465a0f1 Mon Sep 17 00:00:00 2001 From: Phantom0110 Date: Thu, 7 Mar 2024 18:13:30 -0500 Subject: [PATCH 13/18] Testing for firebase-secret.json --- .github/workflows/main.yml | 2 +- server/firebase-secret.json | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 server/firebase-secret.json diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c95164897..cab9b430c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,7 +60,7 @@ jobs: - name: Check for private.json and .env files run: | - if [ -e "server/firebase-secret.json" ] || [ -e "/.env"]; then + if [ -e "server/firebase-secret.json" ] || [ -e ".env"]; then echo "Error: Found .env or firebase-secret.json in the pull request. Please remove them before merging."; exit 1; fi diff --git a/server/firebase-secret.json b/server/firebase-secret.json new file mode 100644 index 000000000..e69de29bb From 1c256812a5311f6060d858bafeede4243880a2fb Mon Sep 17 00:00:00 2001 From: Mohammed Ali Date: Thu, 18 Apr 2024 17:56:20 -0400 Subject: [PATCH 14/18] recovered --- .../Windows/UUS/State/_active.uusver | 1 + client/src/navigation/AppNavigator.tsx | 90 ++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver diff --git a/client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver b/client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver new file mode 100644 index 000000000..263a6a827 --- /dev/null +++ b/client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver @@ -0,0 +1 @@ +1214.2401.18012.1 \ No newline at end of file diff --git a/client/src/navigation/AppNavigator.tsx b/client/src/navigation/AppNavigator.tsx index e93cf0c28..d6043c44e 100644 --- a/client/src/navigation/AppNavigator.tsx +++ b/client/src/navigation/AppNavigator.tsx @@ -1,10 +1,21 @@ import * as React from "react"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; +import { + SafeAreaView, + ScrollView, + StatusBar, + StyleSheet, + Text, + useColorScheme, + Image, + View, +} from 'react-native'; import ChatScreen from "../screens/chat/ChatScreen"; import SettingsScreen from "../screens/settings/SettingsScreen"; import { SocketProvider } from "../contexts/SocketContext"; import { LocationProvider } from "../contexts/LocationContext"; import { UserProvider } from "../contexts/UserContext"; +import { Map, Settings, MessageSquare } from "react-native-feather"; const Tab = createBottomTabNavigator(); @@ -15,10 +26,83 @@ const AppNavigator = () => { - - + ( + + + + Map + + + + ) + }} + /> + ( + + + + Chat + + + + ) + }} /> + ( + + + + Settings + + + ) + }} + /> From c39c210f26f004b2ad5ebb0a24b6137f687c814f Mon Sep 17 00:00:00 2001 From: Mohammed Ali <146048575+Phantom0110@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:58:03 -0400 Subject: [PATCH 15/18] deleting some silly directory issues --- client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver | 1 - 1 file changed, 1 deletion(-) delete mode 100644 client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver diff --git a/client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver b/client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver deleted file mode 100644 index 263a6a827..000000000 --- a/client/%ProgramData%/Microsoft/Windows/UUS/State/_active.uusver +++ /dev/null @@ -1 +0,0 @@ -1214.2401.18012.1 \ No newline at end of file From fe7159121d088a277c14d939663a83ee1e376c42 Mon Sep 17 00:00:00 2001 From: Alexander Wang <98280966+AlexanderWangY@users.noreply.github.com> Date: Wed, 5 Jun 2024 22:26:39 +0900 Subject: [PATCH 16/18] Delete server/firebase-secret.json --- server/firebase-secret.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 server/firebase-secret.json diff --git a/server/firebase-secret.json b/server/firebase-secret.json deleted file mode 100644 index e69de29bb..000000000 From ebf283fa5a1bbd0f8d072c3950884fdf7a002422 Mon Sep 17 00:00:00 2001 From: Mohammed Ali Date: Thu, 13 Jun 2024 07:01:35 +0300 Subject: [PATCH 17/18] merge with main --- client/src/navigation/AppNavigator.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/navigation/AppNavigator.tsx b/client/src/navigation/AppNavigator.tsx index e32dbeda8..615c20340 100644 --- a/client/src/navigation/AppNavigator.tsx +++ b/client/src/navigation/AppNavigator.tsx @@ -1,4 +1,5 @@ import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; +import * as React import { SafeAreaView, ScrollView, From cb9fdcbc16976e6fbdb0da1870a12e63f8a7458b Mon Sep 17 00:00:00 2001 From: Mohammed Ali Date: Thu, 13 Jun 2024 07:02:24 +0300 Subject: [PATCH 18/18] merge with main --- client/src/navigation/AppNavigator.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/navigation/AppNavigator.tsx b/client/src/navigation/AppNavigator.tsx index 615c20340..8baacf061 100644 --- a/client/src/navigation/AppNavigator.tsx +++ b/client/src/navigation/AppNavigator.tsx @@ -1,5 +1,5 @@ import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; -import * as React +import * as React from 'react'; import { SafeAreaView, ScrollView,