Added new categories table

SQLDefinitions/tables.sql

@@ -23,6 +23,12 @@ CREATE TABLE `tabs` (
   PRIMARY KEY (`id`)
 );
 
+CREATE TABLE `categories` (
+  `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(50),
+  PRIMARY KEY (`id`)
+);
+
 CREATE TABLE `messages` (
   `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
   `message` VARCHAR(255),
@@ -54,4 +60,4 @@ CREATE TABLE `themes` (
   `colortextacc` VARCHAR(9),
   `colorborder` VARCHAR(9),
   PRIMARY KEY (`id`)
-);
+);

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,19 +83,31 @@ 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) => {
-    res.status(200).send(themes.themes);
+    con.query('SELECT * FROM themes', (error, results, fields) => {
+        if (error) throw error;
+        res.status(200).send(results);
+      });
 });
 
 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) => {

src/assets/functions.js

@@ -23,7 +23,7 @@ export function greet() {
     let currentTime = new Date();
     let greet = Math.floor(currentTime.getHours() / 6);
     let easterEggChance = Math.floor(Math.random() * 100);
-    let greetings = require('../messages.json');
+    let greetings = require("../messages.json");
     let timeBased = [];
     let easterEggs = [];
     for (var i = 0; i < greetings.messages.length; i++) {

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
+export default MessageInfo

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;
+export default Messages;

src/components/PersonalInfo.js

@@ -7,7 +7,7 @@ function PersonalInfo() {
   const getData = async () => {
     const response = await fetch("/sui/api/personaldata");
     const data = await response.json();
-    setState(data);
+    setState(data[0]);
   };
 
   useEffect(() => {
@@ -23,4 +23,4 @@ function PersonalInfo() {
   );
 }
 
-export default PersonalInfo;
+export default PersonalInfo;