Skip to content

Commit b0f9109

Browse files
adkifadkif
authored
Merge pull request #34 from ever-co/chore/migrate-to-latest-nx
[Chore] Migrate to latest nx v20
2 parents 1d3150f + 45a6aa2 commit b0f9109

File tree

124 files changed

+3873
-4170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+3873
-4170
lines changed

‎apps/ui/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"inlineStyleLanguage": "scss",
1919
"assets": ["apps/ui/src/favicon.ico", "apps/ui/src/assets"],
2020
"styles": [
21-
"@angular/material/prebuilt-themes/azure-blue.css",
21+
"@angular/material/prebuilt-themes/deeppurple-amber.css",
2222
"apps/ui/src/styles.scss"
2323
],
2424
"stylePreprocessorOptions": {

‎apps/ui/src/app/app.component.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import { Component } from '@angular/core';
22
import { RouterOutlet } from '@angular/router';
33

44
@Component({
5-
standalone: true,
6-
imports: [RouterOutlet],
7-
selector: 'app-root',
8-
templateUrl: './app.component.html',
9-
styleUrl: './app.component.scss',
5+
imports: [RouterOutlet],
6+
selector: 'app-root',
7+
templateUrl: './app.component.html',
8+
styleUrl: './app.component.scss'
109
})
1110
export class AppComponent {
1211
title = 'Continues Recording';

‎apps/ui/src/styles.scss‎

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
@import "tailwindcss/base";
2-
@import "tailwindcss/components";
3-
@import "tailwindcss/utilities";
1+
@use '@angular/material' as mat;
2+
3+
@tailwind base;
4+
@tailwind components;
5+
@tailwind utilities;
46

57
.mdc-notched-outline__notch {
68
border-right: none;
@@ -55,7 +57,7 @@ body {
5557

5658
body {
5759
margin: 0;
58-
font-family: Roboto, "Helvetica Neue", sans-serif;
60+
font-family: Roboto, 'Helvetica Neue', sans-serif;
5961
}
6062

6163
mat-icon {
@@ -70,5 +72,57 @@ mat-icon:active,
7072
font-family: 'Material Icons' !important;
7173
}
7274

73-
html, body { height: 100%; }
74-
body { margin: 0; font-family: Roboto, "Helvetica Neue", sans-serif; }
75+
html {
76+
color-scheme: light;
77+
@include mat.theme(
78+
(
79+
color: mat.$azure-palette,
80+
typography: Roboto,
81+
density: 0,
82+
)
83+
);
84+
}
85+
86+
@include mat.typography-hierarchy(
87+
mat.define-theme(
88+
(
89+
typography: (
90+
use-system-variables: true,
91+
system-variables-prefix: mat-sys,
92+
),
93+
)
94+
)
95+
);
96+
97+
:root {
98+
--border-radius: var(
99+
--mdc-outlined-card-container-shape,
100+
var(--mat-sys-corner-medium)
101+
);
102+
}
103+
104+
@layer utilities {
105+
.rounded-bl-df {
106+
border-bottom-left-radius: var(--border-radius);
107+
border-top-left-radius: var(--border-radius);
108+
}
109+
110+
.rounded-br-df {
111+
border-bottom-right-radius: var(--border-radius);
112+
border-top-right-radius: var(--border-radius);
113+
}
114+
115+
.rounded-t-df {
116+
border-top-left-radius: var(--border-radius);
117+
border-top-right-radius: var(--border-radius);
118+
}
119+
120+
.rounded-b-df {
121+
border-bottom-left-radius: var(--border-radius);
122+
border-bottom-right-radius: var(--border-radius);
123+
}
124+
125+
.rounded-df {
126+
border-radius: var(--border-radius);
127+
}
128+
}

‎libs/electron/utils/CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
44

5+
# [0.2.0](https://github.com/ever-co/ever-capture/compare/electron-utils-0.1.4...electron-utils-0.2.0) (2025-04-04)
6+
7+
8+
### Features
9+
10+
* **logger:** initialize electron logger with unique id ([4cac175](https://github.com/ever-co/ever-capture/commit/4cac1756a9c499aaf40e4278972c49de3e635dd1))
11+
12+
13+
514
## [0.1.4](https://github.com/ever-co/ever-capture/compare/electron-utils-0.1.3...electron-utils-0.1.4) (2025-04-04)
615

716

‎libs/electron/utils/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ever-co/electron-utils",
3-
"version": "0.1.4",
3+
"version": "0.2.0",
44
"dependencies": {
55
"tslib": "^2.3.0"
66
},

‎libs/electron/utils/src/lib/services/logger/electron-logger.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export class ElectronLogger implements ILogger {
1515
}
1616

1717
try {
18-
const log = await lastValueFrom(this.log$);
19-
this.logger = log || console;
18+
const log = (await lastValueFrom(this.log$)) as any;
19+
this.logger = log.create({ logId: crypto.randomUUID() }) || console;
2020
return this.logger;
2121
} catch (e) {
2222
console.error('Failed to load electron-log', e);

‎libs/shared/components/project.json‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
"targets": {
99
"build": {
1010
"executor": "@nx/angular:package",
11-
"outputs": [
12-
"{workspaceRoot}/dist/{projectRoot}"
13-
],
11+
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
1412
"options": {
15-
"project": "libs/shared/components/ng-package.json",
16-
"tailwindConfig": "libs/shared/components/tailwind.config.js"
13+
"project": "libs/shared/components/ng-package.json"
1714
},
1815
"configurations": {
1916
"production": {
@@ -27,9 +24,7 @@
2724
},
2825
"test": {
2926
"executor": "@nx/jest:jest",
30-
"outputs": [
31-
"{workspaceRoot}/coverage/{projectRoot}"
32-
],
27+
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
3328
"options": {
3429
"jestConfig": "libs/shared/components/jest.config.ts"
3530
}
@@ -50,14 +45,9 @@
5045
"executor": "nx:run-commands",
5146
"options": {
5247
"parallel": false,
53-
"commands": [
54-
"cd dist/libs/shared/components && npm publish"
55-
]
48+
"commands": ["cd dist/libs/shared/components && npm publish"]
5649
},
57-
"dependsOn": [
58-
"version",
59-
"build"
60-
],
50+
"dependsOn": ["version", "build"],
6151
"parallelism": false
6252
}
6353
}

‎libs/shared/components/src/index.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ export * from './lib/ui/action-button-group/gallery/gallery-buttons-action.compo
77
export * from './lib/ui/action-button-group/group/action-button-group.component';
88
export * from './lib/ui/dialogs/confirmation/confirmation.component';
99
export * from './lib/ui/dialogs/services/confirmation-dialog.service';
10-
export * from './lib/ui/gallery/gallery.component';
1110
export * from './lib/ui/no-data/no-data.component';
1211
export * from './lib/ui/screenshot/screenshot.component';
1312
export * from './lib/ui/time-log-statistics/time-log-statistics.component';
1413
export * from './lib/ui/toggle/toggle.component';
1514
export * from './lib/ui/video/video.component';
16-

‎libs/shared/components/src/lib/features/copy-context/copy-context-button.component.ts‎

Lines changed: 49 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -14,74 +14,55 @@ import { NotificationService } from '@ever-co/notification-data-access';
1414
import { CopyContextService } from './copy-context.service';
1515

1616
@Component({
17-
selector: 'lib-copy-context',
18-
standalone: true,
19-
imports: [CommonModule, MatButtonModule, MatIconModule],
20-
templateUrl: './copy-context-button.component.html',
21-
styleUrl: './copy-context-button.component.scss',
22-
animations: [
23-
trigger('iconState', [
24-
state(
25-
'copy',
26-
style({
27-
transform: 'scale(1)',
28-
color: 'rgba(0, 0, 0, 0.87)',
29-
})
30-
),
31-
state(
32-
'checked',
33-
style({
34-
transform: 'scale(1)',
35-
})
36-
),
37-
transition('copy => checked', [
38-
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
39-
]),
40-
transition('checked => copy', [
41-
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
42-
]),
43-
]),
44-
trigger('iconRotate', [
45-
state(
46-
'copy',
47-
style({
48-
transform: 'rotate(0deg)',
49-
})
50-
),
51-
state(
52-
'checked',
53-
style({
54-
transform: 'rotate(360deg)',
55-
})
56-
),
57-
transition('copy => checked', [
58-
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
59-
]),
60-
transition('checked => copy', [
61-
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
62-
]),
63-
]),
64-
trigger('scaleButton', [
65-
state(
66-
'normal',
67-
style({
68-
transform: 'scale(1)',
69-
})
70-
),
71-
state(
72-
'pressed',
73-
style({
74-
transform: 'scale(0.9)',
75-
})
76-
),
77-
transition('normal => pressed', [
78-
animate('100ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
79-
]),
80-
transition('pressed => normal', [
81-
animate('100ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
82-
]),
83-
]),
84-
],
17+
selector: 'lib-copy-context',
18+
imports: [CommonModule, MatButtonModule, MatIconModule],
19+
templateUrl: './copy-context-button.component.html',
20+
styleUrl: './copy-context-button.component.scss',
21+
animations: [
22+
trigger('iconState', [
23+
state('copy', style({
24+
transform: 'scale(1)',
25+
color: 'rgba(0, 0, 0, 0.87)',
26+
})),
27+
state('checked', style({
28+
transform: 'scale(1)',
29+
})),
30+
transition('copy => checked', [
31+
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
32+
]),
33+
transition('checked => copy', [
34+
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
35+
]),
36+
]),
37+
trigger('iconRotate', [
38+
state('copy', style({
39+
transform: 'rotate(0deg)',
40+
})),
41+
state('checked', style({
42+
transform: 'rotate(360deg)',
43+
})),
44+
transition('copy => checked', [
45+
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
46+
]),
47+
transition('checked => copy', [
48+
animate('300ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
49+
]),
50+
]),
51+
trigger('scaleButton', [
52+
state('normal', style({
53+
transform: 'scale(1)',
54+
})),
55+
state('pressed', style({
56+
transform: 'scale(0.9)',
57+
})),
58+
transition('normal => pressed', [
59+
animate('100ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
60+
]),
61+
transition('pressed => normal', [
62+
animate('100ms cubic-bezier(0.4, 0.0, 0.2, 1)'),
63+
]),
64+
]),
65+
]
8566
})
8667
export class CopyContextButtonComponent {
8768
public copying = false;

‎libs/shared/components/src/lib/features/date-picker/date-picker.component.ts‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,20 @@ import {
3535
} from 'rxjs';
3636

3737
@Component({
38-
selector: 'lib-date-picker',
39-
standalone: true,
40-
imports: [
41-
CommonModule,
42-
MatFormFieldModule,
43-
MatDatepickerModule,
44-
MatButtonModule,
45-
FormsModule,
46-
ReactiveFormsModule,
47-
HumanizeDateRangePipe,
48-
],
49-
providers: [provideNativeDateAdapter()],
50-
templateUrl: './date-picker.component.html',
51-
styleUrl: './date-picker.component.scss',
52-
changeDetection: ChangeDetectionStrategy.OnPush,
38+
selector: 'lib-date-picker',
39+
imports: [
40+
CommonModule,
41+
MatFormFieldModule,
42+
MatDatepickerModule,
43+
MatButtonModule,
44+
FormsModule,
45+
ReactiveFormsModule,
46+
HumanizeDateRangePipe,
47+
],
48+
providers: [provideNativeDateAdapter()],
49+
templateUrl: './date-picker.component.html',
50+
styleUrl: './date-picker.component.scss',
51+
changeDetection: ChangeDetectionStrategy.OnPush
5352
})
5453
export class DatePickerComponent implements OnInit, OnDestroy {
5554
private destroy$ = new Subject<void>();

0 commit comments

Comments
 (0)