From a4d831b8d1de3ca5af5328de5459f2b060c4f78e Mon Sep 17 00:00:00 2001
From: petertieu <tieu.peter.v@gmail.com>
Date: Sun, 19 Nov 2023 17:02:54 +1100
Subject: [PATCH 1/2] Test commit

---
 web-frontend/package-lock.json |  8 ++++----
 web-frontend/src/App.js        | 22 +++++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/web-frontend/package-lock.json b/web-frontend/package-lock.json
index f474e1856..518355af9 100644
--- a/web-frontend/package-lock.json
+++ b/web-frontend/package-lock.json
@@ -15746,16 +15746,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=14.17"
+        "node": ">=4.2.0"
       }
     },
     "node_modules/unbox-primitive": {
diff --git a/web-frontend/src/App.js b/web-frontend/src/App.js
index 4e55c3f77..221567e7c 100644
--- a/web-frontend/src/App.js
+++ b/web-frontend/src/App.js
@@ -3,12 +3,20 @@ import PreferencesComponent from './components/pref-dis-health';
 
 
 function App() {
-    return (
-      <div>
-        <PreferencesComponent />
-      </div>
-    );
-  }
-  
+  return (
+    <div>
+      {/* <Landing /> */}
+      <PreferencesComponent />
+      {/* <SignIn /> */}
+      {/* <SignUp /> */}
+      {/* <DailyNutritionPlanComponent /> */}
+      {/* <AccessNotif /> */}
+      {/* <Allergy /> */}
+      {/* <DailyNutritionPlanComponent /> */}
+      {/* <SignUpComponent /> */}
+    </div>
+  );
+}
+
 
 export default App;

From 9a4c05ed171a97a7efe7c88734c7c0928fd98de8 Mon Sep 17 00:00:00 2001
From: petertieu <tieu.peter.v@gmail.com>
Date: Sun, 19 Nov 2023 17:05:12 +1100
Subject: [PATCH 2/2] Test

---
 .gitignore                |   2 ++
 Team-TaskforceX/.DS_Store | Bin 0 -> 6148 bytes
 web-frontend/src/App.js   |   1 +
 3 files changed, 3 insertions(+)
 create mode 100644 Team-TaskforceX/.DS_Store

diff --git a/.gitignore b/.gitignore
index 7d2206dfa..91f9b583b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+node_moduleså
 Team-TaskforceX/node_modules
+web-frontend/node_modules
\ No newline at end of file
diff --git a/Team-TaskforceX/.DS_Store b/Team-TaskforceX/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/web-frontend/src/App.js b/web-frontend/src/App.js
index 221567e7c..71f76cbe0 100644
--- a/web-frontend/src/App.js
+++ b/web-frontend/src/App.js
@@ -14,6 +14,7 @@ function App() {
       {/* <Allergy /> */}
       {/* <DailyNutritionPlanComponent /> */}
       {/* <SignUpComponent /> */}
+
     </div>
   );
 }