Skip to content

Commit

Permalink
#6 added footer and home route
Browse files Browse the repository at this point in the history
timofeysie committed Sep 1, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 9842c44 commit f2ba625
Showing 6 changed files with 40 additions and 9 deletions.
7 changes: 6 additions & 1 deletion docs/trendy-client-layout.md
Original file line number Diff line number Diff line change
@@ -35,9 +35,10 @@ Just add our own panel on the right and use that.

In mobile view, the panel should disappear and the footer should appear (or grow).


## Git issue

Git fatal: failed to resolve HEAD as a valid ref.

Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
@@ -57,3 +58,7 @@ libs/trendy-layout/src/lib/containers/trendy-layout/trendy-layout.component.ts
Untracked files:
(use "git add <file>..." to include in what will be committed)
apps/trendy/src/assets/pictures/mike-richards/transitioncat-mike-richards-452-316.jpg

The solution was to re-clone the project in a new directory and move the files to that to make the commit. This is the second time this has happened to a repo on this hp laptop. I'm concerned about the hard drive.

Best to keep everything backed up on other peoples computers (the cloud). Thanks to the cloud.
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
<p>pictures works!</p>
<mat-card class="info">
<mat-card-title><h1>In the news</h1></mat-card-title>
<mat-card-subtitle>An assortment of art based on breaking news items.</mat-card-subtitle>
</mat-card>
<mat-list role="list">
<mat-list-item role="listitem"><a href="/Mike%20Richards">Mike Richards</a></mat-list-item>
<mat-list-item role="listitem">Kylie Jenner</mat-list-item>
<mat-list-item role="listitem">Item 3</mat-list-item>
</mat-list>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.info {
width: 90%;
height: 100%;
margin: 16px;
}
8 changes: 7 additions & 1 deletion libs/pictures/src/lib/pictures.module.ts
Original file line number Diff line number Diff line change
@@ -15,9 +15,15 @@ export const picturesRoutes: Route[] = [];
MaterialModule,
RouterModule.forChild([
{ path: '', component: PicturesComponent },
{ path: 'home', component: PicturesComponent },
{ path: 'Mike Richards', component: MikeRichardsComponent },
]),
],
declarations: [PicturesComponent, MikeRichardsComponent, ToonifyMikeRichardsComponent, TransitioncatMikeRichardsComponent],
declarations: [
PicturesComponent,
MikeRichardsComponent,
ToonifyMikeRichardsComponent,
TransitioncatMikeRichardsComponent,
],
})
export class PicturesModule {}
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
<mat-toolbar color="primary" fxLayout="row">
<h1>BREAKING ART</h1>
<div class="right-nav">Paintings</div>
</mat-toolbar>
<mat-sidenav-container>
<mat-sidenav
class="mat-elevation-z8"
mode="side"
position="end"
[opened]="(isHandset$ | async) === (false)"
[opened]="(isHandset$ | async) === false"
md-theme="default"
>
<button mat-button class="menu-button">
<mat-icon>home</mat-icon>
<span>Home</span>
<span>Ad</span>
</button>
</mat-sidenav>
<mat-sidenav-content class="content mat-elevation-z8"
[ngClass]="{'nav-open': (isHandset$ | async) === (false)}">
<mat-sidenav-content
class="content mat-elevation-z8"
[ngClass]="{ 'nav-open': (isHandset$ | async) === false }"
>
<ng-content></ng-content>
<mat-toolbar color="primary" class="footer" *ngIf="(isHandset$ | async) === true">
<span>Footer ad</span>
</mat-toolbar>
</mat-sidenav-content>
</mat-sidenav-container>
Original file line number Diff line number Diff line change
@@ -21,3 +21,7 @@ mat-sidenav {
box-shadow: none;
font-size: 2rem;
}

.footer {
width: 100%;
}

0 comments on commit f2ba625

Please sign in to comment.