diff --git a/.github/workflows/deploy-do-dev.yml b/.github/workflows/deploy-do-dev.yml index 018805ecd..45a62bca4 100644 --- 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 index f84988474..d62a50056 100644 --- 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 index 49f0c0dcb..d0150bcbe 100644 --- 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 index 2fee9532f..e5b025b68 100644 --- 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 index f6b2d4482..494a60de1 100644 --- 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 index 7c477818d..55020a252 100644 --- a/.github/workflows/desktop.apps.yml +++ b/.github/workflows/desktop.apps.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Check out Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 'ever-co/ever-gauzy' ref: develop @@ -29,7 +29,7 @@ jobs: - 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,7 +105,7 @@ jobs: steps: - name: Check out Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: 'ever-co/ever-gauzy' ref: develop @@ -113,7 +113,7 @@ jobs: - 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,11 +179,11 @@ 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 @@ -191,7 +191,7 @@ jobs: - 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 index 574fe4cc7..0a7322da7 100644 --- 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 index ad4986543..5c7e25c96 100644 --- 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 index 4f3f4ae8c..1230bd585 100644 --- 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 index aa8908d1a..ab1b2ff02 100644 --- 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 index 68aade178..2e6fb6897 100644 --- 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 index 52e2ea401..0fa5752f1 100644 --- 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 index a207081bd..006bcda26 100644 --- 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 index 6cd4ce5f6..5baff77ed 100644 --- 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 index 1846759cc..e18423b87 100644 --- 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 index 26a960fc1..5ec935ee3 100644 --- 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/github-tag-action@v6.1 diff --git a/.github/workflows/release.dev.yml b/.github/workflows/release.dev.yml index 153a8b004..e318c4dc4 100644 --- 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/github-tag-action@v6.1 diff --git a/.github/workflows/release.prod.yml b/.github/workflows/release.prod.yml index 2c173a80d..ef91e01d3 100644 --- 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/github-tag-action@v6.1 diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml index fe9d9fbc9..411197db8 100644 --- 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 index 2ee63899e..ed66195e5 100644 --- 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 index 6ab23a1fd..e2f737957 100644 --- a/README.md +++ b/README.md @@ -162,10 +162,12 @@ WIP ## 📄 Content -- `/web` - NextJs-based (React) Web App at (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 ) +- `/apps/web` - NextJs-based (React) Web App at (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 ) +- `/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 new file mode 100644 index 000000000..4baa4e40a --- /dev/null +++ b/apps/server-api/README.md @@ -0,0 +1,3 @@ +# Ever Teams API Server + +The Source code for Ever Teams API Server located in diff --git a/apps/server-web/README.md b/apps/server-web/README.md new file mode 100644 index 000000000..9d0d9808e --- /dev/null +++ b/apps/server-web/README.md @@ -0,0 +1,3 @@ +# Ever Teams Web Server + +Electron-based Desktop App that serve Ever Teams NextJs frontend.