Merge pull request mathisGarberg#21 from TomHAnderson/feature/singular-names

Feature/singular names

Author: mathisGarberg

.documentation/additional-resources.rst

@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { AuthLayoutComponent } from './layouts/auth-layout/auth-layout.component';
-import { ContentLayoutComponent } from './layouts/content-layout/content-layout.component';
+import { AuthLayoutComponent } from './layout/auth-layout/auth-layout.component';
+import { ContentLayoutComponent } from './layout/content-layout/content-layout.component';
 
-import { NoAuthGuard } from '@app/core';
+import { NoAuthGuard } from './core/guard/no-auth.guard';
 
 const routes: Routes = [
   {
@@ -20,25 +20,25 @@ const routes: Routes = [
       {
         path: 'dashboard',
         loadChildren: () =>
-          import('./modules/home/home.module').then(m => m.HomeModule)
+          import('./module/home/home.module').then(m => m.HomeModule)
       },
       {
         path: 'about',
         loadChildren: () =>
-          import('./modules/about/about.module').then(m => m.AboutModule)
+          import('./module/about/about.module').then(m => m.AboutModule)
       },
       {
         path: 'contact',
         loadChildren: () =>
-          import('./modules/contact/contact.module').then(m => m.ContactModule)
+          import('./module/contact/contact.module').then(m => m.ContactModule)
       }
     ]
   },
   {
     path: 'auth',
     component: AuthLayoutComponent,
     loadChildren: () =>
-      import('./modules/auth/auth.module').then(m => m.AuthModule)
+      import('./module/auth/auth.module').then(m => m.AuthModule)
   },
   // Fallback when no prior routes is matched
   { path: '**', redirectTo: '/auth/login', pathMatch: 'full' }

.documentation/core.rst

@@ -1,18 +1,18 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 
-import { CoreModule } from '@app/core';
-import { SharedModule } from '@app/shared';
+import { CoreModule } from './core/core.module';
+import { SharedModule } from './shared/shared.module';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
 
-import { ContentLayoutComponent } from './layouts/content-layout/content-layout.component';
-import { NavComponent } from './layouts/nav/nav.component';
-import { FooterComponent } from './layouts/footer/footer.component';
+import { ContentLayoutComponent } from './layout/content-layout/content-layout.component';
+import { NavComponent } from './layout/nav/nav.component';
+import { FooterComponent } from './layout/footer/footer.component';
 
-import { AuthModule } from './modules/auth/auth.module';
-import { AuthLayoutComponent } from './layouts/auth-layout/auth-layout.component';
+import { AuthModule } from './module/auth/auth.module';
+import { AuthLayoutComponent } from './layout/auth-layout/auth-layout.component';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
 @NgModule({

.documentation/data.rst

@@ -1,15 +1,14 @@
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 
-import { environment } from '@env/environment';
-import { AuthGuard } from './guards/auth.guard';
-import { NoAuthGuard } from './guards/no-auth.guard';
+import { AuthGuard } from './guard/auth.guard';
+import { NoAuthGuard } from './guard/no-auth.guard';
+import { throwIfAlreadyLoaded } from './guard/module-import.guard';
 
-import { NgxSpinnerModule } from 'ngx-spinner';
+import { TokenInterceptor } from './interceptor/token.interceptor';
 
-import { TokenInterceptor } from './interceptors/token.interceptor';
+import { NgxSpinnerModule } from 'ngx-spinner';
 
-import { throwIfAlreadyLoaded } from './guards/module-import.guard';
 
 @NgModule({
     imports: [

.documentation/index.rst

@@ -5,19 +5,11 @@ import {
   HttpEvent,
   HttpInterceptor
 } from '@angular/common/http';
-// import { AuthService } from './auth/auth.service';
 import { Observable } from 'rxjs/Observable';
 
 @Injectable()
 export class TokenInterceptor implements HttpInterceptor {
-  constructor() {}
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    
-    // request = request.clone({
-    //   setHeaders: {
-    //     Authorization: `Bearer ${this.auth.getToken()}`
-    //   }
-    // });
     return next.handle(request);
   }
 }

.documentation/layout.rst

@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
-import { delay, map, catchError } from 'rxjs/operators';
-
-import { config } from '../app-config';
+import { delay, catchError } from 'rxjs/operators';
+import { environment } from '@env/environment';
 
 @Injectable({
   providedIn: 'root'
@@ -12,7 +11,7 @@ export class JsonApiService {
   constructor(private httpClient: HttpClient) {}
 
   fetch(url): Observable<any> {
-    return this.httpClient.get(this.getBaseUrl() + config.API_URL + url).pipe(
+    return this.httpClient.get(this.getBaseUrl() + environment.API_URL + url).pipe(
       delay(100),
       catchError(this.handleError)
     );

.documentation/module.rst

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { OverlayContainer } from '@angular/cdk/overlay';
-import { ThemeService } from '@app/core';
+import { ThemeService } from '../../core/service/theme.service';
 import { Observable } from 'rxjs';
 
 @Component({

.documentation/shared.rst

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { environment as env } from '@env/environment';
 import { Observable } from 'rxjs/Observable';
-import { ThemeService } from '@app/core';
+import { ThemeService } from '../../core/service/theme.service';
 
 @Component({
     selector: 'app-footer',

.documentation/theme.rst

@@ -7,21 +7,12 @@ import { environment } from '@env/environment';
     templateUrl: './nav.component.html',
     styleUrls: ['./nav.component.scss']
 })
-export class NavComponent implements OnInit {
+export class NavComponent {
   version = environment.version;
 
-
   navItems = [
     { link: '/dashboard/home', title: 'Home' },
     { link: '/about', title: 'About' },
     { link: '/contact', title: 'Contact' }
   ];
-
-  constructor() { }
-
-  ngOnInit() {
-
-  }
-
-
 }

src/app/app-routing.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { AboutComponent } from './pages/about/about.component';
+import { AboutComponent } from './page/about/about.component';
 
 const routes: Routes = [
   {

src/app/app.module.ts

@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '@app/shared';
+import { SharedModule } from '../../shared/shared.module';
 
 import { AboutRoutingModule } from './about-routing.module';
-import { AboutComponent } from './pages/about/about.component';
+import { AboutComponent } from './page/about/about.component';
 
 @NgModule({
   declarations: [AboutComponent],

src/app/core/app-config.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { LoginComponent } from './pages/login/login.component';
-import { RegisterComponent } from './pages/register/register.component';
-import { SharedModule } from '@app/shared';
+import { LoginComponent } from './page/login/login.component';
+import { RegisterComponent } from './page/register/register.component';
+import { SharedModule } from '../../shared/shared.module';
 
 import { AuthRoutingModule } from './auth.routing';
 

src/app/core/core.module.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-import { LoginComponent } from './pages/login/login.component';
-import { RegisterComponent } from './pages/register/register.component';
+import { LoginComponent } from './page/login/login.component';
+import { RegisterComponent } from './page/register/register.component';
 
 const routes: Routes = [
   {

src/app/core/guards/auth.guard.ts renamed to src/app/core/guard/auth.guard.ts

@@ -4,7 +4,7 @@ import { FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { tap, delay, finalize, catchError } from 'rxjs/operators';
 import { of } from 'rxjs';
 
-import { AuthService } from '../../../../core/services/auth.service';
+import { AuthService } from '../../../../core/service/auth.service';
 
 @Component({
   selector: 'app-login',

src/app/core/guards/module-import.guard.ts renamed to src/app/core/guard/module-import.guard.ts

@@ -1,5 +1,5 @@
 import { Routes, RouterModule } from '@angular/router';
-import { ContactComponent } from './pages/contact/contact.component';
+import { ContactComponent } from './page/contact/contact.component';
 
 const routes: Routes = [
   {

src/app/core/guards/no-auth.guard.ts renamed to src/app/core/guard/no-auth.guard.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '@app/shared';
+import { SharedModule } from '../../shared/shared.module';
 import { ContactRoutes } from './contact-routing.module';
-import { ContactComponent } from './pages/contact/contact.component';
+import { ContactComponent } from './page/contact/contact.component';
 
 
 @NgModule({

src/app/core/guards/index.ts

@@ -1,13 +1,13 @@
 import { NgModule } from '@angular/core';
 
-import { MyModalComponent } from './modals/my-modal.component';
+import { MyModalComponent } from './modal/my-modal.component';
 
-import { HomeComponent } from './pages/home.component';
+import { HomeComponent } from './page/home.component';
 import { HomeRoutingModule } from './home.routing';
 
-import { SharedModule } from '@app/shared';
-import { ProjectItemComponent } from './pages/project-item/project-item.component';
-import { ProjectDetailsComponent } from './pages/project-details/project-details.component';
+import { SharedModule } from '../../shared/shared.module';
+import { ProjectItemComponent } from './page/project-item/project-item.component';
+import { ProjectDetailsComponent } from './page/project-details/project-details.component';
 
 @NgModule({
     declarations: [

src/app/core/index.ts

@@ -1,8 +1,8 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { ProjectResolver } from './project-resolver.service';
-import { HomeComponent } from './pages/home.component';
-import { ProjectDetailsComponent } from './pages/project-details/project-details.component';
+import { HomeComponent } from './page/home.component';
+import { ProjectDetailsComponent } from './page/project-details/project-details.component';
 
 export const routes: Routes = [
   {

src/app/core/interceptors/token.interceptor.ts renamed to src/app/core/interceptor/token.interceptor.ts

@@ -5,7 +5,7 @@ import { ProjectService } from '../../../data/service/project.service';
 import { Project } from '../../../data/schema/project';
 import { Observable } from 'rxjs';
 
-import { MyModalComponent } from '../modals/my-modal.component';
+import { MyModalComponent } from '../modal/my-modal.component';
 
 @Component({
     selector: 'app-home',

src/app/core/interceptors/index.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { ValidationService } from '../../services/validation.service';
+import { ValidationService } from '../../service/validation.service';
 
 @Component({
   selector: 'app-control-messages',

src/app/core/services/auth.service.spec.ts renamed to src/app/core/service/auth.service.spec.ts

@@ -64,8 +64,8 @@ library.add(
   faBook
 );
 
-import { ControlMessagesComponent } from './components/control-messages/control-messages.component';
-import { SpinnerComponent } from './components/spinner/spinner.component';
+import { ControlMessagesComponent } from './component/control-messages/control-messages.component';
+import { SpinnerComponent } from './component/spinner/spinner.component';
 
 @NgModule({
   imports: [

src/app/core/services/auth.service.ts renamed to src/app/core/service/auth.service.ts

@@ -6,4 +6,5 @@ export const environment = {
   version: env.npm_package_version,
   serverUrl: '/api',
   envName: 'PROD',
+  API_URL: 'assets/api'
 };