diff --git a/package.json b/package.json index d3c8900..1d7c632 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@angular/platform-browser": "~8.1.3", "@angular/platform-browser-dynamic": "~8.1.3", "@angular/router": "~8.1.3", + "angular-epic-spinners": "^2.0.0", "rxjs": "~6.4.0", "tslib": "^1.9.0", "zone.js": "~0.9.1" @@ -28,9 +29,9 @@ "@angular/cli": "~8.1.3", "@angular/compiler-cli": "~8.1.3", "@angular/language-service": "~8.1.3", - "@types/node": "~8.9.4", "@types/jasmine": "~3.3.8", "@types/jasminewd2": "~2.0.3", + "@types/node": "~8.9.4", "codelyzer": "^5.0.0", "jasmine-core": "~3.4.0", "jasmine-spec-reporter": "~4.2.1", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 06c7342..c758891 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,11 +1,16 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { VideoGamerLayoutModule } from './modules/layouts/video-gamer-layout/video-gamer-layout.module'; - -const routes: Routes = []; +const routes: Routes = [ + { + path: '', + loadChildren: () => VideoGamerLayoutModule + } +]; @NgModule({ imports: [RouterModule.forRoot(routes)], exports: [RouterModule] }) -export class AppRoutingModule { } +export class AppRoutingModule {} diff --git a/src/app/app.component.html b/src/app/app.component.html index 0f3d9d8..0680b43 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,21 +1 @@ - -
-

- Welcome to {{ title }}! -

- Angular Logo -
-

Here are some links to help you start:

- - diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 501be31..e9f6ffa 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,6 +5,4 @@ import { Component } from '@angular/core'; templateUrl: './app.component.html', styleUrls: ['./app.component.css'] }) -export class AppComponent { - title = 'video-gamer'; -} +export class AppComponent {} diff --git a/src/app/modules/index.ts b/src/app/modules/index.ts new file mode 100644 index 0000000..6aa82f2 --- /dev/null +++ b/src/app/modules/index.ts @@ -0,0 +1,3 @@ +import { VideoGamerLayoutModule } from './layouts/video-gamer-layout/video-gamer-layout.module'; + +export { VideoGamerLayoutModule }; diff --git a/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.css b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.css new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.css @@ -0,0 +1 @@ + diff --git a/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.html b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.html new file mode 100644 index 0000000..e91fa55 --- /dev/null +++ b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.html @@ -0,0 +1 @@ + diff --git a/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.spec.ts b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.spec.ts new file mode 100644 index 0000000..eb0d146 --- /dev/null +++ b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DefaultComponent } from './default.component'; + +describe('DefaultComponent', () => { + let component: DefaultComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DefaultComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DefaultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.ts b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.ts new file mode 100644 index 0000000..0bec71f --- /dev/null +++ b/src/app/modules/layouts/video-gamer-layout/comoponents/default/default.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-default', + templateUrl: './default.component.html', + styleUrls: ['./default.component.css'] +}) +export class DefaultComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/modules/layouts/video-gamer-layout/comoponents/index.ts b/src/app/modules/layouts/video-gamer-layout/comoponents/index.ts new file mode 100644 index 0000000..d69e798 --- /dev/null +++ b/src/app/modules/layouts/video-gamer-layout/comoponents/index.ts @@ -0,0 +1,3 @@ +import { DefaultComponent } from './default/default.component'; + +export { DefaultComponent }; diff --git a/src/app/modules/layouts/video-gamer-layout/video-gamer-layout.module.ts b/src/app/modules/layouts/video-gamer-layout/video-gamer-layout.module.ts new file mode 100644 index 0000000..51543e4 --- /dev/null +++ b/src/app/modules/layouts/video-gamer-layout/video-gamer-layout.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { SharedComponentsModule } from '../../shared-components/shared-components.module'; +import { DefaultComponent } from './comoponents'; +import { RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: '', + component: DefaultComponent, + children: [] + } +]; + +@NgModule({ + declarations: [DefaultComponent], + imports: [CommonModule, RouterModule.forChild(routes), SharedComponentsModule] +}) +export class VideoGamerLayoutModule {} diff --git a/src/app/modules/shared-components/components/header/header.component.css b/src/app/modules/shared-components/components/header/header.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/modules/shared-components/components/header/header.component.html b/src/app/modules/shared-components/components/header/header.component.html new file mode 100644 index 0000000..4f5a95d --- /dev/null +++ b/src/app/modules/shared-components/components/header/header.component.html @@ -0,0 +1 @@ +

header works!

diff --git a/src/app/modules/shared-components/components/header/header.component.spec.ts b/src/app/modules/shared-components/components/header/header.component.spec.ts new file mode 100644 index 0000000..2d0479d --- /dev/null +++ b/src/app/modules/shared-components/components/header/header.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HeaderComponent } from './header.component'; + +describe('HeaderComponent', () => { + let component: HeaderComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HeaderComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HeaderComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/shared-components/components/header/header.component.ts b/src/app/modules/shared-components/components/header/header.component.ts new file mode 100644 index 0000000..3ee4d0f --- /dev/null +++ b/src/app/modules/shared-components/components/header/header.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-header', + templateUrl: './header.component.html', + styleUrls: ['./header.component.css'] +}) +export class HeaderComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/modules/shared-components/components/index.ts b/src/app/modules/shared-components/components/index.ts new file mode 100644 index 0000000..1765006 --- /dev/null +++ b/src/app/modules/shared-components/components/index.ts @@ -0,0 +1,3 @@ +import { HeaderComponent } from './header/header.component'; + +export { HeaderComponent }; diff --git a/src/app/modules/shared-components/shared-components.module.ts b/src/app/modules/shared-components/shared-components.module.ts new file mode 100644 index 0000000..4dd986b --- /dev/null +++ b/src/app/modules/shared-components/shared-components.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { HeaderComponent } from './components'; + +@NgModule({ + declarations: [HeaderComponent], + imports: [CommonModule], + exports: [HeaderComponent] +}) +export class SharedComponentsModule {} diff --git a/src/app/modules/shared/shared.module.ts b/src/app/modules/shared/shared.module.ts new file mode 100644 index 0000000..76cf203 --- /dev/null +++ b/src/app/modules/shared/shared.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + + + +@NgModule({ + declarations: [], + imports: [ + CommonModule + ] +}) +export class SharedModule { } diff --git a/tsconfig.json b/tsconfig.json index 30956ae..41c84bb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,5 +22,10 @@ "angularCompilerOptions": { "fullTemplateTypeCheck": true, "strictInjectionParameters": true + }, + "paths": { + "@service*": ["app/services/*"], + "@model*": ["app/models/*"], + "@env*": ["environments/*"] } } diff --git a/yarn.lock b/yarn.lock index f8dd702..bb2060a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -658,6 +658,13 @@ amdefine@>=0.0.4: resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= +angular-epic-spinners@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/angular-epic-spinners/-/angular-epic-spinners-2.0.0.tgz#2f7c340836e98b6dddadf754a7185c3172d7a03a" + integrity sha512-+OElE3Vb0A555DcRh44LpHuYxdoTKFsOkVCFubFBt4FexYLaPuyzY0qGL566C2Y/i0cFmcl+CNcKvX1SuVp0Ig== + dependencies: + tslib "^1.9.0" + ansi-colors@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.0.tgz#e1674bd61027c8c219b9edec929b6b57641b0c09"