diff --git a/SQL Definitions/tables.sql b/SQL Definitions/tables.sql deleted file mode 100644 index 896c2dcc..00000000 --- a/SQL Definitions/tables.sql +++ /dev/null @@ -1,44 +0,0 @@ -CREATE TABLE [home_page].[apps] ( - [id] INT NOT NULL IDENTITY(1,1) PRIMARY KEY, - [name] VARCHAR(30), - [url] VARCHAR(50), - [icon] VARCHAR(30), - [urlbase] VARCHAR(15), - [NSFW] VARCHAR(10) -); - -CREATE TABLE [home_page].[links] ( - [id] INT NOT NULL IDENTITY(1,1) PRIMARY KEY, - [category] VARCHAR(20), - [name] VARCHAR(20), - [url] VARCHAR(50) -); - -CREATE TABLE [home_page].[messages] ( - [id] INT NOT NULL IDENTITY(1,1) PRIMARY KEY, - [message] VARCHAR(255), - [easteregg] BOOLEAN -); - -CREATE TABLE [home_page].[personaldata] ( - [fname] VARCHAR(20), - [lname] VARCHAR(30), - [email] VARCHAR(50) -); - -CREATE TABLE [home_page].[providers] ( - [id] INT NOT NULL IDENTITY(1,1) PRIMARY KEY, - [name] VARCHAR(20), - [url] VARCHAR(100), - [prefix] VARCHAR(5) -); - -CREATE TABLE [home_page].[themes] ( - [name] VARCHAR(20), - [imagebackground] VARCHAR(100), - [colorbackground] VARCHAR(9), - [colorserachbackground] VARCHAR(9), - [colortextpri] VARCHAR(9), - [colortextacc] VARCHAR(9), - [colorborder] VARCHAR(9) -); \ No newline at end of file diff --git a/SQLDefinitions/tables.sql b/SQLDefinitions/tables.sql new file mode 100644 index 00000000..20794c77 --- /dev/null +++ b/SQLDefinitions/tables.sql @@ -0,0 +1,50 @@ +CREATE TABLE `apps` ( + `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(30), + `url` VARCHAR(50), + `icon` VARCHAR(30), + `urlbase` VARCHAR(15), + `NSFW` VARCHAR(10), + PRIMARY KEY (`id`) +); + +CREATE TABLE `links` ( + `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, + `category` VARCHAR(20), + `name` VARCHAR(20), + `url` VARCHAR(50), + PRIMARY KEY (`id`) +); + +CREATE TABLE `messages` ( + `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, + `message` VARCHAR(255), + `easteregg` BOOLEAN, + PRIMARY KEY (`id`) +); + +CREATE TABLE `personaldata` ( + `fname` VARCHAR(20), + `lname` VARCHAR(30), + `email` VARCHAR(50) +); + +CREATE TABLE `providers` ( + `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(20), + `url` VARCHAR(100), + `prefix` VARCHAR(5), + PRIMARY KEY (`id`) +); + +CREATE TABLE `themes` ( + `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT, + `name` VARCHAR(20), + `imagebackground` VARCHAR(100), + `colorbackground` VARCHAR(9), + `colorserachbackground` VARCHAR(9), + `colortextpri` VARCHAR(9), + `colortextacc` VARCHAR(9), + `colorborder` VARCHAR(9), + PRIMARY KEY (`id`) +); \ No newline at end of file diff --git a/api/server.js b/api/server.js index 7a8a08b4..4d9d5c12 100644 --- a/api/server.js +++ b/api/server.js @@ -2,8 +2,8 @@ const express = require("express"); const bodyParser = require("body-parser"); const cors = require("cors"); const fs = require("fs"); -const wol = require("wol") -const mysql = require("mysql") +const wol = require("wol"); +const mysql = require("mysql"); var con = mysql.createConnection({ host: "localhost", @@ -11,6 +11,8 @@ var con = mysql.createConnection({ password: "changeme" }); + +//Read bookmarks try { var links = require('../src/links.json'); } catch(err) { @@ -31,6 +33,7 @@ try { var links = require('../src/links.json'); } +//Read personal data try { var personaldata = require('../src/personaldata.json'); } catch(err) { @@ -43,6 +46,7 @@ try { var personaldata = require('../src/personaldata.json'); } +//Read app list if (fs.existsSync('../src/apps.json')) { console.log("apps.json exists"); }else { @@ -54,6 +58,7 @@ if (fs.existsSync('../src/apps.json')) { fs.writeFileSync('../src/apps.json',body); } +//Read everything else const providers = require('../src/providers.json'); const themes = require('../src/themes.json'); const messages = require('../src/messages.json');