Conflicts resolved

.cspell.json

@@ -5,6 +5,7 @@
 	"words": [
 		"barcodes",
 		"cacheable",
+		"camelcase",
 		"cloudinary",
 		"clsxm",
 		"dummyimage",
@@ -13,6 +14,9 @@
 		"exposdk",
 		"headlessui",
 		"heroicons",
+		"JITSU",
+		"kanban",
+		"passcode",
 		"plasmo",
 		"RECAPTCHA",
 		"svgs",
@@ -53,7 +57,13 @@
 		"docker-compose.demo.yml",
 		"docker-compose.yml",
 		"wait",
+		"signin",
+		"Chatwoot",
+		"CHATWOOT",
 		"apps/web/lib/i18n/*.ts",
+		"apps/web/public/locales/**",
 		"apps/mobile/app/i18n/*.ts",
+		"apps/mobile/android/**",
+		"apps/mobile/ios/**"
 	]
 }

.github/workflows/docker-build-publish.yml

@@ -0,0 +1,80 @@
+name: Build and Publish Docker Images Prod
+
+on:
+  push:
+    branches: [main]
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  ever-teams-webapp:
+    runs-on: buildjet-8vcpu-ubuntu-2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          load: true
+          tags: |
+            ghcr.io/ever-co/ever-teams-webapp:latest
+            everco/ever-teams-webapp:latest
+            registry.digitalocean.com/ever/ever-teams-webapp:latest
+            ${{ secrets.CW_DOCKER_REGISTRY }}/ever-co/ever-teams-webapp:latest
+          cache-from: type=registry,ref=everco/ever-teams-webapp:latest
+          cache-to: type=inline
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Push to Docker Hub Registry
+        run: |
+          docker push everco/ever-teams-webapp:latest
+
+      - name: Install doctl
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+      - name: Log in to DigitalOcean Container Registry with short-lived credentials
+        run: doctl registry login --expiry-seconds 3600
+
+      - name: Push to DigitalOcean Registry
+        run: |
+          docker push registry.digitalocean.com/ever/ever-teams-webapp:latest
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GH_TOKEN }}
+
+      - name: Push to Github Registry
+        run: |
+          docker push ghcr.io/ever-co/ever-teams-webapp:latest
+
+      - name: Login to CW Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.CW_DOCKER_REGISTRY }}
+          username: ${{ secrets.CW_DOCKER_USER }}
+          password: ${{ secrets.CW_DOCKER_USER_PASSWORD }}
+
+      - name: Push to CW Registry
+        run: |
+          docker push ${{ secrets.CW_DOCKER_REGISTRY }}/ever-co/ever-teams-webapp:latest

.github/workflows/mobile-prod.yml

@@ -50,15 +50,15 @@ jobs:
           yarn build:mobile
 
       - name: Build on EAS
-        run: cd apps/mobile && eas build --platform android --non-interactive
+        run: cd apps/mobile && eas build --platform all --non-interactive
 
       - name: Publish update
         run: cd apps/mobile && eas update --auto
 
       - name: Decode Google Credentials
         run: |
           DECODED_GOOGLE_CREDENTIALS=$(echo '${{ secrets.GOOGLE_CREDENTIALS }}' | base64 --decode)
-          echo "DECODED_GOOGLE_CREDENTIALS=$DECODED_GOOGLE_CREDENTIALS" >> $GITHUB_ENV          
+          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')
@@ -79,4 +79,7 @@ jobs:
           project_id: "ever-teams-399720"
 
       - name: Upload to Play Store Console
-        run: cd apps/mobile && eas submit -p android --latest --key ${{ secrets.GOOGLE_CREDENTIALS }} 
+        run: cd apps/mobile && eas submit --platform android --latest --non-interactive
+
+      - name: Publish to App Store
+        run: EXPO_APPLE_APP_SPECIFIC_PASSWORD=${{ secrets.EXPO_APPLE_APP_SPECIFIC_PASSWORD }} eas submit --platform ios --latest --non-interactive

.gitignore

@@ -69,3 +69,6 @@ Thumbs.db
 /apps/**/.cache
 /packages/**/.cache
 /packages/**/dist
+
+# Local Netlify folder
+.netlify

.node-version

@@ -0,0 +1 @@
+18.18.2

.nvmrc

@@ -0,0 +1 @@
+18.18.2

Dockerfile

@@ -4,12 +4,19 @@
 ARG NODE_VERSION=18.17.1
 FROM node:${NODE_VERSION}-slim as base
 
-
 # Next.js app lives here
 WORKDIR /app
 
