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 @@ +