From 54d18e6cb942c2b875fd0463c074a4e8427e42d0 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Tue, 6 Feb 2024 13:39:55 +0100 Subject: [PATCH] chore: switching to Ever Teams APIs (WIP) --- .cspell.json | 509 +++++++++--------- .render/render.dev.yaml | 4 +- Dockerfile | 2 +- README.md | 17 +- apps/mobile/.env.template | 2 +- apps/mobile/app/config/config.dev.ts | 2 +- .../app/services/client/requests/auth.ts | 158 +++--- apps/mobile/eas.json | 2 +- apps/web/.env | 4 +- apps/web/.env.sample | 4 +- apps/web/app/constants.ts | 3 +- .../server/requests/timer/timer-slot.ts | 2 - apps/web/next.config.js | 3 + render.yaml | 4 +- 14 files changed, 355 insertions(+), 361 deletions(-) diff --git a/.cspell.json b/.cspell.json index 924429a66..024df3872 100644 --- a/.cspell.json +++ b/.cspell.json @@ -4,332 +4,323 @@ "caseSensitive": false, "$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json", "words": [ - "appdev", - "gauzystage", + "accepte", + "Accordian", "adipiscing", - "amet", "aliqua", - "signin", + "amet", + "Andross", + "animatable", + "apidev", + "apisauce", + "apistage", + "appdev", + "appkey", + "applesimutils", "APPSTORE", + "arrowleft", + "asel", + "Authentificate", "barcodes", + "billrate", "binutils", + "Boilerplates", + "bootsplash", + "borde", + "Bowser", + "Btns", + "Bugsnag", "buildjet", "cacheable", "camelcase", + "capitaliz", + "Chami", + "Chane", + "Changemail", + "Charaters", "Chatwoot", + "cheched", + "checkcircle", + "checkcircleo", "chetwode", + "choos", + "ciphertext", + "classpath", "cloc", + "clockcircleo", "cloudinary", "clsx", "clsxm", - "opentelemetry", - "otlp", + "Cmbx", + "cmdk", + "Codacy", + "codecov", + "Codementor", + "Combox", + "combx", "commitlint", - "DONT", - "greenkeeper", - "classpath", - "tsbuildinfo", - "sentryclirc", + "comparision", "compodoc", "consectetur", + "contaniner", + "creatoe", + "Darkmode", + "datas", + "Defaul", + "Descrption", + "deserunt", + "dimesions", + "discrepenancy", "dolor", "dolore", + "domhandler", + "domutils", + "DONT", + "dotenv", + "Dropown", + "dropwdown", "dummyimage", + "dvalue", + "Efate", "eiusmod", "elit", + "ellipsize", + "embla", + "Enderbury", + "endregion", + "Entypo", "envalid", + "errr", "everco", "everteamsdesktop", + "excalidraw", + "exclamationcircleo", "exposdk", + "extramenu", + "Fakaofo", + "falsey", + "fbjs", + "Ffeeds", + "Filder", + "filtmembers", + "firstname", + "flaticon", + "fomated", + "Formated", + "FULLNAME", + "Funtion", + "Galery", + "gauzystage", "gcloud", + "Gitter", + "gradlew", "graphicsmagick", + "greenkeeper", + "greppable", + "grotesk", "gtag", + "Hanlder", "headlessui", + "Heinze", "heroicons", - "overlapper", + "hidde", + "Holmgren", + "horcrux", + "HUBSTAFF", "Huhn", + "huntr", + "hwba", + "hyperscript", + "ianatz", "icnsutils", + "Icontent", + "imagebutton", + "imlement", + "immediatly", + "imodal", + "implem", + "INAPP", "incididunt", + "INFOTMATION", + "inital", + "Instanciate", + "insted", + "Intervall", + "invdate", + "Invitatio", + "invitationid", + "Invitions", + "Ionicons", + "iphonesimulator", + "ipsum", "isdragging", "isdraggingfrom", "isdropdisabled", - "ipsum", + "Isssue", + "ISSUETYPE", + "Isvalid", + "itask", + "iuser", + "Jamon", + "jitsi", "JITSU", + "jsbundle", "kanban", + "Kanbanboard", "kanbandata", - "Lorem", + "Kiritimati", + "Kolkata", + "Kosrae", + "labore", + "Lask", + "lastest", + "lastlog", + "lgcard", "libappindicator", + "Lngs", + "Loadtasks", + "localstorage", + "locatio", + "loglevel", + "longpress", + "Lorem", "lucide", + "mappagination", "mathieudutour", + "Mazen", + "Metral", + "miliseconds", + "millisencods", + "mobx", + "Moresby", "ncipollo", + "Neue", "nextjs", + "nimg", + "nocheck", + "noreferrer", + "Opena", + "opentelemetry", + "Ordereds", + "Organizatio", + "OSTYPE", + "otlp", + "outclick", + "overlapper", + "Pago", + "pako", + "paren", + "Parens", "passcode", + "payperiod", + "Permisson", + "Personnal", + "phraseapp", + "pkill", + "Plaholder", "plasmo", + "plasmohq", + "popperjs", + "Pourtcent", "precommit", + "Pressable", + "Pressible", + "progess", + "Proguard", + "Propf", + "publicactive", + "reactotron", + "Reactotron's", "RECAPTCHA", + "recieve", + "Reconds", + "Repobeats", + "RESERVERD", + "Rickert", + "runned", + "Screenshoot", + "screenshoots", + "SCREENSHOOTS", + "screenstatus", + "sentryclirc", + "setrole", + "Settingfilter", "setuptools", "setwin", + "shadcn", + "shandow", + "signin", + "Signle", + "signoff", + "simplecast", + "sitekey", + "skey", + "smalltext", "snyk", + "stackoverflow", + "statsus", + "statut", + "STMP", + "strock", "stylelint", + "stylesheet", + "subsquently", "svgs", - "Tailess", + "Swith", + "Syle", + "Synk", "tailess", + "Tailess", "tailwindcss", - "testid", - "Timesheet", "tanstack", + "taskid", "taskstatus", + "teamtask", "tempor", - "vcpu", - "Vercel", - "HUBSTAFF", - "UPWORK", - "runned", + "testid", + "Timesheet", + "Timesheets", "Timeslot", - "Isssue", - "datas", - "Changemail", - "Lask", - "publicactive", - "Formated", - "Btns", - "RESERVERD", - "shandow", - "UIUX", - "xlight", - "domutils", - "domhandler", - "hyperscript", - "nocheck", - "locatio", - "labore", - "falsey", - "unhang", - "popperjs", - "Isssue", - "inital", - "FULLNAME", - "extramenu", - "iuser", - "Pourtcent", - "Reconds", - "Pourtcent", - "combx", - "fomated", - "Hanlder", - "cmdk", - "sitekey", - "Loadtasks", - "Accordian", - "lgcard", - "dvalue", - "Codacy", - "codecov", - "huntr", - "Gitter", - "shadcn", - "Repobeats", - "Codementor", - "xlcard", - "wght", - "worksace", - "appkey", - "jitsi", - "accepte", - "Parens", - "pako", - "embla", - "excalidraw", - "Lngs", - "Transpiles", - "wasabisys", - "apistage", - "flaticon", - "VERSONS", - "vertificalline", + "tinvitations", + "tnode", + "Togger", "Tongatapu", - "Moresby", - "Pago", - "Kosrae", - "Kiritimati", - "Fakaofo", - "Enderbury", - "Efate", - "Propf", - "mappagination", - "INAPP", - "INFOTMATION", - "nimg", - "strock", - "ISSUETYPE", - "borde", - "imlement", - "Invitatio", - "Synk", - "nimg", - "capitaliz", - "nimg", - "Settingfilter", - "recieve", - "Opena", + "tota", "TRANSFERT", - "choos", - "Darkmode", - "recieve", - "Vefified", + "Transpiles", + "tsbuildinfo", + "typeof", + "uicolors", + "uidotdev", + "UIUX", + "unasigned", + "unchild", + "unhang", + "unimodules", + "unoffic", + "UPWORK", + "usehooks", "Uturn", - "insted", - "Cmbx", - "hidde", - "invitationid", - "cheched", - "Dropown", - "imodal", - "Signle", - "Filder", - "outclick", - "Filder", - "skey", - "outclick", - "Xlarge", - "Permisson", - "noreferrer", - "errr", - "Instanciate", "Varibales", - "ciphertext", - "discrepenancy", - "unoffic", - "implem", - "asel", - "Togger", - "Organizatio", - "Combox", - "unchild", - "signoff", - "Settingfilter", - "X", - "stackoverflow", - "payperiod", - "billrate", - "tnode", - "localstorage", - "millisencods", - "taskid", - "creatoe", - "setrole", - "lastest", - "immediatly", + "vcpu", + "Vefified", + "Vercel", "Verifiy", - "invdate", - "ianatz", - "uicolors", - "greppable", - "Andross", - "Bowser", - "Boilerplates", + "VERSONS", + "vertificalline", + "wasabisys", + "wght", + "withteam", + "worksace", + "Worspace", + "X", + "xcodebuild", "xcodeproj", - "gradlew", - "paren", - "iphonesimulator", "xcworkspace", - "dropwdown", - "itask", - "xcodebuild", - "reactotron", - "fbjs", - "stylesheet", - "bootsplash", - "animatable", - "apisauce", - "grotesk", - "jsbundle", - "unimodules", - "mobx", - "typeof", - "loglevel", - "applesimutils", - "phraseapp", - "OSTYPE", - "pkill", - "yellowbox", - "miliseconds", - "Bugsnag", - "Neue", - "Defaul", - "Reactotron's", - "Worspace", - "Funtion", - "tinvitations", - "Authentificate", - "screenstatus", - "withteam", - "Invitions", - "lastlog", - "STMP", - "statut", - "statsus", - "simplecast", - "Ffeeds", - "smalltext", - "Pressible", - "Pressable", - "deserunt", - "longpress", - "endregion", - "checkcircleo", - "Entypo", - "Charaters", - "Ionicons", - "ellipsize", - "unasigned", - "progess", - "Icontent", - "arrowleft", - "Descrption", - "Swith", - "Chane", - "Plaholder", - "firstname", - "Isvalid", - "Chane", - "checkcircle", - "exclamationcircleo", - "contaniner", - "Galery", - "clockcircleo", - "filtmembers", - "comparision", - "Jamon", - "Chami", - "Mazen", - "Heinze", - "Kanbanboard", - "Kolkata", - "Holmgren", - "Jamon", - "Rickert", - "Metral", - "subsquently", - "Syle", - "teamtask", - "imagebutton", - "hwba", - "plasmohq", - "Proguard", - "horcrux", - "dimesions", - "Ordereds", - "uidotdev", - "usehooks", - "Personnal", - "SCREENSHOOTS", - "Screenshoot", - "screenshoots", - "tota", - "Intervall", - "Timesheets", - "dotenv" + "Xlarge", + "xlcard", + "xlight", + "yellowbox" ], "useGitignore": true, "ignorePaths": [ diff --git a/.render/render.dev.yaml b/.render/render.dev.yaml index 44b0641b2..43c9791ca 100644 --- a/.render/render.dev.yaml +++ b/.render/render.dev.yaml @@ -12,9 +12,9 @@ services: - key: RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED value: false - key: NEXT_PUBLIC_GAUZY_API_SERVER_URL - value: https://apistage.gauzy.co + value: https://apidev.ever.team - key: GAUZY_API_SERVER_URL - value: https://apistage.gauzy.co/api + value: https://apidev.ever.team/api - key: NEXT_PUBLIC_GA_MEASUREMENT_ID sync: false - key: NEXT_PUBLIC_CAPTCHA_SITE_KEY diff --git a/Dockerfile b/Dockerfile index 8712f6f9a..ddf296336 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Ever Teams Platform ARG NODE_VERSION=18.17.1 -ARG NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.gauzy.co +ARG NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.ever.team ARG NEXT_PUBLIC_GA_MEASUREMENT_ID ARG NEXT_PUBLIC_CAPTCHA_SITE_KEY ARG NEXT_PUBLIC_DISABLE_AUTO_REFRESH=false diff --git a/README.md b/README.md index e2f737957..6ab64bc94 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,9 @@ Note: Currently WIP, the screenshot is just a temporary picture :) ## 🔗 Links -- **** - Ever Teams Platform web application (not yet in production release) +- **** - Ever Teams Platform Web Application (not yet in production release). +- **** - Ever Teams Platform Demo Web Application (not yet in production release). +- **** - Ever Teams Platform Documentation (WIP). - **** - Check more information about the Ever Teams platform at the official website (WIP). - **** - Check more information about the Ever Gauzy Platform at the official website. - **** - Get more information about our company products. @@ -72,9 +74,10 @@ Ever® Teams™ Platform () is built on top of our Busine - [NextJs](https://nextjs.org) - [React](https://reactjs.org) - [React Native](https://reactnative.dev) -- [Tailwind](https://tailwindcss.com/) - CSS / Styles -- [shadcn/ui](https://ui.shadcn.com/) - Component Library -- [Vercel](https://vercel.com) - Hosting +- [Expo](https://expo.dev) +- [Tailwind](https://tailwindcss.com) - CSS / Styles +- [shadcn/ui](https://ui.shadcn.com), [Radix](https://www.radix-ui.com) and [HeadlessUI](https://headlessui.com) - Component Libraries +- [Vercel](https://vercel.com) and [DigitalOcean](https://www.digitalocean.com) - Hosting #### See also README.md and CREDITS.md files in relevant folders for lists of libraries and software included in the Platform, information about licenses, and other details @@ -95,13 +98,15 @@ Please refer to our official [Platform Documentation](https://docs.ever.team) (W 3. Run `yarn build:web` 4. Run `yarn start:web` -Note: by default, Ever Teams web frontend will be connected to our production [Ever Gauzy](https://github.com/ever-co/ever-gauzy) API endpoint . You can change it in environment variable `GAUZY_API_SERVER_URL`, see below how to run with a Self-hosted Backend. +Notes: + +- by default, Ever Teams web frontend will be connected to our production [Ever Gauzy API](https://github.com/ever-co/ever-gauzy) API endpoint . You can change it in environment variables `GAUZY_API_SERVER_URL` and `NEXT_PUBLIC_GAUZY_API_SERVER_URL`, see below how to run with a Self-hosted Backend. ### Run with a Self-hosted Backend 1. Download and run the Ever Gauzy Server setup () or run the server manually (see ). You can also run only Ever Gauzy APIs (manually), see . For getting starting instructions, it's best to check the Ever Gauzy [README](https://github.com/ever-co/ever-gauzy/blob/develop/README.md) file. 2. Clone this repo -3. After you get the API or Server running, make sure you set the environment variable `GAUZY_API_SERVER_URL` in Ever Teams .env file (see for example). +3. After you get the API or Server running, make sure you set the environment variables `GAUZY_API_SERVER_URL` and `NEXT_PUBLIC_GAUZY_API_SERVER_URL` in Ever Teams .env file (see for example). 4. Run `yarn install` 5. Run `yarn build:web` 6. Run `yarn start:web` diff --git a/apps/mobile/.env.template b/apps/mobile/.env.template index f07c6ee3f..ca80410b5 100644 --- a/apps/mobile/.env.template +++ b/apps/mobile/.env.template @@ -1,7 +1,7 @@ # NOTE: do NOT ever put here any secure settings! (e.g. Secret Keys) # We are using react-native-dotenv (.env) -GAUZY_API_URL=https://api.gauzy.co +GAUZY_API_URL=https://api.ever.team INVITE_CALLBACK_URL=https://app.ever.team/auth/passcode EXPO_PUBLIC_SENTRY_DSN= SENTRY_ORG=ever-co diff --git a/apps/mobile/app/config/config.dev.ts b/apps/mobile/app/config/config.dev.ts index a1a4359d6..95bc487e7 100644 --- a/apps/mobile/app/config/config.dev.ts +++ b/apps/mobile/app/config/config.dev.ts @@ -1,3 +1,3 @@ export default { - API_URL: "https://apistage.gauzy.co/api", + API_URL: "https://apidev.ever.team/api", } diff --git a/apps/mobile/app/services/client/requests/auth.ts b/apps/mobile/app/services/client/requests/auth.ts index a2709aaf3..e4e267c88 100644 --- a/apps/mobile/app/services/client/requests/auth.ts +++ b/apps/mobile/app/services/client/requests/auth.ts @@ -4,140 +4,136 @@ import { IRegisterDataRequest, ISuccessResponse, ISignInResponse, - ILoginResponse, -} from "../../interfaces/IAuthentication" -import { IUser } from "../../interfaces/IUserData" -import { serverFetch } from "../fetch" + ILoginResponse +} from '../../interfaces/IAuthentication'; +import { IUser } from '../../interfaces/IUserData'; +import { serverFetch } from '../fetch'; const registerDefaultValue = { - appName: "Ever Teams", - appSignature: "Ever Team", - appLogo: "https://app.ever.team/assets/ever-teams.png", - appLink: "https://ever.team/", - appEmailConfirmationUrl: "https://app.gauzy.co/#/auth/confirm-email", -} + appName: 'Ever Teams', + appSignature: 'Ever Team', + appLogo: 'https://app.ever.team/assets/ever-teams.png', + appLink: 'https://ever.team/', + appEmailConfirmationUrl: 'https://app.gauzy.co/#/auth/confirm-email' +}; export const registerUserRequest = (data: IRegisterDataRequest) => { const body = { ...data, - ...registerDefaultValue, - } + ...registerDefaultValue + }; return serverFetch({ - path: "/auth/register", - method: "POST", - body, - }) -} + path: '/auth/register', + method: 'POST', + body + }); +}; export const loginUserRequest = (email: string, password: string) => { return serverFetch({ - path: "/auth/login", - method: "POST", + path: '/auth/login', + method: 'POST', body: { email, - password, - }, - }) -} + password + } + }); +}; export const whetherUserAuthenticatedRequest = (bearer_token: string) => { return serverFetch({ - path: "/user/authenticated", - method: "GET", - bearer_token, - }) -} + path: '/user/authenticated', + method: 'GET', + bearer_token + }); +}; type IUEmployeeParam = { - bearer_token: string - relations?: string[] -} + bearer_token: string; + relations?: string[]; +}; export const currentAuthenticatedUserRequest = ({ bearer_token, - relations = ["employee", "role", "tenant"], + relations = ['employee', 'role', 'tenant'] }: IUEmployeeParam) => { - const params = {} as { [x: string]: string } + const params = {} as { [x: string]: string }; relations.forEach((rl, i) => { - params[`relations[${i}]`] = rl - }) + params[`relations[${i}]`] = rl; + }); - const query = new URLSearchParams(params) + const query = new URLSearchParams(params); return serverFetch({ path: `/user/me?${query.toString()}`, - method: "GET", - bearer_token, - }) -} + method: 'GET', + bearer_token + }); +}; export const refreshTokenRequest = (refresh_token: string) => { return serverFetch<{ token: string }>({ - path: "/auth/refresh-token", - method: "POST", + path: '/auth/refresh-token', + method: 'POST', body: { - refresh_token, - }, - }) -} + refresh_token + } + }); +}; // auth/signin.email export function sendAuthCodeRequest(email: string) { - return serverFetch<{ status: number; message: string | "ok" }>({ - path: "/auth/signin.email", - method: "POST", - body: { email }, - }) + return serverFetch<{ status: number; message: string | 'ok' }>({ + path: '/auth/signin.email', + method: 'POST', + body: { email } + }); } // auth/signin.email/confirm Gives response with tenantId's export function verifyAuthCodeRequest(email: string, code: string) { return serverFetch({ - path: "/auth/signin.email/confirm?includeTeams=true", - method: "POST", - body: { email, code }, - }) + path: '/auth/signin.email/confirm?includeTeams=true', + method: 'POST', + body: { email, code } + }); } // auth/signin.workspace Need the email and the token from auth/signin.email/confirm export const signInWorkspaceRequest = (email: string, token: string) => { return serverFetch({ - path: "/auth/signin.workspace", - method: "POST", - body: { email, token }, - }) -} + path: '/auth/signin.workspace', + method: 'POST', + body: { email, token } + }); +}; export const verifyUserEmailByCodeRequest = (data: { - bearer_token: string - code: string - email: string - tenantId: string + bearer_token: string; + code: string; + email: string; + tenantId: string; }) => { - const { code, email, bearer_token, tenantId } = data + const { code, email, bearer_token, tenantId } = data; return serverFetch({ - path: "/auth/email/verify/code", - method: "POST", + path: '/auth/email/verify/code', + method: 'POST', body: { code, email, tenantId }, tenantId: data.tenantId, - bearer_token, - }) -} + bearer_token + }); +}; -export const resentVerifyUserLinkRequest = (data: { - bearer_token: string - email: string - tenantId: string -}) => { - const { email, bearer_token, tenantId } = data +export const resentVerifyUserLinkRequest = (data: { bearer_token: string; email: string; tenantId: string }) => { + const { email, bearer_token, tenantId } = data; return serverFetch({ - path: "/auth/email/verify/resend-link", - method: "POST", + path: '/auth/email/verify/resend-link', + method: 'POST', body: { email, tenantId }, tenantId: data.tenantId, - bearer_token, - }) -} + bearer_token + }); +}; diff --git a/apps/mobile/eas.json b/apps/mobile/eas.json index 0613e5925..6bcd4efad 100644 --- a/apps/mobile/eas.json +++ b/apps/mobile/eas.json @@ -30,7 +30,7 @@ "autoIncrement": true, "channel": "production", "env": { - "GAUZY_API_URL": "https://api.gauzy.co", + "GAUZY_API_URL": "https://api.ever.team", "INVITE_CALLBACK_URL": "https://app.ever.team/auth/passcode" } } diff --git a/apps/web/.env b/apps/web/.env index 539845cf2..e8d086fee 100644 --- a/apps/web/.env +++ b/apps/web/.env @@ -1,7 +1,7 @@ RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false -GAUZY_API_SERVER_URL=https://api.gauzy.co/api -NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.gauzy.co +GAUZY_API_SERVER_URL=https://api.ever.team/api +NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.ever.team NEXT_PUBLIC_GA_MEASUREMENT_ID= # CAPTCHA Settings diff --git a/apps/web/.env.sample b/apps/web/.env.sample index 61cbba1e7..30999081e 100644 --- a/apps/web/.env.sample +++ b/apps/web/.env.sample @@ -1,7 +1,7 @@ RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false -GAUZY_API_SERVER_URL=https://api.gauzy.co/api -NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.gauzy.co +GAUZY_API_SERVER_URL=https://api.ever.team/api +NEXT_PUBLIC_GAUZY_API_SERVER_URL=https://api.ever.team NEXT_PUBLIC_GA_MEASUREMENT_ID= # CAPTCHA Settings diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts index 4cb5ea7a6..5c4b500d9 100644 --- a/apps/web/app/constants.ts +++ b/apps/web/app/constants.ts @@ -36,7 +36,8 @@ export const RECAPTCHA_SITE_KEY = getNextPublicEnv( export const RECAPTCHA_SECRET_KEY = process.env.CAPTCHA_SECRET_KEY; // Gauzy Server URL -export const GAUZY_API_SERVER_URL = process.env.GAUZY_API_SERVER_URL || 'https://api.gauzy.co/api'; +export const GAUZY_API_SERVER_URL = process.env.GAUZY_API_SERVER_URL || 'https://api.ever.team/api'; + export const GAUZY_API_BASE_SERVER_URL = getNextPublicEnv( 'NEXT_PUBLIC_GAUZY_API_SERVER_URL', process.env.NEXT_PUBLIC_GAUZY_API_SERVER_URL diff --git a/apps/web/app/services/server/requests/timer/timer-slot.ts b/apps/web/app/services/server/requests/timer/timer-slot.ts index 9ffc18b7e..9d3463822 100644 --- a/apps/web/app/services/server/requests/timer/timer-slot.ts +++ b/apps/web/app/services/server/requests/timer/timer-slot.ts @@ -61,5 +61,3 @@ export function deleteEmployeeTimeSlotsRequest({ tenantId }); } - -// https://apidemo.gauzy.co/api/timesheet/time-slot?ids[0]=71bde97d-f6e7-463a-90ef-c752072755ab&organizationId=0289f323-5aa5-4dc2-92c5-633f3e70ecb4&tenantId=ae69bf6c-072f-44cb-8f41-e981a3eccdb1 diff --git a/apps/web/next.config.js b/apps/web/next.config.js index c47e96931..f3561a349 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -50,7 +50,10 @@ const nextConfig = { '127.0.0.1', 'cdn-icons-png.flaticon.com', // Remove this domain once the Backend Icons list is added 'api.gauzy.co', + 'apidev.gauzy.co', 'apistage.gauzy.co', + 'api.ever.team', + 'apidev.ever.team', 'gauzy.s3.wasabisys.com', 'gauzystage.s3.wasabisys.com' ] diff --git a/render.yaml b/render.yaml index 4a60baf46..9d3e8444c 100644 --- a/render.yaml +++ b/render.yaml @@ -12,9 +12,9 @@ services: - key: RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED value: false - key: NEXT_PUBLIC_GAUZY_API_SERVER_URL - value: https://api.gauzy.co + value: https://api.ever.team - key: GAUZY_API_SERVER_URL - value: https://api.gauzy.co/api + value: https://api.ever.team/api - key: NEXT_PUBLIC_GA_MEASUREMENT_ID sync: false - key: NEXT_PUBLIC_CAPTCHA_SITE_KEY