From 3bb85c40ebebac4bebfca4ad10b712567b4b1932 Mon Sep 17 00:00:00 2001 From: "fabio.formosa" Date: Sat, 4 May 2019 17:19:29 +0200 Subject: [PATCH] renamed some folders --- .../src/app/app-routing.module.ts | 14 +++++++------- .../src/app/app.component.spec.ts | 14 +++++++------- quartz-manager-frontend/src/app/app.module.ts | 18 +++++++++--------- .../footer/footer.component.html | 0 .../footer/footer.component.scss | 0 .../footer/footer.component.ts | 0 .../{component => components}/footer/index.ts | 0 .../github/github.component.html | 0 .../github/github.component.scss | 0 .../github/github.component.ts | 0 .../{component => components}/github/index.ts | 0 .../account-menu/account-menu.component.html | 0 .../account-menu/account-menu.component.scss | 0 .../account-menu.component.spec.ts | 4 ++-- .../account-menu/account-menu.component.ts | 2 +- .../header/header.component.html | 0 .../header/header.component.scss | 0 .../header/header.component.ts | 2 +- .../{component => components}/header/index.ts | 0 .../src/app/{component => components}/index.ts | 0 .../logs-panel/index.ts | 0 .../logs-panel/logs-panel.component.html | 0 .../logs-panel/logs-panel.component.scss | 0 .../logs-panel/logs-panel.component.ts | 2 +- .../progress-panel/index.ts | 0 .../progress-panel.component.html | 0 .../progress-panel.component.scss | 0 .../progress-panel/progress-panel.component.ts | 4 ++-- .../scheduler-config/index.ts | 0 .../scheduler-config.component.html | 0 .../scheduler-config.component.scss | 0 .../scheduler-config.component.ts | 2 +- .../scheduler-control/index.ts | 0 .../scheduler-control.component.html | 0 .../scheduler-control.component.scss | 0 .../scheduler-control.component.ts | 2 +- .../app/{guard => guards}/admin.guard.spec.ts | 4 ++-- .../src/app/{guard => guards}/admin.guard.ts | 2 +- .../src/app/{guard => guards}/guest.guard.ts | 2 +- .../src/app/{guard => guards}/index.ts | 0 .../src/app/{guard => guards}/login.guard.ts | 2 +- .../app/{service => services}/api.service.ts | 0 .../app/{service => services}/auth.service.ts | 0 .../{service => services}/config.service.ts | 0 .../src/app/{service => services}/index.ts | 0 .../logs.websocket.service.ts | 0 .../mocks/api.service.mock.ts | 0 .../app/{service => services}/mocks/index.ts | 0 .../mocks/user.service.mock.ts | 0 .../progress.websocket.service.ts | 0 .../{service => services}/scheduler.service.ts | 0 .../app/{service => services}/user.service.ts | 0 .../{service => services}/websocket.service.ts | 0 .../change-password.component.html | 0 .../change-password.component.scss | 0 .../change-password.component.spec.ts | 4 ++-- .../change-password.component.ts | 4 ++-- .../app/{ => views}/change-password/index.ts | 0 .../forbidden/forbidden.component.css | 0 .../forbidden/forbidden.component.html | 0 .../forbidden/forbidden.component.spec.ts | 0 .../forbidden/forbidden.component.ts | 0 .../src/app/{ => views}/forbidden/index.ts | 0 .../src/app/{ => views}/login/index.ts | 0 .../app/{ => views}/login/login.component.html | 0 .../app/{ => views}/login/login.component.scss | 0 .../{ => views}/login/login.component.spec.ts | 4 ++-- .../app/{ => views}/login/login.component.ts | 4 ++-- .../src/app/{ => views}/manager/index.ts | 0 .../{ => views}/manager/manager.component.html | 0 .../{ => views}/manager/manager.component.scss | 0 .../{ => views}/manager/manager.component.ts | 2 +- .../src/app/{ => views}/not-found/index.ts | 0 .../not-found/not-found.component.css | 0 .../not-found/not-found.component.html | 0 .../not-found/not-found.component.spec.ts | 0 .../not-found/not-found.component.ts | 0 .../src/app/{ => views}/signup/index.ts | 0 .../{ => views}/signup/signup.component.html | 0 .../{ => views}/signup/signup.component.scss | 0 .../signup/signup.component.spec.ts | 4 ++-- .../app/{ => views}/signup/signup.component.ts | 4 ++-- 82 files changed, 50 insertions(+), 50 deletions(-) rename quartz-manager-frontend/src/app/{component => components}/footer/footer.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/footer/footer.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/footer/footer.component.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/footer/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/github/github.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/github/github.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/github/github.component.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/github/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/header/account-menu/account-menu.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/header/account-menu/account-menu.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/header/account-menu/account-menu.component.spec.ts (95%) rename quartz-manager-frontend/src/app/{component => components}/header/account-menu/account-menu.component.ts (96%) rename quartz-manager-frontend/src/app/{component => components}/header/header.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/header/header.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/header/header.component.ts (91%) rename quartz-manager-frontend/src/app/{component => components}/header/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/logs-panel/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/logs-panel/logs-panel.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/logs-panel/logs-panel.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/logs-panel/logs-panel.component.ts (91%) rename quartz-manager-frontend/src/app/{component => components}/progress-panel/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/progress-panel/progress-panel.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/progress-panel/progress-panel.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/progress-panel/progress-panel.component.ts (91%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-config/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-config/scheduler-config.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-config/scheduler-config.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-config/scheduler-config.component.ts (91%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-control/index.ts (100%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-control/scheduler-control.component.html (100%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-control/scheduler-control.component.scss (100%) rename quartz-manager-frontend/src/app/{component => components}/scheduler-control/scheduler-control.component.ts (93%) rename quartz-manager-frontend/src/app/{guard => guards}/admin.guard.spec.ts (87%) rename quartz-manager-frontend/src/app/{guard => guards}/admin.guard.ts (94%) rename quartz-manager-frontend/src/app/{guard => guards}/guest.guard.ts (91%) rename quartz-manager-frontend/src/app/{guard => guards}/index.ts (100%) rename quartz-manager-frontend/src/app/{guard => guards}/login.guard.ts (91%) rename quartz-manager-frontend/src/app/{service => services}/api.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/auth.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/config.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/index.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/logs.websocket.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/mocks/api.service.mock.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/mocks/index.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/mocks/user.service.mock.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/progress.websocket.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/scheduler.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/user.service.ts (100%) rename quartz-manager-frontend/src/app/{service => services}/websocket.service.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/change-password/change-password.component.html (100%) rename quartz-manager-frontend/src/app/{ => views}/change-password/change-password.component.scss (100%) rename quartz-manager-frontend/src/app/{ => views}/change-password/change-password.component.spec.ts (94%) rename quartz-manager-frontend/src/app/{ => views}/change-password/change-password.component.ts (93%) rename quartz-manager-frontend/src/app/{ => views}/change-password/index.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/forbidden/forbidden.component.css (100%) rename quartz-manager-frontend/src/app/{ => views}/forbidden/forbidden.component.html (100%) rename quartz-manager-frontend/src/app/{ => views}/forbidden/forbidden.component.spec.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/forbidden/forbidden.component.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/forbidden/index.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/login/index.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/login/login.component.html (100%) rename quartz-manager-frontend/src/app/{ => views}/login/login.component.scss (100%) rename quartz-manager-frontend/src/app/{ => views}/login/login.component.spec.ts (92%) rename quartz-manager-frontend/src/app/{ => views}/login/login.component.ts (92%) rename quartz-manager-frontend/src/app/{ => views}/manager/index.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/manager/manager.component.html (100%) rename quartz-manager-frontend/src/app/{ => views}/manager/manager.component.scss (100%) rename quartz-manager-frontend/src/app/{ => views}/manager/manager.component.ts (94%) rename quartz-manager-frontend/src/app/{ => views}/not-found/index.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/not-found/not-found.component.css (100%) rename quartz-manager-frontend/src/app/{ => views}/not-found/not-found.component.html (100%) rename quartz-manager-frontend/src/app/{ => views}/not-found/not-found.component.spec.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/not-found/not-found.component.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/signup/index.ts (100%) rename quartz-manager-frontend/src/app/{ => views}/signup/signup.component.html (100%) rename quartz-manager-frontend/src/app/{ => views}/signup/signup.component.scss (100%) rename quartz-manager-frontend/src/app/{ => views}/signup/signup.component.spec.ts (96%) rename quartz-manager-frontend/src/app/{ => views}/signup/signup.component.ts (96%) diff --git a/quartz-manager-frontend/src/app/app-routing.module.ts b/quartz-manager-frontend/src/app/app-routing.module.ts index f670421..7d2d1c6 100644 --- a/quartz-manager-frontend/src/app/app-routing.module.ts +++ b/quartz-manager-frontend/src/app/app-routing.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; -import { LoginComponent } from './login'; -import { LoginGuard } from './guard'; -import { GuestGuard, AdminGuard } from './guard'; -import { NotFoundComponent } from './not-found'; -import { ChangePasswordComponent } from './change-password'; -import { ForbiddenComponent } from './forbidden'; +import { LoginComponent } from './views/login'; +import { LoginGuard } from './guards'; +import { GuestGuard, AdminGuard } from './guards'; +import { NotFoundComponent } from './views/not-found'; +import { ChangePasswordComponent } from './views/change-password'; +import { ForbiddenComponent } from './views/forbidden'; -import { ManagerComponent } from './manager'; +import { ManagerComponent } from './views/manager'; export const routes: Routes = [ { diff --git a/quartz-manager-frontend/src/app/app.component.spec.ts b/quartz-manager-frontend/src/app/app.component.spec.ts index ccf3e66..e3809f7 100644 --- a/quartz-manager-frontend/src/app/app.component.spec.ts +++ b/quartz-manager-frontend/src/app/app.component.spec.ts @@ -2,16 +2,16 @@ import { TestBed, async } from '@angular/core/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app.component'; -import { ManagerComponent } from './manager'; -import { LoginComponent } from './login'; -import { MockApiService } from './service/mocks/api.service.mock'; +import { ManagerComponent } from './views/manager'; +import { LoginComponent } from './views/login'; +import { MockApiService } from './services/mocks/api.service.mock'; -import { LoginGuard } from './guard'; -import { NotFoundComponent } from './not-found'; +import { LoginGuard } from './guards'; +import { NotFoundComponent } from './views/not-found'; import { FooterComponent, GithubComponent, -} from './component'; +} from './components'; import { MatToolbarModule, @@ -24,7 +24,7 @@ import { AuthService, UserService, ConfigService -} from './service'; +} from './services'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; diff --git a/quartz-manager-frontend/src/app/app.module.ts b/quartz-manager-frontend/src/app/app.module.ts index d60c593..72f2901 100644 --- a/quartz-manager-frontend/src/app/app.module.ts +++ b/quartz-manager-frontend/src/app/app.module.ts @@ -21,11 +21,11 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FlexLayoutModule } from '@angular/flex-layout'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app-routing.module'; -import { ManagerComponent } from './manager'; -import { LoginComponent } from './login'; -import { LoginGuard, GuestGuard, AdminGuard } from './guard'; -import { NotFoundComponent } from './not-found'; -import { AccountMenuComponent } from './component/header/account-menu/account-menu.component'; +import { ManagerComponent } from './views/manager'; +import { LoginComponent } from './views/login'; +import { LoginGuard, GuestGuard, AdminGuard } from './guards'; +import { NotFoundComponent } from './views/not-found'; +import { AccountMenuComponent } from './components/header/account-menu/account-menu.component'; import { HeaderComponent, @@ -35,7 +35,7 @@ import { SchedulerControlComponent, LogsPanelComponent, ProgressPanelComponent -} from './component'; +} from './components'; import { ApiService, @@ -45,9 +45,9 @@ import { ConfigService, ProgressWebsocketService, LogsWebsocketService -} from './service'; -import { ChangePasswordComponent } from './change-password/change-password.component'; -import { ForbiddenComponent } from './forbidden/forbidden.component'; +} from './services'; +import { ChangePasswordComponent } from './views/change-password/change-password.component'; +import { ForbiddenComponent } from './views/forbidden/forbidden.component'; export function initUserFactory(userService: UserService) { return () => userService.jsessionInitUser(); diff --git a/quartz-manager-frontend/src/app/component/footer/footer.component.html b/quartz-manager-frontend/src/app/components/footer/footer.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/footer/footer.component.html rename to quartz-manager-frontend/src/app/components/footer/footer.component.html diff --git a/quartz-manager-frontend/src/app/component/footer/footer.component.scss b/quartz-manager-frontend/src/app/components/footer/footer.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/footer/footer.component.scss rename to quartz-manager-frontend/src/app/components/footer/footer.component.scss diff --git a/quartz-manager-frontend/src/app/component/footer/footer.component.ts b/quartz-manager-frontend/src/app/components/footer/footer.component.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/footer/footer.component.ts rename to quartz-manager-frontend/src/app/components/footer/footer.component.ts diff --git a/quartz-manager-frontend/src/app/component/footer/index.ts b/quartz-manager-frontend/src/app/components/footer/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/footer/index.ts rename to quartz-manager-frontend/src/app/components/footer/index.ts diff --git a/quartz-manager-frontend/src/app/component/github/github.component.html b/quartz-manager-frontend/src/app/components/github/github.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/github/github.component.html rename to quartz-manager-frontend/src/app/components/github/github.component.html diff --git a/quartz-manager-frontend/src/app/component/github/github.component.scss b/quartz-manager-frontend/src/app/components/github/github.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/github/github.component.scss rename to quartz-manager-frontend/src/app/components/github/github.component.scss diff --git a/quartz-manager-frontend/src/app/component/github/github.component.ts b/quartz-manager-frontend/src/app/components/github/github.component.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/github/github.component.ts rename to quartz-manager-frontend/src/app/components/github/github.component.ts diff --git a/quartz-manager-frontend/src/app/component/github/index.ts b/quartz-manager-frontend/src/app/components/github/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/github/index.ts rename to quartz-manager-frontend/src/app/components/github/index.ts diff --git a/quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.html b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.html rename to quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.html diff --git a/quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.scss b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.scss rename to quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.scss diff --git a/quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.spec.ts b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.spec.ts similarity index 95% rename from quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.spec.ts rename to quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.spec.ts index 8353da3..0cf29b1 100644 --- a/quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.spec.ts +++ b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.spec.ts @@ -7,11 +7,11 @@ import { ConfigService, ApiService, UserService -} from '../../../service'; +} from '../../../services'; import { MockUserService, MockApiService -} from '../../../service/mocks'; +} from '../../../services/mocks'; import { AccountMenuComponent } from './account-menu.component'; describe('AccountMenuComponent', () => { diff --git a/quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.ts b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.ts similarity index 96% rename from quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.ts rename to quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.ts index 509f4ed..4ad72eb 100644 --- a/quartz-manager-frontend/src/app/component/header/account-menu/account-menu.component.ts +++ b/quartz-manager-frontend/src/app/components/header/account-menu/account-menu.component.ts @@ -3,7 +3,7 @@ import { ConfigService, AuthService, UserService -} from '../../../service'; +} from '../../../services'; import { Router } from '@angular/router'; @Component({ diff --git a/quartz-manager-frontend/src/app/component/header/header.component.html b/quartz-manager-frontend/src/app/components/header/header.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/header/header.component.html rename to quartz-manager-frontend/src/app/components/header/header.component.html diff --git a/quartz-manager-frontend/src/app/component/header/header.component.scss b/quartz-manager-frontend/src/app/components/header/header.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/header/header.component.scss rename to quartz-manager-frontend/src/app/components/header/header.component.scss diff --git a/quartz-manager-frontend/src/app/component/header/header.component.ts b/quartz-manager-frontend/src/app/components/header/header.component.ts similarity index 91% rename from quartz-manager-frontend/src/app/component/header/header.component.ts rename to quartz-manager-frontend/src/app/components/header/header.component.ts index 6de663b..52a3aff 100644 --- a/quartz-manager-frontend/src/app/component/header/header.component.ts +++ b/quartz-manager-frontend/src/app/components/header/header.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { UserService, AuthService -} from '../../service'; +} from '../../services'; import { Router } from '@angular/router'; @Component({ diff --git a/quartz-manager-frontend/src/app/component/header/index.ts b/quartz-manager-frontend/src/app/components/header/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/header/index.ts rename to quartz-manager-frontend/src/app/components/header/index.ts diff --git a/quartz-manager-frontend/src/app/component/index.ts b/quartz-manager-frontend/src/app/components/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/index.ts rename to quartz-manager-frontend/src/app/components/index.ts diff --git a/quartz-manager-frontend/src/app/component/logs-panel/index.ts b/quartz-manager-frontend/src/app/components/logs-panel/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/logs-panel/index.ts rename to quartz-manager-frontend/src/app/components/logs-panel/index.ts diff --git a/quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.html b/quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.html rename to quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.html diff --git a/quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.scss b/quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.scss rename to quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.scss diff --git a/quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.ts b/quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.ts similarity index 91% rename from quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.ts rename to quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.ts index 93ab00b..4d3d3c3 100644 --- a/quartz-manager-frontend/src/app/component/logs-panel/logs-panel.component.ts +++ b/quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { LogsWebsocketService, ApiService } from '../../service'; +import { LogsWebsocketService, ApiService } from '../../services'; import { Observable } from 'rxjs'; @Component({ diff --git a/quartz-manager-frontend/src/app/component/progress-panel/index.ts b/quartz-manager-frontend/src/app/components/progress-panel/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/progress-panel/index.ts rename to quartz-manager-frontend/src/app/components/progress-panel/index.ts diff --git a/quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.html b/quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.html rename to quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.html diff --git a/quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.scss b/quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.scss rename to quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.scss diff --git a/quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.ts b/quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.ts similarity index 91% rename from quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.ts rename to quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.ts index cdc1ad9..324c51b 100644 --- a/quartz-manager-frontend/src/app/component/progress-panel/progress-panel.component.ts +++ b/quartz-manager-frontend/src/app/components/progress-panel/progress-panel.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core' -import { ProgressWebsocketService } from '../../service'; +import { ProgressWebsocketService } from '../../services'; import { Observable } from 'rxjs'; // import {Message} from '@stomp/stompjs'; @@ -10,7 +10,7 @@ import { Observable } from 'rxjs'; // import { QueueingSubject } from 'queueing-subject' // import websocketConnect from 'rxjs-websockets' // import 'rxjs/add/operator/share' -// import {ServerSocket} from '../../service/qz.socket.service' +// import {ServerSocket} from '../../services/qz.socket.service' @Component({ selector: 'progress-panel', diff --git a/quartz-manager-frontend/src/app/component/scheduler-config/index.ts b/quartz-manager-frontend/src/app/components/scheduler-config/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/scheduler-config/index.ts rename to quartz-manager-frontend/src/app/components/scheduler-config/index.ts diff --git a/quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.html b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.html rename to quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.html diff --git a/quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.scss b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.scss rename to quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.scss diff --git a/quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.ts b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts similarity index 91% rename from quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.ts rename to quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts index 59ea733..ba05991 100644 --- a/quartz-manager-frontend/src/app/component/scheduler-config/scheduler-config.component.ts +++ b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { SchedulerService } from '../../service'; +import { SchedulerService } from '../../services'; import { SchedulerConfig } from '../../model/schedulerConfig.model' @Component({ diff --git a/quartz-manager-frontend/src/app/component/scheduler-control/index.ts b/quartz-manager-frontend/src/app/components/scheduler-control/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/component/scheduler-control/index.ts rename to quartz-manager-frontend/src/app/components/scheduler-control/index.ts diff --git a/quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.html b/quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.html similarity index 100% rename from quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.html rename to quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.html diff --git a/quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.scss b/quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.scss rename to quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.scss diff --git a/quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.ts b/quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.ts similarity index 93% rename from quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.ts rename to quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.ts index 2640054..19152f4 100644 --- a/quartz-manager-frontend/src/app/component/scheduler-control/scheduler-control.component.ts +++ b/quartz-manager-frontend/src/app/components/scheduler-control/scheduler-control.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { UserService, SchedulerService } from '../../service'; +import { UserService, SchedulerService } from '../../services'; @Component({ selector: 'scheduler-control', diff --git a/quartz-manager-frontend/src/app/guard/admin.guard.spec.ts b/quartz-manager-frontend/src/app/guards/admin.guard.spec.ts similarity index 87% rename from quartz-manager-frontend/src/app/guard/admin.guard.spec.ts rename to quartz-manager-frontend/src/app/guards/admin.guard.spec.ts index a90713f..0292d54 100644 --- a/quartz-manager-frontend/src/app/guard/admin.guard.spec.ts +++ b/quartz-manager-frontend/src/app/guards/admin.guard.spec.ts @@ -1,8 +1,8 @@ import { TestBed, async, inject } from '@angular/core/testing'; import { Router } from '@angular/router'; -import { UserService } from '../service'; +import { UserService } from '../services'; import { AdminGuard } from './admin.guard'; -import { MockUserService } from '../service/mocks'; +import { MockUserService } from '../services/mocks'; export class RouterStub { navigate(commands?: any[], extras?: any) {} diff --git a/quartz-manager-frontend/src/app/guard/admin.guard.ts b/quartz-manager-frontend/src/app/guards/admin.guard.ts similarity index 94% rename from quartz-manager-frontend/src/app/guard/admin.guard.ts rename to quartz-manager-frontend/src/app/guards/admin.guard.ts index f2bcc02..b0a6979 100644 --- a/quartz-manager-frontend/src/app/guard/admin.guard.ts +++ b/quartz-manager-frontend/src/app/guards/admin.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; -import { UserService } from '../service'; +import { UserService } from '../services'; import { Observable } from 'rxjs'; @Injectable() diff --git a/quartz-manager-frontend/src/app/guard/guest.guard.ts b/quartz-manager-frontend/src/app/guards/guest.guard.ts similarity index 91% rename from quartz-manager-frontend/src/app/guard/guest.guard.ts rename to quartz-manager-frontend/src/app/guards/guest.guard.ts index b157e00..a85d20e 100644 --- a/quartz-manager-frontend/src/app/guard/guest.guard.ts +++ b/quartz-manager-frontend/src/app/guards/guest.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Router, CanActivate } from '@angular/router'; -import { UserService } from '../service'; +import { UserService } from '../services'; import { Observable } from 'rxjs'; @Injectable() diff --git a/quartz-manager-frontend/src/app/guard/index.ts b/quartz-manager-frontend/src/app/guards/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/guard/index.ts rename to quartz-manager-frontend/src/app/guards/index.ts diff --git a/quartz-manager-frontend/src/app/guard/login.guard.ts b/quartz-manager-frontend/src/app/guards/login.guard.ts similarity index 91% rename from quartz-manager-frontend/src/app/guard/login.guard.ts rename to quartz-manager-frontend/src/app/guards/login.guard.ts index 70ef5fc..153fb4d 100644 --- a/quartz-manager-frontend/src/app/guard/login.guard.ts +++ b/quartz-manager-frontend/src/app/guards/login.guard.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { Router, CanActivate } from '@angular/router'; -import { UserService } from '../service'; +import { UserService } from '../services'; import { Observable } from 'rxjs'; @Injectable() diff --git a/quartz-manager-frontend/src/app/service/api.service.ts b/quartz-manager-frontend/src/app/services/api.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/api.service.ts rename to quartz-manager-frontend/src/app/services/api.service.ts diff --git a/quartz-manager-frontend/src/app/service/auth.service.ts b/quartz-manager-frontend/src/app/services/auth.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/auth.service.ts rename to quartz-manager-frontend/src/app/services/auth.service.ts diff --git a/quartz-manager-frontend/src/app/service/config.service.ts b/quartz-manager-frontend/src/app/services/config.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/config.service.ts rename to quartz-manager-frontend/src/app/services/config.service.ts diff --git a/quartz-manager-frontend/src/app/service/index.ts b/quartz-manager-frontend/src/app/services/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/index.ts rename to quartz-manager-frontend/src/app/services/index.ts diff --git a/quartz-manager-frontend/src/app/service/logs.websocket.service.ts b/quartz-manager-frontend/src/app/services/logs.websocket.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/logs.websocket.service.ts rename to quartz-manager-frontend/src/app/services/logs.websocket.service.ts diff --git a/quartz-manager-frontend/src/app/service/mocks/api.service.mock.ts b/quartz-manager-frontend/src/app/services/mocks/api.service.mock.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/mocks/api.service.mock.ts rename to quartz-manager-frontend/src/app/services/mocks/api.service.mock.ts diff --git a/quartz-manager-frontend/src/app/service/mocks/index.ts b/quartz-manager-frontend/src/app/services/mocks/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/mocks/index.ts rename to quartz-manager-frontend/src/app/services/mocks/index.ts diff --git a/quartz-manager-frontend/src/app/service/mocks/user.service.mock.ts b/quartz-manager-frontend/src/app/services/mocks/user.service.mock.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/mocks/user.service.mock.ts rename to quartz-manager-frontend/src/app/services/mocks/user.service.mock.ts diff --git a/quartz-manager-frontend/src/app/service/progress.websocket.service.ts b/quartz-manager-frontend/src/app/services/progress.websocket.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/progress.websocket.service.ts rename to quartz-manager-frontend/src/app/services/progress.websocket.service.ts diff --git a/quartz-manager-frontend/src/app/service/scheduler.service.ts b/quartz-manager-frontend/src/app/services/scheduler.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/scheduler.service.ts rename to quartz-manager-frontend/src/app/services/scheduler.service.ts diff --git a/quartz-manager-frontend/src/app/service/user.service.ts b/quartz-manager-frontend/src/app/services/user.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/user.service.ts rename to quartz-manager-frontend/src/app/services/user.service.ts diff --git a/quartz-manager-frontend/src/app/service/websocket.service.ts b/quartz-manager-frontend/src/app/services/websocket.service.ts similarity index 100% rename from quartz-manager-frontend/src/app/service/websocket.service.ts rename to quartz-manager-frontend/src/app/services/websocket.service.ts diff --git a/quartz-manager-frontend/src/app/change-password/change-password.component.html b/quartz-manager-frontend/src/app/views/change-password/change-password.component.html similarity index 100% rename from quartz-manager-frontend/src/app/change-password/change-password.component.html rename to quartz-manager-frontend/src/app/views/change-password/change-password.component.html diff --git a/quartz-manager-frontend/src/app/change-password/change-password.component.scss b/quartz-manager-frontend/src/app/views/change-password/change-password.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/change-password/change-password.component.scss rename to quartz-manager-frontend/src/app/views/change-password/change-password.component.scss diff --git a/quartz-manager-frontend/src/app/change-password/change-password.component.spec.ts b/quartz-manager-frontend/src/app/views/change-password/change-password.component.spec.ts similarity index 94% rename from quartz-manager-frontend/src/app/change-password/change-password.component.spec.ts rename to quartz-manager-frontend/src/app/views/change-password/change-password.component.spec.ts index 5fc506a..c703bb5 100644 --- a/quartz-manager-frontend/src/app/change-password/change-password.component.spec.ts +++ b/quartz-manager-frontend/src/app/views/change-password/change-password.component.spec.ts @@ -7,8 +7,8 @@ import { AuthService, UserService, ConfigService -} from '../service'; -import { MockApiService } from '../service/mocks'; +} from '../services'; +import { MockApiService } from '../services/mocks'; import { ChangePasswordComponent } from './change-password.component'; diff --git a/quartz-manager-frontend/src/app/change-password/change-password.component.ts b/quartz-manager-frontend/src/app/views/change-password/change-password.component.ts similarity index 93% rename from quartz-manager-frontend/src/app/change-password/change-password.component.ts rename to quartz-manager-frontend/src/app/views/change-password/change-password.component.ts index 48adf5a..3514b2a 100644 --- a/quartz-manager-frontend/src/app/change-password/change-password.component.ts +++ b/quartz-manager-frontend/src/app/views/change-password/change-password.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { AuthService } from 'app/service'; +import { AuthService } from 'app/services'; import { Router } from '@angular/router'; -import { DisplayMessage } from '../shared/models/display-message'; +import { DisplayMessage } from '../../shared/models/display-message'; import { delay, mergeMap } from 'rxjs/operators'; @Component({ diff --git a/quartz-manager-frontend/src/app/change-password/index.ts b/quartz-manager-frontend/src/app/views/change-password/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/change-password/index.ts rename to quartz-manager-frontend/src/app/views/change-password/index.ts diff --git a/quartz-manager-frontend/src/app/forbidden/forbidden.component.css b/quartz-manager-frontend/src/app/views/forbidden/forbidden.component.css similarity index 100% rename from quartz-manager-frontend/src/app/forbidden/forbidden.component.css rename to quartz-manager-frontend/src/app/views/forbidden/forbidden.component.css diff --git a/quartz-manager-frontend/src/app/forbidden/forbidden.component.html b/quartz-manager-frontend/src/app/views/forbidden/forbidden.component.html similarity index 100% rename from quartz-manager-frontend/src/app/forbidden/forbidden.component.html rename to quartz-manager-frontend/src/app/views/forbidden/forbidden.component.html diff --git a/quartz-manager-frontend/src/app/forbidden/forbidden.component.spec.ts b/quartz-manager-frontend/src/app/views/forbidden/forbidden.component.spec.ts similarity index 100% rename from quartz-manager-frontend/src/app/forbidden/forbidden.component.spec.ts rename to quartz-manager-frontend/src/app/views/forbidden/forbidden.component.spec.ts diff --git a/quartz-manager-frontend/src/app/forbidden/forbidden.component.ts b/quartz-manager-frontend/src/app/views/forbidden/forbidden.component.ts similarity index 100% rename from quartz-manager-frontend/src/app/forbidden/forbidden.component.ts rename to quartz-manager-frontend/src/app/views/forbidden/forbidden.component.ts diff --git a/quartz-manager-frontend/src/app/forbidden/index.ts b/quartz-manager-frontend/src/app/views/forbidden/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/forbidden/index.ts rename to quartz-manager-frontend/src/app/views/forbidden/index.ts diff --git a/quartz-manager-frontend/src/app/login/index.ts b/quartz-manager-frontend/src/app/views/login/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/login/index.ts rename to quartz-manager-frontend/src/app/views/login/index.ts diff --git a/quartz-manager-frontend/src/app/login/login.component.html b/quartz-manager-frontend/src/app/views/login/login.component.html similarity index 100% rename from quartz-manager-frontend/src/app/login/login.component.html rename to quartz-manager-frontend/src/app/views/login/login.component.html diff --git a/quartz-manager-frontend/src/app/login/login.component.scss b/quartz-manager-frontend/src/app/views/login/login.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/login/login.component.scss rename to quartz-manager-frontend/src/app/views/login/login.component.scss diff --git a/quartz-manager-frontend/src/app/login/login.component.spec.ts b/quartz-manager-frontend/src/app/views/login/login.component.spec.ts similarity index 92% rename from quartz-manager-frontend/src/app/login/login.component.spec.ts rename to quartz-manager-frontend/src/app/views/login/login.component.spec.ts index 60e4baf..fb57c05 100644 --- a/quartz-manager-frontend/src/app/login/login.component.spec.ts +++ b/quartz-manager-frontend/src/app/views/login/login.component.spec.ts @@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { LoginComponent } from './login.component'; import { RouterTestingModule } from '@angular/router/testing'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { MockApiService } from '../service/mocks/api.service.mock'; +import { MockApiService } from '../services/mocks/api.service.mock'; import { ReactiveFormsModule } from '@angular/forms'; import { @@ -10,7 +10,7 @@ import { AuthService, UserService, ConfigService -} from '../service'; +} from '../services'; describe('LoginComponent', () => { let component: LoginComponent; diff --git a/quartz-manager-frontend/src/app/login/login.component.ts b/quartz-manager-frontend/src/app/views/login/login.component.ts similarity index 92% rename from quartz-manager-frontend/src/app/login/login.component.ts rename to quartz-manager-frontend/src/app/views/login/login.component.ts index 8dac90e..53b7a55 100644 --- a/quartz-manager-frontend/src/app/login/login.component.ts +++ b/quartz-manager-frontend/src/app/views/login/login.component.ts @@ -2,14 +2,14 @@ import { Inject } from '@angular/core'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router, ActivatedRoute } from '@angular/router'; -import { DisplayMessage } from '../shared/models/display-message'; +import { DisplayMessage } from '../../shared/models/display-message'; import { Subscription } from 'rxjs'; import { takeUntil, delay } from 'rxjs/operators' import { UserService, AuthService -} from '../service'; +} from '../../services'; import { Observable } from 'rxjs'; import { Subject } from 'rxjs'; diff --git a/quartz-manager-frontend/src/app/manager/index.ts b/quartz-manager-frontend/src/app/views/manager/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/manager/index.ts rename to quartz-manager-frontend/src/app/views/manager/index.ts diff --git a/quartz-manager-frontend/src/app/manager/manager.component.html b/quartz-manager-frontend/src/app/views/manager/manager.component.html similarity index 100% rename from quartz-manager-frontend/src/app/manager/manager.component.html rename to quartz-manager-frontend/src/app/views/manager/manager.component.html diff --git a/quartz-manager-frontend/src/app/manager/manager.component.scss b/quartz-manager-frontend/src/app/views/manager/manager.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/manager/manager.component.scss rename to quartz-manager-frontend/src/app/views/manager/manager.component.scss diff --git a/quartz-manager-frontend/src/app/manager/manager.component.ts b/quartz-manager-frontend/src/app/views/manager/manager.component.ts similarity index 94% rename from quartz-manager-frontend/src/app/manager/manager.component.ts rename to quartz-manager-frontend/src/app/views/manager/manager.component.ts index c56b0ea..a780d49 100644 --- a/quartz-manager-frontend/src/app/manager/manager.component.ts +++ b/quartz-manager-frontend/src/app/views/manager/manager.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { ConfigService, UserService -} from '../service'; +} from '../../services'; @Component({ selector: 'manager', diff --git a/quartz-manager-frontend/src/app/not-found/index.ts b/quartz-manager-frontend/src/app/views/not-found/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/not-found/index.ts rename to quartz-manager-frontend/src/app/views/not-found/index.ts diff --git a/quartz-manager-frontend/src/app/not-found/not-found.component.css b/quartz-manager-frontend/src/app/views/not-found/not-found.component.css similarity index 100% rename from quartz-manager-frontend/src/app/not-found/not-found.component.css rename to quartz-manager-frontend/src/app/views/not-found/not-found.component.css diff --git a/quartz-manager-frontend/src/app/not-found/not-found.component.html b/quartz-manager-frontend/src/app/views/not-found/not-found.component.html similarity index 100% rename from quartz-manager-frontend/src/app/not-found/not-found.component.html rename to quartz-manager-frontend/src/app/views/not-found/not-found.component.html diff --git a/quartz-manager-frontend/src/app/not-found/not-found.component.spec.ts b/quartz-manager-frontend/src/app/views/not-found/not-found.component.spec.ts similarity index 100% rename from quartz-manager-frontend/src/app/not-found/not-found.component.spec.ts rename to quartz-manager-frontend/src/app/views/not-found/not-found.component.spec.ts diff --git a/quartz-manager-frontend/src/app/not-found/not-found.component.ts b/quartz-manager-frontend/src/app/views/not-found/not-found.component.ts similarity index 100% rename from quartz-manager-frontend/src/app/not-found/not-found.component.ts rename to quartz-manager-frontend/src/app/views/not-found/not-found.component.ts diff --git a/quartz-manager-frontend/src/app/signup/index.ts b/quartz-manager-frontend/src/app/views/signup/index.ts similarity index 100% rename from quartz-manager-frontend/src/app/signup/index.ts rename to quartz-manager-frontend/src/app/views/signup/index.ts diff --git a/quartz-manager-frontend/src/app/signup/signup.component.html b/quartz-manager-frontend/src/app/views/signup/signup.component.html similarity index 100% rename from quartz-manager-frontend/src/app/signup/signup.component.html rename to quartz-manager-frontend/src/app/views/signup/signup.component.html diff --git a/quartz-manager-frontend/src/app/signup/signup.component.scss b/quartz-manager-frontend/src/app/views/signup/signup.component.scss similarity index 100% rename from quartz-manager-frontend/src/app/signup/signup.component.scss rename to quartz-manager-frontend/src/app/views/signup/signup.component.scss diff --git a/quartz-manager-frontend/src/app/signup/signup.component.spec.ts b/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts similarity index 96% rename from quartz-manager-frontend/src/app/signup/signup.component.spec.ts rename to quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts index a7b3a19..db38407 100644 --- a/quartz-manager-frontend/src/app/signup/signup.component.spec.ts +++ b/quartz-manager-frontend/src/app/views/signup/signup.component.spec.ts @@ -9,13 +9,13 @@ import { RouterTestingModule } from '@angular/router/testing'; import { MockUserService, MockApiService - } from 'app/service/mocks'; + } from 'app/services/mocks'; import { UserService, AuthService, ApiService, ConfigService - } from 'app/service'; + } from 'app/services'; describe('SignupComponent', () => { let component: SignupComponent; diff --git a/quartz-manager-frontend/src/app/signup/signup.component.ts b/quartz-manager-frontend/src/app/views/signup/signup.component.ts similarity index 96% rename from quartz-manager-frontend/src/app/signup/signup.component.ts rename to quartz-manager-frontend/src/app/views/signup/signup.component.ts index aaa5ad2..0a9c6fb 100644 --- a/quartz-manager-frontend/src/app/signup/signup.component.ts +++ b/quartz-manager-frontend/src/app/views/signup/signup.component.ts @@ -2,13 +2,13 @@ import { Inject } from '@angular/core'; import { Component, OnInit, OnDestroy } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router, ActivatedRoute } from '@angular/router'; -import { DisplayMessage } from '../shared/models/display-message'; +import { DisplayMessage } from '../../shared/models/display-message'; import { Subscription } from 'rxjs'; import { takeUntil, delay } from 'rxjs/operators' import { UserService, AuthService -} from '../service'; +} from '../../services'; import { Observable } from 'rxjs'; import { Subject } from 'rxjs';