-# Set production environment
-ENV NEXT_SHARP_PATH=/app/node_modules/sharp
+ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_BUILD_OUTPUT_TYPE=standalone
+ENV NEXT_SHARP_PATH=/temp/node_modules/sharp
+
+RUN npm i -g npm@latest
+# Install sharp, NextJS image optimization
+RUN mkdir /temp && cd /temp && \
+    npm i sharp
+
+RUN npm cache clean --force
 
 
 # Throw-away build stage to reduce size of final image
@@ -33,7 +40,7 @@ RUN cd apps/web && \
 # Copy application code
 COPY --link . .
 
-ENV NODE_ENV="production"
+ENV NODE_ENV=production
 
 # Build application
 RUN yarn run build:web
@@ -42,16 +49,22 @@ RUN yarn run build:web
 RUN cd apps/web && \
     yarn install --prod --ignore-scripts
 
+RUN yarn cache clean
+
 
 # Final stage for app image
 FROM base
 
-ENV NODE_ENV="production"
+ENV NODE_ENV=production
 
 # Copy built application
-COPY --from=build /app /app
+COPY --from=build /app/apps/web/.next/standalone ./
+COPY --from=build /app/apps/web/.next/static ./apps/web/.next/static
+COPY --from=build /app/apps/web/public ./apps/web/public
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 3000
 
-CMD [ "npm", "run", "start:web" ]
+ENV PORT=3000
+
+CMD [ "node", "./apps/web/server.js" ]

README.md

@@ -132,17 +132,21 @@ WIP
 
 [![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fever-co%2Fever-teams&project-name=ever-teams&repository-name=ever-teams&output-directory=.next&build-command=yarn%20build&install-command=yarn%20install%20--frozen-lockfile&root-directory=apps%2Fweb)
 
+### Render
+
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/ever-co/ever-teams)
+
 ### Railway
 
-Note: WIP
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/7_OfzR?referralCode=40jeja)
 
-[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/EverTeams)
+### Fly
 
