Merge pull request #1684 from ever-co/develop

Release

.cspell.json

@@ -13,6 +13,7 @@
 		"exposdk",
 		"headlessui",
 		"heroicons",
+		"JITSU",
 		"plasmo",
 		"RECAPTCHA",
 		"svgs",
@@ -54,6 +55,6 @@
 		"docker-compose.yml",
 		"wait",
 		"apps/web/lib/i18n/*.ts",
-		"apps/mobile/app/i18n/*.ts",
+		"apps/mobile/app/i18n/*.ts"
 	]
 }

.node-version

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

.nvmrc

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

README.md

@@ -132,17 +132,15 @@ 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)
 
-### Railway
-
-Note: WIP
+### Render
 
-[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/EverTeams)
+[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/ever-co/ever-teams)
 
-### Render
+### Railway
 
 Note: WIP
 
-[![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 on Railway](https://railway.app/button.svg)](https://railway.app/template/EverTeams)
 
 ## 📄 Content
 

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/package.json

@@ -270,5 +270,9 @@
 			"react/prop-types": 0,
 			"space-before-function-paren": 0
 		}
+	},
+	"engines": {
+		"node": ">=16.0.0",
+		"yarn": ">=1.13.0"
 	}
 }

apps/web/.env

@@ -2,7 +2,6 @@ RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false
 
 NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.gauzy.co
 GAUZY_API_SERVER_URL=https://api.gauzy.co/api
-INVITE_CALLBACK_URL=https://app.ever.team/passcode
 NEXT_PUBLIC_GA_MEASUREMENT_ID=SOME_MEASUREMENT_ID
 
 # CAPTCHA Settings
@@ -41,7 +40,7 @@ NEXT_PUBLIC_BOARD_FIREBASE_CONFIG=
 
 # Meet
 NEXT_PUBLIC_MEET_DOMAIN="meet.ever.team"
-# Private Variables (Meet)
+# Meet Private Vars
 MEET_JWT_APP_ID=ever_teams
 MEET_JWT_APP_SECRET=
 

apps/web/.env.sample

@@ -2,12 +2,11 @@ RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false
 
 NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.gauzy.co
 GAUZY_API_SERVER_URL=https://api.gauzy.co/api
-INVITE_CALLBACK_URL=https://app.ever.team/passcode
-NEXT_PUBLIC_GA_MEASUREMENT_ID=SOME_MEASUREMENT_ID
+NEXT_PUBLIC_GA_MEASUREMENT_ID=
 
 # CAPTCHA Settings
-NEXT_PUBLIC_CAPTCHA_SITE_KEY=SOME_CAPTCHA_SITE_KEY
-CAPTCHA_SECRET_KEY=SOME_CAPTCHA_SECRET_KEY
+NEXT_PUBLIC_CAPTCHA_SITE_KEY=
+CAPTCHA_SECRET_KEY=
 
 # Invite Callback URL
 INVITE_CALLBACK_URL=https://app.ever.team/auth/passcode

apps/web/app/constants.ts

@@ -36,6 +36,7 @@ export const INVITE_CALLBACK_URL = process.env.INVITE_CALLBACK_URL;
 export const INVITE_CALLBACK_PATH = '/auth/passcode';
 export const VERIFY_EMAIL_CALLBACK_URL = process.env.VERIFY_EMAIL_CALLBACK_URL;
 export const VERIFY_EMAIL_CALLBACK_PATH = '/verify-email';
+export const GA_MEASUREMENT_ID = process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID
 
 export const SMTP_FROM_ADDRESS = process.env.SMTP_FROM_ADDRESS || '[email protected]';
 export const SMTP_HOST = process.env.SMTP_HOST || '';

apps/web/package.json

@@ -101,5 +101,9 @@
 		"eslint": "^8.28.0",
 		"eslint-config-next": "^13.1.6",
 		"typescript": "^4.9.4"
+	},
+	"engines": {
+		"node": ">=16.0.0",
+		"yarn": ">=1.13.0"
 	}
 }

apps/web/pages/_app.tsx

@@ -1,8 +1,7 @@
 /* eslint-disable no-mixed-spaces-and-tabs */
 import 'react-loading-skeleton/dist/skeleton.css';
 import '../styles/globals.css';
-
-import { jitsuConfiguration } from '@app/constants';
+import { GA_MEASUREMENT_ID, RECAPTCHA_SITE_KEY, jitsuConfiguration } from '@app/constants';
 import { JitsuProvider } from '@jitsu/jitsu-react';
 import { Analytics } from '@vercel/analytics/react';
 import { AppState } from 'lib/app/init-state';
@@ -16,20 +15,27 @@ import { SkeletonTheme } from 'react-loading-skeleton';
 import { RecoilRoot } from 'recoil';
 import { JitsuAnalytics } from '../lib/components/services/jitsu-analytics';
 import i18n from '../ni18n.config';
+
 const MyApp = ({ Component, pageProps }: AppProps) => {
 	const isJitsuEnvsPresent = jitsuConfiguration.host && jitsuConfiguration.writeKey;
 	return (
 		<>
-			<Script
-				strategy="lazyOnload"
-				src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID}`}
-			/>
-			<Script strategy="lazyOnload" id="google-analytic-script">
-				{` window.dataLayer = window.dataLayer || [];
-  				function gtag(){dataLayer.push(arguments);}
-  				gtag('js', new Date());
-  				gtag('config', '${process.env.NEXT_PUBLIC_GA_MEASUREMENT_ID}');`}
-			</Script>
+
+			{GA_MEASUREMENT_ID && (
+				<>
+					<Script
+					strategy="lazyOnload"
+					src={`https://www.googletagmanager.com/gtag/js?id=${GA_MEASUREMENT_ID}`}
+				/>
+				<Script strategy="lazyOnload" id="google-analytic-script">
+					{` window.dataLayer = window.dataLayer || [];
+					  function gtag(){dataLayer.push(arguments);}
+					  gtag('js', new Date());
+					  gtag('config', '${GA_MEASUREMENT_ID}');`}
+				</Script>
+				</>
+			)}
+
 			<Head>
 				<link rel="preconnect" href="https://fonts.googleapis.com" />
 				<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />