Merge pull request #13 from nitrotap/develop

Develop

client/src/app/about/about.module.ts

@@ -8,13 +8,16 @@ import { AboutPageRoutingModule } from './about-routing.module';
 
 import { AboutPage } from './about.page';
 
+import { NavComponent } from '../nav/nav.component';
+
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    AboutPageRoutingModule
+    AboutPageRoutingModule,
+    NavComponent
   ],
   declarations: [AboutPage]
 })
-export class AboutPageModule {}
+export class AboutPageModule { }

client/src/app/about/about.page.html

@@ -1,31 +1,41 @@
-<ion-header>
+<ion-header [translucent]="true">
   <ion-toolbar>
-    <ion-title>
-      About Us
-    </ion-title>
+    <ion-title>About Us</ion-title>
   </ion-toolbar>
 </ion-header>
 
-<ion-content>
-  <ion-list>
-    <ion-item *ngFor="let member of members">
-      <ion-avatar slot="start">
-        <img [src]="member.avatar" alt="{{ member.name }} Avatar">
-      </ion-avatar>
-      <ion-label>
-        <h2>{{ member.name }}</h2>
-        <p>Email: <a [href]="'mailto:'+member.email">{{ member.email }}</a></p>
-        <p>GitHub:
-          <a [href]="member.github" target="_blank" rel="noopener noreferrer">{{ member.github }}</a>
-        </p>
-        <p>LinkedIn:
-          <a [href]="member.linkedin" target="_blank" rel="noopener noreferrer">{{ member.linkedin }}</a>
-        </p>
-        <p>Personal Website:
-          <a [href]="member.website" target="_blank" rel="noopener noreferrer">{{ member.website }}</a>
-        </p>
-        <p>{{ member.bio }}</p>
-      </ion-label>
-    </ion-item>
-  </ion-list>
+<ion-content [fullscreen]="true">
+
+  <app-nav></app-nav>
+  <ion-header>
+    <ion-toolbar>
+      <ion-title>
+        Project Contributors
+      </ion-title>
+    </ion-toolbar>
+  </ion-header>
+
+  <ion-content>
+    <ion-list>
+      <ion-item *ngFor="let member of members">
+        <ion-avatar slot="start">
+          <img [src]="member.avatar" alt="{{ member.name }} Avatar">
+        </ion-avatar>
+        <ion-label>
+          <h2>{{ member.name }}</h2>
+          <p>Email: <a [href]="'mailto:'+member.email">{{ member.email }}</a></p>
+          <p>GitHub:
+            <a [href]="member.github" target="_blank" rel="noopener noreferrer">{{ member.github }}</a>
+          </p>
+          <p>LinkedIn:
+            <a [href]="member.linkedin" target="_blank" rel="noopener noreferrer">{{ member.linkedin }}</a>
+          </p>
+          <p>Personal Website:
+            <a [href]="member.website" target="_blank" rel="noopener noreferrer">{{ member.website }}</a>
+          </p>
+          <p>{{ member.bio }}</p>
+        </ion-label>
+      </ion-item>
+    </ion-list>
+  </ion-content>
 </ion-content>

client/src/app/about/about.page.scss

@@ -0,0 +1,8 @@
+ion-card, ion-title, ion-card-subtitle {
+    --ion-item-border-color: #025E73;
+    --ion-item-background: #80A7BF;
+    --ion-text-color: #012E40;
+    overflow: visible;
+    color: black;
+    text-align: center;
+}

client/src/app/app-routing.module.ts

@@ -51,6 +51,10 @@ const routes: Routes = [
     path: 'task',
     loadChildren: () => import('./task/task.module').then(m => m.TaskPageModule)
   },
+  {
+    path: 'results',
+    loadChildren: () => import('./results/results.module').then( m => m.ResultsPageModule)
+  },
 
 
 

client/src/app/education/education.module.ts

@@ -8,12 +8,16 @@ import { EducationPageRoutingModule } from './education-routing.module';
 
 import { EducationPage } from './education.page';
 
+import { NavComponent } from '../nav/nav.component';
+
+
 @NgModule({
   imports: [
     CommonModule,
     FormsModule,
     IonicModule,
-    EducationPageRoutingModule
+    EducationPageRoutingModule,
+    NavComponent
   ],
   declarations: [EducationPage]
 })