From 8d2df73484c4d5c7ae8237c7478963ba6e1c42f7 Mon Sep 17 00:00:00 2001 From: Daniel Lukats Date: Thu, 23 Jul 2020 14:53:03 +0200 Subject: [PATCH] Added GameModule --- src/app/app-routing.module.ts | 5 +++ src/app/app.module.ts | 12 +++---- src/app/{ => game}/chat/chat.component.css | 1 + src/app/{ => game}/chat/chat.component.html | 0 .../{ => game}/chat/chat.component.spec.ts | 0 src/app/{ => game}/chat/chat.component.ts | 3 +- .../{ => game}/chat/entry/entry.component.css | 0 .../chat/entry/entry.component.html | 0 .../chat/entry/entry.component.spec.ts | 0 .../{ => game}/chat/entry/entry.component.ts | 0 src/app/{ => game}/chat/entry/entry.spec.ts | 0 src/app/{ => game}/chat/entry/entry.ts | 0 .../{ => game}/chat/input/input.component.css | 0 .../chat/input/input.component.html | 0 .../chat/input/input.component.spec.ts | 0 .../{ => game}/chat/input/input.component.ts | 6 ++-- src/app/{ => game}/chat/message.spec.ts | 0 src/app/{ => game}/chat/message.ts | 0 src/app/game/game-routing.module.ts | 18 ++++++++++ src/app/game/game.component.css | 7 ++++ src/app/game/game.component.html | 11 ++++++ src/app/game/game.component.spec.ts | 25 +++++++++++++ src/app/game/game.component.ts | 15 ++++++++ src/app/game/game.module.ts | 35 +++++++++++++++++++ src/app/game/navbar/navbar.component.css | 8 +++++ src/app/game/navbar/navbar.component.html | 11 ++++++ src/app/game/navbar/navbar.component.spec.ts | 25 +++++++++++++ src/app/game/navbar/navbar.component.ts | 15 ++++++++ src/app/{ => game}/test/test.component.css | 0 src/app/{ => game}/test/test.component.html | 0 .../{ => game}/test/test.component.spec.ts | 0 src/app/{ => game}/test/test.component.ts | 2 +- src/assets/build_circle-24px.svg | 1 + 33 files changed, 187 insertions(+), 13 deletions(-) rename src/app/{ => game}/chat/chat.component.css (67%) rename src/app/{ => game}/chat/chat.component.html (100%) rename src/app/{ => game}/chat/chat.component.spec.ts (100%) rename src/app/{ => game}/chat/chat.component.ts (94%) rename src/app/{ => game}/chat/entry/entry.component.css (100%) rename src/app/{ => game}/chat/entry/entry.component.html (100%) rename src/app/{ => game}/chat/entry/entry.component.spec.ts (100%) rename src/app/{ => game}/chat/entry/entry.component.ts (100%) rename src/app/{ => game}/chat/entry/entry.spec.ts (100%) rename src/app/{ => game}/chat/entry/entry.ts (100%) rename src/app/{ => game}/chat/input/input.component.css (100%) rename src/app/{ => game}/chat/input/input.component.html (100%) rename src/app/{ => game}/chat/input/input.component.spec.ts (100%) rename src/app/{ => game}/chat/input/input.component.ts (74%) rename src/app/{ => game}/chat/message.spec.ts (100%) rename src/app/{ => game}/chat/message.ts (100%) create mode 100644 src/app/game/game-routing.module.ts create mode 100644 src/app/game/game.component.css create mode 100644 src/app/game/game.component.html create mode 100644 src/app/game/game.component.spec.ts create mode 100644 src/app/game/game.component.ts create mode 100644 src/app/game/game.module.ts create mode 100644 src/app/game/navbar/navbar.component.css create mode 100644 src/app/game/navbar/navbar.component.html create mode 100644 src/app/game/navbar/navbar.component.spec.ts create mode 100644 src/app/game/navbar/navbar.component.ts rename src/app/{ => game}/test/test.component.css (100%) rename src/app/{ => game}/test/test.component.html (100%) rename src/app/{ => game}/test/test.component.spec.ts (100%) rename src/app/{ => game}/test/test.component.ts (92%) create mode 100644 src/assets/build_circle-24px.svg diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d237669..d4e067d 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,15 +1,20 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; + import { AppComponent } from './app.component'; import { AuthGuard } from './account/auth.guard'; import { LoginComponent } from './account/login/login.component'; import { RegisterComponent } from './account/register/register.component'; +const gameModule = () => import('./game/game.module').then(x => x.GameModule); + const routes: Routes = [ { path: '', component: AppComponent, canActivate: [AuthGuard] }, + // { path: '', redirectTo: '/game', pathMatch: 'prefix', canActivate: [AuthGuard] }, { path: 'login', component: LoginComponent }, { path: 'register', component: RegisterComponent }, + { path: 'game', loadChildren: gameModule, canActivate: [AuthGuard] }, { path: '**', redirectTo: '' }, ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ed2613b..ab0bc90 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -12,22 +12,15 @@ import { MatInputModule } from '@angular/material/input'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { ChatComponent } from './chat/chat.component'; -import { EntryComponent } from './chat/entry/entry.component'; -import { InputComponent } from './chat/input/input.component'; import { LoginComponent } from './account/login/login.component'; -import { TestComponent } from './test/test.component'; import { RegisterComponent } from './account/register/register.component'; import { fakeBackendProvider } from './utils/fake-backend'; +import { GameModule } from './game/game.module'; @NgModule({ declarations: [ AppComponent, - ChatComponent, - EntryComponent, - InputComponent, LoginComponent, - TestComponent, RegisterComponent ], imports: [ @@ -41,10 +34,13 @@ import { fakeBackendProvider } from './utils/fake-backend'; MatInputModule, ReactiveFormsModule, AppRoutingModule, + GameModule, ], providers: [ fakeBackendProvider, ], + exports: [ + ], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/app/chat/chat.component.css b/src/app/game/chat/chat.component.css similarity index 67% rename from src/app/chat/chat.component.css rename to src/app/game/chat/chat.component.css index 7f2f8b5..189a393 100644 --- a/src/app/chat/chat.component.css +++ b/src/app/game/chat/chat.component.css @@ -1,4 +1,5 @@ #chat-log { height: calc(99% - 34px); overflow-y: scroll; + background-color: goldenrod; } diff --git a/src/app/chat/chat.component.html b/src/app/game/chat/chat.component.html similarity index 100% rename from src/app/chat/chat.component.html rename to src/app/game/chat/chat.component.html diff --git a/src/app/chat/chat.component.spec.ts b/src/app/game/chat/chat.component.spec.ts similarity index 100% rename from src/app/chat/chat.component.spec.ts rename to src/app/game/chat/chat.component.spec.ts diff --git a/src/app/chat/chat.component.ts b/src/app/game/chat/chat.component.ts similarity index 94% rename from src/app/chat/chat.component.ts rename to src/app/game/chat/chat.component.ts index 7406eeb..32d0bc8 100644 --- a/src/app/chat/chat.component.ts +++ b/src/app/game/chat/chat.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit } from '@angular/core'; + import { Entry } from './entry/entry'; import { Message } from './message'; -import {SocketService} from '../socket/socket.service'; +import { SocketService } from '../../socket/socket.service'; @Component({ selector: 'app-chat', diff --git a/src/app/chat/entry/entry.component.css b/src/app/game/chat/entry/entry.component.css similarity index 100% rename from src/app/chat/entry/entry.component.css rename to src/app/game/chat/entry/entry.component.css diff --git a/src/app/chat/entry/entry.component.html b/src/app/game/chat/entry/entry.component.html similarity index 100% rename from src/app/chat/entry/entry.component.html rename to src/app/game/chat/entry/entry.component.html diff --git a/src/app/chat/entry/entry.component.spec.ts b/src/app/game/chat/entry/entry.component.spec.ts similarity index 100% rename from src/app/chat/entry/entry.component.spec.ts rename to src/app/game/chat/entry/entry.component.spec.ts diff --git a/src/app/chat/entry/entry.component.ts b/src/app/game/chat/entry/entry.component.ts similarity index 100% rename from src/app/chat/entry/entry.component.ts rename to src/app/game/chat/entry/entry.component.ts diff --git a/src/app/chat/entry/entry.spec.ts b/src/app/game/chat/entry/entry.spec.ts similarity index 100% rename from src/app/chat/entry/entry.spec.ts rename to src/app/game/chat/entry/entry.spec.ts diff --git a/src/app/chat/entry/entry.ts b/src/app/game/chat/entry/entry.ts similarity index 100% rename from src/app/chat/entry/entry.ts rename to src/app/game/chat/entry/entry.ts diff --git a/src/app/chat/input/input.component.css b/src/app/game/chat/input/input.component.css similarity index 100% rename from src/app/chat/input/input.component.css rename to src/app/game/chat/input/input.component.css diff --git a/src/app/chat/input/input.component.html b/src/app/game/chat/input/input.component.html similarity index 100% rename from src/app/chat/input/input.component.html rename to src/app/game/chat/input/input.component.html diff --git a/src/app/chat/input/input.component.spec.ts b/src/app/game/chat/input/input.component.spec.ts similarity index 100% rename from src/app/chat/input/input.component.spec.ts rename to src/app/game/chat/input/input.component.spec.ts diff --git a/src/app/chat/input/input.component.ts b/src/app/game/chat/input/input.component.ts similarity index 74% rename from src/app/chat/input/input.component.ts rename to src/app/game/chat/input/input.component.ts index ee1ce58..89aec71 100644 --- a/src/app/chat/input/input.component.ts +++ b/src/app/game/chat/input/input.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; -import {SocketService} from '../../socket/socket.service'; -import {Message} from '../message'; -import {Events} from '../../socket/events-enum'; +import { Message } from '../message'; +import { Events } from '../../../socket/events-enum'; +import { SocketService } from '../../../socket/socket.service'; @Component({ selector: 'app-input', diff --git a/src/app/chat/message.spec.ts b/src/app/game/chat/message.spec.ts similarity index 100% rename from src/app/chat/message.spec.ts rename to src/app/game/chat/message.spec.ts diff --git a/src/app/chat/message.ts b/src/app/game/chat/message.ts similarity index 100% rename from src/app/chat/message.ts rename to src/app/game/chat/message.ts diff --git a/src/app/game/game-routing.module.ts b/src/app/game/game-routing.module.ts new file mode 100644 index 0000000..c498101 --- /dev/null +++ b/src/app/game/game-routing.module.ts @@ -0,0 +1,18 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { GameComponent } from './game.component'; +import { TestComponent } from './test/test.component'; + +const routes: Routes = [ + { path: '', component: GameComponent, + children: [ + { path: '', redirectTo: 'test', pathMatch: 'prefix' }, + { path: 'test', component: TestComponent }, + ]} +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class GameRoutingModule { } diff --git a/src/app/game/game.component.css b/src/app/game/game.component.css new file mode 100644 index 0000000..bcd57b4 --- /dev/null +++ b/src/app/game/game.component.css @@ -0,0 +1,7 @@ +#game-items { + height: 100%; +} + +#navbar { + background-color: #333333; +} diff --git a/src/app/game/game.component.html b/src/app/game/game.component.html new file mode 100644 index 0000000..59c8059 --- /dev/null +++ b/src/app/game/game.component.html @@ -0,0 +1,11 @@ +
+ +
+ +
+
+ +
+
diff --git a/src/app/game/game.component.spec.ts b/src/app/game/game.component.spec.ts new file mode 100644 index 0000000..bdf06d3 --- /dev/null +++ b/src/app/game/game.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GameComponent } from './game.component'; + +describe('GameComponent', () => { + let component: GameComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ GameComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(GameComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/game/game.component.ts b/src/app/game/game.component.ts new file mode 100644 index 0000000..7241eb1 --- /dev/null +++ b/src/app/game/game.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-game', + templateUrl: './game.component.html', + styleUrls: ['./game.component.css'] +}) +export class GameComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/game/game.module.ts b/src/app/game/game.module.ts new file mode 100644 index 0000000..41d6f36 --- /dev/null +++ b/src/app/game/game.module.ts @@ -0,0 +1,35 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FlexModule } from '@angular/flex-layout'; + +import { MatCardModule } from '@angular/material/card'; + +import { GameRoutingModule } from './game-routing.module'; +import { GameComponent } from './game.component'; +import { ChatComponent } from './chat/chat.component'; +import { EntryComponent } from './chat/entry/entry.component'; +import { InputComponent } from './chat/input/input.component'; +import { NavbarComponent } from './navbar/navbar.component'; +import { TestComponent } from './test/test.component'; + + +@NgModule({ + declarations: [ + GameComponent, + NavbarComponent, + ChatComponent, + TestComponent, + EntryComponent, + InputComponent, + ], + exports: [ + NavbarComponent + ], + imports: [ + CommonModule, + GameRoutingModule, + FlexModule, + MatCardModule, + ] +}) +export class GameModule { } diff --git a/src/app/game/navbar/navbar.component.css b/src/app/game/navbar/navbar.component.css new file mode 100644 index 0000000..b1cf6dd --- /dev/null +++ b/src/app/game/navbar/navbar.component.css @@ -0,0 +1,8 @@ +.nav-img { + width: 40px; + height: 40px; +} + +.nav-item { + margin: 2px 4px; +} diff --git a/src/app/game/navbar/navbar.component.html b/src/app/game/navbar/navbar.component.html new file mode 100644 index 0000000..bbe0e28 --- /dev/null +++ b/src/app/game/navbar/navbar.component.html @@ -0,0 +1,11 @@ +
+ + TODO + + + TODO + + + TODO + +
diff --git a/src/app/game/navbar/navbar.component.spec.ts b/src/app/game/navbar/navbar.component.spec.ts new file mode 100644 index 0000000..9032ad2 --- /dev/null +++ b/src/app/game/navbar/navbar.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { NavbarComponent } from './navbar.component'; + +describe('NavbarComponent', () => { + let component: NavbarComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ NavbarComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(NavbarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/game/navbar/navbar.component.ts b/src/app/game/navbar/navbar.component.ts new file mode 100644 index 0000000..18d7b70 --- /dev/null +++ b/src/app/game/navbar/navbar.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-navbar', + templateUrl: './navbar.component.html', + styleUrls: ['./navbar.component.css'] +}) +export class NavbarComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/test/test.component.css b/src/app/game/test/test.component.css similarity index 100% rename from src/app/test/test.component.css rename to src/app/game/test/test.component.css diff --git a/src/app/test/test.component.html b/src/app/game/test/test.component.html similarity index 100% rename from src/app/test/test.component.html rename to src/app/game/test/test.component.html diff --git a/src/app/test/test.component.spec.ts b/src/app/game/test/test.component.spec.ts similarity index 100% rename from src/app/test/test.component.spec.ts rename to src/app/game/test/test.component.spec.ts diff --git a/src/app/test/test.component.ts b/src/app/game/test/test.component.ts similarity index 92% rename from src/app/test/test.component.ts rename to src/app/game/test/test.component.ts index 2d9218e..419e7f3 100644 --- a/src/app/test/test.component.ts +++ b/src/app/game/test/test.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import {SocketService} from '../socket/socket.service'; +import {SocketService} from '../../socket/socket.service'; @Component({ selector: 'app-test', diff --git a/src/assets/build_circle-24px.svg b/src/assets/build_circle-24px.svg new file mode 100644 index 0000000..aed860c --- /dev/null +++ b/src/assets/build_circle-24px.svg @@ -0,0 +1 @@ + \ No newline at end of file