Merge pull request #1887 from ever-co/develop

Release
ever-co · Nov 28, 2023 · cb368b6 · cb368b6
2 parents 544667b + 6ad3230
commit cb368b6
Show file tree

Hide file tree

Showing 16 changed files with 3,192 additions and 2,766 deletions.
diff --git a/.cspell.json b/.cspell.json
@@ -5,6 +5,9 @@
 	"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
 	"words": [
 		"appdev",
+		"adipiscing",
+		"amet",
+		"aliqua",
 		"signin",
 		"APPSTORE",
 		"barcodes",
@@ -19,7 +22,12 @@
 		"clsxm",
 		"commitlint",
 		"compodoc",
+		"consectetur",
+		"dolor",
+		"dolore",
 		"dummyimage",
+		"eiusmod",
+		"elit",
 		"envalid",
 		"everco",
 		"everteamsdesktop",
@@ -31,11 +39,14 @@
 		"heroicons",
 		"Huhn",
 		"icnsutils",
+		"incididunt",
 		"isdragging",
 		"isdraggingfrom",
 		"isdropdisabled",
+		"ipsum",
 		"JITSU",
 		"kanban",
+		"Lorem",
 		"libappindicator",
 		"lucide",
 		"mathieudutour",
@@ -56,6 +67,7 @@
 		"testid",
 		"Timesheet",
 		"tanstack",
+		"tempor",
 		"vcpu",
 		"Vercel",
 		"HUBSTAFF",
@@ -78,6 +90,7 @@
 		"hyperscript",
 		"nocheck",
 		"locatio",
+		"labore",
 		"falsey",
 		"unhang",
 		"popperjs",

diff --git a/.github/workflows/mobile.apps.yml → .github/workflows/mobile.apps.android.yml b/.github/workflows/mobile.apps.yml → .github/workflows/mobile.apps.android.yml
@@ -1,4 +1,4 @@
-name: Mobile Build, Deploy and Publish Apps
+name: Mobile Build, Deploy and Publish Apps Android
 on:
   push:
     branches:
@@ -44,22 +44,6 @@ jobs:
           eas-version: latest
           token: ${{ secrets.EXPO_TOKEN }}
 
-      - name: Set Apple Store Credentials
-        run: |
-          echo "APPLE_ID=${{ secrets.APPLE_ID }}" >> $GITHUB_ENV
-          echo "APPSTORE_ISSUER_ID=${{ secrets.APPSTORE_ISSUER_ID }}" >> $GITHUB_ENV
-          echo "APPSTORE_API_KEY_ID=${{ secrets.APPSTORE_API_KEY_ID }}" >> $GITHUB_ENV
-
-      - name: Replace Secrets in eas.json
-        run: |
-          sed -i 's/APPLE_ID_PLACEHOLDER/${{ secrets.APPLE_ID }}/' ./apps/mobile/eas.json
-          sed -i 's/APPSTORE_ISSUER_ID_PLACEHOLDER/${{ secrets.APPSTORE_ISSUER_ID }}/' ./apps/mobile/eas.json
-          sed -i 's/APPSTORE_API_KEY_ID_PLACEHOLDER/${{ secrets.APPSTORE_API_KEY_ID }}/' ./apps/mobile/eas.json
-
-      - name: Create Apple API Key File
-        run: |
-          echo "${{ secrets.APPSTORE_API_PRIVATE_KEY }}" > ./apps/mobile/AuthKey_R9QZ5LP8NK.p8
-
       - name: Decode Google Credentials
         run: |
           DECODED_GOOGLE_CREDENTIALS=$(echo '${{ secrets.GOOGLE_CREDENTIALS }}' | base64 --decode)
@@ -79,13 +63,10 @@ jobs:
           yarn build:mobile
 
       - name: Build on EAS
-        run: cd apps/mobile && eas build --platform all --non-interactive
+        run: cd apps/mobile && eas build --platform android --non-interactive
 
       - name: Publish update
-        run: cd apps/mobile && eas update --auto
-
-      - name: Upload App build to App store
-        run: cd apps/mobile && eas submit --platform ios --latest --non-interactive
+        run: cd apps/mobile && eas update --auto --platform android --non-interactive
 
       - name: 'Authenticate to Google Cloud'
         uses: 'google-github-actions/auth@v1'

diff --git a/.github/workflows/mobile.apps.ios.yml b/.github/workflows/mobile.apps.ios.yml
@@ -0,0 +1,78 @@
+name: Mobile Build, Deploy and Publish Apps iOS
+on:
+  push:
+    branches:
+      - apps
+    paths:
+      - '.github/workflows/mobile.apps.yml'
+      - 'apps/mobile/**'
+      - 'package.json'
+      - 'yarn.lock'
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    environment: prod
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'yarn'
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Set Apple Store Credentials
+        run: |
+          echo "APPLE_ID=${{ secrets.APPLE_ID }}" >> $GITHUB_ENV
+          echo "APPSTORE_ISSUER_ID=${{ secrets.APPSTORE_ISSUER_ID }}" >> $GITHUB_ENV
+          echo "APPSTORE_API_KEY_ID=${{ secrets.APPSTORE_API_KEY_ID }}" >> $GITHUB_ENV
+
+      - name: Replace Secrets in eas.json
+        run: |
+          sed -i 's/APPLE_ID_PLACEHOLDER/${{ secrets.APPLE_ID }}/' ./apps/mobile/eas.json
+          sed -i 's/APPSTORE_ISSUER_ID_PLACEHOLDER/${{ secrets.APPSTORE_ISSUER_ID }}/' ./apps/mobile/eas.json
+          sed -i 's/APPSTORE_API_KEY_ID_PLACEHOLDER/${{ secrets.APPSTORE_API_KEY_ID }}/' ./apps/mobile/eas.json
+
+      - name: Create Apple API Key File
+        run: |
+          echo "${{ secrets.APPSTORE_API_PRIVATE_KEY }}" > ./apps/mobile/AuthKey_R9QZ5LP8NK.p8
+
+      - name: Install Packages
+        run: |
+          yarn install --frozen-lockfile
+
+      - name: Build Mobile
+        run: |
+          yarn build:mobile
+
+      - name: Build on EAS
+        run: cd apps/mobile && eas build --platform ios --non-interactive
+
+      - name: Publish update
+        run: cd apps/mobile && eas update --auto --platform ios --non-interactive
+
+      - name: Upload App build to App store
+        run: cd apps/mobile && eas submit --platform ios --latest --non-interactive
diff --git a/.github/workflows/mobile.before-merge.yml b/.github/workflows/mobile.before-merge.yml
@@ -21,13 +21,6 @@ jobs:
       contents: read
 
     steps:
-      - name: Check for EXPO_TOKEN
-        run: |
-          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
-            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
-            exit 1
-          fi
-
       - uses: actions/checkout@v3
 
       - name: Skip workflow if PR is from develop to main
@@ -47,12 +40,6 @@ jobs:
           node-version: '18'
           cache: 'yarn'
 
-      - name: Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
       - name: Install Packages
         run: |
           yarn install --frozen-lockfile

diff --git a/.github/workflows/mobile.dev.yml b/.github/workflows/mobile.dev.yml
@@ -1,4 +1,4 @@
-name: Mobile Build & Deploy DEV
+name: Mobile Build DEV
 on:
   push:
     branches:

diff --git a/.github/workflows/mobile.prod.yml b/.github/workflows/mobile.prod.yml
@@ -1,4 +1,4 @@
-name: Mobile Build, Deploy and Publish PROD
+name: Mobile Build PROD
 on:
   push:
     branches:
@@ -23,13 +23,6 @@ jobs:
       contents: read
 
     steps:
-      - name: Check for EXPO_TOKEN
-        run: |
-          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
-            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
-            exit 1
-          fi
-
       - uses: actions/checkout@v3
 
       - name: Use Node.js 18.x
@@ -38,38 +31,6 @@ jobs:
           node-version: '18'
           cache: 'yarn'
 
-      - name: Setup EAS
-        uses: expo/expo-github-action@v8
-        with:
-          eas-version: latest
-          token: ${{ secrets.EXPO_TOKEN }}
-
-      - name: Set Apple Store Credentials
-        run: |
-          echo "APPLE_ID=${{ secrets.APPLE_ID }}" >> $GITHUB_ENV
-          echo "APPSTORE_ISSUER_ID=${{ secrets.APPSTORE_ISSUER_ID }}" >> $GITHUB_ENV
-          echo "APPSTORE_API_KEY_ID=${{ secrets.APPSTORE_API_KEY_ID }}" >> $GITHUB_ENV
-
-      - name: Replace Secrets in eas.json
-        run: |
-          sed -i 's/APPLE_ID_PLACEHOLDER/${{ secrets.APPLE_ID }}/' ./apps/mobile/eas.json
-          sed -i 's/APPSTORE_ISSUER_ID_PLACEHOLDER/${{ secrets.APPSTORE_ISSUER_ID }}/' ./apps/mobile/eas.json
-          sed -i 's/APPSTORE_API_KEY_ID_PLACEHOLDER/${{ secrets.APPSTORE_API_KEY_ID }}/' ./apps/mobile/eas.json
-
-      - name: Create Apple API Key File
-        run: |
-          echo "${{ secrets.APPSTORE_API_PRIVATE_KEY }}" > ./apps/mobile/AuthKey_R9QZ5LP8NK.p8
-
-      - name: Decode Google Credentials
-        run: |
-          DECODED_GOOGLE_CREDENTIALS=$(echo '${{ secrets.GOOGLE_CREDENTIALS }}' | base64 --decode)
-          echo "DECODED_GOOGLE_CREDENTIALS=$DECODED_GOOGLE_CREDENTIALS" >> $GITHUB_ENV
-          echo "::add-mask::$DECODED_GOOGLE_CREDENTIALS"
-          ESCAPED_GOOGLE_CREDENTIALS=$(echo "$DECODED_GOOGLE_CREDENTIALS" | sed ':a;N;$!ba;s/\n/\\n/g' | sed 's/"/\\"/g')
-          ESCAPED_GOOGLE_CREDENTIALS=$(echo $ESCAPED_GOOGLE_CREDENTIALS | sed 's/\\n/\\\\n/g')
-          echo "ESCAPED_GOOGLE_CREDENTIALS=$ESCAPED_GOOGLE_CREDENTIALS" >> $GITHUB_ENV
-          echo "::add-mask::$ESCAPED_GOOGLE_CREDENTIALS"
-
       - name: Install Packages
         run: |
           yarn install --frozen-lockfile

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 
 [Ever® Teams™](https://app.ever.team) - Open Work and Project Management Platform.
 
-![web](https://docs.gauzy.co/docs/assets/gauzy-teams/web/overview.png)
+![web](https://docs.ever.team/web/overview.png)
 
 **NOTE: Platform currently is in active development stage / WIP, please use with caution!**
 
@@ -33,17 +33,17 @@ Below is a list of the most important planned features:
 
 ### Web Platform
 
-![web](https://docs.gauzy.co/docs/assets/gauzy-teams/web/overview.png)
-![web](https://docs.gauzy.co/docs/assets/gauzy-teams/web/web2.png)
-![web](https://docs.gauzy.co/docs/assets/gauzy-teams/web/web3.png)
+![web](https://docs.ever.team/web/overview.png)
+![web](https://docs.ever.team/web/web2.png)
+![web](https://docs.ever.team/web/web3.png)
 
 ### Mobile Apps (iOS/Android)
 
-![mobile](https://docs.gauzy.co/docs/assets/gauzy-teams/mobile/overview.png)
+![mobile](https://docs.ever.team/mobile/overview.png)
 
 ### Browser Extension
 
-![extension](https://docs.gauzy.co/docs/assets/gauzy-teams/extension/overview.png)
+![extension](https://docs.ever.team/extension/overview.png)
 
 Note: Currently WIP, the screenshot is just a temporary picture :)
 
@@ -152,6 +152,10 @@ WIP
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
 
+### Koyeb
+
+[![Deploy to Koyeb](https://www.koyeb.com/static/images/deploy/button.svg)](https://app.koyeb.com/deploy?name=ever-teams&type=docker&builder=dockerfile&image=ghcr.io/ever-co/ever-teams-webapp:latest&env[PORT]=3000&ports=3000;http;/)
+
 ## 📄 Content
 
 -   `/web` - NextJs-based (React) Web App at <https://app.ever.team> (deployed from `main` branch)

diff --git a/apps/mobile/ios/GauzyTeams.xcodeproj/project.pbxproj b/apps/mobile/ios/GauzyTeams.xcodeproj/project.pbxproj
@@ -448,6 +448,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -461,6 +462,10 @@
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -501,6 +506,10 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION,
+				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -511,6 +520,10 @@
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\"";
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;