Skip to content

Commit

Permalink
Merge pull request #8052 from ever-co/stage
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
evereq authored Aug 11, 2024
2 parents 1070957 + d1332fe commit bed11fb
Show file tree
Hide file tree
Showing 1,904 changed files with 13,341 additions and 6,524 deletions.
31 changes: 30 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,36 @@
"unixepoch",
"macbook",
"upvotes",
"downvotes"
"downvotes",
"Bykey",
"Recu",
"Clokr",
"KNEX",
"ASPECTO",
"COBERTURA",
"EXTP",
"RDCL",
"VMFE",
"GOROOT",
"PGBIN",
"PGDATA",
"PGPASSWORD",
"PGROOT",
"PGUSER",
"PHPROOT",
"PIPX",
"UPDATECHECK",
"NOLOGO",
"GHCUP",
"MSYS",
"PERFLOG",
"PROGRAMFILES",
"ALLUSERSPROFILE",
"APPDATA",
"COMMONPROGRAMFILES",
"serverapi",
"serializables",
"drppicker"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
4 changes: 4 additions & 0 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/p
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
COPY --chown=node:node packages/plugins/job-employee-ui/package.json ./packages/plugins/job-employee-ui/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-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/
Expand Down Expand Up @@ -223,6 +225,8 @@ COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/p
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
COPY --chown=node:node packages/plugins/job-employee-ui/package.json ./packages/plugins/job-employee-ui/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-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/
Expand Down
2 changes: 2 additions & 0 deletions .deploy/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ COPY --chown=node:node packages/plugins/product-reviews/package.json ./packages/
COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/plugins/knowledge-base/
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
COPY --chown=node:node packages/plugins/job-employee-ui/package.json ./packages/plugins/job-employee-ui/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-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/
Expand Down
4 changes: 2 additions & 2 deletions .scripts/translation/translation-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export class TranslationUtil {
* Copy all files from the source directory to the destination directory.
*/
private copyAll(): void {
const source = path.join('packages', 'ui-core', 'src', 'lib', 'i18n', 'assets', 'i18n');
const source = path.join('packages', 'ui-core', 'i18n', 'assets', 'i18n');
fs.cpSync(source, this.destination, { recursive: true });
console.log(`✔ All translations copied from ${source}.`);
}
Expand All @@ -76,7 +76,7 @@ export class TranslationUtil {
private copyOne(language: string): void {
try {
const fileName = `${language}.json`;
const sourceFilePath = path.join('packages', 'ui-core', 'src', 'lib', 'i18n', 'assets', 'i18n');
const sourceFilePath = path.join('packages', 'ui-core', 'i18n', 'assets', 'i18n');
const destinationFilePath = path.join(this.destination, fileName);

fs.copyFileSync(sourceFilePath, destinationFilePath);
Expand Down
112 changes: 92 additions & 20 deletions angular.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"polyfills": "apps/gauzy/src/polyfills.ts",
"tsConfig": "apps/gauzy/tsconfig.app.json",
"stylePreprocessorOptions": {
"includePaths": ["packages/ui-core/src/lib/static/styles"]
"includePaths": ["packages/ui-core/static/styles"]
},
"assets": [
"apps/gauzy/src/favicon.ico",
Expand All @@ -47,7 +47,7 @@
"apps/gauzy/src/silent-refresh.html",
{
"glob": "**/*",
"input": "packages/ui-core/src/lib/i18n/assets/i18n",
"input": "packages/ui-core/i18n/assets/i18n",
"output": "assets/i18n/"
}
],
Expand All @@ -62,7 +62,7 @@
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/@ali-hm/angular-tree-component/css/angular-tree-component.css",
"node_modules/leaflet/dist/leaflet.css",
"packages/ui-core/src/lib/static/styles/styles.scss",
"packages/ui-core/static/styles/styles.scss",
"node_modules/@ng-select/ng-select/themes/default.theme.css"
],
"scripts": [
Expand Down Expand Up @@ -253,7 +253,7 @@
}
}
},
"@gauzy/ui-core": {
"ui-core": {
"projectType": "library",
"root": "packages/ui-core",
"sourceRoot": "packages/ui-core",
Expand All @@ -262,7 +262,7 @@
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/ui-core/src/lib/ng-package.json"
"project": "packages/ui-core/ng-package.json"
},
"configurations": {
"production": {
Expand All @@ -289,6 +289,78 @@
}
}
},
"plugin-job-employee-ui": {
"projectType": "library",
"root": "packages/plugins/job-employee-ui",
"sourceRoot": "packages/plugins/job-employee-ui",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/plugins/job-employee-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/plugins/job-employee-ui/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "packages/plugins/job-employee-ui/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "packages/plugins/job-employee-ui/tsconfig.spec.json",
"polyfills": ["zone.js", "zone.js/testing"]
}
}
},
"schematics": {
"@nrwl/angular:component": {
"prefix": "ngx",
"style": "scss"
}
}
},
"plugin-job-matching-ui": {
"projectType": "library",
"root": "packages/plugins/job-matching-ui",
"sourceRoot": "packages/plugins/job-matching-ui",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "packages/plugins/job-matching-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "packages/plugins/job-matching-ui/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "packages/plugins/job-matching-ui/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"tsConfig": "packages/plugins/job-matching-ui/tsconfig.spec.json",
"polyfills": ["zone.js", "zone.js/testing"]
}
}
},
"schematics": {
"@nrwl/angular:component": {
"prefix": "ngx",
"style": "scss"
}
}
},
"plugin-job-search-ui": {
"projectType": "library",
"root": "packages/plugins/job-search-ui",
Expand Down Expand Up @@ -507,7 +579,7 @@
"polyfills": "apps/gauzy/src/polyfills.ts",
"tsConfig": "apps/gauzy/tsconfig.app.json",
"stylePreprocessorOptions": {
"includePaths": ["packages/ui-core/src/lib/static/styles"]
"includePaths": ["packages/ui-core/static/styles"]
},
"assets": [
"apps/gauzy/src/favicon.ico",
Expand All @@ -522,7 +594,7 @@
},
{
"glob": "**/*",
"input": "packages/ui-core/src/lib/i18n/assets/i18n",
"input": "packages/ui-core/i18n/assets/i18n",
"output": "assets/i18n/"
}
],
Expand All @@ -536,7 +608,7 @@
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/@ali-hm/angular-tree-component/css/angular-tree-component.css",
"node_modules/leaflet/dist/leaflet.css",
"packages/ui-core/src/lib/static/styles/styles.scss",
"packages/ui-core/static/styles/styles.scss",
"node_modules/@ng-select/ng-select/themes/default.theme.css"
],
"scripts": [
Expand Down Expand Up @@ -667,7 +739,7 @@
"node_modules/@ali-hm/angular-tree-component/css/angular-tree-component.css",
"node_modules/leaflet/dist/leaflet.css",
"apps/desktop/src/assets/styles/styles.scss",
"packages/ui-core/src/lib/static/styles/styles.scss",
"packages/ui-core/static/styles/styles.scss",
"node_modules/@ng-select/ng-select/themes/default.theme.css"
],
"scripts": []
Expand Down Expand Up @@ -699,8 +771,8 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "15kb",
"maximumError": "40kb"
"maximumWarning": "60kb",
"maximumError": "120kb"
}
]
}
Expand Down Expand Up @@ -896,8 +968,8 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "15kb",
"maximumError": "40kb"
"maximumWarning": "60kb",
"maximumError": "120kb"
}
]
}
Expand Down Expand Up @@ -1015,8 +1087,8 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "15kb",
"maximumError": "40kb"
"maximumWarning": "60kb",
"maximumError": "120kb"
}
]
}
Expand Down Expand Up @@ -1078,7 +1150,7 @@
"polyfills": "apps/gauzy/src/polyfills.ts",
"tsConfig": "apps/gauzy/tsconfig.app.json",
"stylePreprocessorOptions": {
"includePaths": ["packages/ui-core/src/lib/static/styles"]
"includePaths": ["packages/ui-core/static/styles"]
},
"assets": [
"apps/gauzy/src/favicon.ico",
Expand All @@ -1087,7 +1159,7 @@
"apps/gauzy/src/silent-refresh.html",
{
"glob": "**/*",
"input": "packages/ui-core/src/lib/i18n/assets/i18n",
"input": "packages/ui-core/i18n/assets/i18n",
"output": "assets/i18n/"
}
],
Expand All @@ -1101,7 +1173,7 @@
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/@ali-hm/angular-tree-component/css/angular-tree-component.css",
"node_modules/leaflet/dist/leaflet.css",
"packages/ui-core/src/lib/static/styles/styles.scss",
"packages/ui-core/static/styles/styles.scss",
"node_modules/@ng-select/ng-select/themes/default.theme.css"
],
"scripts": [
Expand Down Expand Up @@ -1268,8 +1340,8 @@
},
{
"type": "anyComponentStyle",
"maximumWarning": "15kb",
"maximumError": "40kb"
"maximumWarning": "60kb",
"maximumError": "120kb"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop-timer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"@nebular/theme": "^12.0.0",
"@ng-select/ng-select": "^11.2.0",
"@ngneat/until-destroy": "^9.2.0",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@sentry/angular-ivy": "^7.101.1",
"@sentry/electron": "^4.18.0",
"@sentry/node": "^7.101.1",
Expand Down
33 changes: 17 additions & 16 deletions apps/desktop-timer/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
import { RouterModule, Routes, ExtraOptions } from '@angular/router';
import { NgModule } from '@angular/core';
import { ExtraOptions, RouterModule, Routes } from '@angular/router';
import {
ImageViewerComponent,
SettingsComponent,
ScreenCaptureComponent,
TimeTrackerComponent,
SetupComponent,
UpdaterComponent,
SplashScreenComponent,
NgxLoginComponent,
AboutComponent,
AlwaysOnComponent,
AuthGuard,
ImageViewerComponent,
NgxLoginComponent,
NoAuthGuard,
ScreenCaptureComponent,
ServerDownPage,
AlwaysOnComponent
SettingsComponent,
SetupComponent,
SplashScreenComponent,
TimeTrackerComponent,
UpdaterComponent
} from '@gauzy/desktop-ui-lib';
import {
NbAuthComponent,
NbRequestPasswordComponent,
NbResetPasswordComponent
} from '@nebular/auth';
import { NbAuthComponent, NbRequestPasswordComponent, NbResetPasswordComponent } from '@nebular/auth';
import { AppModuleGuard } from './app.module.guards';

const routes: Routes = [
Expand Down Expand Up @@ -68,7 +64,8 @@ const routes: Routes = [
},
{
path: 'settings',
component: SettingsComponent
component: SettingsComponent,
loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.pluginRoutes)
},
{
path: 'updater',
Expand All @@ -86,6 +83,10 @@ const routes: Routes = [
path: 'server-down',
component: ServerDownPage
},
{
path: 'recap',
loadChildren: () => import('@gauzy/desktop-ui-lib').then((m) => m.recapRoutes)
},
{
path: '',
component: TimeTrackerComponent,
Expand Down
Loading

0 comments on commit bed11fb

Please sign in to comment.