Merge pull request #23 from nitrotap/test/edu-merge

Test/edu merge
nitrotap · Jun 20, 2023 · 4c398b1 · 4c398b1
2 parents 94382b7 + 3005159
commit 4c398b1
Show file tree

Hide file tree

Showing 32 changed files with 693 additions and 523 deletions.
diff --git a/client/src/app/about/about.module.ts b/client/src/app/about/about.module.ts
@@ -1,22 +1,24 @@
-import {NgModule} from '@angular/core';
-import {CommonModule, NgOptimizedImage} from '@angular/common';
-import {FormsModule} from '@angular/forms';
+import { NgModule } from '@angular/core';
+import { CommonModule, NgOptimizedImage } from '@angular/common';
+import { FormsModule } from '@angular/forms';
 
-import {IonicModule} from '@ionic/angular';
+import { IonicModule } from '@ionic/angular';
 
-import {AboutPageRoutingModule} from './about-routing.module';
+import { AboutPageRoutingModule } from './about-routing.module';
 
-import {AboutPage} from './about.page';
+import { AboutPage } from './about.page';
 
-import {NavComponent} from '../nav/nav.component';
+import { NavComponent } from '../nav/nav.component';
+import { FooterPage } from '../footer/footer.page';
 
 @NgModule({
     imports: [
         CommonModule,
         FormsModule,
         IonicModule,
         AboutPageRoutingModule,
-        NavComponent
+        NavComponent,
+        FooterPage
     ],
     declarations: [AboutPage]
 })

diff --git a/client/src/app/about/about.page.html b/client/src/app/about/about.page.html
@@ -22,7 +22,7 @@
                     <ion-row style="display: flex; justify-content: center; align-items: center;">
                         <ion-col size="3">
                             <img [src]="member.avatar" alt="{{ member.name }} Avatar"
-                                 style=" border-radius: 50%; border: solid 3px">
+                                style=" border-radius: 50%; border: solid 3px">
                         </ion-col>
                         <ion-col>
                             <ion-card style="border-radius: 30px;">
@@ -33,16 +33,16 @@ <h1>{{ member.name }}</h1>
                                     <ion-card-subtitle>
                                         <h6>Email: <a [href]="'mailto:' + member.email">{{ member.email }}</a></h6>
                                         <h6>GitHub:
-                                            <a [href]="member.github" target="_blank"
-                                               rel="noopener noreferrer">{{ member.github }}</a>
+                                            <a [href]="member.github" target="_blank" rel="noopener noreferrer">{{
+                                                member.github }}</a>
                                         </h6>
                                         <h6>LinkedIn:
-                                            <a [href]="member.linkedin" target="_blank"
-                                               rel="noopener noreferrer">{{ member.linkedin }}</a>
+                                            <a [href]="member.linkedin" target="_blank" rel="noopener noreferrer">{{
+                                                member.linkedin }}</a>
                                         </h6>
                                         <h6>Personal Website:
-                                            <a [href]="member.website" target="_blank"
-                                               rel="noopener noreferrer">{{ member.website }}</a>
+                                            <a [href]="member.website" target="_blank" rel="noopener noreferrer">{{
+                                                member.website }}</a>
                                         </h6>
                                     </ion-card-subtitle>
                                 </ion-card-header>
@@ -78,4 +78,6 @@ <h4>
             </h4>
         </ion-card-content>
     </ion-card>
