diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index acf3597d..9875699a 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -10,11 +10,11 @@ import { ActiveAccountComponent } from './pages/active-account/active-account.co import { ProfileComponent } from './pages/profile/profile.component'; import { CheckCodeRestPasswordComponent } from './pages/check-code-rest-password/check-code-rest-password.component'; import { ResetPasswordComponent } from './pages/reset-password/reset-password.component'; -import { AuthGuard } from './services/auth.guard'; +import { AuthGuard } from './guard/auth.guard'; import { EditUserComponent } from './pages/edit-user/edit-user.component'; import { SuggestAgendaComponent } from './pages/suggest-agenda/suggest-agenda.component'; import { ParticipateComponent } from './pages/participate/participate.component'; -import { NoTokenGuard } from './services/no-token.guard'; +import { NoTokenGuard } from './guard/no-token.guard'; const routes: Routes = [ { path: 'login', component: LoginComponent, canActivate: [NoTokenGuard], }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9352c56e..624ed001 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -25,10 +25,10 @@ import { LoginSocialComponent } from './pages/login-social/login-social.componen import { ActiveAccountComponent } from './pages/active-account/active-account.component'; import { HomePageComponent } from './pages/home-page/home-page.component'; import { ProfileComponent } from './pages/profile/profile.component'; -import { UserTokenInterceptor } from './services/user-token-interceptor.service'; +import { UserTokenInterceptor } from './interceptor/user-token-interceptor.service'; import { ResetPasswordComponent } from './pages/reset-password/reset-password.component'; import { CheckCodeRestPasswordComponent } from './pages/check-code-rest-password/check-code-rest-password.component'; -import { AuthGuard } from './services/auth.guard'; +import { AuthGuard } from './guard/auth.guard'; import { AuthService } from './services/auth.service'; import { EditUserComponent } from './pages/edit-user/edit-user.component'; import { SuggestAgendaComponent } from './pages/suggest-agenda/suggest-agenda.component'; diff --git a/src/app/services/auth.guard.spec.ts b/src/app/guard/auth.guard.spec.ts similarity index 100% rename from src/app/services/auth.guard.spec.ts rename to src/app/guard/auth.guard.spec.ts diff --git a/src/app/services/auth.guard.ts b/src/app/guard/auth.guard.ts similarity index 89% rename from src/app/services/auth.guard.ts rename to src/app/guard/auth.guard.ts index e7f58868..cf049b73 100644 --- a/src/app/services/auth.guard.ts +++ b/src/app/guard/auth.guard.ts @@ -1,7 +1,7 @@ // auth.guard.ts import { Injectable } from '@angular/core'; import { CanActivate, Router } from '@angular/router'; -import { AuthService } from './auth.service'; +import { AuthService } from '../services/auth.service'; @Injectable({ providedIn: 'root', diff --git a/src/app/services/no-token.guard.spec.ts b/src/app/guard/no-token.guard.spec.ts similarity index 100% rename from src/app/services/no-token.guard.spec.ts rename to src/app/guard/no-token.guard.spec.ts diff --git a/src/app/services/no-token.guard.ts b/src/app/guard/no-token.guard.ts similarity index 88% rename from src/app/services/no-token.guard.ts rename to src/app/guard/no-token.guard.ts index 39756b18..1b229db5 100644 --- a/src/app/services/no-token.guard.ts +++ b/src/app/guard/no-token.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router } from '@angular/router'; -import { AuthService } from './auth.service'; +import { AuthService } from '../services/auth.service'; @Injectable({ providedIn: 'root' diff --git a/src/app/services/user-token-interceptor.service.spec.ts b/src/app/interceptor/user-token-interceptor.service.spec.ts similarity index 96% rename from src/app/services/user-token-interceptor.service.spec.ts rename to src/app/interceptor/user-token-interceptor.service.spec.ts index 3f520648..8ca74733 100644 --- a/src/app/services/user-token-interceptor.service.spec.ts +++ b/src/app/interceptor/user-token-interceptor.service.spec.ts @@ -1,7 +1,7 @@ import { TestBed } from '@angular/core/testing'; import { UserTokenInterceptor } from './user-token-interceptor.service'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; -import { UserService } from './user.service'; +import { UserService } from '../services/user.service'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; diff --git a/src/app/services/user-token-interceptor.service.ts b/src/app/interceptor/user-token-interceptor.service.ts similarity index 100% rename from src/app/services/user-token-interceptor.service.ts rename to src/app/interceptor/user-token-interceptor.service.ts