removed admin functionality completely

SetupApp/index.js

@@ -14,5 +14,4 @@ document.addEventListener('DOMContentLoaded', () => {
   portForward.addEventListener('click', () => {
     fetch('/api/setup/portForward');
   });
-
 });

__tests__/ServerRoutes.test.js

@@ -7,28 +7,17 @@ const bodyParser = require("body-parser");
 const app = express();
 app.use(bodyParser.json());
 
-import accountRouter from '../server/routes/accountRouter';
-import adminRouter from '../server/routes/adminRouter';
 import apiRouter from '../server/routes/apiRouter';
 import commandRouter from '../server/routes/commandRouter';
 import signupRouter from '../server/routes/signupRouter';
 import loginRouter from '../server/routes/loginRouter';
-import dbRouter from '../server/routes/dbRouter';
 import initRouter from '../server/routes/initRouter';
 import logoutRouter from '../server/routes/logoutRouter';
-// import settingsRouter from '../server/routes/settingsRouter';
 
-// app.use('/test', (req, res) => {
-//   res.status(200).json({
-//     success: true,
-//   });
-// });
 
-app.use('/account', accountRouter);
 app.use('/gapi', apiRouter);
 app.use('/api', apiRouter);
 app.use('command', commandRouter);
-app.use('/db', dbRouter);
 app.use('/init', initRouter);
 app.use('/login', loginRouter);
 app.use('/logout', logoutRouter);
@@ -46,7 +35,7 @@ let testKey;
 describe('test test', () => {
   test('Get request', async () => {
     const res = await request(app)
-      .get('/gapi/hello');
+      .get('/gapi/test');
     expect(res.body.data).toBe('in hello testing');
     expect(res.status).toBe(200)
 
@@ -80,29 +69,6 @@ describe('uid test', () => {
   });
 })
 
-// account route
-xdescribe('Account Route', () => {
-  test('Get request', () => {
-    request(app)
-      .get('/account')
-      .expect('Content-Type', 'application/json; charset=utf-8')
-      .expect(200)
-      .expect(response);
-  });
-});
-
-
-// admin route
-xdescribe('Admin Route', () => {
-  test('Get request', () => {
-    request(app)
-      .get('/admin')
-      .expect('Content-Type', 'application/json; charset=utf-8')
-      .expect(200)
-      .expect(response);
-  });
-});
-
 // api route
 xdescribe('Api Route', () => {
   test('Get request', () => {
@@ -125,17 +91,6 @@ xdescribe('Command Route', () => {
   });
 });
 
-// db route
-xdescribe('Db Route', () => {
-  test('Get request', () => {
-    request(app)
-      .get('/db')
-      .expect('Content-Type', 'application/json; charset=utf-8')
-      .expect(200)
-      .expect(response);
-  });
-});
-
 // init route
 xdescribe('Init Route', () => {
   test('Get request', () => {
@@ -169,29 +124,6 @@ xdescribe('Logout Route', () => {
   });
 });
 
-// setting route
-// describe('Settings Route', () => {
-//   test('Get request should return empty mem, cpu, stopped', async () => {
-//     await request(app)
-//       .get('/settings')
-//       .expect('Content-Type', 'application/json; charset=utf-8')
-//       .expect(200)
-//       .expect(response);
-//   });
-//   xtest('Post request', async () => {
-//     await request(app)
-//       .post('/settings/insert')
-//       .send({
-//         container: ['test', 'value'],
-//         name: 'testname',
-//         metric: 'hello'
-//       })
-//       .expect('Content-Type', 'application/json; charset=utf-8')
-//       .expect(200)
-//       .expect(response);
-//   });
-// });
-
 // signup route
 // describe('Signup Route', () => {
 //   test('get request', async () => {

imageConfigs/postgres/init.sql

@@ -1,25 +1,11 @@
--- CREATE TABLE roles (
---   _id SERIAL NOT NULL,
---   role VARCHAR (255) NOT NULL,
---   PRIMARY KEY (_id)
--- ) WITH (
---   OIDS = FALSE
--- );
-
 CREATE TABLE users (
     _id SERIAL NOT NULL,
     username VARCHAR (255) UNIQUE NOT NULL,
-    email VARCHAR (255),
     password VARCHAR (255) NOT NULL,
-  phone VARCHAR (255),
-  -- role VARCHAR (255) DEFAULT 'user',
-  -- role_id INTEGER DEFAULT 3,
-  contact_pref VARCHAR (255),
   mem_threshold INTEGER DEFAULT 80,
   cpu_threshold INTEGER DEFAULT 80,
   container_stops BOOLEAN DEFAULT true,
   PRIMARY KEY (_id),
-  -- FOREIGN KEY (role_id) REFERENCES Roles(_id)
 ) WITH (
   OIDS = FALSE
 );
@@ -44,25 +30,15 @@ CREATE TABLE containers (
   CONSTRAINT unique_id UNIQUE(id)
 );
 
-CREATE TABLE notification_settings (
-  id SERIAL PRIMARY KEY,
-  metric_name TEXT NOT NULL,
-  triggering_value INT,
-  CONSTRAINT unique_name UNIQUE(metric_name)
-);
+-- CREATE TABLE notification_settings (
+--   id SERIAL PRIMARY KEY,
+--   metric_name TEXT NOT NULL,
+--   triggering_value INT,
+--   CONSTRAINT unique_name UNIQUE(metric_name)
+-- );
 
 CREATE TABLE container_settings (
   container_id TEXT REFERENCES containers(id),
   notification_settings_id INT REFERENCES notification_settings(id),
   CONSTRAINT container_setting PRIMARY KEY(container_id, notification_settings_id)
 );
-
-INSERT INTO notification_settings (metric_name, triggering_value) VALUES
-('memory', 80),
-('cpu', 80),
-('stopped', 0);
-
--- INSERT INTO roles (role) VALUES 
---   ('system admin'),
---   ('admin'),
---   ('user');

server/app.ts

@@ -31,11 +31,8 @@ exec(
 );
 
 // Importing routers...
-import accountRouter from './routes/accountRouter';
-// import adminRouter from './routes/adminRouter';
 import apiRouter from './routes/apiRouter';
 import commandRouter from './routes/commandRouter';
-import dbRouter from './routes/dbRouter';
 import initRouter from './routes/initRouter';
 import loginRouter from './routes/loginRouter';
 import logoutRouter from './routes/logoutRouter';
@@ -49,23 +46,18 @@ app.use(express.static('SetupApp'));
 
 
 // Defining routers...
-
 app.use('/k8', (req: Request, res: Response) => {
   res.status(200).sendFile(path.join(__dirname, '../SetupApp/index.html'));
 });
 
 
-app.use('/account', accountRouter);
 app.use('/gapi', apiRouter);
 app.use('/command', commandRouter);
-app.use('/db', dbRouter);
 app.use('/init', initRouter);
 app.use('/login', loginRouter);
 app.use('/logout', logoutRouter);
 app.use('/setup', setupRouter);
 app.use('/signup', signupRouter);
-// app.use('/admin', adminRouter);
-// app.use('/api', apiRouter);
 
 // Handling requests to unknown endpoints...
 app.use('/', (req: Request, res: Response): Response => {
@@ -89,5 +81,4 @@ app.get(
   }
 );
 
-// Exporting app...
 export default app;