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.

Sign up for GitHub

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 #8627

Merged
merged 10 commits into from
Dec 26, 2024
Merged

Release #8627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9bff365
fix(desktop): added missing command for gauzy desktop server
rahul-rocket Dec 26, 2024
3b25653
fix: desktop apps commands for generate missing environments
rahul-rocket Dec 26, 2024
9b79349
Update gitignore
rahul-rocket Dec 26, 2024
761c639
fix: added `yarn run build:package:all` for desktop server
rahul-rocket Dec 26, 2024
b4c7c70
fix: replace deprecated unquote() with string.unquote() in SCSS files
rahul-rocket Dec 26, 2024
2112ad2
fix: replace deprecated unquote() with string.unquote() in SCSS files
rahul-rocket Dec 26, 2024
09fda3a
Merge pull request #8626 from ever-co/fix/replace-string-unquote
rahul-rocket Dec 26, 2024
37ee771
fix: added `yarn run build:package:all:prod` for desktop server
rahul-rocket Dec 26, 2024
b64e2fc
Merge pull request #8625 from ever-co/fix/desktop-server
rahul-rocket Dec 26, 2024
772d6ff
Feat/dashboard widget api (#8624)
GloireMutaliko21 Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ormlogs.log
/packages/**/dist

/.deploy/nginx/log

/apps/gauzy/src/environments/environment.prod.ts
/apps/gauzy/src/environments/environment.ts

Expand All @@ -76,6 +77,9 @@ ormlogs.log
/apps/server/src/environments/environment.prod.ts
/apps/server/src/environments/environment.ts

/apps/server-api/src/environments/environment.prod.ts
/apps/server-api/src/environments/environment.ts

/export
/import
/apps/api/*.tsbuildinfo
Expand Down
9 changes: 5 additions & 4 deletions apps/desktop-timer/src/assets/styles/material/_material-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #fff2f7,
color-primary-200: #ffd4e3,
color-primary-300: #fc9abc,
Expand Down Expand Up @@ -358,13 +359,13 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote(
shadow: string.unquote(
'0px 2px 1px -1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)'
),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0px 3px 5px -1px rgba(0, 0, 0, 0.2), 0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12)'
),

Expand Down
9 changes: 5 additions & 4 deletions apps/desktop-timer/src/assets/styles/material/_material-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #e8cbfe,
color-primary-200: #ce97fd,
color-primary-300: #ae63f9,
Expand Down Expand Up @@ -358,11 +359,11 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
shadow: string.unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0 1px 18px 0 rgba(0,0,0,.12)'
),

Expand Down
9 changes: 5 additions & 4 deletions apps/desktop/src/assets/styles/material/_material-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #fff2f7,
color-primary-200: #ffd4e3,
color-primary-300: #fc9abc,
Expand Down Expand Up @@ -358,13 +359,13 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote(
shadow: string.unquote(
'0px 2px 1px -1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)'
),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0px 3px 5px -1px rgba(0, 0, 0, 0.2), 0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12)'
),

Expand Down
9 changes: 5 additions & 4 deletions apps/desktop/src/assets/styles/material/_material-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #e8cbfe,
color-primary-200: #ce97fd,
color-primary-300: #ae63f9,
Expand Down Expand Up @@ -358,11 +359,11 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
shadow: string.unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0 1px 18px 0 rgba(0,0,0,.12)'
),

Expand Down
10 changes: 6 additions & 4 deletions apps/desktop/src/assets/styles/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:string";
// @nebular theming framework
@import '@nebular/theme/styles/theming';
// @nebular out of the box themes
Expand All @@ -8,6 +9,7 @@
// Google Inter font
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap');


$nb-themes: nb-register-theme(
(
font-family-secondary: font-family-primary,
Expand Down Expand Up @@ -307,8 +309,8 @@ $nb-themes: nb-register-theme(
tabset-tab-focus-underline-color: none,
tabset-tab-text-transform: capitalize,
button-filled-text-transform: none,
font-family-primary: unquote('Inter, sans-serif'),
font-family-secondary: unquote('Inter, sans-serif'),
font-family-primary: string.unquote('Inter, sans-serif'),
font-family-secondary: string.unquote('Inter, sans-serif'),
button-outline-text-transform: none,
gauzy-text-contact: #323232,
button-filled-medium-padding: 0.4375rem 0.875rem,
Expand Down Expand Up @@ -391,8 +393,8 @@ $nb-themes: nb-register-theme(
tabset-tab-focus-underline-color: none,
tabset-tab-text-transform: capitalize,
button-filled-text-transform: none,
font-family-primary: unquote('Inter, sans-serif'),
font-family-secondary: unquote('Inter, sans-serif'),
font-family-primary: string.unquote('Inter, sans-serif'),
font-family-secondary: string.unquote('Inter, sans-serif'),
button-outline-text-transform: none,
button-filled-medium-padding: 0.4375rem 0.875rem,
button-outline-medium-padding: 0.4375rem 0.875rem,
Expand Down
9 changes: 5 additions & 4 deletions apps/server-api/src/assets/styles/material/_material-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #fff2f7,
color-primary-200: #ffd4e3,
color-primary-300: #fc9abc,
Expand Down Expand Up @@ -358,13 +359,13 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote(
shadow: string.unquote(
'0px 2px 1px -1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)'
),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0px 3px 5px -1px rgba(0, 0, 0, 0.2), 0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12)'
),

Expand Down
9 changes: 5 additions & 4 deletions apps/server-api/src/assets/styles/material/_material-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #e8cbfe,
color-primary-200: #ce97fd,
color-primary-300: #ae63f9,
Expand Down Expand Up @@ -358,11 +359,11 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
shadow: string.unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0 1px 18px 0 rgba(0,0,0,.12)'
),

Expand Down
10 changes: 6 additions & 4 deletions apps/server-api/src/assets/styles/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:string";
// @nebular theming framework
@import '@nebular/theme/styles/theming';
// @nebular out of the box themes
Expand All @@ -6,6 +7,7 @@
@import './material/material-dark';
@import './material/material-light';


$nb-themes: nb-register-theme(
(
font-family-secondary: font-family-primary,
Expand Down Expand Up @@ -305,8 +307,8 @@ $nb-themes: nb-register-theme(
tabset-tab-focus-underline-color: none,
tabset-tab-text-transform: capitalize,
button-filled-text-transform: none,
font-family-primary: unquote('Inter, sans-serif'),
font-family-secondary: unquote('Inter, sans-serif'),
font-family-primary: string.unquote('Inter, sans-serif'),
font-family-secondary: string.unquote('Inter, sans-serif'),
button-outline-text-transform: none,
gauzy-text-contact: #323232,
button-filled-medium-padding: 0.4375rem 0.875rem,
Expand Down Expand Up @@ -389,8 +391,8 @@ $nb-themes: nb-register-theme(
tabset-tab-focus-underline-color: none,
tabset-tab-text-transform: capitalize,
button-filled-text-transform: none,
font-family-primary: unquote('Inter, sans-serif'),
font-family-secondary: unquote('Inter, sans-serif'),
font-family-primary: string.unquote('Inter, sans-serif'),
font-family-secondary: string.unquote('Inter, sans-serif'),
button-outline-text-transform: none,
button-filled-medium-padding: 0.4375rem 0.875rem,
button-outline-medium-padding: 0.4375rem 0.875rem,
Expand Down
9 changes: 5 additions & 4 deletions apps/server/src/assets/styles/material/_material-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #fff2f7,
color-primary-200: #ffd4e3,
color-primary-300: #fc9abc,
Expand Down Expand Up @@ -358,13 +359,13 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote(
shadow: string.unquote(
'0px 2px 1px -1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12)'
),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0px 3px 5px -1px rgba(0, 0, 0, 0.2), 0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12)'
),

Expand Down
9 changes: 5 additions & 4 deletions apps/server/src/assets/styles/material/_material-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
@use "sass:string";

$theme: (
$theme: (
color-primary-100: #e8cbfe,
color-primary-200: #ce97fd,
color-primary-300: #ae63f9,
Expand Down Expand Up @@ -358,11 +359,11 @@
text-danger-active-color: color-danger-active,
text-danger-disabled-color: color-danger-400,

font-family-primary: unquote('Roboto, sans-serif'),
font-family-primary: string.unquote('Roboto, sans-serif'),

shadow: unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
shadow: string.unquote('0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)'),
card-shadow: shadow,
header-shadow: unquote(
header-shadow: string.unquote(
'0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0 1px 18px 0 rgba(0,0,0,.12)'
),

Expand Down
9 changes: 5 additions & 4 deletions apps/server/src/assets/styles/themes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@use "sass:string";
// @nebular theming framework
@import '@nebular/theme/styles/theming';
// @nebular out of the box themes
Expand Down Expand Up @@ -305,8 +306,8 @@ $nb-themes: nb-register-theme(
tabset-tab-focus-underline-color: none,
tabset-tab-text-transform: capitalize,
button-filled-text-transform: none,
font-family-primary: unquote('Inter, sans-serif'),
font-family-secondary: unquote('Inter, sans-serif'),
font-family-primary: string.unquote('Inter, sans-serif'),
font-family-secondary: string.unquote('Inter, sans-serif'),
button-outline-text-transform: none,
gauzy-text-contact: #323232,
button-filled-medium-padding: 0.4375rem 0.875rem,
Expand Down Expand Up @@ -389,8 +390,8 @@ $nb-themes: nb-register-theme(
tabset-tab-focus-underline-color: none,
tabset-tab-text-transform: capitalize,
button-filled-text-transform: none,
font-family-primary: unquote('Inter, sans-serif'),
font-family-secondary: unquote('Inter, sans-serif'),
font-family-primary: string.unquote('Inter, sans-serif'),
font-family-secondary: string.unquote('Inter, sans-serif'),
button-outline-text-transform: none,
button-filled-medium-padding: 0.4375rem 0.875rem,
button-outline-medium-padding: 0.4375rem 0.875rem,
Expand Down
16 changes: 8 additions & 8 deletions apps/server/src/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
"bin": "api/main.js",
"workspaces": {
"packages": [
"../../../dist/packages/plugins/integration-ai",
"../../../dist/packages/plugins/job-proposal",
"../../../dist/packages/config",
"../../../dist/packages/contracts",
"../../../dist/packages/desktop-lib",
Expand All @@ -32,7 +30,9 @@
"../../../dist/packages/auth",
"../../../dist/packages/plugin",
"../../../dist/packages/core",
"../../../dist/packages/common"
"../../../dist/packages/common",
"../../../dist/packages/plugins/integration-ai",
"../../../dist/packages/plugins/job-proposal"
]
},
"build": {
Expand Down Expand Up @@ -131,10 +131,13 @@
"@datorama/akita-ngdevtools": "^7.0.0",
"@datorama/akita": "^7.1.1",
"@electron/remote": "^2.0.8",
"@gauzy/config": "file:../../../dist/packages/config",
"@gauzy/auth": "file:../../../dist/packages/auth",
"@gauzy/plugin": "file:../../../dist/packages/plugin",
"@gauzy/contracts": "file:../../../dist/packages/contracts",
"@gauzy/config": "file:../../../dist/packages/config",
"@gauzy/core": "file:../../../dist/packages/core",
"@gauzy/desktop-lib": "file:../../../dist/packages/desktop-lib",
"@gauzy/desktop-window": "file:../../../dist/packages/desktop-window",
"@gauzy/plugin": "file:../../../dist/packages/plugin",
"@gauzy/plugin-changelog": "file:../../../dist/packages/plugins/changelog",
"@gauzy/plugin-integration-ai": "file:../../../dist/packages/plugins/integration-ai",
"@gauzy/plugin-integration-github": "file:../../../dist/packages/plugins/integration-github",
Expand All @@ -148,9 +151,6 @@
"@gauzy/plugin-product-reviews": "file:../../../dist/packages/plugins/product-reviews",
"@gauzy/plugin-sentry": "file:../../../dist/packages/plugins/sentry-tracing",
"@gauzy/plugin-videos": "file:../../../dist/packages/plugins/videos",
"@gauzy/contracts": "^0.1.0",
"@gauzy/desktop-lib": "^0.1.0",
"@gauzy/desktop-window": "^0.1.0",
"@gauzy/ui-config": "file:../../../dist/packages/ui-config",
"@nestjs/platform-express": "^10.3.7",
"@sentry/electron": "^4.18.0",
Expand Down
Loading
Loading