-
Notifications
You must be signed in to change notification settings - Fork 563
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7045 from ever-co/develop
* fix: #7000 github integration check issue created by user/bot * Feat/Ever Gauzy Platform branding (#7036) * feat: add new desktop environment variables * feat: use desktop environment variables instead hardcoded values * feat: auto generate desktop icons from web or from assets * feat: remove duplicated icons * fix: generated desktop logo and generate icon tray * fix: deepscan * fix: macos icon format * fix: url validation * chore: update electron-builder * fix: import * fix: tiny improvements * feat: update package.json on build * feat: pack electron app package.json on build * feat: set default project repository * fix: remove unnecessary icons * fix: generate @2x tray icon to optimize renderer for macOS retina display. * fix: window ico generate dependency * feat: create a factory that generate environment content * fix: deepscan * fix: desktop full app file replacement * refactor: normalize variables for desktop applications * feat: change icon tray path * rename: PLATFORM_LOGO_URL to PLATFORM_LOGO * feat: update server default package.json * fix: deepscan --------- Co-authored-by: RAHUL RATHORE <[email protected]> Co-authored-by: Rahul R <[email protected]> Co-authored-by: Kifungo A <[email protected]>
- Loading branch information
Showing
154 changed files
with
2,289 additions
and
987 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...s/electron-desktop-environment/concrete-environment-content/common-environment-content.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { IContentGenerator } from '../interfaces/i-content-generator'; | ||
| import { Env } from '../../env'; | ||
|
|
||
| export class CommonEnvironmentContent implements IContentGenerator { | ||
| public generate(variable: Partial<Env>): string { | ||
| return ` | ||
| AWHost: '${variable.AWHost}', | ||
| API_DEFAULT_PORT: ${variable.API_DEFAULT_PORT}, | ||
| GAUZY_UI_DEFAULT_PORT: ${variable.GAUZY_UI_DEFAULT_PORT}, | ||
| SCREENSHOTS_ENGINE_METHOD: '${variable.SCREENSHOTS_ENGINE_METHOD}', // ElectronDesktopCapturer || ScreenshotDesktopLib | ||
| SENTRY_DSN: '${variable.SENTRY_DSN}', | ||
| SENTRY_TRACES_SAMPLE_RATE: '${variable.SENTRY_TRACES_SAMPLE_RATE}', | ||
| PLATFORM_LOGO: '${variable.PLATFORM_LOGO}', | ||
| PROJECT_REPO: '${variable.PROJECT_REPO}', | ||
| COMPANY_SITE_LINK: '${variable.COMPANY_SITE_LINK}', | ||
| GAUZY_DESKTOP_LOGO_512X512: '${variable.GAUZY_DESKTOP_LOGO_512X512}', | ||
| NO_INTERNET_LOGO: '${variable.NO_INTERNET_LOGO}', | ||
| `; | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
.../electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { IContentGenerator } from '../interfaces/i-content-generator'; | ||
| import { IDesktopEnvironment } from '../interfaces/i-desktop-environment'; | ||
|
|
||
| export class DesktopEnvironmentContent implements IContentGenerator { | ||
| public generate(variable: Partial<IDesktopEnvironment>): string { | ||
| return ` | ||
| NAME: '${variable.DESKTOP_APP_NAME || variable.NAME}', | ||
| DESCRIPTION: '${variable.DESKTOP_APP_DESCRIPTION || variable.DESCRIPTION}', | ||
| APP_ID: '${variable.DESKTOP_APP_ID || variable.APP_ID}', | ||
| REPO_NAME: '${variable.DESKTOP_APP_REPO_NAME || variable.REPO_NAME}', | ||
| REPO_OWNER: '${variable.DESKTOP_APP_REPO_OWNER || variable.REPO_OWNER}', | ||
| WELCOME_TITLE: '${variable.DESKTOP_APP_WELCOME_TITLE || variable.WELCOME_TITLE || ''}', | ||
| WELCOME_CONTENT: '${variable.DESKTOP_APP_WELCOME_CONTENT || variable.WELCOME_CONTENT || ''}', | ||
| I18N_FILES_URL: '${variable.DESKTOP_APP_I18N_FILES_URL || variable.I18N_FILES_URL || ''}', | ||
| IS_DESKTOP_TIMER: ${false}, | ||
| IS_DESKTOP: ${true}, | ||
| IS_SERVER: ${false}, | ||
| `; | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...on-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { IContentGenerator } from '../interfaces/i-content-generator'; | ||
| import { IDesktopEnvironment } from '../interfaces/i-desktop-environment'; | ||
|
|
||
| export class DesktopServerEnvironmentContent implements IContentGenerator { | ||
| public generate(variable: Partial<IDesktopEnvironment>): string { | ||
| return ` | ||
| NAME: '${variable.DESKTOP_SERVER_APP_NAME || variable.NAME}', | ||
| DESCRIPTION: '${variable.DESKTOP_SERVER_APP_DESCRIPTION || variable.DESCRIPTION}', | ||
| APP_ID: '${variable.DESKTOP_SERVER_APP_ID || variable.APP_ID}', | ||
| REPO_NAME: '${variable.DESKTOP_SERVER_APP_REPO_NAME || variable.REPO_NAME}', | ||
| REPO_OWNER: '${variable.DESKTOP_SERVER_APP_REPO_OWNER || variable.REPO_OWNER}', | ||
| WELCOME_TITLE: '${variable.DESKTOP_SERVER_APP_WELCOME_TITLE || variable.WELCOME_TITLE || ''}', | ||
| WELCOME_CONTENT: '${variable.DESKTOP_SERVER_APP_WELCOME_CONTENT || variable.WELCOME_CONTENT || ''}', | ||
| I18N_FILES_URL: '${variable.DESKTOP_SERVER_APP_I18N_FILES_URL || variable.I18N_FILES_URL || ''}', | ||
| IS_DESKTOP_TIMER: ${false}, | ||
| IS_DESKTOP: ${false}, | ||
| IS_SERVER: ${true}, | ||
| `; | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...ron-desktop-environment/concrete-environment-content/desktop-timer-environment-content.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import { IContentGenerator } from '../interfaces/i-content-generator'; | ||
| import { IDesktopEnvironment } from '../interfaces/i-desktop-environment'; | ||
|
|
||
| export class DesktopTimerEnvironmentContent implements IContentGenerator { | ||
| public generate(variable: Partial<IDesktopEnvironment>): string { | ||
| return ` | ||
| NAME: '${variable.DESKTOP_TIMER_APP_NAME || variable.NAME}', | ||
| DESCRIPTION: '${variable.DESKTOP_TIMER_APP_DESCRIPTION || variable.DESCRIPTION}', | ||
| APP_ID: '${variable.DESKTOP_TIMER_APP_ID || variable.APP_ID}', | ||
| REPO_NAME: '${variable.DESKTOP_TIMER_APP_REPO_NAME || variable.REPO_NAME}', | ||
| REPO_OWNER: '${variable.DESKTOP_TIMER_APP_REPO_OWNER || variable.REPO_OWNER}', | ||
| WELCOME_TITLE: '${variable.DESKTOP_TIMER_APP_WELCOME_TITLE || variable.WELCOME_TITLE || ''}', | ||
| WELCOME_CONTENT: '${variable.DESKTOP_TIMER_APP_WELCOME_CONTENT || variable.WELCOME_CONTENT || ''}', | ||
| I18N_FILES_URL: '${variable.DESKTOP_TIMER_APP_I18N_FILES_URL || variable.I18N_FILES_URL || ''}', | ||
| IS_DESKTOP_TIMER: ${true}, | ||
| IS_DESKTOP: ${false}, | ||
| IS_SERVER: ${false}, | ||
| `; | ||
| } | ||
| } |
Oops, something went wrong.