Remove useHaproxy from middlewares where not needed

Indent fixes
update dockerfile and docker-compose

Dockerfile

@@ -5,7 +5,7 @@ ENV NODE_ENV production
 
 COPY package.json /opt/package.json
 
-RUN npm install --production
+RUN npm install --omit=dev
 
 COPY .env /opt/.env
 COPY . /opt

docker-compose.yml

@@ -3,18 +3,17 @@ services:
   haproxy_panel_next:
     restart: always
     build: .
+    network_mode: host
     ports:
-      - "10.0.0.44:3000:3000"
+      - "127.0.0.1:3000:3000"
     environment:
       - NODE_ENV=production
-    volumes:
-      - .:/opt
   haproxy_panel_mongo:
     restart: always
     image: mongo:latest
-#    volumes:
-#      - mongodb_data_container:/data/db
-
+    network_mode: host
+    ports:
+      - "127.0.0.1:27017:27017"
 networks:
   default:
     name: haproxy_panel_next

gulpfile.js

@@ -27,9 +27,6 @@ async function reset() {
 			}, {
 				$set: {
 					passwordHash,
-					domains: ['localhost'],
-					clusters: ['http://admin:admin@127.0.0.1:2001'],
-					activeCluster: 0,
 				}
 			});
 	}

router.js

@@ -53,14 +53,13 @@ const testRouter = (server, app) => {
 
 		const csrfMiddleware = csrf();
 
-		//HAProxy-sdk middleware
+		//dataplaneapi middleware
 		const useHaproxy = async (req, res, next) => {
 			if (res.locals.user.clusters.length === 0) {
 				return next();
 			}
 			try {
 				//TODO: handle cluster
-				//const cluster = res.locals.user.clusters[res.locals.user.activeCluster]
 				res.locals.fMap = server.locals.fMap;
 				res.locals.mapValueNames = server.locals.mapValueNames;
 				const firstClusterURL = new URL(res.locals.user.clusters[res.locals.user.activeCluster].split(',')[0]);
@@ -115,23 +114,23 @@ const testRouter = (server, app) => {
 		server.get(`/map/:name(${mapNamesOrString})`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.mapPage.bind(null, app));
 		server.get(`/map/:name(${mapNamesOrString}).json`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.mapJson);
 
-		server.get('/clusters', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, clustersController.clustersPage.bind(null, app));
-		server.get('/clusters.json', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, clustersController.clustersJson);
+		server.get('/clusters', useSession, fetchSession, checkSession, csrfMiddleware, clustersController.clustersPage.bind(null, app));
+		server.get('/clusters.json', useSession, fetchSession, checkSession, csrfMiddleware, clustersController.clustersJson);
 
-		server.get('/domains', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, domainsController.domainsPage.bind(null, app));
-		server.get('/domains.json', useSession, fetchSession, checkSession, useHaproxy, csrfMiddleware, domainsController.domainsJson);
+		server.get('/domains', useSession, fetchSession, checkSession, csrfMiddleware, domainsController.domainsPage.bind(null, app));
+		server.get('/domains.json', useSession, fetchSession, checkSession, csrfMiddleware, domainsController.domainsJson);
 
 		//authed pages that useHaproxy
 		const clusterRouter = express.Router({ caseSensitive: true });
-		clusterRouter.post('/global/toggle', accountController.globalToggle);
-		clusterRouter.post('/cluster', clustersController.setCluster);
-		clusterRouter.post('/cluster/add', clustersController.addCluster);
-		clusterRouter.post('/cluster/delete', clustersController.deleteClusters);
-		clusterRouter.post('/domain/add', domainsController.addDomain);
-		clusterRouter.post('/domain/delete', domainsController.deleteDomain);
-		clusterRouter.post(`/map/:name(${mapNamesOrString})/add`, mapsController.patchMapForm); //add to MAP
-		clusterRouter.post(`/map/:name(${mapNamesOrString})/delete`, mapsController.deleteMapForm); //delete from MAP
-		server.use('/forms', useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, clusterRouter);
+		clusterRouter.post('/global/toggle', useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, accountController.globalToggle);
+		clusterRouter.post(`/map/:name(${mapNamesOrString})/add`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.patchMapForm); //add to MAP
+		clusterRouter.post(`/map/:name(${mapNamesOrString})/delete`, useSession, fetchSession, checkSession, useHaproxy, hasCluster, csrfMiddleware, mapsController.deleteMapForm); //delete from MAP
+		clusterRouter.post('/cluster', useSession, fetchSession, checkSession, hasCluster, csrfMiddleware, clustersController.setCluster);
+		clusterRouter.post('/cluster/add', useSession, fetchSession, checkSession, hasCluster, csrfMiddleware, clustersController.addCluster);
+		clusterRouter.post('/cluster/delete', useSession, fetchSession, checkSession, hasCluster, csrfMiddleware, clustersController.deleteClusters);
+		clusterRouter.post('/domain/add', useSession, fetchSession, checkSession, hasCluster, csrfMiddleware, domainsController.addDomain);
+		clusterRouter.post('/domain/delete', useSession, fetchSession, checkSession, hasCluster, csrfMiddleware, domainsController.deleteDomain);
+		server.use('/forms', clusterRouter);
 
 };
 

server.js

@@ -9,16 +9,16 @@ dotenv.config({ path: '.env' });
 
 const server = require('express')
 	, nextjs = require('next')
-    , dev = process.env.NODE_ENV !== 'production'
-    , hostname = 'localhost'
-    , port = 3000
+	, dev = process.env.NODE_ENV !== 'production'
+	, hostname = 'localhost'
+	, port = 3000
 	, app = nextjs({ dev, hostname, port })
 	, handle = app.getRequestHandler()
 	, express = require('express')
 	, bodyParser = require('body-parser')
 	, cookieParser = require('cookie-parser')
 	, db = require('./db.js');
-	
+
 app.prepare()
 	.then(async () => {
 
@@ -50,7 +50,7 @@ app.prepare()
 			}
 			console.log('> Ready on http://localhost:3000');
 		});
-		
+
 	})
 	.catch(err => {
 		console.error(err.stack);

util.js

@@ -49,7 +49,7 @@ module.exports = {
 	validClustersString: (string) => {
 		return !string.split(',').some(c => {
 			const cUrl = url.parse(c);
-			return (cUrl.protocol !== 'tcp:' || !cUrl.hostname)
+			return (cUrl.protocol !== 'http:' || !cUrl.hostname)
 		});
 	},