Skip to content

Commit 64d03b6

Browse files
ilmartyrkilmartyrk
authored
Merge pull request #1675 from citizenos/refactor
Update paths to services, interfaces and shared components
2 parents be12941 + 5005141 commit 64d03b6

File tree

140 files changed

+510
-543
lines changed

Some content is hidden

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

140 files changed

+510
-543
lines changed

‎.github/workflows/qodana_code_quality.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/app/account/components/add-eid/add-eid.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, OnInit, Inject } from '@angular/core';
22
import { DIALOG_DATA, DialogService } from 'src/app/shared/dialog';
3-
import { ConfigService } from 'src/app/services/config.service';
3+
import { ConfigService } from '@services/config.service';
44
import { ConnectEidComponent } from '../connect-eid/connect-eid.component';
55
import { ConnectSmartIdComponent } from '../connect-smart-id/connect-smart-id.component';
66

‎src/app/account/components/add-email/add-email.component.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { AuthService } from 'src/app/services/auth.service';
1+
import { AuthService } from '@services/auth.service';
22
import { Component, OnInit, Inject } from '@angular/core';
33
import { Router } from '@angular/router';
4-
import { UserService } from 'src/app/services/user.service';
5-
import { NotificationService } from 'src/app/services/notification.service';
6-
import { DialogService, DIALOG_DATA, DialogRef } from 'src/app/shared/dialog';
4+
import { UserService } from '@services/user.service';
5+
import { NotificationService } from '@services/notification.service';
6+
import { DialogService, DIALOG_DATA, DialogRef } from '@shared/dialog';
77
import { take } from 'rxjs';
8-
import { User } from 'src/app/interfaces/user';
8+
import { User } from '@interfaces/user';
99
import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
1010

1111
export interface AddEmailData {

‎src/app/account/components/est-id-login-form/est-id-login-form.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, Input } from '@angular/core';
22
import { catchError, interval, map, of, switchMap, take, takeWhile } from 'rxjs';
3-
import { AuthService } from 'src/app/services/auth.service';
4-
import { ConfigService } from 'src/app/services/config.service';
3+
import { AuthService } from '@services/auth.service';
4+
import { ConfigService } from '@services/config.service';
55
import { DialogService } from 'src/app/shared/dialog';
6-
import { NotificationService } from 'src/app/services/notification.service';
6+
import { NotificationService } from '@services/notification.service';
77
import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
88
import { ActivatedRoute, Router } from '@angular/router';
99
declare let hwcrypto: any;

‎src/app/account/components/login-form/login-form.component.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
import { PlausibleService } from './../../../services/plausible.service';
2-
import { AuthService } from 'src/app/services/auth.service';
1+
import { PlausibleService } from '@services/plausible.service';
2+
import { AuthService } from '@services/auth.service';
33
import { Component, Inject, Input } from '@angular/core';
4-
import { NotificationService } from 'src/app/services/notification.service';
5-
import { LocationService } from 'src/app/services/location.service';
4+
import { NotificationService } from '@services/notification.service';
5+
import { LocationService } from '@services/location.service';
66
import { Router } from '@angular/router';
77
import { DialogService } from 'src/app/shared/dialog';
88
import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
99
import { PasswordForgotComponent } from '../password-forgot/password-forgot.component';
1010
import { TranslateService } from '@ngx-translate/core';
11-
import { RegisterDialogComponent } from '../register/register.component';
12-
import { take } from 'rxjs';
1311

