From 841456793ce4931490de3e339e363386db5e3a0c Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Mon, 16 Sep 2024 03:29:29 +0100
Subject: [PATCH 1/8] Update App.jsx

update
---
 src/App.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/App.jsx b/src/App.jsx
index 144ecd6..28910be 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,8 +1,11 @@
 const App = () => {
   return (
-    <h1 className="underline p-4">
+    <div>
+    <h1 className="text-orange text-4xl font-bold" style={{ color: '#ff6725' }}>
       Hello World!
     </h1>
+      <p className="text-brown text-4xl font-bold" style={{ color: '#00b579' }}> Sign In </p>
+    </div>
   );
 };
 

From cc7f6e0c2eabcac2aa1f73edf1617b9bdcce643c Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Thu, 19 Sep 2024 18:37:05 +0100
Subject: [PATCH 2/8] Update tailwind.config.js

added colors and color codes
---
 tailwind.config.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tailwind.config.js b/tailwind.config.js
index dca8ba0..e2fdf3c 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -5,7 +5,14 @@ export default {
     "./src/**/*.{js,ts,jsx,tsx}",
   ],
   theme: {
-    extend: {},
+    extend: {
+      colors: {
+        'orange': '#ff6725',
+        'orange-dark': '#ff3f25',
+        'brown': '#453a34',
+        'green': '#00b579',
+      },
+    },
   },
   plugins: [],
 }

From 9c49ae0e582ecaa9adee1adc553b135e394d961e Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Thu, 19 Sep 2024 18:42:46 +0100
Subject: [PATCH 3/8] Update App.jsx

revamped
---
 src/App.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 28910be..915913d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,10 +1,10 @@
 const App = () => {
   return (
     <div>
-    <h1 className="text-orange text-4xl font-bold" style={{ color: '#ff6725' }}>
+    <h1 className="text-orange bg-brown text-4xl font-bold">
       Hello World!
     </h1>
-      <p className="text-brown text-4xl font-bold" style={{ color: '#00b579' }}> Sign In </p>
+      <p className="text-orange-dark"> Sign In </p>
     </div>
   );
 };

From f31e9834224a6c1102e9596b215c4ec27a4dc414 Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Thu, 3 Oct 2024 12:23:23 +0100
Subject: [PATCH 4/8] Fixes #29: Update tailwind.config.js

Added orange-light
---
 tailwind.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tailwind.config.js b/tailwind.config.js
index e2fdf3c..9d532aa 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -9,6 +9,7 @@ export default {
       colors: {
         'orange': '#ff6725',
         'orange-dark': '#ff3f25',
+        'orange-light': '#fef7f3',
         'brown': '#453a34',
         'green': '#00b579',
       },

From 272bc1f447b2dce3440b831ad25b48ae57a6b165 Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Fri, 4 Oct 2024 02:46:10 +0100
Subject: [PATCH 5/8] Fixes #29: Update tailwind.config.js

Added defaultColors
Added custom colors
---
 tailwind.config.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tailwind.config.js b/tailwind.config.js
index 0a6a183..d3d0494 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,3 +1,5 @@
+const defaultColors = require('tailwindcss/colors');
+
 /** @type {import('tailwindcss').Config} */
 export default {
   content: [
@@ -8,9 +10,12 @@ export default {
   theme: {
     extend: {
       colors: {
-        'orange': '#ff6725',
-        'orange-dark': '#ff3f25',
-        'orange-light': '#fef7f3',
+        ...defaultColors,
+        'orange':{
+          DEFAULT: '#ff6725',
+        'dark': '#ff3f25',
+        'light': '#fef7f3',
+        },
         'brown': '#453a34',
         'green': '#00b579',
       },

From e8b1638cd93c2580544153c121a3f5d939cfd080 Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Sat, 5 Oct 2024 09:34:36 +0100
Subject: [PATCH 6/8] Fix #29: Update App.jsx

returns only hello world
---
 src/App.jsx | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 0ece3d9..be51378 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,18 +1,5 @@
-const App = () => {
-  return (
-<<<<<<< HEAD
-    <div>
-    <h1 className="text-orange bg-brown text-4xl font-bold">
-      Hello World!
-    </h1>
-      <p className="text-orange-dark"> Sign In </p>
-    </div>
-=======
-    <>
-      <h1 className="underline p-4">Hello World!</h1>
-    </>
->>>>>>> origin/main
-  );
-};
-
-export default App;
+<h1 className="text-orange bg-brown text-4xl font-bold">
+  Hello World!
+</h1>
+    
+    

From 42e150012988c2f7ac59045aaf6bf9d0620e67da Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Sat, 5 Oct 2024 09:42:56 +0100
Subject: [PATCH 7/8] Fix #29: Update tailwind.config.js

re-indenting code
---
 tailwind.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tailwind.config.js b/tailwind.config.js
index d3d0494..61e9f76 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -11,10 +11,10 @@ export default {
     extend: {
       colors: {
         ...defaultColors,
-        'orange':{
+        'orange': {
           DEFAULT: '#ff6725',
-        'dark': '#ff3f25',
-        'light': '#fef7f3',
+          'dark': '#ff3f25',
+          'light': '#fef7f3',
         },
         'brown': '#453a34',
         'green': '#00b579',

From 0647e9fcbbf2b9d3c405d250db023da114ac21e9 Mon Sep 17 00:00:00 2001
From: Adewale James Adesina <adesinaadewale28@yahoo.com>
Date: Thu, 10 Oct 2024 09:22:49 +0100
Subject: [PATCH 8/8] Fixes #29: Update App.jsx

reformat and added whitespace at the bottom
---
 src/App.jsx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index be51378..b3062f1 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,5 +1,11 @@
-<h1 className="text-orange bg-brown text-4xl font-bold">
-  Hello World!
-</h1>
-    
-    
+const App = () => {
+  return (
+    <div>
+      <h1 className="text-orange bg-brown text-4xl font-bold">
+        Welcome to KlinicCon App
+      </h1>
+    </div>
+  );
+};
+
+export default App;