Merge pull request #47 from ishythefishy/contact-form-and-things

Contact form, rejig of homepage, miscellaneous fixes

Author: whitep4nth3r

.gitignore

@@ -40,3 +40,6 @@ Thumbs.db
 
 # Routes
 _routes.txt
+
+# Local Netlify folder
+.netlify

angular.json

@@ -16,7 +16,7 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist/fretonator-web/browser",
-            "index": "apps/fretonator-web/src/index.html",
+            "index": "apps/fretonator-web/src/index-dev.html",
             "main": "apps/fretonator-web/src/main.ts",
             "polyfills": "apps/fretonator-web/src/polyfills.ts",
             "tsConfig": "apps/fretonator-web/tsconfig.app.json",
@@ -44,6 +44,7 @@
                   "with": "apps/fretonator-web/src/environments/environment.prod.ts"
                 }
               ],
+              "index": "apps/fretonator-web/src/index.html",
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -204,4 +205,4 @@
     }
   },
   "defaultProject": "fretonator-web"
-}
+}

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

@@ -3,28 +3,34 @@ import { Route, RouterModule, Routes } from '@angular/router';
 
 const home: Route = {
   path: '',
-  loadChildren: () => import('./pages/home/home.module').then((mod) => mod.HomeModule),
+  loadChildren: () => import('./pages/home/home.module').then((mod) => mod.HomeModule)
 };
 
 const about: Route = {
   path: 'about',
-  loadChildren: () => import('./pages/about/about.module').then((mod) => mod.AboutModule),
+  loadChildren: () => import('./pages/about/about.module').then((mod) => mod.AboutModule)
+};
+
+const contact: Route = {
+  path: 'contact',
+  loadChildren: () => import('./pages/contact/contact.module').then((mod) => mod.ContactModule)
 };
 
 const notFound: Route = {
   path: '**',
-  loadChildren: () => import('./pages/not-found/not-found.module').then((mod) => mod.NotFoundModule),
+  loadChildren: () => import('./pages/not-found/not-found.module').then((mod) => mod.NotFoundModule)
 };
 
-const routes: Routes = [home, about, notFound];
+const routes: Routes = [home, about, contact, notFound];
 
 @NgModule({
   imports: [
     RouterModule.forRoot(routes, {
-    initialNavigation: 'enabled',
-    scrollPositionRestoration: 'disabled',
-}),
+      initialNavigation: 'enabled',
+      scrollPositionRestoration: 'disabled'
+    })
   ],
-  exports: [RouterModule],
+  exports: [RouterModule]
 })
-export class AppRoutingModule {}
+export class AppRoutingModule {
+}

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

@@ -11,9 +11,9 @@ describe('AppComponent', () => {
       imports: [
         RouterTestingModule,
         HeaderModule,
-        FooterModule,
+        FooterModule
       ],
-      declarations: [AppComponent],
+      declarations: [AppComponent]
     }).compileComponents();
   }));
 

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

@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
 }

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

@@ -16,10 +16,11 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
     BrowserAnimationsModule,
     AppRoutingModule,
     HeaderModule,
-    FooterModule,
+    FooterModule
     // ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
   ],
   providers: [],
-  bootstrap: [AppComponent],
+  bootstrap: [AppComponent]
 })
-export class AppModule {}
+export class AppModule {
+}

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

@@ -9,8 +9,9 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
   imports: [
     AppModule,
     ServerModule,
-    NoopAnimationsModule,
+    NoopAnimationsModule
   ],
-  bootstrap: [AppComponent],
+  bootstrap: [AppComponent]
 })
-export class AppServerModule {}
+export class AppServerModule {
+}

apps/fretonator-web/src/app/common/chips/chip/chip.component.html

@@ -1,6 +1,7 @@
 <a
   [routerLink]="['/', note, noteExtender, mode]"
   [attr.aria-label]="note | createChipLinkTitle: noteExtender: mode"
+  (click)="onClick($event)"
   class="chip"
   [class.chip--active]="selected"
   [class.chip--round]="rounded"

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

@@ -1,4 +1,4 @@
-import { Component, DoCheck, Input } from '@angular/core';
+import { Component, DoCheck, EventEmitter, Input, Output } from '@angular/core';
 import { Mode } from '../../../util/types';
 import { ActivatedRoute } from '@angular/router';
 
@@ -19,6 +19,7 @@ export class ChipComponent implements DoCheck {
   @Input() selectedColor: SelectedColor = SelectedColor.default;
   @Input() rounded = false;
   @Input() isBaseNote = false;
+  @Output() chipClick = new EventEmitter<MouseEvent>();
   SelectedColor = SelectedColor;
   selected = false;
 
@@ -48,4 +49,8 @@ export class ChipComponent implements DoCheck {
 
     return true;
   }
+
+  onClick(event: MouseEvent) {
+    this.chipClick.emit(event);
+  }
 }

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

@@ -3,10 +3,12 @@ import { Mode, NoteExtenderString } from '../../../util/types';
 import { FretMapService } from '../../fret-map/fret-map.service';
 
 @Pipe({
-  name: 'createChipLinkTitle',
+  name: 'createChipLinkTitle'
 })
 export class CreateChipLinkTitlePipe implements PipeTransform {
-  constructor(public generateFretMapService: FretMapService) {}
+  constructor(public generateFretMapService: FretMapService) {
+  }
+
   transform(
     note: string,
     noteExtender: string,