1412
@Component({
1513
selector: 'login-form',

‎src/app/account/components/login/login.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { Component, Inject, inject, Input } from '@angular/core';
22
import { DIALOG_DATA, DialogService, DialogRef } from 'src/app/shared/dialog';
33
import { ActivatedRoute, Router } from '@angular/router';
44
import { Subscription, take } from 'rxjs';
5-
import { AuthService } from 'src/app/services/auth.service';
6-
import { ConfigService } from 'src/app/services/config.service';
7-
import { UserService } from 'src/app/services/user.service';
5+
import { AuthService } from '@services/auth.service';
6+
import { ConfigService } from '@services/config.service';
7+
import { UserService } from '@services/user.service';
88
import { EstIdLoginDialogComponent } from '../est-id-login/est-id-login.component';
99
import { SmartIdLoginDialogComponent } from '../smart-id-login/smart-id-login.component';
10-
import { LocationService } from 'src/app/services/location.service';
10+
import { LocationService } from '@services/location.service';
1111
import { TranslateService } from '@ngx-translate/core';
1212

1313
@Component({

‎src/app/account/components/password-forgot-form/password-forgot-form.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Component } from '@angular/core';
22
import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
33
import { take } from 'rxjs';
4-
import { AuthService } from 'src/app/services/auth.service';
5-
import { NotificationService } from 'src/app/services/notification.service';
4+
import { AuthService } from '@services/auth.service';
5+
import { NotificationService } from '@services/notification.service';
66

77
@Component({
88
selector: 'password-forgot-form',

‎src/app/account/components/password-reset-form/password-reset-form.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Component, Input, Inject } from '@angular/core';
22
import { Router, ActivatedRoute } from '@angular/router';
33
import { take } from 'rxjs';
4-
import { AuthService } from 'src/app/services/auth.service';
5-
import { NotificationService } from 'src/app/services/notification.service';
4+
import { AuthService } from '@services/auth.service';
5+
import { NotificationService } from '@services/notification.service';
66
import { UntypedFormGroup, UntypedFormControl } from '@angular/forms'
77
import { DialogService } from 'src/app/shared/dialog';
88

‎src/app/account/components/privacy-policy/privacy-policy.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { ActivatedRoute, Router } from '@angular/router';
33
import { DialogService, DIALOG_DATA } from 'src/app/shared/dialog';
44
import { take } from 'rxjs';
55
import { User } from 'src/app/interfaces/user';
6-
import { AuthService } from 'src/app/services/auth.service';
7-
import { ConfigService } from 'src/app/services/config.service';
8-
import { UserService } from 'src/app/services/user.service';
6+
import { AuthService } from '@services/auth.service';
7+
import { ConfigService } from '@services/config.service';
8+
import { UserService } from '@services/user.service';
99
import { ConfirmDialogComponent } from 'src/app/shared/components/confirm-dialog/confirm-dialog.component';
1010
import { AddEidComponent } from '../add-eid/add-eid.component';
1111

‎src/app/account/components/profile/profile.component.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { languages } from 'src/app/services/language.service';
1+
import { languages } from '@services/language.service';
22

33
import { Component, ElementRef, ViewChild } from '@angular/core';
44
import { ActivatedRoute, Router, PRIMARY_OUTLET } from '@angular/router';
55
import { map, take, takeWhile } from 'rxjs/operators';
66
import { DialogService } from 'src/app/shared/dialog';
77

88
import { ConfirmDialogComponent } from 'src/app/shared/components/confirm-dialog/confirm-dialog.component';
9-
import { AppService } from 'src/app/services/app.service';
10-
import { AuthService } from 'src/app/services/auth.service';
11-
import { UserService } from 'src/app/services/user.service';
12-
import { TopicNotificationService } from 'src/app/services/topic-notification.service';
9+
import { AppService } from '@services/app.service';
10+
import { AuthService } from '@services/auth.service';
11+
import { UserService } from '@services/user.service';
12+
import { TopicNotificationService } from '@services/topic-notification.service';
1313
import { User } from 'src/app/interfaces/user';
14-
import { NotificationService } from 'src/app/services/notification.service';
14+
import { NotificationService } from '@services/notification.service';
1515
import { Observable, of } from 'rxjs';
1616
import { Topic } from 'src/app/interfaces/topic';
1717
import { TranslateService } from '@ngx-translate/core';
18-
import { ConfigService } from 'src/app/services/config.service';
18+
import { ConfigService } from '@services/config.service';
1919

2020
@Component({
2121
selector: 'app-profile',

0 commit comments

Comments
 (0)