Commit 909fc378 authored by Pamela Petterchak's avatar Pamela Petterchak
Browse files

fixed bugs

parent 29c72838
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { ClosingVideoComponent } from './closing/closing.component';
import { CreditsComponent } from './credits/credits.component';
import { GamePlayComponent } from './game-play/game-play.component';
import { LandingPageComponent } from './landing/landing.component';
import { OpeningVideoComponent } from './opening/opening.component';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'landing-page', pathMatch: 'full' }, { path: '', redirectTo: 'landing-page', pathMatch: 'full' },
{ {
path: 'landing-page', path: 'landing-page',
loadChildren: () => component: LandingPageComponent,
import('./landing/landing.module').then((m) => m.LandingPageModule),
}, },
{ {
path: 'opening-video', path: 'opening-video',
loadChildren: () => component: OpeningVideoComponent,
import('./opening/opening.module').then((m) => m.OpeningVideoModule),
}, },
{ {
path: 'game-play', path: 'game-play',
loadChildren: () => component: GamePlayComponent,
import('./game-play/game-play.module').then((m) => m.GamePlayModule),
}, },
{ {
path: 'closing-video', path: 'closing-video',
loadChildren: () => component: ClosingVideoComponent,
import('./closing/closing.module').then((m) => m.ClosingVideoModule),
}, },
{ {
path: 'credits', path: 'credits',
loadChildren: () => component: CreditsComponent,
import('./credits/credits.module').then((m) => m.CreditsModule),
}, },
]; ];
......
<header> <!-- <mat-selection-list [multiple]="false">
<nav> <mat-list-option>
<div class="nav-wrapper"> <a routerLink="/landing-page">Landing</a>
<ul> </mat-list-option>
<li routerLinkActive="green-background"> <mat-list-option>
<a routerLink="/landing-page">Landing</a> <a routerLink="/opening-video">Opening</a>
</li> </mat-list-option>
<li routerLinkActive="green-background"> <mat-list-option>
<a routerLink="/opening-video">Opening</a> <a routerLink="/game-play">Game Play</a>
</li> </mat-list-option>
<li routerLinkActive="green-background"> <mat-list-option>
<a routerLink="/game-play">Game Play</a> <a routerLink="/credits">Credits</a>
</li> </mat-list-option>
<li routerLinkActive="green-background"> </mat-selection-list> -->
<a routerLink="/closing-video">Closing</a>
</li> <router-outlet></router-outlet>
<li routerLinkActive="green-background">
<a routerLink="/credits">Credits</a>
</li>
</ul>
</div>
</nav>
</header>
<div>
<router-outlet></router-outlet>
</div>
...@@ -3,10 +3,20 @@ ...@@ -3,10 +3,20 @@
text-align: center; text-align: center;
} }
@media only screen and (min-width: 601px) { .mat-selection-list {
.two-across { list-style-type: none;
grid-template-columns: repeat(2, 1fr); margin: 0;
} padding: 0;
overflow: hidden;
background-color: green;
}
.mat-list-option {
display: block;
color: white;
text-align: center;
padding: 16px;
text-decoration: none;
} }
//.left { //.left {
......
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { MaterialDepsModule } from 'src/app/material-deps.module';
import { ClickComponent } from './click.component'; import { ClickComponent } from './click.component';
const cmsRoutes: Routes = [{ path: '', component: ClickComponent }]; const cmsRoutes: Routes = [{ path: '', component: ClickComponent }];
@NgModule({ @NgModule({
declarations: [ClickComponent], declarations: [ClickComponent],
imports: [CommonModule, RouterModule.forChild(cmsRoutes)], imports: [CommonModule, RouterModule.forChild(cmsRoutes), MaterialDepsModule],
exports: [ClickComponent], exports: [ClickComponent],
}) })
export class ClickModule { } export class ClickModule {}
<!-- Need to create two columns - one with assets, one with cookie clicker stuff --> <button mat-raised-button>
<a routerLink="/credits">Credits</a>
</button>
<div class="two-across"> <mat-card class="title">
<div> <mat-card-title>Test</mat-card-title>
<mat-card class="title"> </mat-card>
<mat-card-title>Test</mat-card-title> <app-accumulators></app-accumulators>
</mat-card>
<app-accumulators></app-accumulators>
</div>
<div> <mat-card class="title">
<mat-card class="title"> <mat-card-title>Pickle Clicker</mat-card-title>
<mat-card-title>Pickle Clicker</mat-card-title> </mat-card>
<mat-card-subtitle>Click My Pickle!</mat-card-subtitle> <app-click></app-click>
</mat-card>
<app-click></app-click>
</div>
</div>
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@media only screen and (min-width: 601px) {
.two-across {
grid-template-columns: repeat(2, 1fr);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment