Merge pull request #2059 from ever-co/develop

Release
ever-co · Jan 4, 2024 · 87d0a7a · 87d0a7a
2 parents 9ad7162 + 5f800fd
commit 87d0a7a
Show file tree

Hide file tree

Showing 23 changed files with 69 additions and 61 deletions.
diff --git a/.github/workflows/deploy-do-dev.yml b/.github/workflows/deploy-do-dev.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2

diff --git a/.github/workflows/deploy-do-prod.yml b/.github/workflows/deploy-do-prod.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2

diff --git a/.github/workflows/deploy-render-dev.yml b/.github/workflows/deploy-render-dev.yml
@@ -1,41 +1,41 @@
 name: Deploy to Render Dev
 
 on:
-    workflow_run:
-        workflows: ['Build and Publish Docker Images Dev']
-        branches: [render]
-        types:
-            - completed
+  workflow_run:
+    workflows: ['Build and Publish Docker Images Dev']
+    branches: [render]
+    types:
+      - completed
 
 jobs:
-    deploy-demo:
-        runs-on: ubuntu-latest
+  deploy-demo:
+    runs-on: ubuntu-latest
 
-        environment: dev
+    environment: dev
 
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v3
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-            - name: Set up Render CLI
-              run: |
-                  wget  -O render https://github.com/render-oss/render-cli/releases/download/v0.1.8/render-linux-x86_64
-                  chmod +x render
-                  sudo mv render /usr/local/bin/render
-                  mkdir ~/.render
-                  cat << EOF > ~/.render/config.yaml
-                        version: 1
-                        sshPreserveHosts: true
-                        profiles:
-                          default:
-                            defaultRegion: oregon
-                            apiKey: ${{ secrets.RENDER_API_KEY }}
-                          demo:
-                            defaultRegion: oregon
-                            apiKey: ${{ secrets.RENDER_API_KEY }}
-                        EOF
+      - name: Set up Render CLI
+        run: |
+          wget  -O render https://github.com/render-oss/render-cli/releases/download/v0.1.8/render-linux-x86_64
+          chmod +x render
+          sudo mv render /usr/local/bin/render
+          mkdir ~/.render
+          cat << EOF > ~/.render/config.yaml
+                version: 1
+                sshPreserveHosts: true
+                profiles:
+                  default:
+                    defaultRegion: oregon
+                    apiKey: ${{ secrets.RENDER_API_KEY }}
+                  demo:
+                    defaultRegion: oregon
+                    apiKey: ${{ secrets.RENDER_API_KEY }}
+                EOF
 
-            - name: Deploy Services
-              run: |
-                  cp .render/render.dev.yaml ./render.yaml
-                  render blueprint launch --profile dev
+      - name: Deploy Services
+        run: |
+          cp .render/render.dev.yaml ./render.yaml
+          render blueprint launch --profile dev
diff --git a/.github/workflows/deploy-vercel-dev.yml b/.github/workflows/deploy-vercel-dev.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/deploy-vercel-prod.yml b/.github/workflows/deploy-vercel-prod.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/desktop.apps.yml b/.github/workflows/desktop.apps.yml
@@ -21,15 +21,15 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'ever-co/ever-gauzy'
           ref: develop
 
       - name: Install Node.js, NPM and Yarn
         uses: buildjet/setup-node@v3
         with:
-          node-version: 16
+          node-version: '18'
           cache: 'yarn'
 
       - name: Change permissions
@@ -105,15 +105,15 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'ever-co/ever-gauzy'
           ref: develop
 
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: '18'
           cache: 'yarn'
 
       - name: Fix node-gyp and Python
@@ -179,19 +179,19 @@ jobs:
 
     strategy:
       matrix:
-        os: [windows-latest-l]
+        os: [windows-latest]
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'ever-co/ever-gauzy'
           ref: develop
 
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: '18'
           cache: 'yarn'
 
       - name: Fix node-gyp and Python

diff --git a/.github/workflows/docker-build-publish-dev.yml b/.github/workflows/docker-build-publish-dev.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2