+
+    <app-footer></app-footer>
 </ion-content>
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
@@ -1,75 +1,79 @@
-import { NgModule } from '@angular/core';
-import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
-
-const routes: Routes = [
-  {
-    path: 'home',
-    loadChildren: () => import('./home/home.module').then(m => m.HomePageModule)
-  },
-  {
-    path: '',
-    redirectTo: 'home',
-    pathMatch: 'full'
-  },
-  {
-    path: 'education',
-    loadChildren: () => import('./education/education.module').then(m => m.EducationPageModule)
-  },
-  {
-    path: 'measure',
-    loadChildren: () => import('./measure/measure.module').then(m => m.MeasurePageModule)
-  },
-  {
-    path: 'strategies',
-    loadChildren: () => import('./strategies/strategies.module').then(m => m.StrategiesPageModule)
-  },
-  {
-    path: 'test',
-    loadChildren: () => import('./test/test.module').then(m => m.TestPageModule)
-  },
-  {
-    path: 'navigation',
-    loadChildren: () => import('./navigation/navigation.module').then(m => m.NavigationPageModule)
-  },
-  {
-    path: 'login',
-    loadChildren: () => import('./login/login.module').then(m => m.LoginPageModule)
-  },
-  {
-    path: 'signup',
-    loadChildren: () => import('./signup/signup.module').then(m => m.SignupPageModule)
-  },
-  {
-    path: 'about',
-    loadChildren: () => import('./about/about.module').then(m => m.AboutPageModule)
+import { NgModule } from '@angular/core';
+import { PreloadAllModules, RouterModule, Routes } from '@angular/router';
+
+const routes: Routes = [
+  {
+    path: 'home',
+    loadChildren: () => import('./home/home.module').then(m => m.HomePageModule)
+  },
+  {
+    path: '',
+    redirectTo: 'home',
+    pathMatch: 'full'
+  },
+  {
+    path: 'education',
+    loadChildren: () => import('./education/education.module').then(m => m.EducationPageModule)
+  },
+  {
+    path: 'measure',
+    loadChildren: () => import('./measure/measure.module').then(m => m.MeasurePageModule)
+  },
+  {
+    path: 'strategies',
+    loadChildren: () => import('./strategies/strategies.module').then(m => m.StrategiesPageModule)
+  },
+  {
+    path: 'test',
+    loadChildren: () => import('./test/test.module').then(m => m.TestPageModule)
+  },
+  {
+    path: 'navigation',
+    loadChildren: () => import('./navigation/navigation.module').then(m => m.NavigationPageModule)
+  },
+  {
+    path: 'login',
+    loadChildren: () => import('./login/login.module').then(m => m.LoginPageModule)
+  },
+  {
+    path: 'signup',
+    loadChildren: () => import('./signup/signup.module').then(m => m.SignupPageModule)
+  },
+  {
+    path: 'about',
+    loadChildren: () => import('./about/about.module').then(m => m.AboutPageModule)
+  },
+  {
+    path: 'quiz',
+    loadChildren: () => import('./quiz/quiz.module').then(m => m.QuizPageModule)
+  },
+  {
+    path: 'task',
+    loadChildren: () => import('./task/task.module').then(m => m.TaskPageModule)
+  },
+  {
+    path: 'results',
+    loadChildren: () => import('./results/results.module').then(m => m.ResultsPageModule)
+  },
+  {
+    path: 'policy',
+    loadChildren: () => import('./policy/policy.module').then( m => m.PolicyPageModule)
+  },  {
+    path: 'footer',
+    loadChildren: () => import('./footer/footer.module').then( m => m.FooterPageModule)
   },
-  {
-    path: 'quiz',
-    loadChildren: () => import('./quiz/quiz.module').then(m => m.QuizPageModule)
-  },
-  {
-    path: 'task',
-    loadChildren: () => import('./task/task.module').then(m => m.TaskPageModule)
-  },
-  {
-    path: 'results',
-    loadChildren: () => import('./results/results.module').then(m => m.ResultsPageModule)
-  },
-  {
-    path: 'policy',
-    loadChildren: () => import('./policy/policy.module').then( m => m.PolicyPageModule)
-  },
-
-
-
-];
-
-@NgModule({
-  imports: [
-    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
-  ],
-  exports: [RouterModule]
-})
-
 
+
+
+
+];
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules })
+  ],
+  exports: [RouterModule]
+})
+
+
 export class AppRoutingModule { }

diff --git a/client/src/app/education/education.module.ts b/client/src/app/education/education.module.ts
@@ -9,6 +9,7 @@ import { EducationPageRoutingModule } from './education-routing.module';
 import { EducationPage } from './education.page';
 
 import { NavComponent } from '../nav/nav.component';
+import { FooterPage } from '../footer/footer.page';
 
 
 @NgModule({
@@ -17,7 +18,8 @@ import { NavComponent } from '../nav/nav.component';
     FormsModule,
     IonicModule,
     EducationPageRoutingModule,
-    NavComponent
+    NavComponent,
+    FooterPage
   ],
   declarations: [EducationPage]
 })