From 8a3db49489ca0a2e4c5fe91ef5a8575e216921c8 Mon Sep 17 00:00:00 2001
From: Sean Edmunds <smedmunds226@gmail.com>
Date: Fri, 30 Dec 2022 16:42:25 -0600
Subject: [PATCH 1/2] Merging

---
 api/server.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/api/server.js b/api/server.js
index bbe9397c..2a99b375 100644
--- a/api/server.js
+++ b/api/server.js
@@ -17,10 +17,9 @@ function getData(table) {
     con.connect();
     con.query((sql + table), (error, results, fields) => {
         if (error) throw error;
-        console.log(results);
+        return results;
       });
     con.end();
-    return results;
 }
 
 //Read bookmarks
@@ -72,9 +71,7 @@ if (fs.existsSync('../src/apps.json')) {
 //Read everything else
 const providers = require('../src/providers.json');
 const themes = require('../src/themes.json');
-const messages = require('../src/messages.json');
-
-var testmessages = getData('messages');
+const messages = getData('messages');
 
 // initializing app
 const app = express();
@@ -110,7 +107,7 @@ app.get("/sui/api/personaldata", (req, res) => {
 });
 
 app.get("/sui/api/messages", (req, res) => {
-    res.status(200).send(messages.messages);
+    res.status(200).send(messages);
 });
 
 app.post("/sui/api/appUpdate", jsonParser, (req, res) => {

From 010c8fd0bb0650b70d0a896aae47ae873b90f2fb Mon Sep 17 00:00:00 2001
From: Sean Edmunds <smedmunds226@gmail.com>
Date: Fri, 30 Dec 2022 18:25:05 -0600
Subject: [PATCH 2/2] Reading some data from SQL

---
 api/server.js                  | 30 ++++++++++++++----------------
 src/components/MessageInfo.js  |  7 +++----
 src/components/Messages.js     |  8 +++-----
 src/components/PersonalInfo.js |  2 +-
 4 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/api/server.js b/api/server.js
index 2a99b375..78888d4e 100644
--- a/api/server.js
+++ b/api/server.js
@@ -13,15 +13,6 @@ var con = mysql.createConnection({
     database: "home_page"
   });
 
-function getData(table) {
-    con.connect();
-    con.query((sql + table), (error, results, fields) => {
-        if (error) throw error;
-        return results;
-      });
-    con.end();
-}
-
 //Read bookmarks
 try {
     var links = require('../src/links.json');
@@ -69,10 +60,7 @@ if (fs.existsSync('../src/apps.json')) {
 }
 
 //Read everything else
-const providers = require('../src/providers.json');
 const themes = require('../src/themes.json');
-const messages = getData('messages');
-
 // initializing app
 const app = express();
 
@@ -87,7 +75,7 @@ app.get("/sui/api/apps", (req, res) => {
 	let apps = JSON.parse(data);
         res.status(200).send(apps.apps);
     });
-    
+
 });
 
 app.get("/sui/api/links", (req, res) => {
@@ -95,7 +83,11 @@ app.get("/sui/api/links", (req, res) => {
 });
 
 app.get("/sui/api/providers", (req, res) => {
-    res.status(200).send(providers.providers);
+    con.query('SELECT * FROM providers', (error, results, fields) => {
+        if (error) throw error;
+        res.status(200).send(results);
+      });
+
 });
 
 app.get("/sui/api/themes", (req, res) => {
@@ -103,11 +95,17 @@ app.get("/sui/api/themes", (req, res) => {
 });
 
 app.get("/sui/api/personaldata", (req, res) => {
-    res.status(200).send(personaldata);
+    con.query('SELECT * FROM personaldata', (error, results, fields) => {
+        if (error) throw error;
+        res.status(200).send(results);
+      });
 });
 
 app.get("/sui/api/messages", (req, res) => {
-    res.status(200).send(messages);
+    con.query('SELECT * FROM messages', (error, results, fields) => {
+        if (error) throw error;
+        res.status(200).send(results);
+      });
 });
 
 app.post("/sui/api/appUpdate", jsonParser, (req, res) => {
diff --git a/src/components/MessageInfo.js b/src/components/MessageInfo.js
index 8fc7002f..92a6b28f 100644
--- a/src/components/MessageInfo.js
+++ b/src/components/MessageInfo.js
@@ -4,7 +4,7 @@ import Messages from './Messages';
 function MessageInfo() {
   const [state, setState] = useState([]);
 
-  const getData = async () => {
+  const getData = async () => { 
     const response = await fetch("/sui/api/messages");
     const data = await response.json();
     setState(data);
@@ -13,14 +13,13 @@ function MessageInfo() {
   useEffect(() => {
     getData();
   }, []);
-  
+
   return (
     <div id="messageForm">
       {state.map((greetings, index) => (
           <Messages
             key={index}
             group={index+1}
-            index={greetings.index}
             greeting={greetings.message}
             easterEgg={greetings.easteregg}
           />
@@ -29,4 +28,4 @@ function MessageInfo() {
   );
 }
 
-export default MessageInfo
\ No newline at end of file
+export default MessageInfo
diff --git a/src/components/Messages.js b/src/components/Messages.js
index c62b50e2..ca3e649e 100644
--- a/src/components/Messages.js
+++ b/src/components/Messages.js
@@ -1,17 +1,15 @@
 function Messages(props) {
 
     var eeChecked;
-    if(props.easterEgg === "TRUE") {
+    if(props.easterEgg === 1) {
       eeChecked = true;
-    } else if(props.easterEgg === "FALSE") {
+    } else if(props.easterEgg === 0) {
       eeChecked = false;
     } else {
       eeChecked = false;
     }
     return (
       <div id="messageGrid" title={props.group}>
-        <label htmlFor="index">Index</label>
-        <input id="index" type="text" defaultValue={props.index}></input>
         <label htmlFor="greeting">Greeting</label>
         <input id="greeting" type="text" defaultValue={props.greeting}></input>
         <label htmlFor="Easter Egg">Easter Egg</label>
@@ -20,4 +18,4 @@ function Messages(props) {
     );
 }
 
-export default Messages;
\ No newline at end of file
+export default Messages;
diff --git a/src/components/PersonalInfo.js b/src/components/PersonalInfo.js
index 356d65f8..ee597e98 100644
--- a/src/components/PersonalInfo.js
+++ b/src/components/PersonalInfo.js
@@ -23,4 +23,4 @@ function PersonalInfo() {
   );
 }
 
-export default PersonalInfo;
\ No newline at end of file
+export default PersonalInfo;