diff --git a/.github/workflows/docker-build-publish-prod.yml b/.github/workflows/docker-build-publish-prod.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2

diff --git a/.github/workflows/extensions.dev.yml b/.github/workflows/extensions.dev.yml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/extensions.prod.yml b/.github/workflows/extensions.prod.yml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/mobile.apps.android.yml b/.github/workflows/mobile.apps.android.yml
@@ -30,7 +30,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/mobile.apps.ios.yml b/.github/workflows/mobile.apps.ios.yml
@@ -30,7 +30,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/mobile.before-merge.yml b/.github/workflows/mobile.before-merge.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Skip workflow if PR is from develop to main
         if: github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main'

diff --git a/.github/workflows/mobile.dev.yml b/.github/workflows/mobile.dev.yml
@@ -21,7 +21,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/mobile.prod.yml b/.github/workflows/mobile.prod.yml
@@ -23,7 +23,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3

diff --git a/.github/workflows/release.apps.yml b/.github/workflows/release.apps.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Bump version and push tag
         uses: mathieudutour/[email protected]

diff --git a/.github/workflows/release.dev.yml b/.github/workflows/release.dev.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Bump version and push tag
         uses: mathieudutour/[email protected]

diff --git a/.github/workflows/release.prod.yml b/.github/workflows/release.prod.yml
@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Bump version and push tag
         uses: mathieudutour/[email protected]

diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
@@ -14,7 +14,7 @@ jobs:
     name: Cspell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: streetsidesoftware/cspell-action@v2
         with:
           # Github token used to fetch the list of changed files in the commit.

diff --git a/.github/workflows/web.before-merge.yml b/.github/workflows/web.before-merge.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Skip workflow if PR is from develop to main
         if: github.event.pull_request.head.ref == 'develop' && github.event.pull_request.base.ref == 'main'

diff --git a/README.md b/README.md
@@ -162,10 +162,12 @@ WIP
 
 ## 📄 Content
 
--   `/web` - NextJs-based (React) Web App at <https://app.ever.team> (deployed from `main` branch)
--   `/mobile` - Expo (ReactNative) powered mobile app
--   `/desktop` - Electron based Desktop Application (customized build from [Ever Gauzy Desktop Timer App](https://github.com/ever-co/ever-gauzy/tree/develop/apps/desktop-timer))
--   `/extensions` - Browser Extensions (powered by <https://github.com/PlasmoHQ/plasmo>)
+-   `/apps/web` - NextJs-based (React) Web App at <https://app.ever.team> (deployed from `main` branch)
+-   `/apps/mobile` - Expo (ReactNative) powered mobile app
+-   `/apps/desktop` - Electron-based Desktop Application (customized build from [Ever Gauzy Desktop Timer App](https://github.com/ever-co/ever-gauzy/tree/develop/apps/desktop-timer))
+-   `/apps/extensions` - Browser Extensions (powered by <https://github.com/PlasmoHQ/plasmo>)
+-   `/apps/server-api` - Ever Teams API Server (customized build from [Ever Gauzy API Server](https://github.com/ever-co/ever-gauzy/tree/develop/apps/server-api))
+-   `/apps/server-web` - Electron-based Ever Teams Web Server that serve Ever Teams NextJs frontend (wraps `apps/web` folder)
 
 ## 💌 Contact Us
 

diff --git a/apps/server-api/README.md b/apps/server-api/README.md
@@ -0,0 +1,3 @@
+# Ever Teams API Server
+
+The Source code for Ever Teams API Server located in <https://github.com/ever-co/ever-gauzy/tree/develop/apps/server-api>
diff --git a/apps/server-web/README.md b/apps/server-web/README.md
@@ -0,0 +1,3 @@
+# Ever Teams Web Server
+
+Electron-based Desktop App that serve Ever Teams NextJs frontend.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Ever Teams API Server

		The Source code for Ever Teams API Server located in <https://github.com/ever-co/ever-gauzy/tree/develop/apps/server-api>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Ever Teams Web Server

		Electron-based Desktop App that serve Ever Teams NextJs frontend.