Merge pull request #108 from frikky/1.0.0

0.6.1

backend/app_sdk/app_base.py

@@ -101,7 +101,7 @@ class AppBase:
         except requests.exceptions.ConnectionError as e:
             print("Connectionerror: %s" %  e)
 
-            action_result["result"] = "Bad setup during startup: %d" % e 
+            action_result["result"] = "Bad setup during startup: %s" % e 
             self.send_result(action_result, headers, stream_path) 
             return
 
@@ -288,7 +288,7 @@ class AppBase:
             # Do stuff here.
             innervalue = parse_nested_param(data, maxDepth(data)-0)
             outervalue = parse_nested_param(data, maxDepth(data)-1)
-            print("INNER: ", outervalue)
+            print("INNER: ", innervalue)
             print("OUTER: ", outervalue)
         
             if outervalue != innervalue:
@@ -710,7 +710,17 @@ class AppBase:
                         continue
 
                     #print(destinationvalue)
-                    if not run_validation(sourcevalue, condition["condition"]["value"], destinationvalue):
+                    # NEGATE 
+                    validation = run_validation(sourcevalue, condition["condition"]["value"], destinationvalue)
+
+                    # Configuration = negated because of WorkflowAppActionParam..
+                    try:
+                        if condition["condition"]["configuration"]:
+                            validation = not validation
+                    except KeyError:
+                        pass
+
+                    if not validation:
                         self.logger.info("Failed condition check for %s %s %s." % (sourcevalue, condition["condition"]["value"], destinationvalue))
                         return False, "Failed condition: %s %s %s" % (sourcevalue, condition["condition"]["value"], destinationvalue)
 

backend/go-app/codegen.go

@@ -398,7 +398,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 		verifyAddin,
 	)
 
-	log.Printf("%s", data)
+	//log.Printf("%s", data)
 	return functionname, data
 }
 

backend/go-app/main.go

@@ -662,7 +662,7 @@ func handleApiAuthentication(resp http.ResponseWriter, request *http.Request) (U
 		if len(Userdata.Username) > 0 {
 			return Userdata, nil
 		} else {
-			return Userdata, errors.New("User is invalid")
+			return Userdata, errors.New(fmt.Sprintf("User is invalid - no username found: %#v", Userdata))
 		}
 	}
 
