Skip to content

Commit 9a35d5a

Browse files
committed
Make almost all components standalone
1 parent 8eba7fb commit 9a35d5a

File tree

103 files changed

+662
-310
lines changed

Some content is hidden

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

103 files changed

+662
-310
lines changed

client/src/app/modules/archive/archive-button/archive-button.component.ts

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { Component, Input, ViewEncapsulation } from '@angular/core';
22
import { ButtonModule } from 'primeng/button';
33
import { NgClass, NgIf } from '@angular/common';
4-
import { SharedModule } from 'primeng/api';
54
import { Store } from '@ngrx/store';
65
import { TranslocoDirective } from '@jsverse/transloco';
76
import { toastNotification } from '../../../ngrx/actions/notifications.actions';
@@ -15,14 +14,7 @@ import { GymModeDirective } from '../../shared/directives/gym-mode.directive';
1514

1615
@Component({
1716
selector: 'lc-archive-button',
18-
imports: [
19-
ButtonModule,
20-
NgIf,
21-
SharedModule,
22-
NgClass,
23-
TranslocoDirective,
24-
GymModeDirective,
25-
],
17+
imports: [ButtonModule, NgIf, NgClass, TranslocoDirective, GymModeDirective],
2618
templateUrl: './archive-button.component.html',
2719
styleUrl: './archive-button.component.scss',
2820
encapsulation: ViewEncapsulation.None,

client/src/app/modules/area/area-form/area-form.component.ts

+46-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,21 @@ import {
66
ViewChildren,
77
} from '@angular/core';
88
import { FormDirective } from '../../shared/forms/form.directive';
9-
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
9+
import {
10+
FormBuilder,
11+
FormGroup,
12+
ReactiveFormsModule,
13+
Validators,
14+
} from '@angular/forms';
1015
import { LoadingState } from '../../../enums/loading-state';
1116
import { Store } from '@ngrx/store';
1217
import { ActivatedRoute, Router } from '@angular/router';
1318
import { SectorsService } from '../../../services/crud/sectors.service';
14-
import { TranslocoService } from '@jsverse/transloco';
19+
import {
20+
TranslocoDirective,
21+
TranslocoPipe,
22+
TranslocoService,
23+
} from '@jsverse/transloco';
1524
import { ConfirmationService, SelectItem } from 'primeng/api';
1625
import { catchError, map } from 'rxjs/operators';
1726
import { forkJoin, of } from 'rxjs';
@@ -31,6 +40,20 @@ import {
3140
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
3241
import { ScalesService } from '../../../services/crud/scales.service';
3342
import { LineType } from '../../../enums/line-type';
43+
import { Card } from 'primeng/card';
44+
import { NgIf } from '@angular/common';
45+
import { ControlGroupDirective } from '../../shared/forms/control-group.directive';
46+
import { InputText } from 'primeng/inputtext';
47+
import { FormControlDirective } from '../../shared/forms/form-control.directive';
48+
import { IfErrorDirective } from '../../shared/forms/if-error.directive';
49+
import { MapMarkerFormArrayComponent } from '../../maps/map-marker-form-array/map-marker-form-array.component';
50+
import { SingleImageUploadComponent } from '../../shared/forms/controls/single-image-upload/single-image-upload.component';
51+
import { Checkbox } from 'primeng/checkbox';
52+
import { Select } from 'primeng/select';
53+
import { Message } from 'primeng/message';
54+
import { Button } from 'primeng/button';
55+
import { ConfirmPopup } from 'primeng/confirmpopup';
56+
import { FormSkeletonComponent } from '../../shared/components/form-skeleton/form-skeleton.component';
3457

3558
/**
3659
* Form component for creating and editing areas.
@@ -40,7 +63,27 @@ import { LineType } from '../../../enums/line-type';
4063
templateUrl: './area-form.component.html',
4164
styleUrls: ['./area-form.component.scss'],
4265
providers: [ConfirmationService],
43-
standalone: false,
66+
imports: [
67+
TranslocoDirective,
68+
Card,
69+
NgIf,
70+
ReactiveFormsModule,
71+
FormDirective,
72+
ControlGroupDirective,
73+
InputText,
74+
FormControlDirective,
75+
IfErrorDirective,
76+
Editor,
77+
MapMarkerFormArrayComponent,
78+
SingleImageUploadComponent,
79+
Checkbox,
80+
TranslocoPipe,
81+
Select,
82+
Message,
83+
Button,
84+
ConfirmPopup,
85+
FormSkeletonComponent,
86+
],
4487
})
4588
@UntilDestroy()
4689
export class AreaFormComponent implements OnInit {

client/src/app/modules/area/area-info/area-info.component.ts

+18-1
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,29 @@ import { MapStyles } from '../../../enums/map-styles';
77
import { MapMarkerType } from '../../../enums/map-marker-type';
88
import { Coordinates } from '../../../interfaces/coordinates.interface';
99
import { GradeDistribution } from '../../../models/scale';
10+
import { TranslocoDirective } from '@jsverse/transloco';
11+
import { NgIf } from '@angular/common';
12+
import { ClosedSpotAlertComponent } from '../../shared/components/closed-spot-alert/closed-spot-alert.component';
13+
import { GradeDistributionBarChartComponent } from '../../shared/components/grade-distribution-bar-chart/grade-distribution-bar-chart.component';
14+
import { SanitizeHtmlPipe } from '../../shared/pipes/sanitize-html.pipe';
15+
import { CoordinatesButtonComponent } from '../../shared/components/coordinates-button/coordinates-button.component';
16+
import { MapComponent } from '../../maps/map/map.component';
17+
import { Skeleton } from 'primeng/skeleton';
1018

1119
@Component({
1220
selector: 'lc-area-info',
1321
templateUrl: './area-info.component.html',
1422
styleUrls: ['./area-info.component.scss'],
15-
standalone: false,
23+
imports: [
24+
TranslocoDirective,
25+
NgIf,
26+
ClosedSpotAlertComponent,
27+
GradeDistributionBarChartComponent,
28+
SanitizeHtmlPipe,
29+
CoordinatesButtonComponent,
30+
MapComponent,
31+
Skeleton,
32+
],
1633
})
1734
export class AreaInfoComponent implements OnInit {
1835
public area: Area;

client/src/app/modules/area/area-list/area-list.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import { HasPermissionDirective } from '../../shared/directives/has-permission.d
2121
import { NgClass, NgForOf, NgIf } from '@angular/common';
2222
import { TopoDataviewSkeletonComponent } from '../../shared/components/topo-dataview-skeleton/topo-dataview-skeleton.component';
2323
import { ArchiveButtonComponent } from '../../archive/archive-button/archive-button.component';
24-
import { SharedModule } from '../../shared/shared.module';
2524
import { AscentCountComponent } from '../../ascent/ascent-count/ascent-count.component';
2625
import { ClosedSpotTagComponent } from '../../shared/components/closed-spot-tag/closed-spot-tag.component';
2726
import { SecretSpotTagComponent } from '../../shared/components/secret-spot-tag/secret-spot-tag.component';
2827
import { Message } from 'primeng/message';
2928
import { LeveledGradeDistributionComponent } from '../../shared/components/leveled-grade-distribution/leveled-grade-distribution.component';
29+
import { SanitizeHtmlPipe } from '../../shared/pipes/sanitize-html.pipe';
3030

3131
/**
3232
* Component that lists all areas in a sector.
@@ -49,12 +49,12 @@ import { LeveledGradeDistributionComponent } from '../../shared/components/level
4949
NgForOf,
5050
NgClass,
5151
ArchiveButtonComponent,
52-
SharedModule,
5352
AscentCountComponent,
5453
ClosedSpotTagComponent,
5554
SecretSpotTagComponent,
5655
Message,
5756
LeveledGradeDistributionComponent,
57+
SanitizeHtmlPipe,
5858
],
5959
})
6060
@UntilDestroy()

client/src/app/modules/area/area.module.ts

-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { TRANSLOCO_SCOPE, TranslocoModule } from '@jsverse/transloco';
4-
import { AreaComponent } from './area/area.component';
5-
import { AreaFormComponent } from './area-form/area-form.component';
6-
import { AreaInfoComponent } from './area-info/area-info.component';
74
import { DataViewModule } from 'primeng/dataview';
85
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
96
import { ButtonModule } from 'primeng/button';
10-
import { SharedModule } from '../shared/shared.module';
117
import { RouterLink, RouterOutlet } from '@angular/router';
128
import { CardModule } from 'primeng/card';
139
import { InputTextModule } from 'primeng/inputtext';
@@ -40,12 +36,10 @@ import { Tab, TabList, Tabs } from 'primeng/tabs';
4036
import { TopoDataviewSkeletonComponent } from '../shared/components/topo-dataview-skeleton/topo-dataview-skeleton.component';
4137

4238
@NgModule({
43-
declarations: [AreaComponent, AreaFormComponent, AreaInfoComponent],
4439
imports: [
4540
CommonModule,
4641
CardModule,
4742
TranslocoModule,
48-
SharedModule,
4943
InputTextModule,
5044
FormsModule,
5145
ReactiveFormsModule,

client/src/app/modules/area/area/area.component.ts

+26-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ import { MenuItem } from 'primeng/api';
55
import { CragsService } from '../../../services/crud/crags.service';
66
import { SectorsService } from '../../../services/crud/sectors.service';
77
import { TranslocoService } from '@jsverse/transloco';
8-
import { ActivatedRoute, Router } from '@angular/router';
8+
import {
9+
ActivatedRoute,
10+
Router,
11+
RouterLink,
12+
RouterOutlet,
13+
} from '@angular/router';
914
import { select, Store } from '@ngrx/store';
1015
import { Title } from '@angular/platform-browser';
1116
import { forkJoin, of } from 'rxjs';
@@ -17,12 +22,31 @@ import { Area } from '../../../models/area';
1722
import { AreasService } from '../../../services/crud/areas.service';
1823
import { selectInstanceSettingsState } from '../../../ngrx/selectors/instance-settings.selectors';
1924
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
25+
import { Card } from 'primeng/card';
26+
import { ClosedSpotTagComponent } from '../../shared/components/closed-spot-tag/closed-spot-tag.component';
27+
import { SecretSpotTagComponent } from '../../shared/components/secret-spot-tag/secret-spot-tag.component';
28+
import { NgIf } from '@angular/common';
29+
import { Breadcrumb } from 'primeng/breadcrumb';
30+
import { Tab, TabList, Tabs } from 'primeng/tabs';
31+
import { SetActiveTabDirective } from '../../shared/directives/set-active-tab.directive';
2032

2133
@Component({
2234
selector: 'lc-area',
2335
templateUrl: './area.component.html',
2436
styleUrls: ['./area.component.scss'],
25-
standalone: false,
37+
imports: [
38+
Card,
39+
ClosedSpotTagComponent,
40+
SecretSpotTagComponent,
41+
NgIf,
42+
Breadcrumb,
43+
Tabs,
44+
SetActiveTabDirective,
45+
TabList,
46+
Tab,
47+
RouterLink,
48+
RouterOutlet,
49+
],
2650
})
2751
@UntilDestroy()
2852
export class AreaComponent implements OnInit {

client/src/app/modules/ascent/ascent-form-title/ascent-form-title.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { Component } from '@angular/core';
22
import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
33
import { Line } from '../../../models/line';
44
import { ScalesService } from '../../../services/crud/scales.service';
5-
import { SharedModule } from '../../shared/shared.module';
5+
import { LineGradePipe } from '../../shared/pipes/line-grade.pipe';
66

77
@Component({
88
selector: 'lc-ascent-form-title',
9-
imports: [SharedModule],
109
templateUrl: './ascent-form-title.component.html',
1110
styleUrl: './ascent-form-title.component.scss',
11+
imports: [LineGradePipe],
1212
})
1313
export class AscentFormTitleComponent {
1414
public line: Line;

client/src/app/modules/ascent/ascent-form/ascent-form.component.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
ReactiveFormsModule,
1010
Validators,
1111
} from '@angular/forms';
12-
import { SharedModule } from '../../shared/shared.module';
1312
import { TranslocoDirective } from '@jsverse/transloco';
1413
import { CheckboxModule } from 'primeng/checkbox';
1514
import { ButtonModule } from 'primeng/button';
@@ -35,14 +34,17 @@ import { ScalesService } from '../../../services/crud/scales.service';
3534
import { DatePickerModule } from 'primeng/datepicker';
3635
import { Select } from 'primeng/select';
3736
import { Textarea } from 'primeng/textarea';
37+
import { TranslateSpecialGradesPipe } from '../../shared/pipes/translate-special-grades.pipe';
38+
import { IfErrorDirective } from '../../shared/forms/if-error.directive';
39+
import { FormControlDirective } from '../../shared/forms/form-control.directive';
40+
import { ControlGroupDirective } from '../../shared/forms/control-group.directive';
3841

3942
@Component({
4043
selector: 'lc-ascent-form',
4144
imports: [
4245
EditorModule,
4346
InputTextModule,
4447
ReactiveFormsModule,
45-
SharedModule,
4648
CheckboxModule,
4749
ButtonModule,
4850
ConfirmPopupModule,
@@ -56,6 +58,11 @@ import { Textarea } from 'primeng/textarea';
5658
MessageModule,
5759
Select,
5860
Textarea,
61+
TranslateSpecialGradesPipe,
62+
IfErrorDirective,
63+
FormControlDirective,
64+
ControlGroupDirective,
65+
FormDirective,
5966
],
6067
templateUrl: './ascent-form.component.html',
6168
styleUrl: './ascent-form.component.scss',

client/src/app/modules/ascent/ascent-list/ascent-list.component.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { Ascent } from '../../../models/ascent';
1515
import { ButtonModule } from 'primeng/button';
1616
import { DataViewModule } from 'primeng/dataview';
1717
import { HasPermissionDirective } from '../../shared/directives/has-permission.directive';
18-
import { SharedModule } from '../../shared/shared.module';
1918
import { LoadingState } from '../../../enums/loading-state';
2019
import { FormsModule } from '@angular/forms';
2120
import { ConfirmationService, MenuItem, SelectItem } from 'primeng/api';
@@ -49,6 +48,9 @@ import { RouterLink } from '@angular/router';
4948
import { InfiniteScrollDirective } from 'ngx-infinite-scroll';
5049
import { AscentListSkeletonComponent } from '../ascent-list-skeleton/ascent-list-skeleton.component';
5150
import { Message } from 'primeng/message';
51+
import { DatePipe } from '../../shared/pipes/date.pipe';
52+
import { TranslateSpecialGradesPipe } from '../../shared/pipes/translate-special-grades.pipe';
53+
import { LineGradePipe } from '../../shared/pipes/line-grade.pipe';
5254

5355
@Component({
5456
selector: 'lc-ascent-list',
@@ -61,7 +63,6 @@ import { Message } from 'primeng/message';
6163
DataViewModule,
6264
HasPermissionDirective,
6365
NgForOf,
64-
SharedModule,
6566
FormsModule,
6667
NgClass,
6768
ConfirmPopupModule,
@@ -81,6 +82,9 @@ import { Message } from 'primeng/message';
8182
InfiniteScrollDirective,
8283
AscentListSkeletonComponent,
8384
Message,
85+
DatePipe,
86+
TranslateSpecialGradesPipe,
87+
LineGradePipe,
8488
],
8589
templateUrl: './ascent-list.component.html',
8690
styleUrl: './ascent-list.component.scss',

client/src/app/modules/ascent/ascents/ascents.component.ts

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { TranslocoDirective } from '@jsverse/transloco';
66

77
@Component({
88
selector: 'lc-ascents',
9-
standalone: true,
109
imports: [BreadcrumbModule, CardModule, RouterOutlet, TranslocoDirective],
1110
templateUrl: './ascents.component.html',
1211
styleUrl: './ascents.component.scss',

client/src/app/modules/ascent/pipes/consensus-grade.pipe.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Ascent } from '../../../models/ascent';
33

44
@Pipe({
55
name: 'consensusGrade',
6-
standalone: true,
76
})
87
export class ConsensusGradePipe implements PipeTransform {
98
transform(ascent: Ascent): boolean {

client/src/app/modules/ascent/pipes/downgrade.pipe.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Ascent } from '../../../models/ascent';
33

44
@Pipe({
55
name: 'downgrade',
6-
standalone: true,
76
})
87
export class DowngradePipe implements PipeTransform {
98
transform(ascent: Ascent): boolean {

client/src/app/modules/ascent/pipes/upgrade.pipe.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Ascent } from '../../../models/ascent';
33

44
@Pipe({
55
name: 'upgrade',
6-
standalone: true,
76
})
87
export class UpgradePipe implements PipeTransform {
98
transform(ascent: Ascent): boolean {

client/src/app/modules/ascent/project-climbed-form-title/project-climbed-form-title.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Component } from '@angular/core';
22
import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
33
import { Line } from '../../../models/line';
4-
import { SharedModule } from '../../shared/shared.module';
54
import { ScalesService } from '../../../services/crud/scales.service';
5+
import { LineGradePipe } from '../../shared/pipes/line-grade.pipe';
66

77
@Component({
88
selector: 'lc-project-climbed-form-title',
9-
imports: [SharedModule],
109
templateUrl: './project-climbed-form-title.component.html',
1110
styleUrl: './project-climbed-form-title.component.scss',
11+
imports: [LineGradePipe],
1212
})
1313
export class ProjectClimbedFormTitleComponent {
1414
public line: Line;

0 commit comments

Comments
 (0)