🚑 Test hotfix

COS301-SE-2023 · Oct 22, 2023 · d96f880 · d96f880
1 parent d780e4f
commit d96f880
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 18 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'fellowship'
-version = '0.0.4'
+version = '1'
 
 java {
 	sourceCompatibility = '17'

diff --git a/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.html b/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.html
@@ -0,0 +1,121 @@
+<ion-item>
+  <div class="card-container">
+    <div class="label-container">
+      <ion-item *ngIf="dayData">
+        <!-- Rest of the code -->
+        <ion-label>{{ dayData.mealDay }}</ion-label>
+      </ion-item>
+
+      <span class="line"></span>
+    </div>
+
+    <ion-item-sliding ion-padding="0px" style="display: contents">
+      <ion-card
+        color="primary"
+        ion-padding
+        [ngClass]="{ 'hidden-card': !isBreakfastLoading }"
+      >
+        <div class="svg-container breakfast-svg-container"></div>
+      </ion-card>
+
+      <ion-card
+        color="primary"
+        ion-padding
+        [ngClass]="{ 'hidden-card': isBreakfastLoading }"
+      >
+        <ion-item
+          class="no-style"
+          color="none"
+          style="--inner-padding-end: 0; --inner-padding-bottom: 0"
+        >
+          <div ion-no-padding style="padding-inline-end: 0px !important">
+            <ion-card-header>
+              <ion-card-subtitle>Breakfast</ion-card-subtitle>
+              <ion-card-title>{{ dayData.breakfast?.name }}</ion-card-title>
+            </ion-card-header>
+
+            <ion-card-content>
+              {{ dayData.breakfast?.description }}
+            </ion-card-content>
+
+            <ion-avatar no-padding no-margin>
+              <img [src]="dayData.breakfast?.image" alt="Breakfast Image" />
+            </ion-avatar>
+          </div>
+        </ion-item>
+      </ion-card>
+    </ion-item-sliding>
+
+    <ion-item-sliding ion-padding="0px" style="display: contents">
+      <ion-card
+        color="primary"
+        ion-padding
+        [ngClass]="{ 'hidden-card': !isLunchLoading }"
+      >
+        <div class="svg-container lunch-svg-container"></div>
+      </ion-card>
+
+      <ion-card
+        color="primary"
+        ion-padding
+        [ngClass]="{ 'hidden-card': isLunchLoading }"
+      >
+        <ion-item
+          class="no-style"
+          color="none"
+          style="--inner-padding-end: 0; --inner-padding-bottom: 0"
+        >
+          <div ion-no-padding style="padding-inline-end: 0px !important">
+            <ion-card-header>
+              <ion-card-subtitle>Lunch</ion-card-subtitle>
+              <ion-card-title>{{ dayData.lunch?.name }}</ion-card-title>
+            </ion-card-header>
+
+            <ion-card-content>
+              {{ dayData.lunch?.description }}
+            </ion-card-content>
+
+            <ion-avatar no-padding no-margin>
+              <img [src]="dayData.lunch?.image" alt="Lunch Image" />
+            </ion-avatar>
+          </div>
+        </ion-item>
+      </ion-card>
+    </ion-item-sliding>
+
+    <ion-item-sliding ion-padding="0px" style="display: contents">
+      <ion-card
+        color="primary"
+        ion-padding
+        [ngClass]="{ 'hidden-card': !isDinnerLoading }"
+      >
+        <div class="svg-container dinner-svg-container"></div>
+      </ion-card>
+      <ion-card
+        color="primary"
+        ion-padding
+        [ngClass]="{ 'hidden-card': isDinnerLoading }"
+      >
+        <ion-item
+          class="no-style"
+          color="none"
+          style="--inner-padding-end: 0; --inner-padding-bottom: 0"
+        >
+          <div ion-no-padding style="padding-inline-end: 0px !important">
+            <ion-card-header>
+              <ion-card-subtitle>Dinner</ion-card-subtitle>
+              <ion-card-title>{{ dayData.dinner?.name }}</ion-card-title>
+            </ion-card-header>
+
+            <ion-card-content>
+              {{ dayData.dinner?.description }}
+            </ion-card-content>
+
+            <ion-avatar no-padding no-margin>
+              <img [src]="this.dayData.dinner?.image" alt="Dinner Image" />
+            </ion-avatar>
+          </div>
+        </ion-item>
+      </ion-card>
+    </ion-item-sliding></div
+></ion-item>
diff --git a/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.scss b/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.scss
@@ -0,0 +1,109 @@
+ion-avatar {
+  height: 20vh;
+  width: auto;
+  --border-radius: 2%;
+}
+ion-item-sliding {
+  --ion-padding: 0px;
+}
+
+ion-item {
+  width: 100%;
+  display: block;
+  --ion-padding: 0px;
+}
+ion-card {
+  padding: 0%;
+  --ion-padding: 0px;
+}
+
+.div1 img {
+  min-width: 100%;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  padding-right: 0px !important;
+  overflow: hidden;
+}
+
+.no-style {
+  --padding-start: 0;
+  --padding-end: 0;
+  padding-right: 0%;
+  --border-style: none;
+}
+
+.item-inner {
+  border-style: none !important;
+}
+.side {
+  display: inline;
+}
+
+.label-container {
+  display: flex;
+  align-items: center;
+}
+
+.line {
+  flex-grow: 1;
+
+  height: 1px;
+  background-color: var(--ion-color-primary);
+  margin-left: 8px;
+  margin-right: 8px;
+}
+
+.svg-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 2.5rem;
+  margin-bottom: 2.5rem;
+  scale: 0.7;
+}
+
+.hidden-card {
+  display: none !important;
+}
+
+.savebutton {
+  color: black;
+  text-transform: capitalize;
+  font-size: smaller;
+  margin-right: 5px;
+  margin-left: 5px;
+  transition: color 0.3 ease;
+}
+
+.savebutton:hover {
+  color: #818181;
+  cursor: pointer;
+}
+
+.likebutton {
+  color: black;
+  font-size: smaller;
+  margin-right: 5px;
+  margin-left: 5px;
+  transition: color 0.3 ease;
+}
+
+.likebutton:hover {
+  color: #818181;
+  cursor: pointer;
+}
+
+.buttons {
+  display: flex;
+  justify-content: space-evenly;
+}
+
+p {
+  padding-left: 5vw;
+}
+
+ion-content {
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
+    Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
+}
diff --git a/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.spec.ts b/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DailyMealsTutorialComponent } from './daily-meals-tutorial.component';
+
+describe('DailyMealsTutorialComponent', () => {
+  let component: DailyMealsTutorialComponent;
+  let fixture: ComponentFixture<DailyMealsTutorialComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DailyMealsTutorialComponent ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DailyMealsTutorialComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.ts b/frontend/src/app/components/daily-meals-tutorial/daily-meals-tutorial.component.ts
@@ -0,0 +1,35 @@
+import { CommonModule } from '@angular/common';
+import { Component, OnInit, Input } from '@angular/core';
+import { IonicModule } from '@ionic/angular';
+import { DaysMealsI, MealI } from '../../models/interfaces';
+
+@Component({
+  selector: 'app-daily-meals-tutorial',
+  templateUrl: './daily-meals-tutorial.component.html',
+  styleUrls: ['./daily-meals-tutorial.component.scss'],
+  standalone: true,
+  imports: [CommonModule, IonicModule],
+})
+export class DailyMealsTutorialComponent implements OnInit {
+  constructor() {}
+
+  breakfast: string = 'breakfast';
+  lunch: string = 'lunch';
+  dinner: string = 'dinner';
+  mealDay: string | undefined;
+  @Input() dayData!: DaysMealsI;
+  isBreakfastModalOpen = false;
+  isLunchModalOpen = false;
+  isDinnerModalOpen = false;
+  isModalOpen = false;
+  currentObject: DaysMealsI | undefined;
+  isBreakfastLoading: boolean = false;
+  isLunchLoading: boolean = false;
+  isDinnerLoading: boolean = false;
+  item: MealI | undefined;
+  fIns: String[] = [];
+  fIng: String[] = [];
+  @Input() items!: MealI[];
+
+  ngOnInit() {}
+}
diff --git a/frontend/src/app/components/tutorial/tutorial.component.html b/frontend/src/app/components/tutorial/tutorial.component.html
@@ -513,12 +513,12 @@
         </ion-header>
 
         <ion-list lines="inset" class="list-container">
-          <app-daily-meals
+          <app-daily-meals-tutorial
             *ngFor="let item of meals"
             [dayData]="item"
             [items]="foods"
           >
-          </app-daily-meals>
+          </app-daily-meals-tutorial>
         </ion-list>
       </div>
     </swiper-slide>

diff --git a/frontend/src/app/components/tutorial/tutorial.component.ts b/frontend/src/app/components/tutorial/tutorial.component.ts
@@ -11,20 +11,14 @@ import { IonicModule } from '@ionic/angular';
 import { CommonModule } from '@angular/common';
 import Swiper from 'swiper';
 import { DaysMealsI, MealI } from '../../models/interfaces';
-import { DailyMealsComponent } from '../daily-meals/daily-meals.component';
-import { RecipeItemComponent } from '../recipe-item/recipe-item.component';
+import { DailyMealsTutorialComponent } from '../daily-meals-tutorial/daily-meals-tutorial.component';
 
 @Component({
   selector: 'app-tutorial',
   templateUrl: './tutorial.component.html',
   styleUrls: ['./tutorial.component.scss'],
   standalone: true,
-  imports: [
-    CommonModule,
-    IonicModule,
-    DailyMealsComponent,
-    RecipeItemComponent,
-  ],
+  imports: [CommonModule, IonicModule, DailyMealsTutorialComponent],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
 })
 export class TutorialComponent implements OnInit, AfterViewInit {

diff --git a/frontend/src/app/pages/signup/signup.page.ts b/frontend/src/app/pages/signup/signup.page.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, NgZone } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
@@ -31,7 +31,8 @@ export class SignupPage {
     private router: Router,
     private errorHandlerService: ErrorHandlerService,
     private auth: AuthenticationService,
-    private modalController: ModalController
+    private modalController: ModalController,
+    private ngZone: NgZone
   ) {}
 
   async signup(form: any) {
@@ -57,8 +58,8 @@ export class SignupPage {
             this.errorHandlerService.presentSuccessToast(
               'Registration successful'
             );
-            this.router.navigate(['app/tabs/home']);
             this.openModal();
+            this.router.navigate(['app/tabs/home']);
           }
         }
       },
@@ -78,11 +79,12 @@ export class SignupPage {
     });
   }
   async openModal() {
-    const modal = await this.modalController.create({
-      component: TutorialComponent,
+    this.ngZone.run(async () => {
+      const modal = await this.modalController.create({
+        component: TutorialComponent,
+      });
+      await modal.present();
     });
-
-    await modal.present();
   }
 
   goToLogin() {