@@ -1605,8 +1605,11 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	// This is a long check to see if an inactive admin can access the site
+	parsedAdmin := "false"
 	if !userInfo.Active {
 		if userInfo.Role == "admin" {
+			parsedAdmin = "true"
+
 			ctx := context.Background()
 			q := datastore.NewQuery("Users")
 			var users []User
@@ -1672,7 +1675,14 @@ func handleInfo(resp http.ResponseWriter, request *http.Request) {
 		Expires: expiration,
 	})
 
-	returnData := fmt.Sprintf(`{"success": true, "cookies": [{"key": "session_token", "value": "%s", "expiration": %d}]}`, userInfo.Session, expiration.Unix())
+	returnData := fmt.Sprintf(`
+	{
+		"success": true, 
+		"admin": %s, 
+		"orgs": [{"name": "Shuffle", "id": "123", "role": "admin"}], 
+		"selected_org": {"name": "Shuffle", "id": "123", "role": "admin"}, 
+		"cookies": [{"key": "session_token", "value": "%s", "expiration": %d}]
+	}`, parsedAdmin, userInfo.Session, expiration.Unix())
 
 	resp.WriteHeader(200)
 	resp.Write([]byte(returnData))
@@ -6134,7 +6144,7 @@ func handleAppHotload(location string) error {
 	}
 
 	//log.Printf("Reading app folder: %#v", dir)
-	err = iterateAppGithubFolders(fs, dir, "", "")
+	err = iterateAppGithubFolders(fs, dir, "", "", false)
 	if err != nil {
 		log.Printf("Err: %s", err)
 		return err
@@ -6345,7 +6355,7 @@ func runInit(ctx context.Context) {
 		//iterateAppGithubFolders(fs, dir, "", "testing")
 
 		// FIXME: Get all the apps?
-		iterateAppGithubFolders(fs, dir, "", "")
+		iterateAppGithubFolders(fs, dir, "", "", false)
 
 		// Hotloads locally
 		location := os.Getenv("APP_HOTLOAD_FOLDER")

backend/go-app/walkoff.go

@@ -94,6 +94,7 @@ type AuthenticationUsage struct {
 }
 
 // An app inside Shuffle
+// Source      string `json:"source" datastore:"soure" yaml:"source"` - downloadlocation
 type WorkflowApp struct {
 	Name        string `json:"name" yaml:"name" required:true datastore:"name"`
 	IsValid     bool   `json:"is_valid" yaml:"is_valid" required:true datastore:"is_valid"`
@@ -4221,9 +4222,10 @@ func loadSpecificApps(resp http.ResponseWriter, request *http.Request) {
 
 	// Field1 & 2 can be a lot of things..
 	type tmpStruct struct {
-		URL    string `json:"url"`
+		URL         string `json:"url"`
-		Field1 string `json:"field_1"`
+		Field1      string `json:"field_1"`
-		Field2 string `json:"field_2"`
+		Field2      string `json:"field_2"`
+		ForceUpdate bool   `json:"force_update"`
 	}
 	//log.Printf("Body: %s", string(body))
 
@@ -4265,7 +4267,13 @@ func loadSpecificApps(resp http.ResponseWriter, request *http.Request) {
 			log.Printf("FAiled reading folder: %s", err)
 		}
 		_ = r
-		iterateAppGithubFolders(fs, dir, "", "")
+
+		if tmpBody.ForceUpdate {
+			log.Printf("Running with force update!")
+		} else {
+			log.Printf("Updating apps with updates")
+		}
+		iterateAppGithubFolders(fs, dir, "", "", tmpBody.ForceUpdate)
 
 	} else if strings.Contains(tmpBody.URL, "s3") {
 		//https://docs.aws.amazon.com/sdk-for-go/api/service/s3/
@@ -4490,8 +4498,13 @@ func iterateWorkflowGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra
 }
 
 // Onlyname is used to
-func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra string, onlyname string) error {
+func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra string, onlyname string, forceUpdate bool) error {
 	var err error
+
+	allapps := []WorkflowApp{}
+
+	// It's here to prevent getting them in every iteration
+	ctx := context.Background()
 	for _, file := range dir {
 		if len(onlyname) > 0 && file.Name() != onlyname {
 			continue
@@ -4508,7 +4521,7 @@ func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra strin
 			}
 
 			// Go routine? Hmm, this can be super quick I guess
-			err = iterateAppGithubFolders(fs, dir, tmpExtra, "")
+			err = iterateAppGithubFolders(fs, dir, tmpExtra, "", forceUpdate)
 			if err != nil {
 				log.Printf("Error reading folder: %s", err)
 				continue
@@ -4591,12 +4604,12 @@ func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra strin
 					fmt.Sprintf("%s:%s_%s", baseDockerName, newName, workflowapp.AppVersion),
 				}
 
-				ctx := context.Background()
+				if len(allapps) == 0 {
-				allapps, err := getAllWorkflowApps(ctx)
+					allapps, err = getAllWorkflowApps(ctx)
-				if err != nil {
+					if err != nil {
-					log.Printf("Failed getting apps to verify: %s", err)
+						log.Printf("Failed getting apps to verify: %s", err)
-					continue
+						continue
-					//return err
+					}
 				}
 
 				// Make an option to override existing apps?
@@ -4607,7 +4620,7 @@ func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra strin
 					if app.Name == workflowapp.Name && app.AppVersion == workflowapp.AppVersion {
 						// FIXME: Check if there's a new APP_SDK as well.
 						// Skip this check if app_sdk is new.
-						if app.Hash == md5 && app.Hash != "" {
+						if app.Hash == md5 && app.Hash != "" && !forceUpdate {
 							skip = true
 							break
 						}
@@ -4617,7 +4630,7 @@ func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra strin
 					}
 				}
 
-				if skip {
+				if skip && !forceUpdate {
 					continue
 				}
 
@@ -4677,6 +4690,7 @@ func iterateAppGithubFolders(fs billy.Filesystem, dir []os.FileInfo, extra strin
 
 				if len(removeApps) > 0 {
 					for _, item := range removeApps {
+						log.Printf("Removing duplicate: %s", item)
 						err = DeleteKey(ctx, "workflowapp", item)
 						if err != nil {
 							log.Printf("Failed deleting %s", item)

frontend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "shuffler",
-  "version": "0.3.0",
+  "version": "0.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3733,9 +3733,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "14.0.13",
+      "version": "14.0.24",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.13.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.24.tgz",
-      "integrity": "sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA=="
+      "integrity": "sha512-btt/oNOiDWcSuI721MdL8VQGnjsKjlTMdrKyTcLCKeQp/n4AAMFJ961wMbp+09y8WuGPClDEv07RIItdXKIXAA=="
     },
     "@types/object-assign": {
       "version": "4.0.30",
@@ -3748,9 +3748,9 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "@types/prop-types": {
-      "version": "15.7.1",
+      "version": "15.7.3",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",
-      "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg=="
+      "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="
     },
     "@types/q": {
       "version": "1.5.4",
@@ -3758,9 +3758,9 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
     },
     "@types/react": {
-      "version": "16.8.20",
+      "version": "16.9.43",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.20.tgz",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.43.tgz",
-      "integrity": "sha512-ZLmI+ubSJpfUIlQuULDDrdyuFQORBuGOvNnMue8HeA0GVrAJbWtZQhcBvnBPNRBI/GrfSfrKPFhthzC2SLEtLQ==",
+      "integrity": "sha512-PxshAFcnJqIWYpJbLPriClH53Z2WlJcVZE+NP2etUtWQs2s7yIMj3/LDKZT/5CHJ/F62iyjVCDu2H3jHEXIxSg==",
       "requires": {
         "@types/prop-types": "*",
         "csstype": "^2.2.0"
@@ -11944,9 +11944,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
+      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash._reinterpolate": {
       "version": "3.0.0",

frontend/src/App.js

@@ -1,169 +0,0 @@
-import React, {useState, useEffect} from 'react';
-
-import {Route} from 'react-router';
-import {BrowserRouter} from 'react-router-dom';
-import { CookiesProvider } from 'react-cookie';
-import { useCookies } from 'react-cookie';
-
-import EditSchedule from "./EditSchedule";
-import Schedules from "./Schedules";
-import Webhooks from "./Webhooks";
-import Workflows from "./Workflows";
-import EditWebhook from "./EditWebhook";
-import AngularWorkflow from "./AngularWorkflow";
-import ForgotPassword from "./ForgotPassword";
-import ForgotPasswordLink from "./ForgotPasswordLink";
-
-import Header from './Header';
-import Apps from './Apps';
-import AppCreator from './AppCreator';
-import Contact from './Contact';
-import Oauth2 from './Oauth2';
-import About from "./About";
-import Post from "./Post";
-import Dashboard from "./Dashboard";
-import AdminSetup from "./AdminSetup";
-import Admin from "./Admin";
-import Docs from "./Docs";
-import RegisterLink from "./RegisterLink";
-import LandingPage from "./Landingpage";
-import LandingPageNew from "./LandingpageNew";
-import LoginPage from "./LoginPage";
-import SettingsPage from "./SettingsPage";
-
-import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider';
-import { createMuiTheme } from '@material-ui/core/styles';
-
-import AlertTemplate from "react-alert-template-basic";
-import { positions, Provider } from "react-alert";
-
-// Production - backend proxy forwarding in nginx
-var globalUrl = window.location.origin
-
-// CORS used for testing purposes. Should only happen with specific port and http
-if (window.location.protocol == "http:" && window.location.port === "3000") {
-	globalUrl = "http://localhost:5001"
-}
-
-const surfaceColor = "#27292D"
-const inputColor = "#383B40"
-
-const theme = createMuiTheme({
-	palette: {
-		primary: {
-			main: "#f85a3e"
-    },
-    secondary: {
-      main: '#e8eaf6',
-    },
-   },
-   typography: { 
-      useNextVariants: true
-   },
-	 overrides: {
-		 MuiMenu: {
-			list: {
-				backgroundColor: inputColor,
-			},
-		},
-	},
-});
-
-
-// FIXME - set client side cookies
-const App = (message, props) => {
-  const [userdata, setUserData] = useState({});
-  //const [homePage, ] = useState(true);
-  const [cookies, setCookie, removeCookie] = useCookies([]);
-  const [isLoggedIn, setIsLoggedIn] = useState(false);
-  const [dataset, setDataset] = useState(false);
-  const [isLoaded, setIsLoaded] = useState(false);
-
-  useEffect(() => {
-	if (dataset === false) {
-		checkLogin() 
-		setDataset(true)
-  }})
-
-	if (isLoaded && !isLoggedIn && (!window.location.pathname.startsWith("/login") && (!window.location.pathname.startsWith("/docs") && (!window.location.pathname.startsWith("/adminsetup"))))) {
-		window.location = "/login"
-	}
-
-  const checkLogin = () => {
-    var baseurl = globalUrl
-    fetch(baseurl+"/api/v1/users/getinfo", {
-	  credentials: "include",
-  	  headers: {
-  		'Content-Type': 'application/json',
-  	  },
-  	})
-    .then(response => response.json())
-    .then(responseJson => {
-      if (responseJson.success === true) {
-				setUserData(responseJson)
-				setIsLoggedIn(true)
-
-				// Updating cookie every request
-				for (var key in responseJson["cookies"]) {
-					setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, {path: "/"})
-				}
-      } 
-	  setIsLoaded(true)
-    })
-    .catch(error => {
-	  setIsLoaded(true)
-    });
-  }
-
-  // Dumb for content load (per now), but good for making the site not suddenly reload parts (ajax thingies)
-  
-  const options = {
-	  timeout: 5000,
-	  position: positions.BOTTOM_CENTER
-  };
-
-  const includedData = window.location.pathname === "/home" || window.location.pathname === "/features" ?
-		<div>
-  			<Route exact path="/home" render={props => <LandingPageNew isLoaded={isLoaded} {...props} /> } />
-		</div> : 
-		<div style={{backgroundColor: "#1F2023", color: "rgba(255, 255, 255, 0.65)", minHeight: "100vh"}}>
-			<Header removeCookie={removeCookie} isLoaded={isLoaded} globalUrl={globalUrl} setIsLoggedIn={setIsLoggedIn} isLoggedIn={isLoggedIn} surfaceColor={surfaceColor} inputColor={inputColor}{...props} />
-			<Route exact path="/oauth2" render={props => <Oauth2 isLoaded={isLoaded} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor}{...props} /> } />
-			<Route exact path="/contact" render={props => <Contact isLoaded={isLoaded} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/login" render={props => <LoginPage isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/admin" render={props => <Admin isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/settings" render={props => <SettingsPage isLoaded={isLoaded} userdata={userdata} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/AdminSetup" render={props => <AdminSetup isLoaded={isLoaded} userdata={userdata} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/webhooks" render={props => <Webhooks isLoaded={isLoaded} globalUrl={globalUrl} {...props} /> } />
-			<Route exact path="/webhooks/:key" render={props => <EditWebhook isLoaded={isLoaded} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/schedules" render={props => <Schedules globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/dashboard" render={props => <Dashboard isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/apps" render={props => <Apps isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/apps/new" render={props => <AppCreator isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/apps/edit/:appid" render={props => <AppCreator isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/schedules/:key" render={props => <EditSchedule globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor} {...props} /> } />
-			<Route exact path="/workflows" render={props => <Workflows isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} cookies={cookies} surfaceColor={surfaceColor} inputColor={inputColor}{...props} /> } />
-			<Route exact path="/workflows/:key" render={props => <AngularWorkflow globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} surfaceColor={surfaceColor} inputColor={inputColor}{...props} /> } />
-			<Route exact path="/docs/:key" render={props => <Docs isLoaded={isLoaded} globalUrl={globalUrl} surfaceColor={surfaceColor} inputColor={inputColor}{...props} /> } />
-			<Route exact path="/docs" render={props => {window.location.pathname = "/docs/about"}} />
-			<Route exact path="/" render={props => {window.location.pathname = "/login"}} />
-		</div>
-	
-  // <div style={{backgroundColor: "rgba(21, 32, 43, 1)", color: "#fffff", minHeight: "100vh"}}>
-  // backgroundColor: "#213243",
-  // This is a mess hahahah
-  return (
-	<MuiThemeProvider theme={theme}>
-		<CookiesProvider>
-			<BrowserRouter>
-				<Provider template={AlertTemplate} {...options}>
-					{includedData}
-				</Provider>
-			</BrowserRouter>
-		</CookiesProvider>
-	</MuiThemeProvider>
-  );
-};
-
-export default App;
-

frontend/src/App.jsx

@@ -0,0 +1,163 @@
+import React, { useState, useEffect } from 'react';
+
+import { Route } from 'react-router';
+import { BrowserRouter } from 'react-router-dom';
+import { CookiesProvider } from 'react-cookie';
+import { useCookies } from 'react-cookie';
+
+import EditSchedule from "./views/EditSchedule";
+import Schedules from "./views/Schedules";
+import Webhooks from "./views/Webhooks";
+import Workflows from "./views/Workflows";
+import EditWebhook from "./views/EditWebhook";
+import AngularWorkflow from "./views/AngularWorkflow";
+
+import Header from './components/Header';
+import Apps from './views/Apps';
+import AppCreator from './views/AppCreator';
+import Contact from './views/Contact';
+import Oauth2 from './views/Oauth2';
+
+import Dashboard from "./views/Dashboard";
+import AdminSetup from "./views/AdminSetup";
+import Admin from "./views/Admin";
+import Docs from "./views/Docs";
+
+import LandingPageNew from "./views/LandingpageNew";
+import LoginPage from "./views/LoginPage";
+import SettingsPage from "./views/SettingsPage";
+
+import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
+
+import AlertTemplate from "react-alert-template-basic";
+import { positions, Provider } from "react-alert";
+
+// Production - backend proxy forwarding in nginx
+var globalUrl = window.location.origin
+
+// CORS used for testing purposes. Should only happen with specific port and http
+if (window.location.protocol == "http:" && window.location.port === "3000") {
+	globalUrl = "http://localhost:5001"
+}
+
+const theme = createMuiTheme({
+	palette: {
+		primary: {
+			main: "#f85a3e"
+		},
+		secondary: {
+			main: '#e8eaf6',
+		},
+		surfaceColor: "#27292d",
+		inputColor: "#383B40"
+	},
+	typography: {
+		useNextVariants: true
+	},
+	overrides: {
+		MuiMenu: {
+			list: {
+				backgroundColor: "#383B40",
+			},
+		},
+	},
+});
+
+
+// FIXME - set client side cookies
+const App = (message, props) => {
+	const [userdata, setUserData] = useState({});
+	//const [homePage, ] = useState(true);
+	const [cookies, setCookie, removeCookie] = useCookies([]);
+	const [isLoggedIn, setIsLoggedIn] = useState(false);
+	const [dataset, setDataset] = useState(false);
+	const [isLoaded, setIsLoaded] = useState(false);
+
+	useEffect(() => {
+		if (dataset === false) {
+			checkLogin()
+			setDataset(true)
+		}
+	})
+
+	if (isLoaded && !isLoggedIn && (!window.location.pathname.startsWith("/login") && (!window.location.pathname.startsWith("/docs") && (!window.location.pathname.startsWith("/adminsetup"))))) {
+		window.location = "/login"
+	}
+
+	const checkLogin = () => {
+		var baseurl = globalUrl
+		fetch(baseurl + "/api/v1/users/getinfo", {
+			credentials: "include",
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		})
+			.then(response => response.json())
+			.then(responseJson => {
+				if (responseJson.success === true) {
+					setUserData(responseJson)
+					setIsLoggedIn(true)
+
+					// Updating cookie every request
+					for (var key in responseJson["cookies"]) {
+						setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
+					}
+				}
+				setIsLoaded(true)
+			})
+			.catch(error => {
+				setIsLoaded(true)
+			});
+	}
+
+	// Dumb for content load (per now), but good for making the site not suddenly reload parts (ajax thingies)
+
+	const options = {
+		timeout: 5000,
+		position: positions.BOTTOM_CENTER
+	};
+
+	const includedData = window.location.pathname === "/home" || window.location.pathname === "/features" ?
+		<div>
+			<Route exact path="/home" render={props => <LandingPageNew isLoaded={isLoaded} {...props} />} />
+		</div> :
+		<div style={{ backgroundColor: "#1F2023", color: "rgba(255, 255, 255, 0.65)", minHeight: "100vh" }}>
+			<Header removeCookie={removeCookie} isLoaded={isLoaded} globalUrl={globalUrl} setIsLoggedIn={setIsLoggedIn} isLoggedIn={isLoggedIn} userdata={userdata} {...props} />
+			<Route exact path="/oauth2" render={props => <Oauth2 isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/contact" render={props => <Contact isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/login" render={props => <LoginPage isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
+			<Route exact path="/admin" render={props => <Admin isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} register={true} isLoaded={isLoaded} globalUrl={globalUrl} setCookie={setCookie} cookies={cookies} {...props} />} />
+			<Route exact path="/settings" render={props => <SettingsPage isLoaded={isLoaded} userdata={userdata} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/AdminSetup" render={props => <AdminSetup isLoaded={isLoaded} userdata={userdata} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/webhooks" render={props => <Webhooks isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/webhooks/:key" render={props => <EditWebhook isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/schedules" render={props => <Schedules globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/dashboard" render={props => <Dashboard isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/apps" render={props => <Apps isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/apps/new" render={props => <AppCreator isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/apps/edit/:appid" render={props => <AppCreator isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/schedules/:key" render={props => <EditSchedule globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/workflows" render={props => <Workflows isLoaded={isLoaded} isLoggedIn={isLoggedIn} globalUrl={globalUrl} cookies={cookies} {...props} />} />
+			<Route exact path="/workflows/:key" render={props => <AngularWorkflow globalUrl={globalUrl} isLoaded={isLoaded} isLoggedIn={isLoggedIn} {...props} />} />
+			<Route exact path="/docs/:key" render={props => <Docs isLoaded={isLoaded} globalUrl={globalUrl} {...props} />} />
+			<Route exact path="/docs" render={props => { window.location.pathname = "/docs/about" }} />
+			<Route exact path="/" render={props => { window.location.pathname = "/login" }} />
+		</div>
+
+	// <div style={{backgroundColor: "rgba(21, 32, 43, 1)", color: "#fffff", minHeight: "100vh"}}>
+	// backgroundColor: "#213243",
+	// This is a mess hahahah
+	return (
+		<MuiThemeProvider theme={theme}>
+			<CookiesProvider>
+				<BrowserRouter>
+					<Provider template={AlertTemplate} {...options}>
+						{includedData}
+					</Provider>
+				</BrowserRouter>
+			</CookiesProvider>
+		</MuiThemeProvider>
+	);
+};
+
+export default App;

frontend/src/Flows.js

@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Flows = () => {
-	return (
-		<div>
-			<h1>Flows</h1>
-
-			<p>
-				Built to suit any organization
-			</p>
-
-			<p>
-				WAT
-			</p>
-
-			<p>
-			</p>
-
-			<p></p>
-
-		</div>
-	)
-}
-
-export default Flows;

frontend/src/Hookpost.js

@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Hooks = () => {
-	return (
-		<div>
-			<h1>Hooks</h1>
-
-			<p>
-				Built to suit any organization
-			</p>
-
-			<p>
-				WAT
-			</p>
-
-			<p>
-			</p>
-
-			<p></p>
-
-		</div>
-	)
-}
-
-export default Hooks;

frontend/src/Schedulespost.js

@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Schedules = () => {
-	return (
-		<div>
-			<h1>Schedules</h1>
-
-			<p>
-				Built to suit any organization
-			</p>
-
-			<p>
-				WAT
-			</p>
-
-			<p>
-			</p>
-
-			<p></p>
-
-		</div>
-	)
-}
-
-export default Schedules;

frontend/src/components/Header.js

@@ -5,19 +5,22 @@ import {Link} from 'react-router-dom';
 
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
-
+import MenuItem from '@material-ui/core/MenuItem';
+import Select from '@material-ui/core/Select';
 import Button from '@material-ui/core/Button';
 import HomeIcon from '@material-ui/icons/Home';
 import PolymerIcon from '@material-ui/icons/Polymer';
 import AppsIcon from '@material-ui/icons/Apps';
 import DescriptionIcon from '@material-ui/icons/Description';
 import Grid from '@material-ui/core/Grid';
+import { useTheme } from '@material-ui/core/styles';
 
 const hoverColor = "#f85a3e"
 const hoverOutColor = "#e8eaf6"
 
 const Header = props => {
-  	const { globalUrl, isLoggedIn, removeCookie, homePage, isLoaded } = props;
+  const { globalUrl, isLoggedIn, removeCookie, homePage, isLoaded, userdata } = props;
+	const theme = useTheme();
 
 	const [HomeHoverColor, setHomeHoverColor] = useState(hoverOutColor);
 	const [SoarHoverColor, setSoarHoverColor] = useState(hoverOutColor);
@@ -100,7 +103,7 @@ const Header = props => {
 
 
 	// Handle top bar or something
-  	const loginTextBrowser = !isLoggedIn ? 
+  const loginTextBrowser = !isLoggedIn ? 
     	<div style={{display: "flex"}}>
 			<List style={{display: "flex", flexDirect: "row"}} component="nav">
 				<ListItem style={{textAlign: "center", marginLeft: "0px"}}>
@@ -192,6 +195,32 @@ const Header = props => {
 							</Button>
 						</Link>
 					</ListItem>
+					{userdata === undefined || userdata.orgs.length <= 1 ? null :
+						<ListItem>
+							<Select
+								SelectDisplayProps={{
+									style: {
+										marginLeft: 10,
+									}
+								}}
+								value={userdata.selected_org}
+								fullWidth
+								style={{backgroundColor: theme.palette.surfaceColor, color: "white", height: "50px"}}
+								onChange={(e) => {
+									console.log("SET ORG TO ", e.target.value)
+								}}
+								>
+								{userdata.orgs.map(data => {
+									return (
+										<MenuItem key={data.id} style={{backgroundColor: theme.palette.inputColor, color: "white"}} value={data}>
+											{data.name}
+										</MenuItem>
+									)
+								})}
+							</Select>
+						</ListItem>
+					}
+
 				</List>
 			</div>
 	    </div>
@@ -287,7 +316,7 @@ const Header = props => {
     	<div>
 			{loadedCheck}
 	    </div>
-  );
+  )
-};
+}
 
 export default Header;

frontend/src/views/About.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 const hrefStyle = {
-	color: "#f85a3e", 
+	color: "#f85a3e",
 	textDecoration: "none"
 }
 
@@ -12,17 +12,17 @@ const About = () => {
 			<h1>About</h1>
 
 			<p>
-			Endao was started as a project in late 2018 as a free service to analyze APK (and soon IPA) files for vulnerabilities. The project was started after I, 
+				Endao was started as a project in late 2018 as a free service to analyze APK (and soon IPA) files for vulnerabilities. The project was started after I,
 				<a href="https://twitter.com/frikkylikeme" style={hrefStyle}>@frikkylikeme</a>
 			, found multiple vulnerabilities in IoT devices based purely on their apps. As I wanted to learn more about these kind of vulnerabilities, I looked for solutions that work for my purpose, but didn't find any good, free and easy to use service - hence this site was born.
 			</p>
 
 			<p>
-				My personal goal has and will always be to make the internet safer. As the IoT sphere grows, I want to be able to add ways of finding possible vulnerabilities fast to this website. This will hopefully include blogposts when I get around to it, as well as actual implementations. The vulnerability discovery field is in no way new, but I'll try my best to add whatever I can to it. As a disclaimer, I'm an "Ops" person, and I had never done frontend before creating this site. This is as much of a learning project within web development as it is in vulnerability discovery. 
+				My personal goal has and will always be to make the internet safer. As the IoT sphere grows, I want to be able to add ways of finding possible vulnerabilities fast to this website. This will hopefully include blogposts when I get around to it, as well as actual implementations. The vulnerability discovery field is in no way new, but I'll try my best to add whatever I can to it. As a disclaimer, I'm an "Ops" person, and I had never done frontend before creating this site. This is as much of a learning project within web development as it is in vulnerability discovery.
 			</p>
 
 			<p>
-				This site currently uses the following projects 
+				This site currently uses the following projects
 			</p>
 			<ul>
 				<li><a style={hrefStyle} href="https://superanalyzer.rocks">SUPER Android Analyzer</a></li>
@@ -34,8 +34,8 @@ const About = () => {
 			<p>Hopefully it is of use to some people :)</p>
 
 			<h3>Thanks</h3>
-				<p>
+			<p>
-					Thanks to Andy for the initial frontend help :)
+				Thanks to Andy for the initial frontend help :)
 				</p>
 
 			<h3>Regards</h3>

frontend/src/views/AngularWorkflow.jsx

@@ -68,8 +68,7 @@ import CytoscapeComponent from 'react-cytoscapejs';
 import undoRedo from 'cytoscape-undo-redo';
 import Draggable from 'react-draggable';
 
-import environmentdata from './environmentdata';
+import cytoscapestyle from '../defaultCytoscapeStyle';
-import cytoscapestyle from './defaultCytoscapeStyle';
 import cxtmenu from 'cytoscape-cxtmenu';
 
 import { w3cwebsocket as W3CWebSocket } from "websocket";
@@ -950,6 +949,10 @@ const AngularWorkflow = (props) => {
 				if (curaction.selectedAuthentication === null || curaction.selectedAuthentication === undefined || curaction.selectedAuthentication.length === "") {
 					curaction.selectedAuthentication = {}
 				}
+			} else {
+				curaction.authentication = []
+				curaction.authentication_id = ""
+				curaction.selectedAuthentication = {}
 			}
 
 			setSelectedApp(curapp)
@@ -2998,7 +3001,7 @@ const AngularWorkflow = (props) => {
 		paddingLeft: 10,
 		minHeight: "100%",
 		zIndex: 1000,
-		resize: "horizontal",
+		resize: "vertical",
 		overflow: "auto",
 	}
 
@@ -3513,14 +3516,6 @@ const AngularWorkflow = (props) => {
 					<div style={{flex: "10"}}> 
 						<b>{data.name} </b> 
 					</div>
-					<Tooltip color="primary" title="Static data" placement="top">
-						<div style={{cursor: "pointer", color: staticcolor}} onClick={(e) => {
-								e.preventDefault()
-								changeActionParameterVariant("STATIC_VALUE") 
-							}}>
-							<CreateIcon />
-						</div>
-					</Tooltip>
 				</div>	
 				{datafield}
 			</div>
@@ -3553,11 +3548,21 @@ const AngularWorkflow = (props) => {
 		<FormControl>
 			<DialogTitle><div style={{color:"white"}}>Condition</div></DialogTitle>
 				<DialogContent style={{display: "flex"}}>
+					<Tooltip color="primary" title={conditionValue.configuration ? "Negated" : "Default"} placement="top">
+						<Button color="primary" variant={conditionValue.configuration ? "contained" : "outlined"} style={{margin: "auto", height: 50, marginBottom: 0, marginRight: 5}} onClick={(e) => {
+							console.log("VALUE: ", conditionValue.configuration)
+							conditionValue.configuration = !conditionValue.configuration
+							setConditionValue(conditionValue)
+							setUpdate("condition "+conditionValue.configuration)
+						}}>
+							{conditionValue.configuration ? "!" : "="}
+						</Button>
+					</Tooltip>
 					<div style={{flex: "2"}}>
 						<AppConditionHandler tmpdata={sourceValue} setData={setSourceValue} type={"source"} />
 					</div>
-					<div style={{flex: "1", margin: "auto", marginBottom: "0px"}}>
+					<div style={{flex: "1", margin: "auto", marginBottom: 0, marginLeft: 5, marginRight: 5,}}>
-					    <Button color="primary" variant="outlined" style={{height: "50px",}} fullWidth aria-haspopup="true" onClick={(e) => {setVariableAnchorEl(e.currentTarget)}}>
+					  <Button color="primary" variant="outlined" style={{height: "50px",}} fullWidth aria-haspopup="true" onClick={(e) => {setVariableAnchorEl(e.currentTarget)}}>
 							{conditionValue.value}	
 						</Button>
 						<Menu
@@ -3621,8 +3626,7 @@ const AngularWorkflow = (props) => {
 								setVariableAnchorEl(null)
 							}} key={"less than"}>less than</MenuItem>
 						</Menu>
-
+					</div>	
-					</div>
 					<div style={{flex: "2"}}>
 						<AppConditionHandler tmpdata={destinationValue} setData={setDestinationValue} type={"destination"} />
 					</div>
@@ -4774,7 +4778,7 @@ const AngularWorkflow = (props) => {
 						<Divider style={{backgroundColor: "white", marginTop: 10, marginBottom: 10,}}/>
 						<FormControlLabel
 							style={{marginBottom: 15, color: "white",}}
-							label=<div style={{color: "white"}}>Exit on Error</div>
+							label={<div style={{color: "white"}}>Exit on Error</div>}
 							control={
 								<Switch checked={workflow.configuration.exit_on_error} onChange={() => {
 									workflow.configuration.exit_on_error = !workflow.configuration.exit_on_error
@@ -4786,7 +4790,7 @@ const AngularWorkflow = (props) => {
 						/>
 						<FormControlLabel
 							style={{marginBottom: 15, color: "white",}}
-							label=<div style={{color: "white"}}>Start from top</div>
+							label={<div style={{color: "white"}}>Start from top</div>}
 							control={
 								<Switch checked={workflow.configuration.start_from_top} onChange={() => {
 									workflow.configuration.start_from_top = !workflow.configuration.start_from_top
@@ -5114,7 +5118,7 @@ const AngularWorkflow = (props) => {
 					<h2>Executing Workflow</h2>	
 					<FormControlLabel
 						style={{color: "white", marginBottom: "0px", marginTop: "10px"}}
-						label=<div style={{color: "white"}}>Show failed / skipped actions</div>
+						label={<div style={{color: "white"}}>Show failed / skipped actions</div>}
 						control={
 							<Switch checked={showSkippedActions} onChange={() => {setShowSkippedActions(!showSkippedActions)}} />
 						}

frontend/src/views/Apps.jsx

@@ -286,7 +286,7 @@ const Apps = (props) => {
 		}
 
 		return (
-			<Paper square style={paperAppStyle} onClick={() => {
+			<Paper square key={data.id} style={paperAppStyle} onClick={() => {
 				if (selectedApp.id !== data.id) {
 					setSelectedApp(data)
 					console.log(data)
@@ -515,7 +515,7 @@ const Apps = (props) => {
 									newActionname = newActionname.replace("_", " ")
 									newActionname = newActionname.charAt(0).toUpperCase()+newActionname.substring(1)
 									return (
-										<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data}>
+										<MenuItem key={data.name} style={{backgroundColor: inputColor, color: "white"}} value={data}>
 											{newActionname}
 
 										</MenuItem>
@@ -540,7 +540,7 @@ const Apps = (props) => {
 
 								const circleSize = 10
 								return (
-									<MenuItem style={{backgroundColor: inputColor, color: "white"}} value={data}>
+									<MenuItem key={data.name} style={{backgroundColor: inputColor, color: "white"}} value={data}>
 										<div style={{width: circleSize, height: circleSize, borderRadius: circleSize / 2, backgroundColor: itemColor, marginRight: "10px"}}/>
 										{data.name}
 
@@ -654,7 +654,7 @@ const Apps = (props) => {
 						{isLoading ? <CircularProgress style={{marginTop: 13, marginRight: 15}} /> : null}
 				    <FormControlLabel
 							style={{color: "white", marginBottom: "0px", marginTop: "10px"}}
-							label=<div style={{color: "white"}}>Search OpenAPI</div>
+							label={<div style={{color: "white"}}>Search OpenAPI</div>}
 							control={<Switch checked={searchBackend} onChange={() => {
 								handleSearchChange("")
 								setSearchBackend(!searchBackend)}
@@ -743,7 +743,7 @@ const Apps = (props) => {
 		null
 
 	// Load data e.g. from github
-	const getSpecificApps = (url) => {
+	const getSpecificApps = (url, forceUpdate) => {
 		setValidation(true)
 
 		setIsLoading(true)
@@ -761,6 +761,8 @@ const Apps = (props) => {
 			parsedData["field_2"] = field2
 		}
 
+		parsedData["force_update"] = forceUpdate
+
 		alert.success("Getting specific apps from your URL.")
 		var cors = "cors"
 		fetch(globalUrl+"/api/v1/apps/get_existing", {
@@ -977,8 +979,8 @@ const Apps = (props) => {
 		window.location.href = "/apps/new?id="+appValidation
 	}
 
-	const handleGithubValidation = () => {
+	const handleGithubValidation = (forceUpdate) => {
-		getSpecificApps(openApi)
+		getSpecificApps(openApi, forceUpdate)
 		setLoadAppsModalOpen(false)
 	}
 
@@ -1034,7 +1036,7 @@ const Apps = (props) => {
 		>
 			<DialogTitle>
 				<div style={{color: "rgba(255,255,255,0.9)"}}>
-					Load from github repo
+					Load from github repo 
 				</div>
 			</DialogTitle>
 			<DialogContent style={{color: "rgba(255,255,255,0.65)"}}>
@@ -1098,7 +1100,12 @@ const Apps = (props) => {
 					Cancel
 				</Button>
 	      <Button style={{borderRadius: "0px"}} disabled={openApi.length === 0 || !openApi.includes("http")} onClick={() => {
-					handleGithubValidation() 
+					handleGithubValidation(true) 
+				}} color="primary">
+	      	Force update	
+	      </Button>
+	      <Button variant="outlined" style={{float: "left", borderRadius: "0px"}} disabled={openApi.length === 0 || !openApi.includes("http")} onClick={() => {
+					handleGithubValidation(false) 
 				}} color="primary">
 	        Submit	
 	      </Button>

frontend/src/views/Contact.jsx

@@ -1,11 +1,13 @@
-import React, {useState} from 'react';
+import React, { useState } from 'react';
-import {BrowserView, MobileView} from "react-device-detect";
+import { BrowserView, MobileView } from "react-device-detect";
 
 import Paper from '@material-ui/core/Paper';
 import Button from '@material-ui/core/Button';
 
 import TextField from '@material-ui/core/TextField';
 
+import { useTheme } from '@material-ui/core/styles';
+
 const bodyDivStyle = {
 	margin: "auto",
 	textAlign: "center",
@@ -13,11 +15,11 @@ const bodyDivStyle = {
 }
 
 
-
-
 // Should be different if logged in :|
 const Contact = (props) => {
-  	const { globalUrl, isLoaded, surfaceColor, inputColor } = props;
+	const { globalUrl, isLoaded } = props;
+	
+	const theme = useTheme();
 
 	const boxStyle = {
 		flex: "1",
@@ -27,24 +29,24 @@ const Contact = (props) => {
 		paddingRight: "30px",
 		paddingBottom: "30px",
 		paddingTop: "30px",
-		backgroundColor: surfaceColor,
+		backgroundColor: theme.palette.surfaceColor,
-		display: "flex", 
+		display: "flex",
 		flexDirection: "column"
 	}
-	
+
 	const bodyTextStyle = {
-		color: "#ffffff",	
+		color: "#ffffff",
 	}
 
-  	const [firstname, setFirstname] = useState("");
+	const [firstname, setFirstname] = useState("");
-  	const [lastname, setLastname] = useState("");
+	const [lastname, setLastname] = useState("");
-  	const [title, setTitle] = useState("");
+	const [title, setTitle] = useState("");
-  	const [companyname, setCompanyname] = useState("");
+	const [companyname, setCompanyname] = useState("");
-  	const [email, setEmail] = useState("");
+	const [email, setEmail] = useState("");
-  	const [phone, setPhone] = useState("");
+	const [phone, setPhone] = useState("");
-  	const [message, setMessage] = useState("");
+	const [message, setMessage] = useState("");
 
-  	const [formMessage, setFormMessage] = useState("");
+	const [formMessage, setFormMessage] = useState("");
 
 	const submitContact = () => {
 		const data = {
@@ -58,43 +60,43 @@ const Contact = (props) => {
 		}
 		console.log(data)
 
-		fetch(globalUrl+"/api/v1/contact", {
+		fetch(globalUrl + "/api/v1/contact", {
-    	  	method: 'POST',
+			method: 'POST',
-				headers: {
+			headers: {
-					'Content-Type': 'application/json',
+				'Content-Type': 'application/json',
-				},
+			},
-				body: JSON.stringify(data),
+			body: JSON.stringify(data),
-    	})
+		})
-    	.then(response => response.json())
+			.then(response => response.json())
-		.then(response => {
+			.then(response => {
-			if (response.success === true) {
+				if (response.success === true) {
-				setFormMessage(response.message)
+					setFormMessage(response.message)
-			} else {
+				} else {
-				setFormMessage("Something went wrong. Please contact frikky@shuffler.io.")
+					setFormMessage("Something went wrong. Please contact frikky@shuffler.io.")
-			}
+				}
-			console.log(response)
+				console.log(response)
-    	})
+			})
-		.catch(error => {
+			.catch(error => {
-    		console.log(error)
+				console.log(error)
-		});
+			});
 	}
 
 	// Random names for type & autoComplete. Didn't research :^)
-	const landingpageDataBrowser = 
+	const landingpageDataBrowser =
 		<div>
 			<div style={bodyTextStyle}>
-				<h3 style={{color: "#f85a3e"}}>Contact us</h3>
+				<h3 style={{ color: "#f85a3e" }}>Contact us</h3>
 				<h2>Lets talk!</h2>
 			</div>
-			<div style={{display: "flex"}}>
+			<div style={{ display: "flex" }}>
 				<Paper style={boxStyle}>
 					<h2>Contact Details</h2>
-					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
+					<div style={{ flex: "1", display: "flex", flexDirection: "row" }}>
 						<TextField
 							required
-							style={{flex: "1", marginRight: "15px", backgroundColor: inputColor}}
+							style={{ flex: "1", marginRight: "15px", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -102,16 +104,16 @@ const Contact = (props) => {
 							fullWidth={true}
 							placeholder="First Name"
 							type="firstname"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="firstname"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setFirstname(e.target.value)}
+							onChange={e => setFirstname(e.target.value)}
 						/>
 						<TextField
-							style={{flex: "1", marginLeft: "15px", backgroundColor: inputColor}}
+							style={{ flex: "1", marginLeft: "15px", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -119,18 +121,18 @@ const Contact = (props) => {
 							fullWidth={true}
 							placeholder="Last Name"
 							type="lastname"
-						  	id="standard"
+							id="standard"
 							autoComplete="lastname"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setLastname(e.target.value)}
+							onChange={e => setLastname(e.target.value)}
 						/>
 					</div>
-					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
+					<div style={{ flex: "1", display: "flex", flexDirection: "row" }}>
 						<TextField
-							style={{flex: "1", marginRight: "15px", backgroundColor: inputColor}}
+							style={{ flex: "1", marginRight: "15px", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -138,16 +140,16 @@ const Contact = (props) => {
 							fullWidth={true}
 							placeholder="Job Title"
 							type="jobtitle"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="jobtitle"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setTitle(e.target.value)}
+							onChange={e => setTitle(e.target.value)}
 						/>
 						<TextField
-							style={{flex: "1", marginLeft: "15px", backgroundColor: inputColor}}
+							style={{ flex: "1", marginLeft: "15px", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -155,19 +157,19 @@ const Contact = (props) => {
 							fullWidth={true}
 							type="companyname"
 							placeholder="Company Name"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="companyname"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setCompanyname(e.target.value)}
+							onChange={e => setCompanyname(e.target.value)}
 						/>
 					</div>
-					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
+					<div style={{ flex: "1", display: "flex", flexDirection: "row" }}>
 						<TextField
 							required
-							style={{flex: "1", marginRight: "15px", backgroundColor: inputColor}}
+							style={{ flex: "1", marginRight: "15px", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -175,16 +177,16 @@ const Contact = (props) => {
 							fullWidth={true}
 							placeholder="Email"
 							type="email"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="email"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setEmail(e.target.value)}
+							onChange={e => setEmail(e.target.value)}
 						/>
 						<TextField
-							style={{flex: "1", marginLeft: "15px", backgroundColor: inputColor}}
+							style={{ flex: "1", marginLeft: "15px", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -192,64 +194,64 @@ const Contact = (props) => {
 							fullWidth={true}
 							type="phone"
 							placeholder="Phone number"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="phone"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setPhone(e.target.value)}
+							onChange={e => setPhone(e.target.value)}
 						/>
 					</div>
-					<div style={{flex: 1}}>
+					<div style={{ flex: 1 }}>
 						<h2>Message</h2>
 					</div>
-					<div style={{flex: 4}}>
+					<div style={{ flex: 4 }}>
 						<TextField
 							multiline
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
 							color="primary"
-							style={{flex: "1", backgroundColor: inputColor}} 
+							style={{ flex: "1", backgroundColor: theme.palette.inputColor }}
 							rows="6"
 							fullWidth={true}
 							placeholder="What can we help you with?"
 							id="filled-multiline-static"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setMessage(e.target.value)}
+							onChange={e => setMessage(e.target.value)}
 						/>
 					</div>
 					<Button
 						disabled={email.length <= 0 || message.length <= 0}
-						style={{width: "100%", height: "60px", marginTop: "10px"}}
+						style={{ width: "100%", height: "60px", marginTop: "10px" }}
 						variant="contained"
 						color="primary"
 						onClick={submitContact}
 					>
-					Submit	
+						Submit
 					</Button>
 					<h3>{formMessage}</h3>
 				</Paper>
 			</div>
 		</div>
 
-	const landingpageDataMobile = 
+	const landingpageDataMobile =
-		<div style={{paddingBottom: "50px"}}>
+		<div style={{ paddingBottom: "50px" }}>
-			<div style={{color: "white", textAlign: "center"}}>
+			<div style={{ color: "white", textAlign: "center" }}>
-				<h3 style={{color: "#f85a3e"}}>Contact us</h3>
+				<h3 style={{ color: "#f85a3e" }}>Contact us</h3>
 				<h2>Lets talk!</h2>
 			</div>
-			<div style={{display: "flex"}}>
+			<div style={{ display: "flex" }}>
 				<Paper style={boxStyle}>
 					<h2>Contact Details</h2>
-					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
+					<div style={{ flex: "1", display: "flex", flexDirection: "row" }}>
 						<TextField
 							required
-							style={{flex: "1", backgroundColor: inputColor}}
+							style={{ flex: "1", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -257,19 +259,19 @@ const Contact = (props) => {
 							fullWidth={true}
 							placeholder="Name"
 							type="firstname"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="firstname"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setFirstname(e.target.value)}
+							onChange={e => setFirstname(e.target.value)}
 						/>
 					</div>
-					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
+					<div style={{ flex: "1", display: "flex", flexDirection: "row" }}>
 						<TextField
 							required
-							style={{flex: "1", backgroundColor: inputColor}}
+							style={{ flex: "1", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -277,22 +279,22 @@ const Contact = (props) => {
 							fullWidth={true}
 							placeholder="Email"
 							type="email"
-						  	id="standard-required"
+							id="standard-required"
 							autoComplete="email"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setEmail(e.target.value)}
+							onChange={e => setEmail(e.target.value)}
 						/>
 					</div>
-					<div style={{flex: 1}}>
+					<div style={{ flex: 1 }}>
 						<h2>Message</h2>
 					</div>
-					<div style={{flex: 4}}>
+					<div style={{ flex: 4 }}>
 						<TextField
 							multiline
-							style={{flex: "1", backgroundColor: inputColor}}
+							style={{ flex: "1", backgroundColor: theme.palette.inputColor }}
 							InputProps={{
-								style:{
+								style: {
 									color: "white",
 								},
 							}}
@@ -303,17 +305,17 @@ const Contact = (props) => {
 							id="filled-multiline-static"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={e => setMessage(e.target.value)}
+							onChange={e => setMessage(e.target.value)}
 						/>
 					</div>
 					<Button
 						disabled={email.length <= 0 || message.length <= 0}
-						style={{width: "100%", height: "60px", marginTop: "10px"}}
+						style={{ width: "100%", height: "60px", marginTop: "10px" }}
 						variant="contained"
 						color="primary"
 						onClick={submitContact}
 					>
-					Submit	
+						Submit
 					</Button>
 					<h3>{formMessage}</h3>
 				</Paper>
@@ -321,7 +323,7 @@ const Contact = (props) => {
 		</div>
 
 
-	const loadedCheck = isLoaded ? 
+	const loadedCheck = isLoaded ?
 		<div>
 			<BrowserView>
 				<div style={bodyDivStyle}>{landingpageDataBrowser}</div>
@@ -334,7 +336,7 @@ const Contact = (props) => {
 		<div>
 		</div>
 
-	return(
+	return (
 		<div>
 			{loadedCheck}
 		</div>

frontend/src/views/Dashboard.jsx

@@ -35,7 +35,7 @@ import {
   chartExample2,
   chartExample3,
   chartExample4
-} from "./charts.js";
+} from "../charts.js";
 
 // This is the start of a dashboard that can be used. 
 // What data do we fill in here? Idk

frontend/src/views/EditSchedule.jsx

@@ -34,9 +34,6 @@ import DeleteIcon from '@material-ui/icons/Delete';
 import Downshift from 'downshift';
 import deburr from 'lodash/deburr';
 
-//import appdata from './appdata';
-
-
 const EditSchedule = (props) => {
   	const { globalUrl } = props;
 

frontend/src/views/EditWebhook.jsx

@@ -6,8 +6,8 @@ import Divider from '@material-ui/core/Divider';
 import Select from '@material-ui/core/Select';
 import MenuItem from '@material-ui/core/MenuItem';
 
-import WebhookImage from './assets/img/webhook.png';
+import WebhookImage from '../assets/img/webhook.png';
-import KafkaImage from './assets/img/kafka.png';
+import KafkaImage from '../assets/img/kafka.png';
 
 import EditWorkflow from "./EditWorkflow";
 

frontend/src/views/LoginPage.jsx

@@ -1,13 +1,15 @@
 /* eslint-disable react/no-multi-comp */
-import React, {useState} from 'react';
+import React, { useState } from 'react';
 import { makeStyles } from '@material-ui/styles';
 
 import TextField from '@material-ui/core/TextField';
 import Button from '@material-ui/core/Button';
 import Paper from '@material-ui/core/Paper';
+import { useTheme } from '@material-ui/core/styles';
+
 
 const hrefStyle = {
-	color: "white", 
+	color: "white",
 	textDecoration: "none"
 }
 
@@ -17,16 +19,6 @@ const bodyDivStyle = {
 	width: "500px",
 }
 
-const surfaceColor = "#27292D"
-const inputColor = "#383B40"
-
-const boxStyle = {
-	paddingLeft: "30px",
-	paddingRight: "30px",
-	paddingBottom: "30px",
-	paddingTop: "30px",
-	backgroundColor: surfaceColor,
-}
 
 const useStyles = makeStyles({
 	notchedOutline: {
@@ -35,12 +27,14 @@ const useStyles = makeStyles({
 });
 
 const LoginDialog = props => {
-  const { globalUrl, isLoaded, isLoggedIn, setIsLoggedIn, setCookie, register } = props;
+	const theme = useTheme();
+
+	const { globalUrl, isLoaded, isLoggedIn, setIsLoggedIn, setCookie, register } = props;
 	const [username, setUsername] = useState("");
 	const [password, setPassword] = useState("");
 	const [firstRequest, setFirstRequest] = useState(true);
 
-  	// Used to swap from login to register. True = login, false = register
+	// Used to swap from login to register. True = login, false = register
 
 	const classes = useStyles();
 	// Error messages etc
@@ -51,32 +45,32 @@ const LoginDialog = props => {
 	}
 
 	if (isLoggedIn === true) {
-		window.location.pathname = "/workflows"		
+		window.location.pathname = "/workflows"
 	}
 
 
 	const checkAdmin = () => {
-		const url = globalUrl+'/api/v1/checkusers';
+		const url = globalUrl + '/api/v1/checkusers';
 		fetch(url, {
-				method: 'GET',
+			method: 'GET',
-				headers: {
+			headers: {
-					'Content-Type': 'application/json',
+				'Content-Type': 'application/json',
-				},
+			},
 		})
-		.then(response =>
+			.then(response =>
-			response.json().then(responseJson => {
+				response.json().then(responseJson => {
-				if (responseJson["success"] === false) {
+					if (responseJson["success"] === false) {
-					setLoginInfo(responseJson["reason"])
+						setLoginInfo(responseJson["reason"])
-				} else {
+					} else {
-					if (responseJson.reason === "stay") {
+						if (responseJson.reason === "stay") {
-						window.location.pathname = "/adminsetup"		
+							window.location.pathname = "/adminsetup"
+						}
 					}
-				}
+				}),
-			}),
+			)
-		)
+			.catch(error => {
-		.catch(error => {
+				setLoginInfo("Error in userdata: ", error)
-			setLoginInfo("Error in userdata: ", error)
+			})
-		})
 	}
 
 	if (firstRequest) {
@@ -89,41 +83,41 @@ const LoginDialog = props => {
 		// FIXME - add some check here ROFL
 
 		// Just use this one?
-		var data = {"username": username, "password": password}
+		var data = { "username": username, "password": password }
 		var baseurl = globalUrl
 		if (register) {
-			var url = baseurl+'/api/v1/users/login';
+			var url = baseurl + '/api/v1/users/login';
 			fetch(url, {
 				mode: 'cors',
-					method: 'POST',
+				method: 'POST',
-					body: JSON.stringify(data),
+				body: JSON.stringify(data),
-					credentials: 'include',
+				credentials: 'include',
-					crossDomain: true,
+				crossDomain: true,
-					withCredentials: true,
+				withCredentials: true,
-					headers: {
+				headers: {
-        		'Content-Type': 'application/json; charset=utf-8',
+					'Content-Type': 'application/json; charset=utf-8',
-					},
+				},
 			})
-			.then(response =>
+				.then(response =>
-				response.json().then(responseJson => {
+					response.json().then(responseJson => {
-					if (responseJson["success"] === false) {
+						if (responseJson["success"] === false) {
-						setLoginInfo(responseJson["reason"])
+							setLoginInfo(responseJson["reason"])
-					} else {
+						} else {
-						setLoginInfo("Successful login, rerouting")
+							setLoginInfo("Successful login, rerouting")
-						for (var key in responseJson["cookies"]) {
+							for (var key in responseJson["cookies"]) {
-							setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, {path: "/"})
+								setCookie(responseJson["cookies"][key].key, responseJson["cookies"][key].value, { path: "/" })
-						}
+							}
 
-						setIsLoggedIn(true)
+							setIsLoggedIn(true)
-						window.location.pathname = "/workflows"		
+							window.location.pathname = "/workflows"
-					}
+						}
-				}),
+					}),
-			)
+				)
-			.catch(error => {
+				.catch(error => {
-				setLoginInfo("Error in userdata: " + error)
+					setLoginInfo("Error in userdata: " + error)
-			});
+				});
 		} else {
-			url = baseurl+'/api/v1/users/register';
+			url = baseurl + '/api/v1/users/register';
 			fetch(url, {
 				method: 'POST',
 				body: JSON.stringify(data),
@@ -131,27 +125,27 @@ const LoginDialog = props => {
 					'Content-Type': 'application/json',
 				},
 			})
-			.then(response =>
+				.then(response =>
-				response.json().then(responseJson => {
+					response.json().then(responseJson => {
-					if (responseJson["success"] === false) {
+						if (responseJson["success"] === false) {
-						setLoginInfo(responseJson["reason"])
+							setLoginInfo(responseJson["reason"])
-					} else {
+						} else {
-						setLoginInfo("Successful register :)")
+							setLoginInfo("Successful register :)")
-					}
+						}
-				}),
+					}),
-			)
+				)
-			.catch(error => {
+				.catch(error => {
-				setLoginInfo("Error in userdata: ", error)
+					setLoginInfo("Error in userdata: ", error)
-			});
+				});
 		}
 	}
 
 	const onChangeUser = (e) => {
-		setUsername(e.target.value)	
+		setUsername(e.target.value)
 	}
 
 	const onChangePass = (e) => {
-		setPassword(e.target.value)	
+		setPassword(e.target.value)
 	}
 
 	//const onClickRegister = () => {
@@ -167,25 +161,32 @@ const LoginDialog = props => {
 	//var loginChange = register ? (<div><p onClick={setLoginCheck(false)}>Want to register? Click here.</p></div>) : (<div><p onClick={setLoginCheck(true)}>Go back to login? Click here.</p></div>);
 	var formtitle = register ? <div>Login</div> : <div>Register</div>
 
-		//	<DialogTitle>{formtitle}</DialogTitle>
+	//	<DialogTitle>{formtitle}</DialogTitle>
-		
+
-	const basedata = 
+	console.log("THEME: ", theme.palette.surfaceColor)
+	const basedata =
 		<div style={bodyDivStyle}>
-			<Paper style={boxStyle}>
+			<Paper style={{
-      	<form onSubmit={onSubmit} style={{margin: "15px 15px 15px 15px", color: "white",}}>
+				paddingLeft: "30px",
+				paddingRight: "30px",
+				paddingBottom: "30px",
+				paddingTop: "30px",
+				backgroundColor: theme.palette.surfaceColor,
+			}}>
+				<form onSubmit={onSubmit} style={{ margin: "15px 15px 15px 15px", color: "white", }}>
 					<h2>{formtitle}</h2>
 					Username
 					<div>
 						<TextField
 							color="primary"
-							style={{backgroundColor: inputColor}}
+							style={{ backgroundColor: theme.palette.inputColor }}
 							autoFocus
 							InputProps={{
 								classes: {
 									notchedOutline: classes.notchedOutline,
 								},
-								style:{
+								style: {
-									height: "50px", 
+									height: "50px",
 									color: "white",
 									fontSize: "1em",
 								},
@@ -197,20 +198,20 @@ const LoginDialog = props => {
 							id="emailfield"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={onChangeUser}
+							onChange={onChangeUser}
 						/>
 					</div>
-					Password	
+					Password
 					<div>
 						<TextField
 							color="primary"
-							style={{backgroundColor: inputColor,}}
+							style={{ backgroundColor: theme.palette.inputColor }}
 							InputProps={{
 								classes: {
 									notchedOutline: classes.notchedOutline,
 								},
-								style:{
+								style: {
-									height: "50px", 
+									height: "50px",
 									color: "white",
 									fontSize: "1em",
 								},
@@ -223,23 +224,23 @@ const LoginDialog = props => {
 							placeholder="**********"
 							margin="normal"
 							variant="outlined"
-      	 					onChange={onChangePass}
+							onChange={onChangePass}
 						/>
 					</div>
-					<div style={{display: "flex", marginTop: "15px"}}>
+					<div style={{ display: "flex", marginTop: "15px" }}>
-						<Button color="primary" variant="contained" type="submit" style={{flex: "1", marginRight: "5px"}} disabled={!handleValidateForm()}>SUBMIT</Button> 				
+						<Button color="primary" variant="contained" type="submit" style={{ flex: "1", marginRight: "5px" }} disabled={!handleValidateForm()}>SUBMIT</Button>
-						
+
 					</div>
-					<div style={{marginTop: "10px"}}>
+					<div style={{ marginTop: "10px" }}>
 						{loginInfo}
 					</div>
 				</form>
 			</Paper>
 		</div>
 
-	const loadedCheck = isLoaded ? 
+	const loadedCheck = isLoaded ?
 		<div>
-      		{basedata}
+			{basedata}
 		</div>
 		:
 		<div>

frontend/src/views/SettingsPage.jsx

@@ -7,23 +7,11 @@ import {Link} from 'react-router-dom';
 
 import TextField from '@material-ui/core/TextField';
 import { useAlert } from "react-alert";
+import { useTheme } from '@material-ui/core/styles';
 
-
-//const tmpdata = {
-//	"username": "frikky",
-//	"firstname": "fred",
-//	"lastname": "ode",
-//	"title": "topkek",
-//	"companyname": "company here",
-//	"email": "your email pls",
-//	"phone": "PHONE!!",
-//}
-
-// FIXME - add fetch for data fields
-// FIXME - remove tmpdata
-// FIXME: Use isLoggedIn :)
 const Settings = (props) => {
-  const { globalUrl, isLoaded, userdata, surfaceColor, inputColor } = props;
+  const { globalUrl, isLoaded, userdata, } = props;
+	const theme = useTheme();
 	const alert = useAlert()
 
 	const [username, setUsername] = useState("");
@@ -61,7 +49,7 @@ const Settings = (props) => {
 		paddingRight: "30px",
 		paddingBottom: "30px",
 		paddingTop: "30px",
-		backgroundColor: surfaceColor,
+		backgroundColor: theme.palette.surfaceColor,
 		display: "flex", 
 		flexDirection: "column"
 	}
@@ -190,7 +178,7 @@ const Settings = (props) => {
 					<h2>APIKEY</h2>
 					<Link to="/docs/API#authentication" style={{textDecoration: "none", color: "#f85a3e"}}>What is the API key used for?</Link>
 					<TextField
-						style={{backgroundColor: inputColor, flex: "1"}}
+						style={{backgroundColor: theme.palette.inputColor, flex: "1"}}
 						InputProps={{
 							style:{
 								height: "50px", 
@@ -218,7 +206,7 @@ const Settings = (props) => {
 					<h2>Settings</h2>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1"}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1"}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -240,7 +228,7 @@ const Settings = (props) => {
 					</div>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginRight: "15px"}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginRight: "15px"}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -260,7 +248,7 @@ const Settings = (props) => {
       	 					onChange={e => setFirstname(e.target.value)}
 						/>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginLeft: "15px"}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginLeft: "15px"}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -282,7 +270,7 @@ const Settings = (props) => {
 					</div>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginRight: "15px",}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginRight: "15px",}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -302,7 +290,7 @@ const Settings = (props) => {
       	 					onChange={e => setTitle(e.target.value)}
 						/>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginLeft: "15px"}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginLeft: "15px"}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -324,7 +312,7 @@ const Settings = (props) => {
 					</div>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginRight: "15px",}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginRight: "15px",}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -344,7 +332,7 @@ const Settings = (props) => {
       	 					onChange={e => setEmail(e.target.value)}
 						/>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginLeft: "15px",}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginLeft: "15px",}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -379,7 +367,7 @@ const Settings = (props) => {
 					<h2>Password</h2>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1"}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1"}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -400,7 +388,7 @@ const Settings = (props) => {
 					</div>
 					<div style={{flex: "1", display: "flex", flexDirection: "row"}}>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginRight: "15px",}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginRight: "15px",}}
 							InputProps={{
 								style:{
 									height: "50px", 
@@ -419,7 +407,7 @@ const Settings = (props) => {
       	 					onChange={e => setNewPassword(e.target.value)}
 						/>
 						<TextField
-							style={{backgroundColor: inputColor, flex: "1", marginLeft: "15px",}}
+							style={{backgroundColor: theme.palette.inputColor, flex: "1", marginLeft: "15px",}}
 							InputProps={{
 								style:{
 									height: "50px", 

frontend/src/views/Webhooks.jsx

@@ -15,8 +15,8 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import DialogActions from '@material-ui/core/DialogActions';
 import DialogContent from '@material-ui/core/DialogContent';
 
-import WebhookImage from './assets/img/webhook.png';
+import WebhookImage from '../assets/img/webhook.png';
-import KafkaImage from './assets/img/kafka.png';
+import KafkaImage from '../assets/img/kafka.png';
 
 const Webhooks = (props) => {
   	const { globalUrl, isLoaded } = props;

frontend/src/views/Workflows.jsx

@@ -563,7 +563,7 @@ const Workflows = (props) => {
 		}
 
 		return (
-			<Paper square style={resultPaperAppStyle} onClick={() => {}}>
+			<Paper key={data.id} square style={resultPaperAppStyle} onClick={() => {}}>
 				<div style={{marginLeft: "10px", marginTop: "5px", marginBottom: "5px", marginRight: "5px", width: boxWidth, backgroundColor: boxColor}}>
 				</div>
 				<Grid container style={{margin: "10px 10px 10px 10px", flex: "1"}}>
@@ -988,7 +988,7 @@ const Workflows = (props) => {
 					<div style={{flex: "1"}}>
 				    	<FormControlLabel
 							style={{color: "white", marginBottom: "0px", marginTop: "10px"}}
-							label=<div style={{color: "white"}}>Collapse results</div>
+							label={<div style={{color: "white"}}>Collapse results</div>}
 							control={<Switch checked={collapseJson} onChange={() => {setCollapseJson(!collapseJson)}} />}
 						/>
 					</div>

functions/onprem/orborus/orborus.go

@@ -78,10 +78,11 @@ func init() {
 	// Skip random containers. Only handle things related to Shuffle.
 	for _, container := range containers {
 		found := false
-		//log.Printf("Running? %#v", container)
+
-		if container.State != "running" {
+		// Bad states - it might just be created sometimes, leading to now netowkr
-			continue
+		//if container.State == "restarting" || container.State == "paused" || container.State == "exited" || container.State == "dead" {
-		}
+		//	continue
+		//}
 
 		for _, name := range container.Names {
 			if !strings.Contains(strings.ToLower(name), containerIdentifier) {
@@ -120,17 +121,10 @@ func deployWorker(image string, identifier string, env []string) {
 		},
 	}
 
-	// ROFL: https://docker-py.readthedocs.io/en/1.4.0/volumes/
-	config := &container.Config{
-		Image: image,
-		Env:   env,
-	}
-
 	// Look for Shuffle network and set it
-
-	// FIXME: Move this out of here and have it be a global setting. During init?
 	networkConfig := &network.NetworkingConfig{}
 	if len(shuffleNetwork) > 0 {
+		log.Printf("Starting worker with network %s", shuffleNetwork)
 		networkConfig = &network.NetworkingConfig{
 			EndpointsConfig: map[string]*network.EndpointSettings{
 				shuffleNetwork: {
@@ -139,7 +133,15 @@ func deployWorker(image string, identifier string, env []string) {
 			},
 		}
 
-		env = append(env, fmt.Sprintf("DOCKER_NETWORK", shuffleNetwork))
+		env = append(env, fmt.Sprintf("DOCKER_NETWORK=%s", shuffleNetwork))
+	} else {
+		log.Printf("Starting worker WITHOUT any specified network: %s", shuffleNetwork)
+	}
+
+	// ROFL: https://docker-py.readthedocs.io/en/1.4.0/volumes/
+	config := &container.Config{
+		Image: image,
+		Env:   env,
 	}
 
 	//test := &network.EndpointSettings{

functions/onprem/worker/worker.go

@@ -1107,6 +1107,13 @@ func main() {
 		}
 	}
 
+	shuffleNetwork := os.Getenv("DOCKER_NETWORK")
+	if len(shuffleNetwork) > 0 {
+		log.Printf("Running with Docker network %s", shuffleNetwork)
+	} else {
+		log.Printf("No docker network specified for Worker.")
+	}
+
 	// WORKER_TESTING_WORKFLOW should be a workflow ID
 	authorization := ""
 	executionId := ""