Merge pull request #44 from COS301-SE-2023/dev

Demo One

Author: simphiwe-nonabe

apps/app/src/assets/Logo.png

@@ -1,6 +1,5 @@
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 import { CoreModule } from '@fridge-to-plate/app/core';
-
 platformBrowserDynamic()
   .bootstrapModule(CoreModule)
   .catch((err) => console.error(err));

apps/app/src/main.ts

@@ -13,6 +13,7 @@ module.exports = {
         'background-light': '#F8F8F8',
         'background-dark': '#010127',
         'primary': '#C35214',
+        'recipe-card-overlay': 'rgba(52,52,52,0.64)',
         'primary-highlight': '#E26310',
         'accept': '#2bc917',
         'reject': '#d70b0b'

apps/app/tailwind.config.js

@@ -5,13 +5,25 @@ import { NxWelcomeComponent } from "./nx-welcome.component";
 import { CoreRouting } from "./core.routing";
 import { IonicModule, IonicRouteStrategy } from "@ionic/angular";
 import { RouteReuseStrategy } from "@angular/router";
+import { LoginModule } from '@fridge-to-plate/app/login/feature';
+import { TabbedComponent } from "./tabbed-component/tabbed-component";
+import { NzStepsModule } from "ng-zorro-antd/steps";
+import { NzFormModule } from "ng-zorro-antd/form";
+import { NzIconModule } from "ng-zorro-antd/icon";
+import { ReactiveFormsModule } from "@angular/forms";
 
 @NgModule({
-  declarations: [CoreShell, NxWelcomeComponent],
+  declarations: [CoreShell, NxWelcomeComponent, TabbedComponent],
   imports: [
     BrowserModule,
-     CoreRouting,
-    IonicModule.forRoot()],
+    LoginModule,
+    CoreRouting,
+    ReactiveFormsModule,
+    IonicModule.forRoot(),
+    NzStepsModule, 
+    NzFormModule, 
+    NzIconModule
+  ],
   providers: [{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }],
   bootstrap: [CoreShell],
 })

libs/app/core/src/core.module.ts

@@ -7,8 +7,27 @@ const routes: Routes = [
         path: '',
         pathMatch: 'full',
         component: NxWelcomeComponent,
+    }, 
+    { 
+        path: 'recommendations', 
+        loadChildren: () => import('@fridge-to-plate/app/recipe-recommendation').then((m) => m.AppRecipeRecommendationModule),
+    },
+    {
+        path: 'login',
+        loadChildren: () => import('@fridge-to-plate/app/login/feature').then((m) => m.LoginModule),
+    },
+    {
+        path: 'signup',
+        loadChildren: () => import('@fridge-to-plate/app/signup/feature').then((m) => m.SignupModule),
+    },
+    {
+        path: 'profile',
+        loadChildren: () => import('@fridge-to-plate/app/profile/feature').then((m) => m.ProfileModule),
+    },
+    {
+        path: 'create',
+        loadChildren: () => import('@fridge-to-plate/app/create/feature').then((m) => m.CreateModule),
     },
-
 ];
 
 @NgModule({

libs/app/core/src/core.routing.ts

@@ -1,3 +1,3 @@
 <ion-app>
     <ion-router-outlet></ion-router-outlet>
-</ion-app>
+</ion-app>

libs/app/core/src/core.shell.html

@@ -9,7 +9,7 @@ import { Component, ViewEncapsulation } from "@angular/core";
     color: #ff69b4;
     text-align: center;
   }
-  
+
   h2 {
     font-size: 24px;
     font-weight: normal;

libs/app/core/src/nx-welcome.component.ts

@@ -0,0 +1,3 @@
+<div>
+Menu
+</div>

libs/app/core/src/tabbed-component/tabbed-component.html

@@ -0,0 +1,8 @@
+.page-container {
+  background-color:#F8F8F8;
+  height: 100%;
+  width: 100%;
+  display: grid;
+  grid-template-rows: repeat(12, minmax(0,1fr));
+  grid-template-columns: repeat(12, minmax(0,1fr));
+}