working updates

2021-03-06 09:24:10 +00:00 · 2021-03-06 09:24:10 +00:00 · 4dc25d1c54
commit 4dc25d1c54
parent 507d822522
20 changed files with 2117 additions and 1812 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -19,7 +19,13 @@
            "skipFiles": [
                "<node_internals>/**"
            ],
-            "program": "${workspaceFolder}/bin/www"
+            "program": "${workspaceFolder}/bin/www",
+            "env": {
+                "HOST": "localhost",
+                "DBUSER": "root",
+                "DBPASS": "example",
+                "DATABASE":"BBLB_DNS"
+            }
        },
        {
            "type": "node",
--- a/SQL/build.sql
+++ b/SQL/build.sql
@ -0,0 +1,132 @@
+-- Adminer 4.7.8 MySQL dump
+
+SET NAMES utf8;
+SET time_zone
+= '+00:00';
+SET foreign_key_checks
+= 0;
+SET sql_mode
+= 'NO_AUTO_VALUE_ON_ZERO';
+
+DROP DATABASE IF EXISTS `BBLB_DNS`;
+CREATE DATABASE `BBLB_DNS` /*!40100 DEFAULT CHARACTER SET utf8 COLLATE utf8_bin */;
+USE `BBLB_DNS`;
+
+DROP TABLE IF EXISTS `streams`;
+CREATE TABLE `streams`
+(
+  `id` int
+(11) NOT NULL AUTO_INCREMENT,
+  `streamName` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  `streamURL` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  PRIMARY KEY
+(`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+INSERT INTO streams (
+streamName
+, streamURL) VALUES
+('Gold',	'http://catenamode.cf:8090'),
+('Insanity',	'https://trippy.pro:443'),
+('PremiumPlus',	'https://itty.in:443'),
+('GunSlinger',	'http://gunslingertv.org:8080'),
+('VIP',	'http://shark.brokenwarrior.xyz:8080'),
+('Technoid',	'http://capoisagod2021.org:8080'),
+('Old Premium',	'https://caporeds.online:443'),
+('New Premium',	'http://fckbrexit.link:8080'),
+('Sol',	'http://tv.realot.xyz:35001'),
+('Bluemoon',	'http://www.tvxclnt.com:8080'),
+('AIRWOLF',	'http://iptv.satplex.co.uk:8080'),
+('Gambler',	'http://37723998.to:2052'),
+('Liveclub',	'http://apkdns.store:8080'),
+('Opplex',	'http://opplex.tv:8080'),
+('DIAZ',	'http://ruby.dnsfor.me:8880'),
+('USA',	'http://pimptv.dnsabr.com:8080'),
+('VIPER',	'http://tavaratv.xyz:2095'),
+('SUNBED',	'http://cms-tan.media:8880'),
+('Knightrider',	'http://streamknighttv.xyz:8080'),
+('Simple',	'http://covidsucks.xyz:8080'),
+('KDB',	'http://mytv.digital:8080/'),
+('PYTHON',	'http://foxmedia.bounceme.net:8282'),
+('KEANO',	'http://ip365.cx:80'),
+('FODEN',	'http://ac.mustardsubs.tk:8880')
+ON DUPLICATE KEY
+UPDATE `streamName` = VALUES
+(`streamName`), `streamURL` = VALUES
+(`streamURL`);
+
+DROP TABLE IF EXISTS `userAccounts`;
+CREATE TABLE `userAccounts`
+(
+  `id` int
+(11) NOT NULL AUTO_INCREMENT,
+  `username` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  `password` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  `stream` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  `userId` int
+(11) NOT NULL,
+  `expiaryDate` int
+(11) NOT NULL,
+  PRIMARY KEY
+(`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+INSERT INTO userAccounts (
+username
+, password, stream, userId, expiaryDate) VALUES
+('Karl2903',	'436e09390f77663091780c2796418f095a74ae0a9b181b69cc51575ec3bcd3a1c8b5a47d1af288b25dd757c27e74319d7457b8a37859e7a248e71f0f9ef5b23304dbf784d26ec2accf9ce6b612c0008387086289527dfaf10d8368c811a853d5402e09815226d6dc',	'Gold',	1,	1617100032),
+('Karl2802',	'bf8605f7c3386f5857a6df3c15be0a3de9cfb32179cb2f0454cf1f46844b4ae2b24a4d6e2705e78dcf3e019a3b7f3b9d90e9f3bf279f8950ae187de96d19c50989e921b6a4c1fe3d1cf189474db05933c505e7eea91ef18a25bdc7f74274e63af4ce8c01da69aeab83fe',	'PremiumPlus',	1,	1614504315),
+('Karl0704',	'89e8e131570896ee1f83bf97fc2a73a61f448cfe379cef9c8af8489f21a5aa7c0309de4350c443f7d5bbc15162ef5c6115db6c58ac510d9a982414f8725246cb6c801fe526d0eac98c198f25b7e1b17c38647cfce3cf8ba4e6276d081ac6522cfc0778d71796294e3f97',	'VIP',	1,	1617787739),
+('Karl24',	'482899bc267eaa17c97ff9440588717feccfd591aa7501d0c16eb0a9667204f6a35c39a098330efef2d167d918ad5a49c3917b85a3dd4e8af7e391e0cb47beff7276dccb3f6a450ee7dafedcbe3a1593c4569509c32b8e8cbbb26bd8db31fe2f214f928d61bf09e8744b',	'Insanity',	1,	1624444437),
+('Karl2206',	'a047fa4d67f78d94b7eb3834055d9ae6af398c448e59701e2e4a52f9e36f72c59529674acb2cb1f334b9eba88b154638f43ab5865c85ed77f1300ed11bcab337e7457a854dd9d1e8f484ddda960d7864448fd12b117690350c19c2a0d583391a279465b6f9e356ab4104',	'GunSlinger',	1,	1624301605),
+('Darren1706',	'cfe5a6be558d12daf878e0570a84bfb96ff02a2b436e9edb8ddd258fc1311522305139f3758e345b905c5b15f3d41fc06f2f5006dee50975342a5eadc2b48f30b106b3c75510e1201f131235f23716edfc61250972018233532f72a537bf4762776ff1bd0e39d4f6017d',	'Technoid',	2,	1624005116),
+('Dazg3012',	'476dd5316a78251fe26cea0a2d2786e8ddaeb8da99f99bfff9e1e34267eb3d0e79f0549cb102edcacd9a1685ee940347f43343c0314fca3816f81d9ec7b9370670e4ec7dddd695795752ad188c56207eb1ef6464d0e8690d4a44084a0918ec12ba6ca01c0d613463886f',	'Old Premium',	2,	1640885178),
+('Martin1607',	'33db85e33346ac83bc72c2feac294873edab0ec43bba6da5830275af7dbca539a445d3667874ba3cb64b9861a52f9aaa452140d92a3df0e6f87cb8d2eb6eceb9d0c0faaf284164beacb0bca8f3870794c2acd1f29ef310c150b4b1ff2b6e007b249b33c9144688eac57f',	'GunSlinger',	3,	2147483647),
+('Martin2204',	'8c7e61d5131661fbb246ad7dad0eb05e481235fa5574707b287619331c77da16643ca1c94fb82fd4290a4bc79c7773428a56673e5c3b20c5d13753d66693da69326c3a5be854fefe8b9829e8e6f4e8775e949959cd4caa8d0d063870a8d0da35167566cb575d459a7594',	'Gold',	3,	1619089223),
+('Karl2404',	'c5ee1fa1168da4abdf5cd12697258141f0c68d50269d8f229c422e9af2f79662daabca432d9a1de40ef907cfdbcb42d8e3b98620a221a17020abb0c0552f50859d10baef6f06482d6fcba91d975034bb99c3428e78921f5c155467090a587a5d6cd0783b9051a06283cb',	'Gold',	1,	NULL),
+('Karl2804',	'a2d35b98846ade449e1fb07f65627b9a219f5c755418cd3da5c51f6467f99e70e4a0f444899b355df7724c972ec88624298e8efb777005590d4053749d596c09abe96c1fc4ff38237e0d7583edc0aca8516dd54ac09d81bab7d0b55fcae5095db9385e6e8530bd9ef4b1',	'Gold',	1,	NULL),
+('Karl2904',	'55dfce0674e85eeef328c1ea86a9f4d1c661468c18cc1d4d60457e5bec45e19621d7e8a57367ba8d31a7461712bef8e5c05518b72194ffde95a5deed34a3bc3f68f48c1546a79a7a19dc260030c9b4cc5f4fef9544665846e50f5212a921a5053a5ee237895718db9e67',	'Gold',	1,	NULL),
+('Karl150520',	'dc4c407fda600e361db82323cef5fc51c9c9cf67fbd67711b38a49f4c5b10b3dbf62d8b7a531252b35222b0186c876fbdfea39414484916765aabab08bbd828d67b6e668f89927f95a3e08f3b45206658ea516711a65c5c4e28d98b9236e5fd8a1317b78626e49572f83',	'Gold',	1,	NULL),
+('Karl1505',	'7bfdf1ab7d86e07a3eb6c5614578c41c571ae6f3faaf836233a9b6f33538c6ea1125dab202d99325a92cd35856191fc495b7e5ec6cb2765d5bafa2af18f43c94f3392425a65a14e0e712d1c5de04f662fb84dc14b37151796db7f0eaec8b34351adfd2a93961125b04d9',	'Gold',	1,	NULL),
+('Karloss0403',	'71f8993c61b41ece3e3a7e8b50ec956670998b9930e667e9f2881ce508effc5b98bac9ddc3579f0455111203e092713bc7375ddd552f0cd7a33c698c147a6d9eea623099c3f993ff8634ef42975c6f8f0e28fb5f81ab1fa3e17a9729388c4b9779e3e9e16204fa570bcb',	'KDB',	1,	NULL),
+('Karloss0403',	'364cafa40eb896ffc220975d3b52431723a6d715a17c13f12296d62fa1e5f31f71ba2809e3fb9120231de8c388a736eec9064494a187fa7cf10357425d5b8c9d545487e5fed49407afad377f0225d935ea08e867dd803f5c12472a3e70cca7bd233a314a8c747e8ec751',	'DIAZ',	1,	NULL);
+ON DUPLICATE KEY
+UPDATE `id` = VALUES
+(`id`), `username` = VALUES
+(`username`), `password` = VALUES
+(`password`), `stream` = VALUES
+(`stream`), `userId` = VALUES
+(`userId`), `expiaryDate` = VALUES
+(`expiaryDate`);
+
+DROP TABLE IF EXISTS `users`;
+CREATE TABLE `users`
+(
+  `id` int
+(11) NOT NULL AUTO_INCREMENT,
+  `userName` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  `password` varchar
+(255) COLLATE utf8_bin NOT NULL,
+  PRIMARY KEY
+(`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+INSERT INTO users (
+userName
+, password) VALUES
+('Karl',	'TEST'),
+('Darren',	'bla'),
+('Duly',	'Blda')
+ON DUPLICATE KEY
+UPDATE `id` = VALUES
+(`id`), `userName` = VALUES
+(`userName`), `password` = VALUES
+(`password`);
+
+-- 2021-02-28 10:28:08
--- a/SQL/streams.sql
+++ b/SQL/streams.sql
@ -5,51 +5,51 @@
 -- Client version: 4.1

 SET NAMES 'utf8';
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (1, 'Gold', 'http://catenamode.cf:8090');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (2, 'Insanity', 'https://trippy.pro:443');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (3, 'PremiumPlus', 'https://itty.in:443');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (4, 'GunSlinger', 'http://gunslingertv.org:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
-(5, 'VIP', 'http://oven-cleaner.com:8080/');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
+(5, 'VIP', 'http://shark.brokenwarrior.xyz:8080');
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (6, 'Technoid', 'http://capoisagod2021.org:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (7, 'Old Premium', 'https://caporeds.online:443');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (8, 'New Premium', 'http://fckbrexit.link:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (9, 'Sol', 'http://tv.realot.xyz:35001');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (10, 'Bluemoon', 'http://www.tvxclnt.com:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (11, 'AIRWOLF', 'http://iptv.satplex.co.uk:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (12, 'Gambler', 'http://37723998.to:2052');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (13, 'Liveclub', 'http://apkdns.store:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (14, 'Opplex', 'http://opplex.tv:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (15, 'Shark', 'http://faithhosting.xyz:25461');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (16, 'USA', 'http://pimptv.dnsabr.com:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (17, 'VIPER', 'http://tavaratv.xyz:2095');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (18, 'SUNBED', 'http://cms-tan.media:8880');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (19, 'Knightrider', 'http://streamknighttv.xyz:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (20, 'Simple', 'http://covidsucks.xyz:8080');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (21, 'KDB', 'http://mytv.digital:8080/');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (22, 'PYTHON', 'http://foxmedia.bounceme.net:8282');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (23, 'KEANO', 'http://ip365.cx:80');
-INSERT INTO BBLB_DNS.streams(idstreams, streamName, streamURL) VALUES
+INSERT INTO BBLB_DNS.streams(id, streamName, streamURL) VALUES
 (24, 'FODEN', 'http://ac.mustardsubs.tk:8880');
--- a/SQL/userAccounts.sql
+++ b/SQL/userAccounts.sql
@ -5,21 +5,21 @@
 -- Client version: 4.1

 SET NAMES 'utf8';
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(12, 'Karl2903', '436e09390f77663091780c2796418f095a74ae0a9b181b69cc51575ec3bcd3a1c8b5a47d1af288b25dd757c27e74319d7457b8a37859e7a248e71f0f9ef5b23304dbf784d26ec2accf9ce6b612c0008387086289527dfaf10d8368c811a853d5402e09815226d6dc', 'Gold', '1', 1617100032);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(16, 'Karl2802', 'bf8605f7c3386f5857a6df3c15be0a3de9cfb32179cb2f0454cf1f46844b4ae2b24a4d6e2705e78dcf3e019a3b7f3b9d90e9f3bf279f8950ae187de96d19c50989e921b6a4c1fe3d1cf189474db05933c505e7eea91ef18a25bdc7f74274e63af4ce8c01da69aeab83fe', 'PremiumPlus', '1', 1614504315);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(17, 'Karl0704', '89e8e131570896ee1f83bf97fc2a73a61f448cfe379cef9c8af8489f21a5aa7c0309de4350c443f7d5bbc15162ef5c6115db6c58ac510d9a982414f8725246cb6c801fe526d0eac98c198f25b7e1b17c38647cfce3cf8ba4e6276d081ac6522cfc0778d71796294e3f97', 'VIP', '1', 1617787739);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(18, 'Karl24', '482899bc267eaa17c97ff9440588717feccfd591aa7501d0c16eb0a9667204f6a35c39a098330efef2d167d918ad5a49c3917b85a3dd4e8af7e391e0cb47beff7276dccb3f6a450ee7dafedcbe3a1593c4569509c32b8e8cbbb26bd8db31fe2f214f928d61bf09e8744b', 'Insanity', '1', 1624444437);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(19, 'Karl2206', 'a047fa4d67f78d94b7eb3834055d9ae6af398c448e59701e2e4a52f9e36f72c59529674acb2cb1f334b9eba88b154638f43ab5865c85ed77f1300ed11bcab337e7457a854dd9d1e8f484ddda960d7864448fd12b117690350c19c2a0d583391a279465b6f9e356ab4104', 'GunSlinger', '1', 1624301605);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(20, 'Darren1706', 'cfe5a6be558d12daf878e0570a84bfb96ff02a2b436e9edb8ddd258fc1311522305139f3758e345b905c5b15f3d41fc06f2f5006dee50975342a5eadc2b48f30b106b3c75510e1201f131235f23716edfc61250972018233532f72a537bf4762776ff1bd0e39d4f6017d', 'Technoid', '2', 1624005116);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(21, 'Dazg3012', '476dd5316a78251fe26cea0a2d2786e8ddaeb8da99f99bfff9e1e34267eb3d0e79f0549cb102edcacd9a1685ee940347f43343c0314fca3816f81d9ec7b9370670e4ec7dddd695795752ad188c56207eb1ef6464d0e8690d4a44084a0918ec12ba6ca01c0d613463886f', 'Old Premium', '2', 1640885178);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(22, 'Martin1607', '33db85e33346ac83bc72c2feac294873edab0ec43bba6da5830275af7dbca539a445d3667874ba3cb64b9861a52f9aaa452140d92a3df0e6f87cb8d2eb6eceb9d0c0faaf284164beacb0bca8f3870794c2acd1f29ef310c150b4b1ff2b6e007b249b33c9144688eac57f', 'GunSlinger', '3', 2147483647);
-INSERT INTO BBLB_DNS.userAccounts(userscol, username, password, stream, userID, expiaryDate) VALUES
-(23, 'Martin2204', '8c7e61d5131661fbb246ad7dad0eb05e481235fa5574707b287619331c77da16643ca1c94fb82fd4290a4bc79c7773428a56673e5c3b20c5d13753d66693da69326c3a5be854fefe8b9829e8e6f4e8775e949959cd4caa8d0d063870a8d0da35167566cb575d459a7594', 'Gold', '3', 1619089223);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(12, 'Karl2903', '436e09390f77663091780c2796418f095a74ae0a9b181b69cc51575ec3bcd3a1c8b5a47d1af288b25dd757c27e74319d7457b8a37859e7a248e71f0f9ef5b23304dbf784d26ec2accf9ce6b612c0008387086289527dfaf10d8368c811a853d5402e09815226d6dc', 'Gold', 1, 1617100032);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(16, 'Karl2802', 'bf8605f7c3386f5857a6df3c15be0a3de9cfb32179cb2f0454cf1f46844b4ae2b24a4d6e2705e78dcf3e019a3b7f3b9d90e9f3bf279f8950ae187de96d19c50989e921b6a4c1fe3d1cf189474db05933c505e7eea91ef18a25bdc7f74274e63af4ce8c01da69aeab83fe', 'PremiumPlus', 1, 1614504315);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(17, 'Karl0704', '89e8e131570896ee1f83bf97fc2a73a61f448cfe379cef9c8af8489f21a5aa7c0309de4350c443f7d5bbc15162ef5c6115db6c58ac510d9a982414f8725246cb6c801fe526d0eac98c198f25b7e1b17c38647cfce3cf8ba4e6276d081ac6522cfc0778d71796294e3f97', 'VIP', 1, 1617787739);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(18, 'Karl24', '482899bc267eaa17c97ff9440588717feccfd591aa7501d0c16eb0a9667204f6a35c39a098330efef2d167d918ad5a49c3917b85a3dd4e8af7e391e0cb47beff7276dccb3f6a450ee7dafedcbe3a1593c4569509c32b8e8cbbb26bd8db31fe2f214f928d61bf09e8744b', 'Insanity', 1, 1624444437);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(19, 'Karl2206', 'a047fa4d67f78d94b7eb3834055d9ae6af398c448e59701e2e4a52f9e36f72c59529674acb2cb1f334b9eba88b154638f43ab5865c85ed77f1300ed11bcab337e7457a854dd9d1e8f484ddda960d7864448fd12b117690350c19c2a0d583391a279465b6f9e356ab4104', 'GunSlinger', 1, 1624301605);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(20, 'Darren1706', 'cfe5a6be558d12daf878e0570a84bfb96ff02a2b436e9edb8ddd258fc1311522305139f3758e345b905c5b15f3d41fc06f2f5006dee50975342a5eadc2b48f30b106b3c75510e1201f131235f23716edfc61250972018233532f72a537bf4762776ff1bd0e39d4f6017d', 'Technoid', 2, 1624005116);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(21, 'Dazg3012', '476dd5316a78251fe26cea0a2d2786e8ddaeb8da99f99bfff9e1e34267eb3d0e79f0549cb102edcacd9a1685ee940347f43343c0314fca3816f81d9ec7b9370670e4ec7dddd695795752ad188c56207eb1ef6464d0e8690d4a44084a0918ec12ba6ca01c0d613463886f', 'Old Premium', 2, 1640885178);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(22, 'Martin1607', '33db85e33346ac83bc72c2feac294873edab0ec43bba6da5830275af7dbca539a445d3667874ba3cb64b9861a52f9aaa452140d92a3df0e6f87cb8d2eb6eceb9d0c0faaf284164beacb0bca8f3870794c2acd1f29ef310c150b4b1ff2b6e007b249b33c9144688eac57f', 'GunSlinger', 3, 2147483647);
+INSERT INTO BBLB_DNS.userAccounts(id, username, password, stream, userID, expiaryDate) VALUES
+(23, 'Martin2204', '8c7e61d5131661fbb246ad7dad0eb05e481235fa5574707b287619331c77da16643ca1c94fb82fd4290a4bc79c7773428a56673e5c3b20c5d13753d66693da69326c3a5be854fefe8b9829e8e6f4e8775e949959cd4caa8d0d063870a8d0da35167566cb575d459a7594', 'Gold', 3, 1619089223);
--- a/SQL/users.sql
+++ b/SQL/users.sql
@ -5,9 +5,9 @@
 -- Client version: 4.1

 SET NAMES 'utf8';
-INSERT INTO BBLB_DNS.users(idusers, userName, password) VALUES
+INSERT INTO BBLB_DNS.users(id, userName, password) VALUES
 (1, 'Karl', 'TEST');
-INSERT INTO BBLB_DNS.users(idusers, userName, password) VALUES
+INSERT INTO BBLB_DNS.users(id, userName, password) VALUES
 (2, 'Darren', 'bla');
-INSERT INTO BBLB_DNS.users(idusers, userName, password) VALUES
+INSERT INTO BBLB_DNS.users(id, userName, password) VALUES
 (3, 'Duly', 'Blda');
--- a/client/.dockerfile
+++ b/client/.dockerfile
@ -2,7 +2,6 @@ FROM node:12-alpine

 LABEL version="1.0"
 LABEL description="FRONTEND"
-# LABEL maintainer = ["danielmurph8@gmail.com", "dylanedwards290@gmail.com"]

 WORKDIR /app

--- a/client/.dockerignore
+++ b/client/.dockerignore
@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@ -3,14 +3,18 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
-    "@testing-library/jest-dom": "^5.11.4",
    "@testing-library/react": "^11.1.0",
    "@testing-library/user-event": "^12.1.10",
    "react": "^17.0.1",
    "react-dom": "^17.0.1",
    "react-dropdown": "^1.9.2",
    "react-scripts": "4.0.2",
-    "web-vitals": "^1.0.1"
+    "web-vitals": "^1.0.1",
+    "@material-ui/core": "^4.11.3",
+    "@material-ui/icons": "^4.11.2",
+    "axios": "^0.21.1",
+    "material-table": "^1.69.2",
+    "react-router-dom": "^5.2.0"
  },
  "scripts": {
    "start": "set PORT=6969 && react-scripts start",
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -8,6 +8,11 @@ services:
    image: "karl0ss/bblbtv_dns-backend"
    ports:
      - "3001:3001"
+    environment:
+      - HOST=db    
+      - DBUSER=dkdkdk
+      - DBPASS=example
+      - DATABASE=BBLB_DNS
  frontend:
    build:
      context: ./client
@ -18,12 +23,16 @@ services:
    environment:
      - PORT=6969
    links:
-      - "backend:be"
+      - "backend"
  db:
    image: mariadb
    restart: always
    environment:
      MYSQL_ROOT_PASSWORD: example
+    ports:
+      - 3306:3306
+    links:
+      - "backend"
  adminer:
    image: adminer
    restart: always
--- a/lib/addAccounts.js
+++ b/lib/addAccounts.js
@ -12,7 +12,7 @@ function storeAccountToDB(accountDetails) {
 function retrievePasswordFromDB(user, userAccUser) {
  let userId
  try {
-    userId = sql.query(`SELECT u.idusers FROM users u WHERE u.userName = '${user}'`);
+    userId = sql.query(`SELECT u.id FROM users u WHERE u.userName = '${user}'`);
    userId = userId[0].idusers
  } catch (error) {
    console.log('User not found')
@ -38,7 +38,7 @@ WHERE userAccounts.userID = ${userId} AND userAccounts.username = '${userAccUser
  }
 }

-retrievePasswordFromDB('Karl', 'Karl2903')
+// retrievePasswordFromDB('Karl', 'Karl2903')

 module.exports = {
  storeAccountToDB,
--- a/lib/getStreamNames.js
+++ b/lib/getStreamNames.js
@ -1,7 +1,7 @@
 const sql = require('./mysql')

 function getStreamNames() {
-    let data = sql.query(`SELECT idstreams, streamName FROM BBLB_DNS.streams`)
+    let data = sql.query(`SELECT id, streamName FROM BBLB_DNS.streams`)
    // console.log(data)
    if (data.length == 0) {
        return 'StreamsFailed'
--- a/lib/getUser.js
+++ b/lib/getUser.js
@ -8,10 +8,10 @@ function getUserAccounts(user) {
      userAccounts.expiaryDate
    FROM users
      INNER JOIN userAccounts
-        ON users.idusers = userAccounts.userID
+        ON users.id = userAccounts.userID
      INNER JOIN streams
        ON userAccounts.stream = streams.streamName
-        WHERE users.idusers = '${user}'`)
+        WHERE users.id = '${user}'`)
    // console.log(data)
    if (data.length == 0) {
        return 'User Not Found'
--- a/lib/getUsers.js
+++ b/lib/getUsers.js
@ -21,7 +21,7 @@ function getUserName(userId) {
  let data = sql.query(`SELECT
    userName
  FROM users
-  WHERE idusers = ${userId}
+  WHERE id = ${userId}
    `)
  // console.log(data)
  if (data.length == 0) {
--- a/lib/logins.json
+++ b/lib/logins.json
@ -58,5 +58,13 @@
    {
        "username": "Darren1607",
        "password": "x5WJtSygdA"
+    },
+    {
+        "username": "Karloss0403",
+        "password": "dcwbg21naT"
+    },
+    {
+        "username": "Karloss0403",
+        "password": "4V5t4M2DS3"
    }
 ]
--- a/lib/mysql.js
+++ b/lib/mysql.js
@ -1,11 +1,11 @@
 var mysql = require('sync-mysql');

 var connection = new mysql({
-    host: 'localhost',
+    host: process.env.HOST,
    port: 3306,
-    user: 'root',
-    password: 'example',
-    database: 'BBLB_DNS',
+    user: process.env.DBUSER,
+    password: process.env.DBPASS,
+    database: process.env.DATABASE,
    insecureAuth: true
 })

--- a/lib/streamArray.json
+++ b/lib/streamArray.json
@ -1 +1 @@
-[{"StreamName":"Insanity","StreamURL":"https://trippy.pro:443"},{"StreamName":"PremPlus","StreamURL":"https://itty.in:443"},{"StreamName":"GunSlinger","StreamURL":"http://gunslingertv.org:8080"},{"StreamName":"VIP","StreamURL":"http://oven-cleaner.com:8080/"},{"StreamName":"Technoid","StreamURL":"http://capoisagod2021.org:8080"},{"StreamName":"Old Premium","StreamURL":"https://caporeds.online:443"},{"StreamName":"??","StreamURL":"http://screamstreams.info:8080"},{"StreamName":"Gold","StreamURL":"http://catenamode.cf:8090"},{"StreamName":"??","StreamURL":"http://bigbox.me.uk:2086"},{"StreamName":"??","StreamURL":"http://beautifilm.xyz:8080"},{"StreamName":"??","StreamURL":"http://mytv.digital:8080/"},{"StreamName":"??","StreamURL":"http://theonlinemedia.network:2052"},{"StreamName":"??","StreamURL":"http://toastthehost.live:8080"},{"StreamName":"??","StreamURL":"http://ac.mustardsubs.tk:8880"},{"StreamName":"Gold","StreamURL":"http://ip365.cx:80"},{"StreamName":"??","StreamURL":"http://stream.streamhubtv.xyz:8080"},{"StreamName":"??","StreamURL":"http://foxmedia.bounceme.net:8282"},{"StreamName":"Foden","StreamURL":"http://theonlinemedia.network:2052"},{"StreamName":"Shark","StreamURL":"http://beautifilm.xyz:8080"},{"StreamName":"Keano","StreamURL":"http://pimptv.dnsabr.com:8080"},{"StreamName":"??","StreamURL":"http://tavaratv.xyz:2095"},{"StreamName":"Python","StreamURL":"http://cms-tan.media:8880"},{"StreamName":"??","StreamURL":"http://streamknighttv.xyz:8080"},{"StreamName":"??","StreamURL":"http://covidsucks.xyz:8080"},{"StreamName":"??","StreamURL":"http://fckbrexit.link:8080"},{"StreamName":"??","StreamURL":"http://tv.realot.xyz:35001"},{"StreamName":"??","StreamURL":"http://iptv.satplex.co.uk:8080"},{"StreamName":"??","StreamURL":"http://faithhosting.xyz:25461"},{"StreamName":"??"},{"StreamName":"??"},{"StreamName":"Gambler"},{"StreamName":"??"},{"StreamName":"??"},{"StreamName":"??"}]
+[{"StreamName":"Insanity","StreamURL":"https://trippy.pro:443"},{"StreamName":"PremPlus","StreamURL":"https://itty.in:443"},{"StreamName":"GunSlinger","StreamURL":"http://gunslingertv.org:8080"},{"StreamName":"VIP","StreamURL":"http://shark.brokenwarrior.xyz:8080"},{"StreamName":"Technoid","StreamURL":"http://capoisagod2021.org:8080"},{"StreamName":"Old Premium","StreamURL":"https://caporeds.online:443"},{"StreamName":"??","StreamURL":"http://screamstreams.info:8080"},{"StreamName":"Gold","StreamURL":"http://catenamode.cf:8090"},{"StreamName":"??","StreamURL":"http://bigbox.me.uk:2086"},{"StreamName":"??","StreamURL":"http://beautifilm.xyz:8080"},{"StreamName":"??","StreamURL":"http://mytv.digital:8080/"},{"StreamName":"??","StreamURL":"http://megav2.tk:2052"},{"StreamName":"??","StreamURL":"http://toastthehost.live:8080"},{"StreamName":"??","StreamURL":"http://ac.mustardsubs.tk:8880"},{"StreamName":"Gold","StreamURL":"http://ip365.cx:80"},{"StreamName":"??","StreamURL":"http://stream.streamhubtv.xyz:8080"},{"StreamName":"??","StreamURL":"http://foxmedia.bounceme.net:8282"},{"StreamName":"Foden","StreamURL":"http://bemo.one:8080"},{"StreamName":"Shark","StreamURL":"http://gold.mypsx.net:8880"},{"StreamName":"Keano","StreamURL":"https://rushem.in:443"},{"StreamName":"??","StreamURL":"http://theonlinemedia.network:2052"},{"StreamName":"Python","StreamURL":"http://beautifilm.xyz:8080"},{"StreamName":"??","StreamURL":"http://pimptv.dnsabr.com:8080"},{"StreamName":"??","StreamURL":"http://tavaratv.xyz:2095"},{"StreamName":"??","StreamURL":"http://cms-tan.media:8880"},{"StreamName":"??","StreamURL":"http://streamknighttv.xyz:8080"},{"StreamName":"??","StreamURL":"http://covidsucks.xyz:8080"},{"StreamName":"??","StreamURL":"http://fckbrexit.link:8080"},{"StreamName":"??","StreamURL":"http://tv.realot.xyz:35001"},{"StreamName":"??","StreamURL":"http://iptv.satplex.co.uk:8080"},{"StreamName":"Gambler","StreamURL":"http://sting.ltd:25461"},{"StreamName":"??","StreamURL":"http://ruby.dnsfor.me:8880"},{"StreamName":"??"},{"StreamName":"??"}]
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -15,13 +15,10 @@
    "debug": "~2.6.9",
    "express": "~4.16.1",
    "express-basic-auth": "^1.2.0",
-    "fs": "0.0.1-security",
    "got": "^11.8.1",
    "http-errors": "~1.6.3",
-    "jade": "~1.11.0",
    "material-table": "^1.69.2",
    "morgan": "~1.9.1",
-    "mysql": "^2.18.1",
    "react-router-dom": "^5.2.0",
    "sync-mysql": "^3.0.1"
  }
--- a/routes/getStreams.js
+++ b/routes/getStreams.js
@ -53,4 +53,6 @@ router.get('/', async function (req, res, next) {
  res.send(fullStreamArray)
 });

+main()
+
 module.exports = router;