renamed some folders

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 { LoginComponent } from './views/login';
-import { LoginGuard } from './guard';
+import { LoginGuard } from './guards';
-import { GuestGuard, AdminGuard } from './guard';
+import { GuestGuard, AdminGuard } from './guards';
-import { NotFoundComponent } from './not-found';
+import { NotFoundComponent } from './views/not-found';
-import { ChangePasswordComponent } from './change-password';
+import { ChangePasswordComponent } from './views/change-password';
-import { ForbiddenComponent } from './forbidden';
+import { ForbiddenComponent } from './views/forbidden';
 
-import { ManagerComponent } from './manager'; 
+import { ManagerComponent } from './views/manager'; 
  
 export const routes: Routes = [
   {

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 { ManagerComponent } from './views/manager';
-import { LoginComponent } from './login';
+import { LoginComponent } from './views/login';
-import { MockApiService } from './service/mocks/api.service.mock';
+import { MockApiService } from './services/mocks/api.service.mock';
 
-import { LoginGuard } from './guard';
+import { LoginGuard } from './guards';
-import { NotFoundComponent } from './not-found';
+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';
 

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 { ManagerComponent } from './views/manager';
-import { LoginComponent } from './login';
+import { LoginComponent } from './views/login';
-import { LoginGuard, GuestGuard, AdminGuard } from './guard';
+import { LoginGuard, GuestGuard, AdminGuard } from './guards';
-import { NotFoundComponent } from './not-found';
+import { NotFoundComponent } from './views/not-found';
-import { AccountMenuComponent } from './component/header/account-menu/account-menu.component';
+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';
+} from './services';
-import { ChangePasswordComponent } from './change-password/change-password.component';
+import { ChangePasswordComponent } from './views/change-password/change-password.component';
-import { ForbiddenComponent } from './forbidden/forbidden.component';
+import { ForbiddenComponent } from './views/forbidden/forbidden.component';
 
 export function initUserFactory(userService: UserService) {
     return () => userService.jsessionInitUser();

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', () => {

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({

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({

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({

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',

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({

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',

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) {}

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()

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()

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()

quartz-manager-frontend/src/app/views/change-password/change-password.component.spec.ts

@@ -7,8 +7,8 @@ import {
   AuthService,
   UserService,
   ConfigService
-} from '../service';
+} from '../services';
-import { MockApiService } from '../service/mocks';
+import { MockApiService } from '../services/mocks';
 
 import { ChangePasswordComponent } from './change-password.component';
 

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({

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;

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';

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',

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;

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';