From 3aafb936a1a8d7f685cf48c04a799d0aa076749c Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 27 Apr 2024 11:01:12 +0200 Subject: [PATCH 1/9] Update README.md --- README.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7d7104fcd..06e5095a2 100644 --- a/README.md +++ b/README.md @@ -107,14 +107,14 @@ Notes: 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 variables `GAUZY_API_SERVER_URL` and `NEXT_PUBLIC_GAUZY_API_SERVER_URL` in Ever Teams .env file (see ). For example, you can set those env vars to if Gauzy API running on that host & port. +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, you can set those env vars to if Gauzy API is running on that host & port. 4. Run `yarn install` 5. Run `yarn build:web && yarn start:web` OR `yarn start:web:dev` 6. Open in in your Browser #### Notes -Note: Ever® Teams™ requires access to Ever® Gauzy™ Platform APIs, provided by another project - Ever® Gauzy™ Platform, see (and also ). Specifically, you might be interested in the `apps/api` and `apps/server` folders of the mono-repo for the code of Gauzy API & Gauzy Server. +Note: Ever® Teams™ requires access to Ever® Gauzy™ Platform APIs, provided by another project - Ever® Gauzy™ Platform, see (and also ). Specifically, you might be interested in the `apps/api` and `apps/server` folders of the mono-repo for the Gauzy API & Gauzy Server code. ### Run in Gitpod @@ -173,7 +173,7 @@ WIP - `/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) +- `/apps/server-web` - Electron-based Ever Teams Web Server that serves Ever Teams NextJs frontend (wraps `apps/web` folder) ## 💌 Contact Us @@ -192,25 +192,25 @@ WIP **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). +See more details in the [LICENSES.md](LICENSES.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.). -If you discover any issue regarding security, please disclose the information responsibly by sending an email to or on [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) and not by creating a GitHub issue. +If you discover any issue regarding security, please disclose the information responsibly by emailing and not by creating a GitHub issue. ## 🛡️ License This software is available under the following licenses: -- [Ever® Teams™ Platform Community Edition](https://github.com/ever-co/ever-teams/blob/master/LICENSE.md##ever-teams-platform-community-edition-license) -- [Ever® Teams™ Platform Small Business](https://github.com/ever-co/ever-teams/blob/master/LICENSE.md#ever-teams-platform-small-business-license) -- [Ever® Teams™ Platform Enterprise](https://github.com/ever-co/ever-teams/blob/master/LICENSE.md#ever-teams-platform-enterprise-license) +- [Ever® Teams™ Platform Community Edition](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md##ever-teams-platform-community-edition-license) +- [Ever® Teams™ Platform Small Business](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md#ever-teams-platform-small-business-license) +- [Ever® Teams™ Platform Enterprise](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md#ever-teams-platform-enterprise-license) #### The default Ever® Teams™ Platform license, without a valid Ever® Teams™ Platform Enterprise or Ever® Teams™ Platform Small Business License agreement, is the Ever® Teams™ Platform Community Edition License We support the open-source community. If you're building awesome non-profit/open-source projects, we're happy to help and will provide (subject to [acceptance criteria](https://github.com/ever-co/ever-gauzy/wiki/Free-license-and-hosting-for-Non-profit-and-Open-Source-projects)) Ever Teams Enterprise edition license and free hosting option! Feel free to contact us at to make a request. More details are explained in our [Wiki](https://github.com/ever-co/ever-gauzy/wiki/Free-license-and-hosting-for-Non-profit-and-Open-Source-projects). -#### Please see [LICENSE](LICENSE.md) for more information on licenses +#### Please see [LICENSES](LICENSES.md) for more information on licenses [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fever-co%2Fever-teams.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fever-co%2Fever-teams?ref=badge_large) @@ -261,7 +261,6 @@ You can also view a full list of our [contributors tracked by Github](https://gi --- ![visitors](https://visitor-badge.laobi.icu/badge?page_id=ever-co.ever-teams-platform) -[![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) [![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) From 68a57b70784454164d9dcf297a0c761cd06e1c21 Mon Sep 17 00:00:00 2001 From: Ruslan Konviser Date: Sat, 27 Apr 2024 11:03:54 +0200 Subject: [PATCH 2/9] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 06e5095a2..b0be0651f 100644 --- a/README.md +++ b/README.md @@ -202,13 +202,13 @@ If you discover any issue regarding security, please disclose the information re This software is available under the following licenses: -- [Ever® Teams™ Platform Community Edition](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md##ever-teams-platform-community-edition-license) +- [Ever® Teams™ Platform Community Edition](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md#ever-teams-platform-community-edition-license) - [Ever® Teams™ Platform Small Business](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md#ever-teams-platform-small-business-license) - [Ever® Teams™ Platform Enterprise](https://github.com/ever-co/ever-teams/blob/master/LICENSES.md#ever-teams-platform-enterprise-license) #### The default Ever® Teams™ Platform license, without a valid Ever® Teams™ Platform Enterprise or Ever® Teams™ Platform Small Business License agreement, is the Ever® Teams™ Platform Community Edition License -We support the open-source community. If you're building awesome non-profit/open-source projects, we're happy to help and will provide (subject to [acceptance criteria](https://github.com/ever-co/ever-gauzy/wiki/Free-license-and-hosting-for-Non-profit-and-Open-Source-projects)) Ever Teams Enterprise edition license and free hosting option! Feel free to contact us at to make a request. More details are explained in our [Wiki](https://github.com/ever-co/ever-gauzy/wiki/Free-license-and-hosting-for-Non-profit-and-Open-Source-projects). +We support the open-source community. If you're building awesome non-profit/open-source projects, we're happy to help and will provide (subject to [acceptance criteria](https://github.com/ever-co/ever-teams/wiki/Free-license-and-hosting-for-Non-profit-and-Open-Source-projects)) Ever Teams Enterprise edition license and free hosting option! Feel free to contact us at to make a request. More details are explained in our [Wiki](https://github.com/ever-co/ever-teams/wiki/Free-license-and-hosting-for-Non-profit-and-Open-Source-projects). #### Please see [LICENSES](LICENSES.md) for more information on licenses From db9fb9fb12005b2d86850009b98d9b40472b0717 Mon Sep 17 00:00:00 2001 From: GedeonTS Date: Sat, 27 Apr 2024 21:59:33 +0200 Subject: [PATCH 3/9] [FIX] fix misaligned timezone field where the dropdown has excessive height --- apps/web/lib/settings/timezone-dropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/lib/settings/timezone-dropdown.tsx b/apps/web/lib/settings/timezone-dropdown.tsx index 9f68f753a..afbe0df7f 100644 --- a/apps/web/lib/settings/timezone-dropdown.tsx +++ b/apps/web/lib/settings/timezone-dropdown.tsx @@ -72,7 +72,7 @@ export const TimezoneDropDown = ({ Date: Sun, 28 Apr 2024 00:49:32 +0200 Subject: [PATCH 4/9] [Feature] Add timer to the passcode screen to prevent the user from sending the confirmation code several times --- .../app/[locale]/auth/passcode/component.tsx | 52 ++++++++++++++++--- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/apps/web/app/[locale]/auth/passcode/component.tsx b/apps/web/app/[locale]/auth/passcode/component.tsx index cd861d5ac..7861cd28c 100644 --- a/apps/web/app/[locale]/auth/passcode/component.tsx +++ b/apps/web/app/[locale]/auth/passcode/component.tsx @@ -128,6 +128,29 @@ function EmailScreen({ form, className }: { form: TAuthenticationPasscode } & IC function PasscodeScreen({ form, className }: { form: TAuthenticationPasscode } & IClassName) { const t = useTranslations(); const inputsRef = useRef>([]); + + const [timer, setTimer] = useState(60); + const [disabled, setDisabled] = useState(true); + + useEffect(() => { + let interval: NodeJS.Timeout | undefined = undefined; + if (timer > 0) { + interval = setInterval(() => { + setTimer((prevTimer) => prevTimer - 1); + }, 1000); + } else { + setDisabled(false); + clearInterval(interval); + } + + return () => clearInterval(interval); + }, [timer]); + + const handleResendClick = () => { + setDisabled(true); + setTimer(60); + }; + const resetForm = () => { if (inputsRef.current) { for (let i = 0; i < inputsRef.current.length; i++) { @@ -193,20 +216,33 @@ function PasscodeScreen({ form, className }: { form: TAuthenticationPasscode } & {t('pages.auth.UNRECEIVED_CODE')} - - {!form.sendCodeLoading && ( + {!form.sendCodeLoading ? ( + ) : ( + )} - {form.sendCodeLoading && }
From c827b81b9b5673cbc6864e25b05b925ec1fa7f68 Mon Sep 17 00:00:00 2001 From: Anishali2 Date: Sun, 28 Apr 2024 23:12:27 +0500 Subject: [PATCH 5/9] [Update]: vscode settings for visible folders in the project --- .vscode/settings.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ba689581a..92c510095 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,15 +27,12 @@ "**/.git": true, "**/.DS_Store": true, "**/node_modules": false, - "**/public/**/*.png": true, - "**/public/**/*.jpg": true, + "**/public/**/*.png": false, + "**/public/**/*.jpg": false, "**/public/**/*.pdf": true }, "search.exclude": { "**/node_modules": true, - "**/bower_components": true, - "**/*.code-search": true, - "**/web/components/**": true }, "docwriter.style": "Auto-detect" } From 4aeab3addf3415546ebb4020b1a1e1d9a5804fc4 Mon Sep 17 00:00:00 2001 From: Anishali2 Date: Sun, 28 Apr 2024 23:45:13 +0500 Subject: [PATCH 6/9] [Update]: vscode settings for visible folders in the project --- .vscode/settings.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 92c510095..d30cc7f23 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,6 +33,12 @@ }, "search.exclude": { "**/node_modules": true, + "**/.idea": true, + "**/.idea/**/*.{xml,iml}": true, + "**/.iml": true, + "**/.yarn": true, + "**/yarn.lock": true }, "docwriter.style": "Auto-detect" } +// exclude search for specific folder with all files From 787c916362e24cdfc42a3264e13731d67c225017 Mon Sep 17 00:00:00 2001 From: Anishali2 Date: Sun, 28 Apr 2024 23:46:25 +0500 Subject: [PATCH 7/9] [Update]: vscode settings for visible folders in the project --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index d30cc7f23..5561567ae 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -41,4 +41,3 @@ }, "docwriter.style": "Auto-detect" } -// exclude search for specific folder with all files From b2b70e7ed36d5bb191b7bb146724e773ccb1127a Mon Sep 17 00:00:00 2001 From: Anishali2 Date: Mon, 29 Apr 2024 03:19:30 +0500 Subject: [PATCH 8/9] bug: dropdown minimum height fix --- apps/web/lib/components/dropdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/lib/components/dropdown.tsx b/apps/web/lib/components/dropdown.tsx index a428e36ca..a2dd6bf89 100644 --- a/apps/web/lib/components/dropdown.tsx +++ b/apps/web/lib/components/dropdown.tsx @@ -115,7 +115,7 @@ export function Dropdown({
)} -
+
{items.map((Item, index) => ( Date: Mon, 29 Apr 2024 03:35:08 +0500 Subject: [PATCH 9/9] Mod1 feat(Editbar): editbar --- apps/web/lib/components/dropdown.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/web/lib/components/dropdown.tsx b/apps/web/lib/components/dropdown.tsx index a2dd6bf89..76da4b7ca 100644 --- a/apps/web/lib/components/dropdown.tsx +++ b/apps/web/lib/components/dropdown.tsx @@ -66,7 +66,7 @@ export function Dropdown({ {loading ? ( -
+
) : !publicTeam ? ( @@ -100,7 +100,7 @@ export function Dropdown({ ({
)} -
+
{items.map((Item, index) => (