Skip to content

refactor(core): migrate to standalone Angular app #683

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

Open
wants to merge 6 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
12 changes: 6 additions & 6 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@angular/platform-browser": "^19.2.2",
"@angular/platform-browser-dynamic": "^19.2.2",
"@angular/router": "^19.2.2",
"@jsverse/transloco": "^7.5.1",
"@jsverse/transloco": "^7.6.1",
"@jsverse/transloco-keys-manager": "^6.1.0",
"@ngneat/until-destroy": "^10.0.0",
"@ngrx/effects": "^19.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component, Input, ViewEncapsulation } from '@angular/core';
import { ButtonModule } from 'primeng/button';
import { NgClass, NgIf } from '@angular/common';
import { SharedModule } from 'primeng/api';
import { Store } from '@ngrx/store';
import { TranslocoDirective } from '@jsverse/transloco';
import { toastNotification } from '../../../ngrx/actions/notifications.actions';
Expand All @@ -15,14 +14,7 @@ import { GymModeDirective } from '../../shared/directives/gym-mode.directive';

@Component({
selector: 'lc-archive-button',
imports: [
ButtonModule,
NgIf,
SharedModule,
NgClass,
TranslocoDirective,
GymModeDirective,
],
imports: [ButtonModule, NgIf, NgClass, TranslocoDirective, GymModeDirective],
templateUrl: './archive-button.component.html',
styleUrl: './archive-button.component.scss',
encapsulation: ViewEncapsulation.None,
Expand Down
49 changes: 46 additions & 3 deletions client/src/app/modules/area/area-form/area-form.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,21 @@ import {
ViewChildren,
} from '@angular/core';
import { FormDirective } from '../../shared/forms/form.directive';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import {
FormBuilder,
FormGroup,
ReactiveFormsModule,
Validators,
} from '@angular/forms';
import { LoadingState } from '../../../enums/loading-state';
import { Store } from '@ngrx/store';
import { ActivatedRoute, Router } from '@angular/router';
import { SectorsService } from '../../../services/crud/sectors.service';
import { TranslocoService } from '@jsverse/transloco';
import {
TranslocoDirective,
TranslocoPipe,
TranslocoService,
} from '@jsverse/transloco';
import { ConfirmationService, SelectItem } from 'primeng/api';
import { catchError, map } from 'rxjs/operators';
import { forkJoin, of } from 'rxjs';
Expand All @@ -31,6 +40,20 @@ import {
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { ScalesService } from '../../../services/crud/scales.service';
import { LineType } from '../../../enums/line-type';
import { Card } from 'primeng/card';
import { NgIf } from '@angular/common';
import { ControlGroupDirective } from '../../shared/forms/control-group.directive';
import { InputText } from 'primeng/inputtext';
import { FormControlDirective } from '../../shared/forms/form-control.directive';
import { IfErrorDirective } from '../../shared/forms/if-error.directive';
import { MapMarkerFormArrayComponent } from '../../maps/map-marker-form-array/map-marker-form-array.component';
import { SingleImageUploadComponent } from '../../shared/forms/controls/single-image-upload/single-image-upload.component';
import { Checkbox } from 'primeng/checkbox';
import { Select } from 'primeng/select';
import { Message } from 'primeng/message';
import { Button } from 'primeng/button';
import { ConfirmPopup } from 'primeng/confirmpopup';
import { FormSkeletonComponent } from '../../shared/components/form-skeleton/form-skeleton.component';

/**
* Form component for creating and editing areas.
Expand All @@ -40,7 +63,27 @@ import { LineType } from '../../../enums/line-type';
templateUrl: './area-form.component.html',
styleUrls: ['./area-form.component.scss'],
providers: [ConfirmationService],
standalone: false,
imports: [
TranslocoDirective,
Card,
NgIf,
ReactiveFormsModule,
FormDirective,
ControlGroupDirective,
InputText,
FormControlDirective,
IfErrorDirective,
Editor,
MapMarkerFormArrayComponent,
SingleImageUploadComponent,
Checkbox,
TranslocoPipe,
Select,
Message,
Button,
ConfirmPopup,
FormSkeletonComponent,
],
})
@UntilDestroy()
export class AreaFormComponent implements OnInit {
Expand Down
19 changes: 18 additions & 1 deletion client/src/app/modules/area/area-info/area-info.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,29 @@ import { MapStyles } from '../../../enums/map-styles';
import { MapMarkerType } from '../../../enums/map-marker-type';
import { Coordinates } from '../../../interfaces/coordinates.interface';
import { GradeDistribution } from '../../../models/scale';
import { TranslocoDirective } from '@jsverse/transloco';
import { NgIf } from '@angular/common';
import { ClosedSpotAlertComponent } from '../../shared/components/closed-spot-alert/closed-spot-alert.component';
import { GradeDistributionBarChartComponent } from '../../shared/components/grade-distribution-bar-chart/grade-distribution-bar-chart.component';
import { SanitizeHtmlPipe } from '../../shared/pipes/sanitize-html.pipe';
import { CoordinatesButtonComponent } from '../../shared/components/coordinates-button/coordinates-button.component';
import { MapComponent } from '../../maps/map/map.component';
import { Skeleton } from 'primeng/skeleton';

@Component({
selector: 'lc-area-info',
templateUrl: './area-info.component.html',
styleUrls: ['./area-info.component.scss'],
standalone: false,
imports: [
TranslocoDirective,
NgIf,
ClosedSpotAlertComponent,
GradeDistributionBarChartComponent,
SanitizeHtmlPipe,
CoordinatesButtonComponent,
MapComponent,
Skeleton,
],
})
export class AreaInfoComponent implements OnInit {
public area: Area;
Expand Down
4 changes: 2 additions & 2 deletions client/src/app/modules/area/area-list/area-list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import { HasPermissionDirective } from '../../shared/directives/has-permission.d
import { NgClass, NgForOf, NgIf } from '@angular/common';
import { TopoDataviewSkeletonComponent } from '../../shared/components/topo-dataview-skeleton/topo-dataview-skeleton.component';
import { ArchiveButtonComponent } from '../../archive/archive-button/archive-button.component';
import { SharedModule } from '../../shared/shared.module';
import { AscentCountComponent } from '../../ascent/ascent-count/ascent-count.component';
import { ClosedSpotTagComponent } from '../../shared/components/closed-spot-tag/closed-spot-tag.component';
import { SecretSpotTagComponent } from '../../shared/components/secret-spot-tag/secret-spot-tag.component';
import { Message } from 'primeng/message';
import { LeveledGradeDistributionComponent } from '../../shared/components/leveled-grade-distribution/leveled-grade-distribution.component';
import { SanitizeHtmlPipe } from '../../shared/pipes/sanitize-html.pipe';

/**
* Component that lists all areas in a sector.
Expand All @@ -49,12 +49,12 @@ import { LeveledGradeDistributionComponent } from '../../shared/components/level
NgForOf,
NgClass,
ArchiveButtonComponent,
SharedModule,
AscentCountComponent,
ClosedSpotTagComponent,
SecretSpotTagComponent,
Message,
LeveledGradeDistributionComponent,
SanitizeHtmlPipe,
],
})
@UntilDestroy()
Expand Down
88 changes: 0 additions & 88 deletions client/src/app/modules/area/area.module.ts

This file was deleted.

31 changes: 28 additions & 3 deletions client/src/app/modules/area/area/area.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ import { Sector } from '../../../models/sector';
import { MenuItem } from 'primeng/api';
import { CragsService } from '../../../services/crud/crags.service';
import { SectorsService } from '../../../services/crud/sectors.service';
import { TranslocoService } from '@jsverse/transloco';
import { ActivatedRoute, Router } from '@angular/router';
import { TRANSLOCO_SCOPE, TranslocoService } from '@jsverse/transloco';
import {
ActivatedRoute,
Router,
RouterLink,
RouterOutlet,
} from '@angular/router';
import { select, Store } from '@ngrx/store';
import { Title } from '@angular/platform-browser';
import { forkJoin, of } from 'rxjs';
Expand All @@ -17,12 +22,32 @@ import { Area } from '../../../models/area';
import { AreasService } from '../../../services/crud/areas.service';
import { selectInstanceSettingsState } from '../../../ngrx/selectors/instance-settings.selectors';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { Card } from 'primeng/card';
import { ClosedSpotTagComponent } from '../../shared/components/closed-spot-tag/closed-spot-tag.component';
import { SecretSpotTagComponent } from '../../shared/components/secret-spot-tag/secret-spot-tag.component';
import { NgIf } from '@angular/common';
import { Breadcrumb } from 'primeng/breadcrumb';
import { Tab, TabList, Tabs } from 'primeng/tabs';
import { SetActiveTabDirective } from '../../shared/directives/set-active-tab.directive';

@Component({
selector: 'lc-area',
templateUrl: './area.component.html',
styleUrls: ['./area.component.scss'],
standalone: false,
imports: [
Card,
ClosedSpotTagComponent,
SecretSpotTagComponent,
NgIf,
Breadcrumb,
Tabs,
SetActiveTabDirective,
TabList,
Tab,
RouterLink,
RouterOutlet,
],
providers: [{ provide: TRANSLOCO_SCOPE, useValue: 'area' }],
})
@UntilDestroy()
export class AreaComponent implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { Component } from '@angular/core';
import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
import { Line } from '../../../models/line';
import { ScalesService } from '../../../services/crud/scales.service';
import { SharedModule } from '../../shared/shared.module';
import { LineGradePipe } from '../../shared/pipes/line-grade.pipe';

@Component({
selector: 'lc-ascent-form-title',
imports: [SharedModule],
templateUrl: './ascent-form-title.component.html',
styleUrl: './ascent-form-title.component.scss',
imports: [LineGradePipe],
})
export class AscentFormTitleComponent {
public line: Line;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
ReactiveFormsModule,
Validators,
} from '@angular/forms';
import { SharedModule } from '../../shared/shared.module';
import { TranslocoDirective } from '@jsverse/transloco';
import { CheckboxModule } from 'primeng/checkbox';
import { ButtonModule } from 'primeng/button';
Expand All @@ -35,14 +34,17 @@ import { ScalesService } from '../../../services/crud/scales.service';
import { DatePickerModule } from 'primeng/datepicker';
import { Select } from 'primeng/select';
import { Textarea } from 'primeng/textarea';
import { TranslateSpecialGradesPipe } from '../../shared/pipes/translate-special-grades.pipe';
import { IfErrorDirective } from '../../shared/forms/if-error.directive';
import { FormControlDirective } from '../../shared/forms/form-control.directive';
import { ControlGroupDirective } from '../../shared/forms/control-group.directive';

@Component({
selector: 'lc-ascent-form',
imports: [
EditorModule,
InputTextModule,
ReactiveFormsModule,
SharedModule,
CheckboxModule,
ButtonModule,
ConfirmPopupModule,
Expand All @@ -56,6 +58,11 @@ import { Textarea } from 'primeng/textarea';
MessageModule,
Select,
Textarea,
TranslateSpecialGradesPipe,
IfErrorDirective,
FormControlDirective,
ControlGroupDirective,
FormDirective,
],
templateUrl: './ascent-form.component.html',
styleUrl: './ascent-form.component.scss',
Expand Down
Loading