-### Render
+[![Deploy on Railway](https://ever.team/fly.png)](https://github.com/ever-co/ever-teams/wiki/Deploy-to-Fly)
 
-Note: WIP
+### Netlify
 
-[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/ever-co/ever-teams)
+[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/ever-co/ever-teams)
 
 ## 📄 Content
 
@@ -166,8 +170,8 @@ Note: WIP
 
 ## 🔐 Security
 
-Ever Teams Platform follows good security practices, but 100% security cannot be guaranteed in any software!
-Ever Teams Platform is provided AS IS without any warranty. Use at your own risk!
+**Ever Teams Platform** follows good security practices, but 100% security cannot be guaranteed in any software!
+**Ever Teams Platform** is provided AS IS without any warranty. Use at your own risk!
 See more details in the [LICENSE.md](LICENSE.md).
 
 In a production setup, all client-side to server-side (backend, APIs) communications should be encrypted using HTTPS/WSS/SSL (REST APIs, GraphQL endpoint, Socket.io WebSockets, etc.).
@@ -241,7 +245,7 @@ You can also view a full list of our [contributors tracked by Github](https://gi
 [![Circle CI](https://circleci.com/gh/ever-co/ever-teams.svg?style=svg)](https://circleci.com/gh/ever-co/ever-teams)
 [![codecov](https://codecov.io/gh/ever-co/ever-teams/branch/master/graph/badge.svg)](https://codecov.io/gh/ever-co/ever-teams)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/8c46f9eb9df64aa9859dea4d572059ac)](https://www.codacy.com/gh/ever-co/ever-teams/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ever-co/ever-teams&utm_campaign=Badge_Grade)
-[![DeepScan grade](https://deepscan.io/api/teams/3293/projects/16703/branches/363423/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=3293&pid=16703&bid=363423)
+[![DeepScan grade](https://deepscan.io/api/teams/3293/projects/25855/branches/814579/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=3293&pid=25855&bid=814579)
 [![Known Vulnerabilities](https://snyk.io/test/github/ever-co/ever-teams/badge.svg)](https://snyk.io/test/github/ever-co/ever-teams)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/ever-co/ever-teams.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ever-co/ever-teams/alerts/)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ever-co/ever-teams.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ever-co/ever-teams/context:javascript)

apps/extensions/components/popup/Header.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import logoImg from 'data-base64:~assets/logo/gauzy-teams-dark.png';
+import logoImg from 'data-base64:~assets/logo/ever-teams-dark.png';
 import React, { FC, useState } from 'react';
 
 import AppDropdown from '~components/shared/AppDropdown';

apps/extensions/package.json

@@ -1,38 +1,42 @@
 {
-  "name": "@ever-teams/extensions",
-  "displayName": "Ever Teams",
-  "version": "0.1.0",
-  "description": "Ever Teams Browser Extensions",
-  "license": "UNLICENSED",
-  "author": "Ever Co. LTD",
-  "scripts": {
-    "dev": "yarn plasmo dev",
-    "start": "yarn dev",
-    "build": "yarn plasmo build"
-  },
-  "dependencies": {
-    "@tailwindcss/forms": "^0.5.3",
-    "@tailwindcss/typography": "^0.5.8",
-    "classnames": "^2.3.2",
-    "plasmo": "^0.59.1",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "react-timer-hook": "^3.0.5",
-    "tailwindcss": "^3.2.4"
-  },
-  "devDependencies": {
-    "@plasmohq/prettier-plugin-sort-imports": "^3.6.0",
-    "@types/chrome": "^0.0.203",
-    "@types/node": "18.8.3",
-    "@types/react": "18.0.21",
-    "@types/react-dom": "18.0.6",
-    "postcss": "^8.4.19",
-    "prettier": "^2.8.0",
-    "typescript": "4.8.4"
-  },
-  "manifest": {
-    "host_permissions": [
-      "https://*/*"
-    ]
-  }
+	"name": "@ever-teams/extensions",
+	"displayName": "Ever Teams",
+	"version": "0.1.0",
+	"description": "Ever Teams Browser Extensions",
+	"license": "UNLICENSED",
+	"author": "Ever Co. LTD",
+	"scripts": {
+		"dev": "yarn plasmo dev",
+		"start": "yarn dev",
+		"build": "yarn plasmo build"
+	},
+	"dependencies": {
+		"@tailwindcss/forms": "^0.5.3",
+		"@tailwindcss/typography": "^0.5.8",
+		"classnames": "^2.3.2",
+		"plasmo": "^0.59.1",
+		"react": "18.2.0",
+		"react-dom": "18.2.0",
+		"react-timer-hook": "^3.0.5",
+		"tailwindcss": "^3.2.4"
+	},
+	"devDependencies": {
+		"@plasmohq/prettier-plugin-sort-imports": "^3.6.0",
+		"@types/chrome": "^0.0.203",
+		"@types/node": "18.8.3",
+		"@types/react": "18.0.21",
+		"@types/react-dom": "18.0.6",
+		"postcss": "^8.4.19",
+		"prettier": "^2.8.0",
+		"typescript": "4.8.4"
+	},
+	"manifest": {
+		"host_permissions": [
+			"https://*/*"
+		]
+	},
+	"engines": {
+		"node": ">=16.0.0",
+		"yarn": ">=1.13.0"
+	}
 }

apps/mobile/.env

@@ -2,8 +2,7 @@
 # We are using react-native-dotenv (.env)
 
 GAUZY_API_URL=https://api.gauzy.co
-INVITE_CALLBACK_URL=https://app.ever.team/passcode
-
+INVITE_CALLBACK_URL=https://app.ever.team/auth/passcode
 EXPO_PUBLIC_SENTRY_DSN=
 SENTRY_ORG=ever-co
 SENTRY_PROJECT=ever-teams-mobile

apps/mobile/.env.template

@@ -1,9 +1,8 @@
 # NOTE: do NOT ever put here any secure settings! (e.g. Secret Keys)
 # We are using react-native-dotenv (.env)
 
-GAUZY_API_URL=
-INVITE_CALLBACK_URL=https://app.ever.team/passcode
-
+GAUZY_API_URL=https://api.gauzy.co
+INVITE_CALLBACK_URL=https://app.ever.team/auth/passcode
 EXPO_PUBLIC_SENTRY_DSN=
-SENTRY_ORG=
-SENTRY_PROJECT=
+SENTRY_ORG=ever-co
+SENTRY_PROJECT=ever-teams-mobile

apps/mobile/android/app/build.gradle

@@ -118,7 +118,7 @@ android {
         applicationId 'ever.team'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
+        versionCode 2
         versionName "0.1.0"
     }
 

apps/mobile/android/app/src/main/AndroidManifest.xml

@@ -15,10 +15,10 @@
   </queries>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="true"/>
-    <meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="exposdk:48.0.0"/>
+    <meta-data android:name="expo.modules.updates.EXPO_RUNTIME_VERSION" android:value="@string/expo_runtime_version"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
-    <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://u.expo.dev/9f38f768-16f6-4c47-b354-9745ebda1335"/>
+    <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://u.expo.dev/2ff924e4-7a91-4b23-9db9-7453a8063bb0"/>
     <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.App.SplashScreen" android:exported="true" android:screenOrientation="portrait">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
@@ -33,4 +33,4 @@
     </activity>
     <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false"/>
   </application>
-</manifest>
+</manifest>