diff --git a/apollo-frontend/src/app/app-routing.module.ts b/apollo-frontend/src/app/app-routing.module.ts index 0297262..32842c3 100644 --- a/apollo-frontend/src/app/app-routing.module.ts +++ b/apollo-frontend/src/app/app-routing.module.ts @@ -1,10 +1,15 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { DashboardComponent } from './dashboard/dashboard.component'; +import { MinigameConveyorRecyclingComponent } from './minigame-conveyor-recycling/minigame-conveyor-recycling.component'; -const routes: Routes = []; +const routes: Routes = [ + { path: 'minigames/conveyor-belt', component: MinigameConveyorRecyclingComponent }, + { path: '', component: DashboardComponent }, +]; @NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule] }) export class AppRoutingModule { } diff --git a/apollo-frontend/src/app/app.component.html b/apollo-frontend/src/app/app.component.html index 2e52e9d..90c6b64 100644 --- a/apollo-frontend/src/app/app.component.html +++ b/apollo-frontend/src/app/app.component.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/apollo-frontend/src/app/app.module.ts b/apollo-frontend/src/app/app.module.ts index f073361..fdff8c8 100644 --- a/apollo-frontend/src/app/app.module.ts +++ b/apollo-frontend/src/app/app.module.ts @@ -15,6 +15,7 @@ import { DashboardCardsComponent } from './dashboard-cards/dashboard-cards.compo import { DashboardComponent } from './dashboard/dashboard.component'; import { DashboardMinigamesComponent } from './dashboard-minigames/dashboard-minigames.component'; import { MinigameCardComponent } from './minigame-card/minigame-card.component'; +import { MinigameConveyorRecyclingComponent } from './minigame-conveyor-recycling/minigame-conveyor-recycling.component'; @NgModule({ declarations: [ @@ -24,6 +25,7 @@ import { MinigameCardComponent } from './minigame-card/minigame-card.component'; DashboardComponent, DashboardMinigamesComponent, MinigameCardComponent, + MinigameConveyorRecyclingComponent, ], imports: [ BrowserModule, diff --git a/apollo-frontend/src/app/db.service.ts b/apollo-frontend/src/app/db.service.ts index cddc331..ff59505 100644 --- a/apollo-frontend/src/app/db.service.ts +++ b/apollo-frontend/src/app/db.service.ts @@ -28,15 +28,8 @@ export class DbService { { id: '0', el: { - name: 'test', - url: 'none', - } - }, - { - id: '1', - el: { - name: 'test2', - url: 'none', + name: 'Convayer Recycling', + url: '/minigames/conveyor-belt', } } ]; diff --git a/apollo-frontend/src/app/minigame-card/minigame-card.component.ts b/apollo-frontend/src/app/minigame-card/minigame-card.component.ts index f7b7dc0..32028f5 100644 --- a/apollo-frontend/src/app/minigame-card/minigame-card.component.ts +++ b/apollo-frontend/src/app/minigame-card/minigame-card.component.ts @@ -41,9 +41,8 @@ export class MinigameCardComponent implements OnInit { } } - play() { + play(): void { this.router.navigate([this.minigame.url], { - replaceUrl: true, }); } } diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html new file mode 100644 index 0000000..c7c9032 --- /dev/null +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss new file mode 100644 index 0000000..b5573f5 --- /dev/null +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.scss @@ -0,0 +1,4 @@ +.canvas { + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.spec.ts b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.spec.ts new file mode 100644 index 0000000..43ea33c --- /dev/null +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MinigameConveyorRecyclingComponent } from './minigame-conveyor-recycling.component'; + +describe('MinigameConveyorRecyclingComponent', () => { + let component: MinigameConveyorRecyclingComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ MinigameConveyorRecyclingComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(MinigameConveyorRecyclingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts new file mode 100644 index 0000000..3fa7d85 --- /dev/null +++ b/apollo-frontend/src/app/minigame-conveyor-recycling/minigame-conveyor-recycling.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-minigame-conveyor-recycling', + templateUrl: './minigame-conveyor-recycling.component.html', + styleUrls: ['./minigame-conveyor-recycling.component.scss'] +}) +export class MinigameConveyorRecyclingComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + + start() { + + } +}