+
+
+ Email (Username)
+
+
-
- Password
-
-
+
+ Password
+
+
- Login
- {{ errorMessage }}
+ Login
+ {{ errorMessage }}
+
+
+
-
\ No newline at end of file
diff --git a/client/src/app/measure/measure.module.ts b/client/src/app/measure/measure.module.ts
index 19b73a2..c10d5e3 100644
--- a/client/src/app/measure/measure.module.ts
+++ b/client/src/app/measure/measure.module.ts
@@ -8,13 +8,16 @@ import { MeasurePageRoutingModule } from './measure-routing.module';
import { MeasurePage } from './measure.page';
+import { NavComponent } from '../nav/nav.component';
+
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- MeasurePageRoutingModule
+ MeasurePageRoutingModule,
+ NavComponent
],
declarations: [MeasurePage]
})
-export class MeasurePageModule {}
+export class MeasurePageModule { }
diff --git a/client/src/app/measure/measure.page.html b/client/src/app/measure/measure.page.html
index 50959ba..04c7692 100644
--- a/client/src/app/measure/measure.page.html
+++ b/client/src/app/measure/measure.page.html
@@ -1,34 +1,10 @@
-
-
-
- Home
-
- Home
-
-
-
- Education
-
- Cog Load Page
- Strategies
- Measure
-
-
-
- Quiz
-
- Quiz - Builder
- New Task
- Quiz - Task Load
- Quiz - Results
-
-
+
-
- Education - Measure
- NASA Task Load Index
-
+
+ Education - Measure
+ NASA Task Load Index
+
@@ -39,11 +15,11 @@
- Content
+ Content
-
- © 2023 Cognitive Load App. All rights reserved.
-
-
+
+ © 2023 Cognitive Load App. All rights reserved.
+
+
\ No newline at end of file
diff --git a/client/src/app/nav/nav.component.html b/client/src/app/nav/nav.component.html
new file mode 100644
index 0000000..f3666f2
--- /dev/null
+++ b/client/src/app/nav/nav.component.html
@@ -0,0 +1,29 @@
+
+
+
+ Home
+
+ Home
+ Login
+ Signup
+
+
+
+ Education
+
+
+ Education
+ Cog Load Page
+ Strategies
+ Measure
+
+
+
+ Quiz
+
+ Quiz
+ New Task
+ Quiz - Results
+ Test
+
+
\ No newline at end of file
diff --git a/client/src/app/nav/nav.component.scss b/client/src/app/nav/nav.component.scss
new file mode 100644
index 0000000..81faa3d
--- /dev/null
+++ b/client/src/app/nav/nav.component.scss
@@ -0,0 +1,6 @@
+ion-accordion {
+ font-family: Arial, sans-serif;
+ font: 16px bold;
+ color: #f4f4f4;
+ background-color: #011411;
+}
\ No newline at end of file
diff --git a/client/src/app/nav/nav.component.spec.ts b/client/src/app/nav/nav.component.spec.ts
new file mode 100644
index 0000000..a94f19e
--- /dev/null
+++ b/client/src/app/nav/nav.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { NavComponent } from './nav.component';
+
+describe('NavComponent', () => {
+ let component: NavComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ NavComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(NavComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/client/src/app/nav/nav.component.ts b/client/src/app/nav/nav.component.ts
new file mode 100644
index 0000000..790cfae
--- /dev/null
+++ b/client/src/app/nav/nav.component.ts
@@ -0,0 +1,70 @@
+import { Component, OnInit } from '@angular/core';
+import { IonicModule } from '@ionic/angular';
+import { Router } from '@angular/router';
+
+
+@Component({
+ selector: 'app-nav',
+ templateUrl: './nav.component.html',
+ styleUrls: ['./nav.component.scss'],
+ standalone: true,
+ imports: [IonicModule],
+
+})
+export class NavComponent implements OnInit {
+
+ constructor(private router: Router) { }
+
+ goHome() {
+ this.router.navigateByUrl('/home');
+ }
+
+ goAbout() {
+ this.router.navigateByUrl('/about');
+ }
+
+ goEducation() {
+ this.router.navigateByUrl('/education');
+ }
+
+ goLogin() {
+ this.router.navigateByUrl('/login');
+ }
+
+ goSignup() {
+ this.router.navigateByUrl('/signup');
+ }
+
+ goMeasure() {
+ this.router.navigateByUrl('/measure');
+ }
+
+ goQuiz() {
+ this.router.navigateByUrl('/quiz');
+ }
+
+ goStrategies() {
+ this.router.navigateByUrl('/strategies');
+ }
+
+ goTask() {
+ this.router.navigateByUrl('/task');
+ }
+
+ goTest() {
+ this.router.navigateByUrl('/test');
+ }
+
+ goResults() {
+ this.router.navigateByUrl('/results');
+ }
+
+
+
+ navigateTo(page: string) {
+ this.router.navigateByUrl('/' + page);
+ }
+
+ ngOnInit() {
+ }
+}
diff --git a/client/src/app/quiz/quiz.module.ts b/client/src/app/quiz/quiz.module.ts
index a05e492..4697247 100644
--- a/client/src/app/quiz/quiz.module.ts
+++ b/client/src/app/quiz/quiz.module.ts
@@ -8,13 +8,16 @@ import { QuizPageRoutingModule } from './quiz-routing.module';
import { QuizPage } from './quiz.page';
+import { NavComponent } from '../nav/nav.component';
+
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- QuizPageRoutingModule
+ QuizPageRoutingModule,
+ NavComponent
],
declarations: [QuizPage]
})
-export class QuizPageModule {}
+export class QuizPageModule { }
diff --git a/client/src/app/quiz/quiz.page.html b/client/src/app/quiz/quiz.page.html
index b19a4e1..1056f3b 100644
--- a/client/src/app/quiz/quiz.page.html
+++ b/client/src/app/quiz/quiz.page.html
@@ -1,28 +1,4 @@
-
-
-
- Home
-
- Home
-
-
-
- Education
-
- Cog Load Page
- Strategies
- Measure
-
-
-
- Quiz
-
- Quiz - Builder
- New Task
- Quiz - Task Load
- Quiz - Results
-
-
+
@@ -30,9 +6,7 @@
-
-
-
+
diff --git a/client/src/app/results/results-routing.module.ts b/client/src/app/results/results-routing.module.ts
new file mode 100644
index 0000000..3a264b4
--- /dev/null
+++ b/client/src/app/results/results-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { ResultsPage } from './results.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: ResultsPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class ResultsPageRoutingModule {}
diff --git a/client/src/app/results/results.module.ts b/client/src/app/results/results.module.ts
new file mode 100644
index 0000000..c0293b9
--- /dev/null
+++ b/client/src/app/results/results.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { ResultsPageRoutingModule } from './results-routing.module';
+
+import { ResultsPage } from './results.page';
+import { NavComponent } from '../nav/nav.component';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ ResultsPageRoutingModule,
+ NavComponent
+ ],
+ declarations: [ResultsPage]
+})
+export class ResultsPageModule { }
diff --git a/client/src/app/results/results.page.html b/client/src/app/results/results.page.html
new file mode 100644
index 0000000..54353e3
--- /dev/null
+++ b/client/src/app/results/results.page.html
@@ -0,0 +1,15 @@
+
+
+ results
+
+
+
+
+
+
+
+
+ Results Page
+
+
+
\ No newline at end of file
diff --git a/client/src/app/results/results.page.scss b/client/src/app/results/results.page.scss
new file mode 100644
index 0000000..e69de29
diff --git a/client/src/app/results/results.page.spec.ts b/client/src/app/results/results.page.spec.ts
new file mode 100644
index 0000000..a478065
--- /dev/null
+++ b/client/src/app/results/results.page.spec.ts
@@ -0,0 +1,17 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ResultsPage } from './results.page';
+
+describe('ResultsPage', () => {
+ let component: ResultsPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ fixture = TestBed.createComponent(ResultsPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/client/src/app/results/results.page.ts b/client/src/app/results/results.page.ts
new file mode 100644
index 0000000..7171ade
--- /dev/null
+++ b/client/src/app/results/results.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-results',
+ templateUrl: './results.page.html',
+ styleUrls: ['./results.page.scss'],
+})
+export class ResultsPage implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/client/src/app/services/user-data.service.ts b/client/src/app/services/user-data.service.ts
index 2253cd3..b5846d8 100644
--- a/client/src/app/services/user-data.service.ts
+++ b/client/src/app/services/user-data.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { HttpHeaders, HttpParams } from '@angular/common/http';
+import { Router } from '@angular/router';
@Injectable({
@@ -11,7 +12,7 @@ export class UserDataService {
private url = 'https://www.brain-lift.org/brain-lift/server/api/user/';
- constructor(private http: HttpClient) { }
+ constructor(private http: HttpClient, private router: Router) { }
getData(): Observable {
return this.http.get(this.url);
@@ -38,6 +39,12 @@ export class UserDataService {
updateData(formData: any): Observable {
+ // // check for sessionID or send to login page
+ // const loggedIn = sessionStorage.getItem('sessionID');
+ // if (!loggedIn) {
+ // this.router.navigateByUrl('/login');
+ // }
+
const updateUrl = `${this.url}/update/`;
const httpOptions = {
diff --git a/client/src/app/signup/signup.module.ts b/client/src/app/signup/signup.module.ts
index 295034b..950dd39 100644
--- a/client/src/app/signup/signup.module.ts
+++ b/client/src/app/signup/signup.module.ts
@@ -8,13 +8,17 @@ import { SignupPageRoutingModule } from './signup-routing.module';
import { SignupPage } from './signup.page';
+import { NavComponent } from '../nav/nav.component';
+
+
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- SignupPageRoutingModule
+ SignupPageRoutingModule,
+ NavComponent
],
declarations: [SignupPage]
})
-export class SignupPageModule {}
+export class SignupPageModule { }
diff --git a/client/src/app/signup/signup.page.html b/client/src/app/signup/signup.page.html
index f8384bb..d42a99f 100644
--- a/client/src/app/signup/signup.page.html
+++ b/client/src/app/signup/signup.page.html
@@ -1,3 +1,5 @@
+
+
Sign Up
@@ -5,16 +7,22 @@
-
- Email (Username)
-
-
+
+
+
+
+ Email (Username)
+
+
+
+
+ Password
+
+
-
- Password
-
-
+ Sign Up
+ {{ errorMessage }}
+
-
Sign Up
-
{{ errorMessage }}
+
Home
-
-
-
- Education
-
- Cog Load Page
- Strategies
- Measure
-
-
-
- Quiz
-
- Quiz - Builder
- New Task
- Quiz - Task Load
- Quiz - Results
-
-
+
+
-
- Education - Strategies
- How to Prevent Cognitive Overload
-
-
- Intrinsic - Sequencing, Chunking, & Scaffolding
- Germane - Reflection & Interweaving
- Extraneous - Keep Things Simple
+
+ Education - Strategies
+ How to Prevent Cognitive Overload
+
+
+ Intrinsic - Sequencing,
+ Chunking, & Scaffolding
+ Germane - Reflection &
+ Interweaving
+ Extraneous - Keep Things
+ Simple
-
+
Strategies to deal with cognitive overload
-
+
-
-EFT
+
+EFT
EMDR
DBT
CBT
-
+
Forum for Tasks
-
+
- Content
+ Content
-
- © 2023 Cognitive Load App. All rights reserved.
-
+
+ © 2023 Cognitive Load App. All rights reserved.
+
\ No newline at end of file
diff --git a/client/src/app/task/task.module.ts b/client/src/app/task/task.module.ts
index fb21ab4..773a76e 100644
--- a/client/src/app/task/task.module.ts
+++ b/client/src/app/task/task.module.ts
@@ -10,6 +10,8 @@ import { IonicModule } from '@ionic/angular';
import { TaskPageRoutingModule } from './task-routing.module';
import { TaskPage } from './task.page';
+import { NavComponent } from '../nav/nav.component';
+
const routes: Routes = [
{
@@ -24,8 +26,9 @@ const routes: Routes = [
FormsModule,
ReactiveFormsModule,
IonicModule,
- TaskPageRoutingModule
+ TaskPageRoutingModule,
+ NavComponent
],
declarations: [TaskPage]
})
-export class TaskPageModule {}
+export class TaskPageModule { }
diff --git a/client/src/app/task/task.page.html b/client/src/app/task/task.page.html
index 59242df..0152863 100644
--- a/client/src/app/task/task.page.html
+++ b/client/src/app/task/task.page.html
@@ -1,28 +1,5 @@
-
-
-
- Home
-
- Home
-
-
-
- Education
-
- Cog Load Page
- Strategies
- Measure
-
-
-
- Quiz
-
- Quiz - Builder
- New Task
- Quiz - Task Load
- Quiz - Results
-
-
+
+
@@ -35,19 +12,19 @@
-
-
+
+ Save Task
+
+
\ No newline at end of file
diff --git a/client/src/app/task/task.page.ts b/client/src/app/task/task.page.ts
index 2bad34b..b823c53 100644
--- a/client/src/app/task/task.page.ts
+++ b/client/src/app/task/task.page.ts
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
+import { TaskDataService } from '../services/task-data.service';
@Component({
selector: 'app-task',
@@ -7,17 +8,45 @@ import { FormControl, FormGroup } from '@angular/forms';
styleUrls: ['./task.page.scss'],
})
export class TaskPage implements OnInit {
-
- taskForm: any
- constructor() { }
+ taskForm = new FormGroup({
+ taskName: new FormControl(''),
+ taskType: new FormControl(''),
+ taskTime: new FormControl(''),
+ userID: new FormControl(''), // todo
+ sessionID: new FormControl(''), // todo
+ });
+
+ constructor(private taskDataService: TaskDataService) { }
ngOnInit() {
}
- selectTaskTime(time: any) { }
- selectTaskType(type: any) { }
+ selectTaskTime(time: any) {
+ this.taskForm.controls['taskTime'].setValue(time);
+ }
-
+ selectTaskType(type: any) {
+ this.taskForm.controls['taskType'].setValue(type);
+ }
-}
+ saveTask() {
+
+ console.log(this.taskForm.value)
+ this.taskForm.value["sessionID"] = sessionStorage.getItem("sessionID")
+ this.taskForm.value["userID"] = sessionStorage.getItem("sessionID")
+
+ const formData = {
+ "taskName": this.taskForm.value.taskName,
+ "taskType": this.taskForm.value.taskType,
+ "taskTime": this.taskForm.value.taskTime,
+ "userID": this.taskForm.value.userID,
+ "sessionID": this.taskForm.value.sessionID
+ }
+
+ this.taskDataService.postData(formData).subscribe({
+ next: response => console.log('Response from server:', response),
+ error: error => console.error('Error:', error)
+ });
+ }
+}
diff --git a/client/src/app/test/test.module.ts b/client/src/app/test/test.module.ts
index e965001..de6465d 100644
--- a/client/src/app/test/test.module.ts
+++ b/client/src/app/test/test.module.ts
@@ -10,6 +10,8 @@ import { TestPage } from './test.page';
import { HttpClientModule } from '@angular/common/http';
+import { NavComponent } from '../nav/nav.component';
+
@NgModule({
imports: [
@@ -18,6 +20,7 @@ import { HttpClientModule } from '@angular/common/http';
IonicModule,
TestPageRoutingModule,
HttpClientModule,
+ NavComponent
],
declarations: [TestPage]
})
diff --git a/client/src/app/test/test.page.html b/client/src/app/test/test.page.html
index e7f34dd..cec2d67 100644
--- a/client/src/app/test/test.page.html
+++ b/client/src/app/test/test.page.html
@@ -1,29 +1,3 @@
-
-
-
- Home
-
- Home
-
-
-
- Education
-
- Cog Load Page
- Strategies
- Measure
-
-
-
- Quiz
-
- Quiz - Builder
- New Task
- Quiz - Task Load
- Quiz - Results
-
-
-
API Route Test Page
@@ -31,6 +5,7 @@
+
Task API Routes
Get Task
From 2b5898e787a2cb05831b32f3d86d529f3023c152 Mon Sep 17 00:00:00 2001
From: nitrotap <9121718+nitrotap@users.noreply.github.com>
Date: Tue, 6 Jun 2023 01:18:36 -0600
Subject: [PATCH 3/3] adding content to front end
---
client/src/app/about/about.page.scss | 8 +
client/src/app/education/education.page.html | 2 +-
client/src/app/education/education.page.scss | 3 +-
client/src/app/home/home.page.html | 13 +-
client/src/app/home/home.page.scss | 20 +-
client/src/app/home/home.page.ts | 8 +-
client/src/app/login/login.page.html | 7 +-
client/src/app/login/login.page.scss | 7 +
client/src/app/measure/measure.page.html | 37 +-
client/src/app/measure/measure.page.scss | 6 +-
client/src/app/nav/nav.component.html | 5 +-
client/src/app/quiz/quiz.page.html | 14 +-
client/src/app/quiz/quiz.page.scss | 6 +-
client/src/app/results/results.page.html | 27 +-
client/src/app/results/results.page.scss | 5 +
client/src/app/results/results.page.ts | 29 +-
client/src/app/signup/signup.page.scss | 5 +
.../src/app/strategies/strategies.page.html | 387 ++++++++++++++++--
.../src/app/strategies/strategies.page.scss | 63 ++-
client/src/app/task/task.page.html | 54 ++-
client/src/app/task/task.page.scss | 10 +-
client/src/app/task/task.page.ts | 12 +-
server/api/task/index.php | 7 +-
23 files changed, 563 insertions(+), 172 deletions(-)
diff --git a/client/src/app/about/about.page.scss b/client/src/app/about/about.page.scss
index e69de29..19ae630 100644
--- a/client/src/app/about/about.page.scss
+++ b/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;
+}
\ No newline at end of file
diff --git a/client/src/app/education/education.page.html b/client/src/app/education/education.page.html
index 8dc3297..f9e6611 100644
--- a/client/src/app/education/education.page.html
+++ b/client/src/app/education/education.page.html
@@ -1,6 +1,6 @@
- Cognitive Load
+ Learn About Cognitive Load
diff --git a/client/src/app/education/education.page.scss b/client/src/app/education/education.page.scss
index 84cc15e..1df9f70 100644
--- a/client/src/app/education/education.page.scss
+++ b/client/src/app/education/education.page.scss
@@ -51,4 +51,5 @@ ion-footer p {
font-size: 12px;
color: #888;
}
-
\ No newline at end of file
+
+
diff --git a/client/src/app/home/home.page.html b/client/src/app/home/home.page.html
index a75cf3e..7a5d6f9 100644
--- a/client/src/app/home/home.page.html
+++ b/client/src/app/home/home.page.html
@@ -1,12 +1,13 @@
-
-
-
- Cognitive Load App
+
+
+ Home
-
+
+
+
@@ -28,7 +29,7 @@
- Get Started
+ Get Started
diff --git a/client/src/app/home/home.page.scss b/client/src/app/home/home.page.scss
index 6d8fcab..867684b 100644
--- a/client/src/app/home/home.page.scss
+++ b/client/src/app/home/home.page.scss
@@ -33,25 +33,13 @@ body {
padding: 0;
}
-/* Navigation Styles */
-
-ion-accordion {
- font-family: Arial, sans-serif;
- font: 16px bold;
- color: #f4f4f4;
-
+ion-card, ion-title, ion-card-subtitle {
+ overflow: visible;
+ color: black;
+ text-align: center;
}
-/* Header Styles */
-ion-header {
- padding: 20px;
-}
-ion-title {
- font-size: 24px;
- font-weight: bold;
- color: #fff;
-}
/* Card Styles */
ion-card {
diff --git a/client/src/app/home/home.page.ts b/client/src/app/home/home.page.ts
index 83522d5..2cb6dfa 100644
--- a/client/src/app/home/home.page.ts
+++ b/client/src/app/home/home.page.ts
@@ -1,12 +1,14 @@
import { Component } from '@angular/core';
-
+import { Router } from '@angular/router';
@Component({
selector: 'app-home',
templateUrl: 'home.page.html',
styleUrls: ['home.page.scss'],
})
export class HomePage {
-
- constructor() {}
+ goSignup() {
+ this.router.navigateByUrl('/signup');
+ }
+ constructor(private router: Router) { }
}
diff --git a/client/src/app/login/login.page.html b/client/src/app/login/login.page.html
index 2a32f71..dbe9c96 100644
--- a/client/src/app/login/login.page.html
+++ b/client/src/app/login/login.page.html
@@ -1,11 +1,12 @@
-
-
+
Login
-
+
+
+
diff --git a/client/src/app/login/login.page.scss b/client/src/app/login/login.page.scss
index e69de29..97a908f 100644
--- a/client/src/app/login/login.page.scss
+++ b/client/src/app/login/login.page.scss
@@ -0,0 +1,7 @@
+ion-card, ion-title, ion-card-subtitle {
+ --ion-item-border-color: #025E73;
+ --ion-text-color: #012E40;
+ overflow: visible;
+ color: black;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/client/src/app/measure/measure.page.html b/client/src/app/measure/measure.page.html
index 04c7692..3c89e9a 100644
--- a/client/src/app/measure/measure.page.html
+++ b/client/src/app/measure/measure.page.html
@@ -1,25 +1,16 @@
-
+
+
+ Measure your cognitive load
+
+
-
-
- Education - Measure
- NASA Task Load Index
-
-
-
-
-Explanation
-
-
-How to Use
-
-
-
- Content
-
+
-
-
- © 2023 Cognitive Load App. All rights reserved.
-
-
\ No newline at end of file
+
+
+
+
+
+ © 2023 Cognitive Load App. All rights reserved.
+
+
\ No newline at end of file
diff --git a/client/src/app/measure/measure.page.scss b/client/src/app/measure/measure.page.scss
index 6445ca8..0c11c7a 100644
--- a/client/src/app/measure/measure.page.scss
+++ b/client/src/app/measure/measure.page.scss
@@ -6,7 +6,11 @@ ion-accordion {
color: #f4f4f4;
}
-
+ion-card, ion-title, ion-card-subtitle {
+ overflow: visible;
+ color: black;
+ text-align: center;
+}
/* Card Styles */
ion-card {
--ion-item-border-color: #025E73;
diff --git a/client/src/app/nav/nav.component.html b/client/src/app/nav/nav.component.html
index f3666f2..24430aa 100644
--- a/client/src/app/nav/nav.component.html
+++ b/client/src/app/nav/nav.component.html
@@ -13,9 +13,8 @@
Education
- Cog Load Page
Strategies
- Measure
+
@@ -23,7 +22,7 @@
Quiz
New Task
- Quiz - Results
+ Results
Test
\ No newline at end of file
diff --git a/client/src/app/quiz/quiz.page.html b/client/src/app/quiz/quiz.page.html
index 1056f3b..1607425 100644
--- a/client/src/app/quiz/quiz.page.html
+++ b/client/src/app/quiz/quiz.page.html
@@ -1,19 +1,13 @@
-
-
Quiz
-
-
-
-
- Quiz Page
-
-
-
+
+
+
+
diff --git a/client/src/app/quiz/quiz.page.scss b/client/src/app/quiz/quiz.page.scss
index 707081a..a171241 100644
--- a/client/src/app/quiz/quiz.page.scss
+++ b/client/src/app/quiz/quiz.page.scss
@@ -23,7 +23,11 @@ ion-range::part(pin) {
height: 28px;
transition: transform 120ms ease, background 120ms ease;
}
-
+ion-card, ion-title, ion-card-subtitle {
+ overflow: visible;
+ color: black;
+ text-align: center;
+}
ion-range::part(pin)::before {
content: none;
}
diff --git a/client/src/app/results/results.page.html b/client/src/app/results/results.page.html
index 54353e3..234e018 100644
--- a/client/src/app/results/results.page.html
+++ b/client/src/app/results/results.page.html
@@ -1,15 +1,30 @@
- results
+ Results
+ See Your Past Results
+
+
+ Task ID: {{ demoResult.taskID }}
+ Answer ID: {{ demoResult.answerID }}
+ Mental Demand: {{ demoResult.taskAnswer_1 }}
+ Physical Demand: {{ demoResult.answerID }}
+ Time (Temporal) Demand: {{ demoResult.answerID }}
+ Self Performance: {{ demoResult.answerID }}
+ Effort: {{ demoResult.answerID }}
+ Frustration Level: {{ demoResult.answerID }}
-
-
- Results Page
-
-
+
+
+
+ View Your Tasks
+
+ Task ID: {{ demoResult.taskID }}
+
+
+ Take a New Quiz
\ No newline at end of file
diff --git a/client/src/app/results/results.page.scss b/client/src/app/results/results.page.scss
index e69de29..0bf84bf 100644
--- a/client/src/app/results/results.page.scss
+++ b/client/src/app/results/results.page.scss
@@ -0,0 +1,5 @@
+ion-card, ion-title, ion-card-subtitle {
+ overflow: visible;
+ color: black;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/client/src/app/results/results.page.ts b/client/src/app/results/results.page.ts
index 7171ade..4494740 100644
--- a/client/src/app/results/results.page.ts
+++ b/client/src/app/results/results.page.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
@Component({
selector: 'app-results',
@@ -6,8 +7,34 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./results.page.scss'],
})
export class ResultsPage implements OnInit {
+ results: any;
+ demoResults = [
+ {
+ "answerID": 10, "taskAnswer_1": 5, "taskAnswer_2": 5, "taskAnswer_3": 5, "taskAnswer_4": 5, "taskAnswer_5": 5, "taskAnswer_6": 5, "taskScore": 30, "dateTaken": "2023-05-15 11:30:00", "userID": 1, "taskID": 1
+ },
+ {
+ "answerID": 11, "taskAnswer_1": 4, "taskAnswer_2": 5, "taskAnswer_3": 4, "taskAnswer_4": 5, "taskAnswer_5": 5, "taskAnswer_6": 5, "taskScore": 28, "dateTaken": "2023-05-15 11:30:00", "userID": 1, "taskID": 1
+ },
+ {
+ "answerID": 10, "taskAnswer_1": 5, "taskAnswer_2": 5, "taskAnswer_3": 5, "taskAnswer_4": 5, "taskAnswer_5": 5, "taskAnswer_6": 5, "taskScore": 30, "dateTaken": "2023-05-15 11:30:00", "userID": 1, "taskID": 3
+ },
+ {
+ "answerID": 11, "taskAnswer_1": 4, "taskAnswer_2": 5, "taskAnswer_3": 4, "taskAnswer_4": 5, "taskAnswer_5": 5, "taskAnswer_6": 5, "taskScore": 28, "dateTaken": "2023-05-15 11:30:00", "userID": 1, "taskID": 3
+ },
+ {
+ "answerID": 10, "taskAnswer_1": 5, "taskAnswer_2": 5, "taskAnswer_3": 5, "taskAnswer_4": 5, "taskAnswer_5": 5, "taskAnswer_6": 5, "taskScore": 30, "dateTaken": "2023-05-15 11:30:00", "userID": 1, "taskID": 4
+ },
+ {
+ "answerID": 11, "taskAnswer_1": 4, "taskAnswer_2": 5, "taskAnswer_3": 4, "taskAnswer_4": 5, "taskAnswer_5": 5, "taskAnswer_6": 5, "taskScore": 28, "dateTaken": "2023-05-15 11:30:00", "userID": 1, "taskID": 4
+ },
+ ]
- constructor() { }
+
+ constructor(private router: Router) { }
+
+ goQuiz() {
+ this.router.navigateByUrl('/quiz');
+ }
ngOnInit() {
}
diff --git a/client/src/app/signup/signup.page.scss b/client/src/app/signup/signup.page.scss
index e69de29..0bf84bf 100644
--- a/client/src/app/signup/signup.page.scss
+++ b/client/src/app/signup/signup.page.scss
@@ -0,0 +1,5 @@
+ion-card, ion-title, ion-card-subtitle {
+ overflow: visible;
+ color: black;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/client/src/app/strategies/strategies.page.html b/client/src/app/strategies/strategies.page.html
index 1a1590c..6450b6f 100644
--- a/client/src/app/strategies/strategies.page.html
+++ b/client/src/app/strategies/strategies.page.html
@@ -1,42 +1,373 @@
-
+
+
+ Strategies
+
+
+
-
-
- Education - Strategies
- How to Prevent Cognitive Overload
-
+
- Intrinsic - Sequencing,
- Chunking, & Scaffolding
- Germane - Reflection &
- Interweaving
- Extraneous - Keep Things
- Simple
+
+
+ Preventing Cognitive Overload
+
+
+ Preventing cognitive overload is certainly harder than it sounds.
+ There are a few ways to help deal with overload, but be sure to consult with a therapist or psychiatrist before
+ relying on any of these methods. These methods are provided as a sample to help those in the moment, and is not to
+ be substituted for health advice.
+
+
-
- Strategies to deal with cognitive overload
-
-
-
+
+ Tips for Intrinsic Load
+
+
+
+
+
+
+
+
+ Chunking
+
+
+ Split up a task into smaller parts
+
+
+
+ Chunking describes the strategy of splitting up a single task into smaller, more manageable chunks.
+ By grouping related pieces of information together, individuals can reduce cognitive load and enhance
+ their ability to process and retain information effectively. Chunking helps simplify complex tasks by
+ organizing them into manageable and interconnected parts, making it easier to remember and execute the
+ individual steps involved. It facilitates efficiency, pattern recognition, and problem-solving by
+ promoting a more streamlined approach to task execution.
+
+
-EFT
-EMDR
-DBT
-CBT
+
+
+
+
+
+ Sequencing
+
+
+ Split up a task in a
+ specific order to complete it
+
-
+
+
+ Sequencing refers to the logical order and arrangement of steps or actions in a process or task. It
+ involves breaking down a complex task into smaller, manageable steps that need to be performed in a
+ specific order to achieve the desired outcome. Sequencing helps ensure that each step is
+ completed before
+ moving on to the next, ensuring efficiency, accuracy, and successful completion of the task. Whether it's
+ in activities like laundry or cooking, sequencing plays a crucial role in organizing the workflow,
+ maintaining consistency, and achieving optimal results.
-Forum for Tasks
+
+
+
+
+
+
+
+ Scaffolding
+
+
+ Using aids to lessen cognitive effort needed to complete the task
+
+
+
+ Scaffolding can take different forms, such as verbal instructions, visual aids, demonstrations, or
+ physical assistance. The goal of scaffolding is to gradually reduce support as as time goes on. It serves
+ as a temporary framework that assists individuals in acquiring and refining the necessary skills to
+ perform tasks effectively and autonomously.
+
+
+
+
+
+
-
+
+ Tips for Extraneous Load
+
+
+
+
+
+
+
+
+ Simplification
+
+
+ Modify your goals to support the cognitive load framework
+
+
+
+ Keep things simple. Modify your existing goals to support the cognitive load framework, and base your
+ success on
+ how well you are accomplishing preventing cognitive overload or slowly gaining independence in the task.
+ Write
+ your goals to gradually reduce extraneous demands on your mental resources.
+
+
+
+
+
+
+
+ Therapy
+
+
+ Provides a supportive and safe environment for individuals to explore their thoughts, emotions, and
+ behaviors
+
+
+
+ Therapy can provide a supportive and safe environment for individuals to explore their thoughts, emotions,
+ and
+ behaviors, leading to increased self-awareness, improved coping skills, and enhanced overall mental
+ well-being.
+
+
+
+
+
+
+
+ Medication
+
+
+ Can help alleviate symptoms, restore chemical imbalances in the brain, and improve overall quality of
+ life
+
+
+
+ For those with mental illness, psychiatric medication can help alleviate symptoms, restore chemical
+ imbalances
+ in the brain, and improve overall quality of life by reducing distress and promoting stability.
+
+
+
+
+
+
-
- Content
-
+
+ Tips for Germane Load
+
+
+
+
+ Reflection
+
+
+ Thinking about tasks and events in advance and after completion
+
+
+
+ Reflection is a powerful tool for managing cognitive load. Thinking about tasks and experiences lets us gain
+ insight into our thinking processes, identify areas of improvement, and make adjustments for more efficient
+ cognitive functioning. By reflecting on our performance, we think about an experience or task outside of the
+ event, helping us to identify and to distinguish between the hard parts of a task and the easy parts. It helps us
+ be strategic with our cognitive effort, and it can help us decrease overall cognitive load. Reflection also
+ provides an opportunity to really understand ourselves and our challenges, all while preparing for the future.
+
+
+
+
+ Interweaving
+
+
+
+
+
+
+
+ Task Switching
+
+
+ Interweave different tasks within a single session
+
+
+
+ Instead of completing one ADL entirely before moving on to the next, you can interweave different tasks
+ within a single session. For example, you can switch between folding laundry, preparing a meal, and
+ organizing your workspace, allowing your brain to transition between different activities and engage with
+ varied cognitive demands.
+
+
+
+
+
+
+
+
+ Multitasking with Intention
+
+
+ Combining activities strategically to make the most of your time
+
+
+
+ While multitasking can sometimes lead to decreased productivity, interweaving tasks with intention can be
+ beneficial. For instance, while waiting for water to boil on the stove, you can use that time to wash a
+ few dishes or sort through your mail. By combining activities strategically, you can make the most of your
+ time and accomplish multiple tasks simultaneously.
+
+
+
+
+
+
+
+ Sequential Overlapping
+
+
+ Overlap steps or actions in different tasks
+
+
+
+ Instead of completing each ADL in isolation, look for opportunities to overlap steps or actions. For
+ instance, while cooking, you can start a load of laundry and let it run in the background while you
+ continue with meal preparation. This way, you're interweaving different tasks and utilizing time and
+ resources more effectively.
+
+
+
+
+
+
+
+
+
+
+ Dealing with Cognitive Overload
+ Emotional Freedom Techniques (EFT)
+
+
+ -
+ Establish a phrase accepting yourself specific the problem you're facing
+
+
+ - "While I am hearing voices, I know the voices aren't real."
+ - "While I am feeling very sad, I know the sad feelings are temporary."
+ - "Even though this is happening, I know I will get through it"
+
+ - Now, tap each of the following points seven (7) times.
+ Start with the side of your hand.
+
+ -
+ Side of hand opposite of your thumb.
+
+ - In between your eyebrows
+ - End of your right eyebrow
+ - Under your right eye
+ - Right under your nose
+ - In between your mouth and your chin
+ - To the right of your upper sternum
+ - Under your right armpit
+ - Back to in between your eyebrows
+
+
+
+ -
+ Starting with the side of your hand opposite your thumb, tap each point seven times.
+
+
+
+
+
+
+
+
+
+ Eye Movement Desensitization and Reprocessing
+
+ EMDR therapy is a method used to help people deal with difficult memories and experiences that may be causing
+ emotional distress. While it's typically done with a trained therapist, there's a simplified technique you can try
+ at home called the "Butterfly Hug." Here's how you can do it:
+
+
+ -
+ Sit comfortably and take a few deep breaths to relax.
+
+ - Cross your arms across your chest, with your hands resting lightly on your upper arms.
+
+ - Start tapping alternately with your right and left hands on your arms, like a butterfly's wings gently
+ fluttering.
+
+ - While tapping, bring to mind a specific memory or issue that's bothering you. It could be something that makes
+ you feel anxious, upset, or scared.
+
+ - Focus on the memory or issue and let the tapping continue for about 20-30 seconds.
+
+ - Take a deep breath and let it out slowly.
+
+ - Notice any thoughts, feelings, or sensations that arise during the process.
+
+
+
+
+ The idea behind this technique is that the bilateral tapping helps stimulate both sides of the brain, which can
+ aid
+ in processing and reducing the emotional intensity of the memory or issue. It's important to remember that this
+ simplified version may not be as effective as undergoing EMDR therapy with a trained professional, especially for
+ complex or severe issues. If you find that your distress persists or worsens, it's recommended to seek the help of
+ a
+ qualified mental health practitioner.
+
+
-
+
+
+
+
+
+ Education - Strategies
+ How to Prevent Cognitive Overload
+
+
+ Intrinsic - Sequencing,
+ Chunking, & Scaffolding
+ Germane - Reflection &
+ Interweaving
+ Extraneous - Keep Things
+ Simple
+
+
+ Strategies to deal with cognitive overload
+
+
+
+
+
+ EFT
+ EMDR
+ DBT
+ CBT
+
+
+
+ Forum for Tasks
+
+
+
+
+ Content
+
+
+
+
+
diff --git a/client/src/app/strategies/strategies.page.scss b/client/src/app/strategies/strategies.page.scss
index b362da2..63ef411 100644
--- a/client/src/app/strategies/strategies.page.scss
+++ b/client/src/app/strategies/strategies.page.scss
@@ -1,39 +1,34 @@
-/* Navigation Styles */
-
-ion-accordion {
- font-family: Arial, sans-serif;
- font: 16px bold;
- color: #f4f4f4;
-
+ion-card, ion-title, ion-card-subtitle {
+ overflow: visible;
+ color: black;
+ text-align: center;
}
-/* Card Styles */
-ion-card {
- --ion-item-border-color: #025E73;
- --ion-item-background: #80A7BF;
- --ion-text-color: #012E40;
-}
+ // @media (max-width: 768px) {
+ // ion-grid {
+ // grid-template-columns: repeat(1, 1fr) !important;
+ // }
+ // }
-ion-button {
- --ion-item-border-color: #025E73;
- --ion-item-background: #80A7BF;
- --ion-text-color: #012E40;
-}
+ // @media (min-width: 769px) {
+ // ion-grid {
+ // grid-template-columns: repeat(3, 1fr) !important;
+ // }
+ // }
-ion-button.large {
- --background: #025E73;
- --ion-text-color: #012E40;
-}
+ // ion-card {
+ // transition: transform 0.3s ease-in-out;
+ // }
-/* Footer Styles */
-ion-footer {
- margin-top: 50px;
- background-color: #f4f4f4;
- padding: 10px;
-}
-
-ion-footer p {
- font-size: 12px;
- color: #888;
-}
-
\ No newline at end of file
+ // ion-card:hover {
+ // transform: scale(1.05);
+ // }
+
+ // ion-button {
+ // transition: background-color 0.3s ease-in-out, transform 0.3s ease-in-out;
+ // }
+
+ // ion-button:hover {
+ // background-color: #dddddd;
+ // transform: scale(1.1);
+ // }
diff --git a/client/src/app/task/task.page.html b/client/src/app/task/task.page.html
index 0152863..de89f62 100644
--- a/client/src/app/task/task.page.html
+++ b/client/src/app/task/task.page.html
@@ -1,29 +1,41 @@
-
-
-
-
+
-
- New Task
-
+ New Task
-
-
-
- 
+ 
+ 
+ 
+ 
-