diff --git a/.angular-cli.json b/.angular-cli.json
index 6efa3c7..74735f3 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -20,6 +20,7 @@
"prefix": "app",
"styles": [
"assets/styles/styles.scss",
+ "assets/styles/styles-app-loading.scss",
"theme.scss"
],
"scripts": [],
diff --git a/.gitignore b/.gitignore
index bc4a491..619fe3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,73 @@ node_modules/
package-lock.json
.README.swp
.idea/
+
+# Created by https://www.gitignore.io/api/jetbrains
+
+### JetBrains ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Ruby plugin and RubyMine
+/.rakeTasks
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### JetBrains Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+
+# End of https://www.gitignore.io/api/jetbrains
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 05997fb..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 5f437be..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,681 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- h1
- @
- icon
- banner-title
- app.component
-
-
- $PROJECT_DIR$
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- DEFINITION_ORDER
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1523813390065
-
-
- 1523813390065
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/app.component.html b/src/app/app.component.html
index d33284b..2715aa1 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,6 +6,7 @@
+
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 18b11f5..49bdbcb 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,6 +4,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatButtonModule, MatProgressSpinnerModule, MatToolbarModule, MatListModule, MatGridListModule, MatIconModule, MatCardModule } from '@angular/material';
import {AppRoutingModule} from './app.routing.module';
import { FormsModule } from '@angular/forms';
+import {MichaelComponent } from './michael/michael.component';
import { HomeComponent } from './home/home.component';
@@ -11,7 +12,7 @@ import { AppComponent} from './app.component';
@NgModule({
declarations: [
- AppComponent, HomeComponent
+ AppComponent, HomeComponent, MichaelComponent
],
imports: [ AppRoutingModule, FormsModule, BrowserModule, MatProgressSpinnerModule , MatButtonModule, MatListModule, MatGridListModule, MatToolbarModule, MatIconModule, MatCardModule ],
providers: [],
diff --git a/src/app/app.routing.module.ts b/src/app/app.routing.module.ts
index 95b4775..cc1eca4 100644
--- a/src/app/app.routing.module.ts
+++ b/src/app/app.routing.module.ts
@@ -2,9 +2,11 @@ import {NgModule} from '@angular/core';
import { CommonModule} from '@angular/common';
import {Router, RouterModule, Routes} from '@angular/router';
import {HomeComponent} from './home/home.component';
+import { MichaelComponent} from './michael/michael.component';
const routes: Routes = [
+ {path: 'michael', component: MichaelComponent},
{path: 'home', component: HomeComponent},
];
diff --git a/src/app/michael/michael.component.html b/src/app/michael/michael.component.html
new file mode 100644
index 0000000..6887361
--- /dev/null
+++ b/src/app/michael/michael.component.html
@@ -0,0 +1,54 @@
+
+
+ Basic Grid List
+
+
+ One
+ Two
+ Three
+ Four
+
+
+
+
+ Grid List with Header
+
+
+
+
+ info_outline
+ {{dog.name}}
+
+
+
+
+
+
+ Grid List with Footer
+
+
+
+
+
+
+ {{dog.name}}
+
+ Human: {{dog.human}}
+ star_border
+
+
+
+
+
+
+
diff --git a/src/app/michael/michael.component.scss b/src/app/michael/michael.component.scss
new file mode 100644
index 0000000..bea9ed7
--- /dev/null
+++ b/src/app/michael/michael.component.scss
@@ -0,0 +1,18 @@
+/*styles for MichaelComponent content only*/
+.grid-list {
+ width: 80%;
+ padding-left: 10%;
+ padding-right: 10%;
+ .mat-card {
+ margin: 16px 0;
+ }
+ p {
+ margin: 16px;
+ }
+ .basic-list .mat-grid-tile {
+ background: rgba(0, 0, 0, 0.32);
+ }
+ img {
+ width: 500px;
+ }
+}
diff --git a/src/app/michael/michael.component.ts b/src/app/michael/michael.component.ts
new file mode 100644
index 0000000..eb7b4df
--- /dev/null
+++ b/src/app/michael/michael.component.ts
@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-root',
+ templateUrl: './michael.component.html',
+ styleUrls: ['./michael.component.scss']
+})
+
+export class MichaelComponent {
+ tiles: {text: string, cols: number, rows: number, color: string}[] = [
+{text: 'One', cols: 3, rows: 1, color: 'lightgreen'},
+ {text: 'Two', cols: 1, rows: 2, color: 'lightlight'},
+ {text: 'Three', cols: 1, rows: 1, color: 'lightblue'},
+ {text: 'Four', cols: 2, rows: 1, color: '#DDBDf1'},
+ ];
+
+ dogs: {name: string, human: string}[] = [
+ {name: 'Chris', human: 'Kara'},
+ {name: 'Michael', human: 'Jeremy'},
+ {name: 'Kerry', human: 'Igor'},
+ {name: 'Alan', human: 'Ward'},
+ {name: 'Molly', human: 'Rob'},
+ {name: 'Ben', human: 'Matias'},
+ ];
+
+ basicRowHeight = 80;
+
+}
diff --git a/src/assets/styles/styles-app-loading.scss b/src/assets/styles/styles-app-loading.scss
new file mode 100644
index 0000000..c0c9195
--- /dev/null
+++ b/src/assets/styles/styles-app-loading.scss
@@ -0,0 +1,33 @@
+.app-loading {
+ .logo {
+ width: 100px;
+ height: 100px;
+ // this way asset gets processed by webpack
+ background:
+ url(../img/coderDojo-loading-icon.png)
+ center center no-repeat;
+ }
+}
+body, html {
+ height: 100%;
+}
+.app-loading {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+}
+.app-loading .spinner {
+ height: 300px;
+ width: 300px;
+ animation: rotate 2s linear infinite;
+ transform-origin: center center;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+}
diff --git a/src/index.html b/src/index.html
index 0f68fe3..2de170b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,10 +9,16 @@
-
- Loading Content...
+
+
+