Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #8111

Merged
merged 127 commits into from
Aug 27, 2024
Merged

Release #8111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
5b570f2
feat: task statuses templates ans APIs
GloireMutaliko21 Aug 14, 2024
0cb423e
feat: add mysql and postgres migrations
GloireMutaliko21 Aug 14, 2024
81fe9ce
Merge branch 'develop' into fix/task-statuses-template
GloireMutaliko21 Aug 14, 2024
dde2daa
fix: typos issues
GloireMutaliko21 Aug 14, 2024
6e227e0
fix: refactor task status workflow as per standard task status type
rahul-rocket Aug 15, 2024
e83a947
fix(deepscan): removed unused import
rahul-rocket Aug 15, 2024
60e1c12
Merge pull request #8077 from ever-co/fix/task-statuses-template
rahul-rocket Aug 15, 2024
8fa3289
fix: moved store providers to the core services
rahul-rocket Aug 15, 2024
90ae80a
fix(cspell): typo spelling :-)
rahul-rocket Aug 15, 2024
3bffd98
fix(cspell): typo spelling :-)
rahul-rocket Aug 15, 2024
c83d3ea
fix(cspell): typo spelling :-)
rahul-rocket Aug 15, 2024
b823f3e
Merge pull request #8081 from ever-co/fix/store-providers
rahul-rocket Aug 15, 2024
5b45c66
feat: get daily plans by team
GloireMutaliko21 Aug 15, 2024
b62d12c
refactor: updated daily plan controller
rahul-rocket Aug 16, 2024
6dbe101
fix(deepscan): removed unused import
rahul-rocket Aug 16, 2024
e9e5477
fix: empty message for angular smart table
rahul-rocket Aug 16, 2024
3dfaa51
fix: empty message for angular smart table
rahul-rocket Aug 16, 2024
b6d0d60
Merge pull request #8084 from ever-co/fix/#5807-smart-table-empty-mes…
rahul-rocket Aug 16, 2024
7b57491
refactor: page registry service & configuration
rahul-rocket Aug 16, 2024
8dff532
fix: disabled parent element clicked when child clicked
rahul-rocket Aug 16, 2024
2e781a6
feat: registered data table dynamic columns for page location ID
rahul-rocket Aug 16, 2024
7f4136e
Merge pull request #8085 from ever-co/feat/data-table-dynamic-registry
rahul-rocket Aug 16, 2024
ddb9878
fix:incorrect api method called for organization contact update
samuelmbabhazi Aug 16, 2024
b67c069
fix total value showing as NaN in Invoice/Estimates
samuelmbabhazi Aug 16, 2024
074b945
feat: legal ui library package
rahul-rocket Aug 17, 2024
a791080
feat: legal ui library package
rahul-rocket Aug 17, 2024
e27d648
fix: legal-ui plugin build command
rahul-rocket Aug 17, 2024
3f844e0
fix: docker build command
rahul-rocket Aug 17, 2024
17cc876
Merge pull request #8086 from samuelmbabhazi/fix/incorrect-api-method…
rahul-rocket Aug 17, 2024
36de246
Merge pull request #8087 from samuelmbabhazi/fix/total-value-showing-…
rahul-rocket Aug 17, 2024
7fa6f46
fix: missing ignore files for packages
rahul-rocket Aug 17, 2024
eec2238
fix(cspell): typo spelling :-)
rahul-rocket Aug 17, 2024
99c023f
fix(deepscan): removed unused import
rahul-rocket Aug 17, 2024
24d42fa
Merge pull request #8088 from ever-co/feat/legal-ui-package
rahul-rocket Aug 17, 2024
788f78b
chore(deps): bump elliptic from 6.5.5 to 6.5.7
dependabot[bot] Aug 17, 2024
7c3de37
fix: uses packages name as ts-config paths
rahul-rocket Aug 17, 2024
2fae966
Merge pull request #8089 from ever-co/dependabot/npm_and_yarn/ellipti…
rahul-rocket Aug 17, 2024
255ee42
Merge pull request #8090 from ever-co/fix/tsconfig-paths
rahul-rocket Aug 17, 2024
dd15767
feat: onboarding ui library basic structure
rahul-rocket Aug 18, 2024
74e1fa3
feat: user onboarding steps library package
rahul-rocket Aug 18, 2024
2491f6b
fix: load permissions onboarding complete page
rahul-rocket Aug 18, 2024
5cc3438
fix: added missing translations
rahul-rocket Aug 18, 2024
2c7007b
Merge pull request #8091 from ever-co/feat/onboarding-ui-plugin
rahul-rocket Aug 18, 2024
26d83e1
[Feature] Add Search Functionality and "Show Rejected" Checkbox for C…
samuelmbabhazi Aug 18, 2024
aa226c4
fix unused import &add comment
samuelmbabhazi Aug 18, 2024
01798c4
refact: daily plan adding team relation
GloireMutaliko21 Aug 19, 2024
2b78bf0
Merge branch 'develop' into fix/daily-plan-get-plans-by-team
GloireMutaliko21 Aug 19, 2024
1b3f2c4
fix: import build issue
GloireMutaliko21 Aug 19, 2024
57ee14b
fix: we used ts-config paths instead of packages
rahul-rocket Aug 20, 2024
8ef9cc2
Update 1724062299873-AlterDailyPlanAddTeamRelation.ts
rahul-rocket Aug 20, 2024
c627a22
fix: organization team feature DTO
rahul-rocket Aug 20, 2024
1b3f72a
fix(deepscan): removed unused import
rahul-rocket Aug 20, 2024
5e9cee1
Merge pull request #8082 from ever-co/fix/daily-plan-get-plans-by-team
rahul-rocket Aug 20, 2024
4235dc5
align radio button with input
samuelmbabhazi Aug 20, 2024
d3abb0d
replace hardcode platFormSiteUrl in user menu template
samuelmbabhazi Aug 20, 2024
dd78a68
Merge pull request #8095 from samuelmbabhazi/feat/#6411
rahul-rocket Aug 21, 2024
bb30a69
feat: public view layout ui library basic structure
rahul-rocket Aug 21, 2024
2184725
fix:i18n
samuelmbabhazi Aug 21, 2024
d8da503
feat: public view layout components & routes
rahul-rocket Aug 21, 2024
d6a3bce
fix: miscellaneous shared module
rahul-rocket Aug 21, 2024
1b962ef
Merge branch 'develop' into fix/update-packages
rahul-rocket Aug 21, 2024
0bdaea7
refactor: ts-config paths for ui packages
rahul-rocket Aug 21, 2024
ce857b3
Merge pull request #8096 from ever-co/fix/update-packages
rahul-rocket Aug 21, 2024
c963f6f
Merge pull request #8097 from ever-co/fix/miscellaneous-shared-module
rahul-rocket Aug 21, 2024
078fe26
Merge branch 'develop' into feat/public-layout-ui-package
rahul-rocket Aug 21, 2024
162abef
fix: moved public route resolver into ui package
rahul-rocket Aug 21, 2024
ad2f4d4
fix: edit public employee redirection url
rahul-rocket Aug 21, 2024
52c684e
refactor: organization & employee public page
rahul-rocket Aug 22, 2024
2e061ca
refactor: ts-config paths for ui packages
rahul-rocket Aug 22, 2024
0c820a7
feat: moved components to the public layout plugin/package
rahul-rocket Aug 22, 2024
8468248
refactor: moved invoice inner view component
rahul-rocket Aug 22, 2024
9489ee7
fix: copy to clipboard tooltip
rahul-rocket Aug 22, 2024
c825aef
fix: invoice/estimate public view
rahul-rocket Aug 22, 2024
c63725a
fix: translation typo
rahul-rocket Aug 22, 2024
51cc7e2
refactor: moved calendar appointments related code to the shared module
rahul-rocket Aug 23, 2024
f46e4f9
feat: added new translations
rahul-rocket Aug 23, 2024
af7fe94
refactor: optimize and improved public appointments components
rahul-rocket Aug 23, 2024
7e91293
fix: appointment calendar moved to the shared
rahul-rocket Aug 23, 2024
1072ad7
fix: rename invoice-estimate component
rahul-rocket Aug 24, 2024
62d9856
move radio right side of the input.
samuelmbabhazi Aug 24, 2024
4231779
Merge pull request #8092 from samuelmbabhazi/feature/add-search-and-s…
rahul-rocket Aug 24, 2024
53cd90f
refactor: moved public appointments into public layout ui
rahul-rocket Aug 24, 2024
d1a94a0
fix: docker build command
rahul-rocket Aug 24, 2024
ec3debe
fix: moment import syntax
rahul-rocket Aug 24, 2024
0f341b7
Merge pull request #8100 from ever-co/fix/moment-syntax
rahul-rocket Aug 24, 2024
2280572
Merge branch 'develop' into feat/public-layout-ui-package
rahul-rocket Aug 24, 2024
00de3ef
fix: updated packages
rahul-rocket Aug 24, 2024
28ab3b4
fix: removed unused files
rahul-rocket Aug 24, 2024
131ef96
fix(cspell): typo spelling :-)
rahul-rocket Aug 24, 2024
0d17c51
Merge pull request #8101 from ever-co/feat/public-layout-ui-package
rahul-rocket Aug 24, 2024
ba8680c
[Feature] Timer | add dropdown Reasons optional
samuelmbabhazi Aug 24, 2024
733ad2c
fix: Timer | add dropdown Reasons optional
samuelmbabhazi Aug 24, 2024
29825d7
fix:cspell CUSTOMREASON
samuelmbabhazi Aug 24, 2024
65b17df
fix:cspell
samuelmbabhazi Aug 24, 2024
00baf3d
integrate feedback
samuelmbabhazi Aug 25, 2024
fca3b0c
feat: maintenance mode ui library basic structure
rahul-rocket Aug 26, 2024
c4beaf2
fix: docker build command
rahul-rocket Aug 26, 2024
e82dc43
Merge pull request #8104 from ever-co/feat/maintenance-mode-ui-plugin
rahul-rocket Aug 26, 2024
5801148
fix: docker build command
rahul-rocket Aug 26, 2024
54f483f
fix: docker build command
rahul-rocket Aug 26, 2024
b0e6507
fix: proposal template plugin moved
rahul-rocket Aug 26, 2024
1127621
feat: proposal ui library package
rahul-rocket Aug 26, 2024
9540227
fix: i18n translations for different language
rahul-rocket Aug 26, 2024
4c193b8
fix: proposal ui package buildable issue
rahul-rocket Aug 26, 2024
94bddcd
fix: route resolver for dynamic page route registry
rahul-rocket Aug 26, 2024
e459e05
fix(cspell): typo spelling :-)
rahul-rocket Aug 26, 2024
fd6b7d1
Merge pull request #8106 from ever-co/feat/proposal-ui-plugin
rahul-rocket Aug 26, 2024
fd6c068
fix: packages build for nest build
rahul-rocket Aug 26, 2024
b97757b
Merge pull request #8107 from ever-co/fix/packages-build
rahul-rocket Aug 26, 2024
ab90b51
Feat/plugin system improvement (#8080)
adkif Aug 26, 2024
247f81f
Feat/weekly recap (#8093)
adkif Aug 26, 2024
e7704ac
[Feat] theme selector on desktop (#8103)
syns2191 Aug 26, 2024
aab5988
feat: dynamic page tab registry service & types
rahul-rocket Aug 27, 2024
187e1db
feat: dynamic tabs registry component
rahul-rocket Aug 27, 2024
022c43d
feat: dynamic tabs registered for timesheets page
rahul-rocket Aug 27, 2024
a0e8983
Merge branch 'develop' into add-dropdown-raisons
rahul-rocket Aug 27, 2024
e73c4be
fix(cspell): typo spelling :-)
rahul-rocket Aug 27, 2024
7c1b4e3
Merge pull request #8102 from ever-co/add-dropdown-raisons
rahul-rocket Aug 27, 2024
44c4232
Merge branch 'develop' into feat/dynamic-tabs-registry
rahul-rocket Aug 27, 2024
3f38f8e
update timesheet layout component
rahul-rocket Aug 27, 2024
b1edd90
fix(deepscan): insufficient null check :-)
rahul-rocket Aug 27, 2024
151cd04
Merge pull request #8108 from ever-co/feat/dynamic-tabs-registry
rahul-rocket Aug 27, 2024
b470e7e
feat: dynamic tabs registered for dashboard page
rahul-rocket Aug 27, 2024
2e6650b
fix: desktop build
adkif Aug 27, 2024
cbbba9e
Merge pull request #8110 from ever-co/fix/desktop-build
rahul-rocket Aug 27, 2024
3df9d2c
Merge branch 'develop' into feat/dashboard-dynamic-tabs
rahul-rocket Aug 27, 2024
993b308
Merge pull request #8109 from ever-co/feat/dashboard-dynamic-tabs
rahul-rocket Aug 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 9 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,15 @@
"COMMONPROGRAMFILES",
"serverapi",
"serializables",
"drppicker"
"drppicker",
"titlebar",
"raleway",
"browserslist",
"flexbox",
"nbinput",
"nbbutton",
"xaxis",
"wdth"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
8 changes: 8 additions & 0 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ COPY --chown=node:node packages/plugins/job-employee-ui/package.json ./packages/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/plugins/job-proposal-ui/package.json ./packages/plugins/job-proposal-ui/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-ui/
COPY --chown=node:node packages/plugins/legal-ui/package.json ./packages/plugins/legal-ui/
COPY --chown=node:node packages/plugins/maintenance-ui/package.json ./packages/plugins/maintenance-ui/
COPY --chown=node:node packages/plugins/onboarding-ui/package.json ./packages/plugins/onboarding-ui/
COPY --chown=node:node packages/plugins/public-layout-ui/package.json ./packages/plugins/public-layout-ui/
COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/
Expand Down Expand Up @@ -230,6 +234,10 @@ COPY --chown=node:node packages/plugins/job-employee-ui/package.json ./packages/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/plugins/job-proposal-ui/package.json ./packages/plugins/job-proposal-ui/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-ui/
COPY --chown=node:node packages/plugins/public-layout-ui/package.json ./packages/plugins/public-layout-ui/
COPY --chown=node:node packages/plugins/legal-ui/package.json ./packages/plugins/legal-ui/
COPY --chown=node:node packages/plugins/maintenance-ui/package.json ./packages/plugins/maintenance-ui/
COPY --chown=node:node packages/plugins/onboarding-ui/package.json ./packages/plugins/onboarding-ui/
COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/
Expand Down
4 changes: 4 additions & 0 deletions .deploy/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ COPY --chown=node:node packages/plugins/job-employee-ui/package.json ./packages/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/plugins/job-proposal-ui/package.json ./packages/plugins/job-proposal-ui/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-ui/
COPY --chown=node:node packages/plugins/legal-ui/package.json ./packages/plugins/legal-ui/
COPY --chown=node:node packages/plugins/maintenance-ui/package.json ./packages/plugins/maintenance-ui/
COPY --chown=node:node packages/plugins/onboarding-ui/package.json ./packages/plugins/onboarding-ui/
COPY --chown=node:node packages/plugins/public-layout-ui/package.json ./packages/plugins/public-layout-ui/
COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/
Expand Down
144 changes: 144 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,150 @@
}
}
},
"plugin-legal-ui": {
"projectType": "library",
"root": "packages/plugins/legal-ui",
"sourceRoot": "packages/plugins/legal-ui",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/plugins/legal-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/plugins/legal-ui/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "packages/plugins/legal-ui/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "packages/plugins/legal-ui/tsconfig.spec.json",
"polyfills": ["zone.js", "zone.js/testing"]
}
}
},
"schematics": {
"@nrwl/angular:component": {
"prefix": "ngx",
"style": "scss"
}
}
},
"plugin-maintenance-ui": {
"projectType": "library",
"root": "packages/plugins/maintenance-ui",
"sourceRoot": "packages/plugins/maintenance-ui",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/plugins/maintenance-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/plugins/maintenance-ui/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "packages/plugins/maintenance-ui/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "packages/plugins/maintenance-ui/jest.config.js",
"passWithNoTests": true
}
}
},
"schematics": {
"@nrwl/angular:component": {
"prefix": "ngx",
"style": "scss"
}
}
},
"plugin-onboarding-ui": {
"projectType": "library",
"root": "packages/plugins/onboarding-ui",
"sourceRoot": "packages/plugins/onboarding-ui",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/plugins/onboarding-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/plugins/onboarding-ui/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "packages/plugins/onboarding-ui/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "packages/plugins/onboarding-ui/tsconfig.spec.json",
"polyfills": ["zone.js", "zone.js/testing"]
}
}
},
"schematics": {
"@nrwl/angular:component": {
"prefix": "ngx",
"style": "scss"
}
}
},
"plugin-public-layout-ui": {
"projectType": "library",
"root": "packages/plugins/public-layout-ui",
"sourceRoot": "packages/plugins/public-layout-ui/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/plugins/public-layout-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/plugins/public-layout-ui/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "packages/plugins/public-layout-ui/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "packages/plugins/public-layout-ui/tsconfig.spec.json",
"polyfills": ["zone.js", "zone.js/testing"]
}
}
},
"schematics": {
"@nrwl/angular:component": {
"prefix": "gz",
"style": "scss"
}
}
},
"gauzy-e2e": {
"root": "apps/gauzy-e2e",
"sourceRoot": "apps/gauzy-e2e/src",
Expand Down
10 changes: 6 additions & 4 deletions apps/desktop-timer/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ import {
TokenInterceptor,
UnauthorizedInterceptor,
UpdaterModule,
serverConnectionFactory
serverConnectionFactory,
NgxDesktopThemeModule
} from '@gauzy/desktop-ui-lib';
import { environment as gauzyEnvironment } from '@gauzy/ui-config';
import {
Expand Down Expand Up @@ -90,7 +91,8 @@ if (environment.SENTRY_DSN) {
BrowserModule,
BrowserAnimationsModule,
AppRoutingModule,
NbThemeModule.forRoot({ name: 'gauzy-light' }),
NbThemeModule,
NgxDesktopThemeModule,
NgxLoginModule,
SetupModule,
TimeTrackerModule,
Expand Down Expand Up @@ -196,7 +198,7 @@ if (environment.SENTRY_DSN) {
},
{
provide: APP_INITIALIZER,
useFactory: () => () => {},
useFactory: () => () => { },
deps: [Sentry.TraceService],
multi: true
},
Expand All @@ -212,4 +214,4 @@ if (environment.SENTRY_DSN) {
bootstrap: [AppComponent],
exports: []
})
export class AppModule {}
export class AppModule { }
4 changes: 4 additions & 0 deletions apps/desktop-timer/src/assets/styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,7 @@
.toast-top-custom-title-bar {
margin-top: 35px !important;
}

::-webkit-scrollbar {
display: none;
}
38 changes: 30 additions & 8 deletions apps/desktop-timer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ console.log = log.log;
Object.assign(console, log.functions);

import * as path from 'path';
import { app, BrowserWindow, ipcMain, shell, Menu, MenuItemConstructorOptions } from 'electron';
import { app, BrowserWindow, ipcMain, shell, Menu, MenuItemConstructorOptions, nativeTheme } from 'electron';
import { environment } from './environments/environment';
import * as Url from 'url';
import * as Sentry from '@sentry/electron';
Expand Down Expand Up @@ -44,7 +44,8 @@ import {
ErrorEventManager,
DialogErrorHandler,
AppError,
UIError
UIError,
DesktopThemeListener
} from '@gauzy/desktop-libs';
import {
createSetupWindow,
Expand Down Expand Up @@ -91,6 +92,18 @@ const report = new ErrorReport(new ErrorReportRepository(process.env.REPO_OWNER,
const eventErrorManager = ErrorEventManager.instance;
args.some((val) => val === '--serve');

ipcMain.handle('PREFERRED_THEME', () => {
const applicationSetting = LocalStore.getStore('appSetting');
let theme: string;
if (!applicationSetting || !applicationSetting.theme) {
theme = nativeTheme.shouldUseDarkColors ? 'dark' : 'light';
LocalStore.updateApplicationSetting({ theme });
} else {
theme = applicationSetting.theme;
}
return theme;
});

let notificationWindow = null;
let gauzyWindow: BrowserWindow = null;
let setupWindow: BrowserWindow = null;
Expand Down Expand Up @@ -236,12 +249,12 @@ async function startServer(value, restart = false) {
project: projectConfig
? projectConfig
: {
projectId: null,
taskId: null,
note: null,
aw,
organizationContactId: null
}
projectId: null,
taskId: null,
note: null,
aw,
organizationContactId: null
}
});
} catch (error) {
throw new AppError('MAINSTRSERVER', error);
Expand Down Expand Up @@ -425,6 +438,15 @@ app.on('ready', async () => {
}
removeMainListener();
ipcMainHandler(store, startServer, knex, { ...environment }, timeTrackerWindow);
new DesktopThemeListener({
timeTrackerWindow,
settingsWindow,
updaterWindow,
imageViewerWindow: imageView,
gauzyWindow,
splashScreenWindow: splashScreen.browserWindow,
alwaysOnWindow: alwaysOn.browserWindow
}).listen();
});

app.on('window-all-closed', () => {
Expand Down
12 changes: 7 additions & 5 deletions apps/desktop/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import {
TimeoutInterceptor,
TimeTrackerModule,
TokenInterceptor,
UpdaterModule
UpdaterModule,
NgxDesktopThemeModule
} from '@gauzy/desktop-ui-lib';
import { environment as gauzyEnvironment } from '@gauzy/ui-config';
import {
Expand Down Expand Up @@ -78,7 +79,8 @@ if (environment.SENTRY_DSN) {
BrowserAnimationsModule,
RouterModule,
AppRoutingModule,
NbThemeModule.forRoot({ name: 'gauzy-light' }),
NbThemeModule,
NgxDesktopThemeModule,
SetupModule,
TimeTrackerModule,
HttpClientModule,
Expand All @@ -90,7 +92,7 @@ if (environment.SENTRY_DSN) {
LanguageModule.forRoot(),
AboutModule,
AlwaysOnModule,
RecapModule
RecapModule,
],
providers: [
AppService,
Expand Down Expand Up @@ -129,7 +131,7 @@ if (environment.SENTRY_DSN) {
},
{
provide: APP_INITIALIZER,
useFactory: () => () => {},
useFactory: () => () => { },
deps: [Sentry.TraceService],
multi: true
},
Expand Down Expand Up @@ -174,5 +176,5 @@ if (environment.SENTRY_DSN) {
bootstrap: [AppComponent]
})
export class AppModule {
constructor() {}
constructor() { }
}
16 changes: 10 additions & 6 deletions apps/desktop/src/assets/styles/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,18 @@
@include angular-material();

// framework global styles
@include nb-theme-global();
@include nb-auth-global();
@include nb-theme-global();
@include nb-auth-global();

@include ngx-layout();
// loading progress bar
@include ngx-pace-theme();
// loading progress bar
@include ngx-pace-theme();

@include nb-overrides();
@include material-overrides();
@include gauzy-overrides();
@include material-overrides();
@include gauzy-overrides();
}

::-webkit-scrollbar {
display: none;
}
Loading
Loading