Skip to content

Commit 9e00d83

Browse files
author
Salma Alam-Naylor
committed
1. Add scroll target to footer link
2. Rearrange home page to follow 'how-to', add an extra step into 'how-to' and standardise layout 3. Small refactors and optimisations of code style etc
1 parent 1bdb713 commit 9e00d83

File tree

109 files changed

+709
-555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+709
-555
lines changed

apps/fretonator-web/src/app/app-routing.module.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,34 @@ import { Route, RouterModule, Routes } from '@angular/router';
33

44
const home: Route = {
55
path: '',
6-
loadChildren: () => import('./pages/home/home.module').then((mod) => mod.HomeModule),
6+
loadChildren: () => import('./pages/home/home.module').then((mod) => mod.HomeModule)
77
};
88

99
const about: Route = {
1010
path: 'about',
11-
loadChildren: () => import('./pages/about/about.module').then((mod) => mod.AboutModule),
11+
loadChildren: () => import('./pages/about/about.module').then((mod) => mod.AboutModule)
1212
};
1313

1414
const contact: Route = {
1515
path: 'contact',
16-
loadChildren: () => import('./pages/contact/contact.module').then((mod) => mod.ContactModule),
16+
loadChildren: () => import('./pages/contact/contact.module').then((mod) => mod.ContactModule)
1717
};
1818

1919
const notFound: Route = {
2020
path: '**',
21-
loadChildren: () => import('./pages/not-found/not-found.module').then((mod) => mod.NotFoundModule),
21+
loadChildren: () => import('./pages/not-found/not-found.module').then((mod) => mod.NotFoundModule)
2222
};
2323

2424
const routes: Routes = [home, about, contact, notFound];
2525

2626
@NgModule({
2727
imports: [
2828
RouterModule.forRoot(routes, {
29-
initialNavigation: 'enabled',
30-
scrollPositionRestoration: 'disabled',
31-
}),
29+
initialNavigation: 'enabled',
30+
scrollPositionRestoration: 'disabled'
31+
})
3232
],
33-
exports: [RouterModule],
33+
exports: [RouterModule]
3434
})
35-
export class AppRoutingModule {}
35+
export class AppRoutingModule {
36+
}

apps/fretonator-web/src/app/app.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ describe('AppComponent', () => {
1111
imports: [
1212
RouterTestingModule,
1313
HeaderModule,
14-
FooterModule,
14+
FooterModule
1515
],
16-
declarations: [AppComponent],
16+
declarations: [AppComponent]
1717
}).compileComponents();
1818
}));
1919

apps/fretonator-web/src/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'app-root',
55
templateUrl: './app.component.html',
6-
styleUrls: ['./app.component.scss'],
6+
styleUrls: ['./app.component.scss']
77
})
88
export class AppComponent {
99
}

apps/fretonator-web/src/app/app.module.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
1616
BrowserAnimationsModule,
1717
AppRoutingModule,
1818
HeaderModule,
19-
FooterModule,
19+
FooterModule
2020
// ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
2121
],
2222
providers: [],
23-
bootstrap: [AppComponent],
23+
bootstrap: [AppComponent]
2424
})
25-
export class AppModule {}
25+
export class AppModule {
26+
}

apps/fretonator-web/src/app/app.server.module.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
99
imports: [
1010
AppModule,
1111
ServerModule,
12-
NoopAnimationsModule,
12+
NoopAnimationsModule
1313
],
14-
bootstrap: [AppComponent],
14+
bootstrap: [AppComponent]
1515
})
16-
export class AppServerModule {}
16+
export class AppServerModule {
17+
}

apps/fretonator-web/src/app/common/chips/chip/create-chip-link-title.pipe.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ import { Mode, NoteExtenderString } from '../../../util/types';
33
import { FretMapService } from '../../fret-map/fret-map.service';
44

55
@Pipe({
6-
name: 'createChipLinkTitle',
6+
name: 'createChipLinkTitle'
77
})
88
export class CreateChipLinkTitlePipe implements PipeTransform {
9-
constructor(public generateFretMapService: FretMapService) {}
9+
constructor(public generateFretMapService: FretMapService) {
10+
}
11+
1012
transform(
1113
note: string,
1214
noteExtender: string,

apps/fretonator-web/src/app/common/chips/chips.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'app-chips',
55
templateUrl: './chips.component.html',
6-
styleUrls: ['./chips.component.scss'],
6+
styleUrls: ['./chips.component.scss']
77
})
88
export class ChipsComponent {
99

apps/fretonator-web/src/app/common/chips/chips.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ import { CreateChipLinkTitlePipe } from './chip/create-chip-link-title.pipe';
99
declarations: [
1010
ChipsComponent,
1111
ChipComponent,
12-
CreateChipLinkTitlePipe,
12+
CreateChipLinkTitlePipe
1313
],
1414
imports: [
1515
CommonModule,
16-
RouterModule,
16+
RouterModule
1717
],
1818
exports: [
1919
ChipComponent,
20-
ChipsComponent,
21-
],
20+
ChipsComponent
21+
]
2222
})
2323
export class ChipsModule {
2424
}

apps/fretonator-web/src/app/common/footer/footer.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ <h6 class="footer__sectionTitle">Who made this?</h6>
5858
the Fretonator is to crowdsource feedback and ideas to create the ultimate guitar learning hub that's simple,
5959
easy and enjoyable to use.</p>
6060
<a [routerLink]="['/', 'contact']"
61+
(click)="onLinkClick()"
6162
class="footer__copy footer__copy--right footer__copy--link">Submit your feedback</a>
6263
<p class="footer__copy footer__copy--right">The Fretonator is free and always will be!</p>
6364
<a href="https://www.buymeacoffee.com/fretonator"

apps/fretonator-web/src/app/common/footer/footer.component.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
}
5454

5555
.footer__copy {
56-
@include font_bodyCopy();
56+
@include font_bodyCopy;
5757
font-size: pxToRem(15);
5858
line-height: pxToRem(22);
5959
color: var(--offwhite);
@@ -84,13 +84,19 @@
8484
}
8585

8686
.footer__sectionTitle {
87-
@include font_medium();
87+
@include font_medium;
8888
font-size: pxToRem(18);
89+
line-height: pxToRem(28);
8990
margin-top: pxToRem($grid-unit);
9091
margin-bottom: pxToRem($grid-unit);
9192
color: var(--peach);
9293
font-weight: var(--font-weight-bold);
9394
display: flex;
95+
text-align: center;
96+
97+
@media screen and (min-width: $screen-med) {
98+
text-align: left;
99+
}
94100
}
95101

96102
.footer__list {
@@ -105,7 +111,7 @@
105111
}
106112

107113
.footer__listItem {
108-
@include font_bodyCopy();
114+
@include font_bodyCopy;
109115
font-size: pxToRem(15);
110116
line-height: pxToRem(26);
111117
color: var(--offwhite);

0 commit comments

Comments
 (0)