- // backgroundColor: "#213243",
- // This is a mess hahahah
- return (
-
-
-
-
- {includedData}
-
-
-
-
- );
-};
-
-export default App;
-
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
new file mode 100644
index 00000000..f5214bab
--- /dev/null
+++ b/frontend/src/App.jsx
@@ -0,0 +1,161 @@
+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" ?
+
+ } />
+
:
+
+
+
} />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ { window.location.pathname = "/docs/about" }} />
+ { window.location.pathname = "/login" }} />
+
+
+ //
+ // backgroundColor: "#213243",
+ // This is a mess hahahah
+ return (
+
+
+
+
+ {includedData}
+
+
+
+
+ );
+};
+
+export default App;
diff --git a/frontend/src/Flows.js b/frontend/src/Flows.js
deleted file mode 100644
index aa1a35a3..00000000
--- a/frontend/src/Flows.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Flows = () => {
- return (
-
-
Flows
-
-
- Built to suit any organization
-
-
-
- WAT
-
-
-
-
-
-
-
-
- )
-}
-
-export default Flows;
diff --git a/frontend/src/Hookpost.js b/frontend/src/Hookpost.js
deleted file mode 100644
index 566a26d4..00000000
--- a/frontend/src/Hookpost.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Hooks = () => {
- return (
-
-
Hooks
-
-
- Built to suit any organization
-
-
-
- WAT
-
-
-
-
-
-
-
-
- )
-}
-
-export default Hooks;
diff --git a/frontend/src/Schedulespost.js b/frontend/src/Schedulespost.js
deleted file mode 100644
index 102144e7..00000000
--- a/frontend/src/Schedulespost.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-
-const Schedules = () => {
- return (
-
-
Schedules
-
-
- Built to suit any organization
-
-
-
- WAT
-
-
-
-
-
-
-
-
- )
-}
-
-export default Schedules;
diff --git a/frontend/src/appdata.js b/frontend/src/__test__/appdata.js
similarity index 100%
rename from frontend/src/appdata.js
rename to frontend/src/__test__/appdata.js
diff --git a/frontend/src/environmentdata.js b/frontend/src/__test__/environmentdata.js
similarity index 100%
rename from frontend/src/environmentdata.js
rename to frontend/src/__test__/environmentdata.js
diff --git a/frontend/src/scheduledata.js b/frontend/src/__test__/scheduledata.js
similarity index 100%
rename from frontend/src/scheduledata.js
rename to frontend/src/__test__/scheduledata.js
diff --git a/frontend/src/webhookdata.js b/frontend/src/__test__/webhookdata.js
similarity index 100%
rename from frontend/src/webhookdata.js
rename to frontend/src/__test__/webhookdata.js
diff --git a/frontend/src/workflowdata.js b/frontend/src/__test__/workflowdata.js
similarity index 100%
rename from frontend/src/workflowdata.js
rename to frontend/src/__test__/workflowdata.js
diff --git a/frontend/src/AlertPopup.js b/frontend/src/components/AlertPopup.js
similarity index 100%
rename from frontend/src/AlertPopup.js
rename to frontend/src/components/AlertPopup.js
diff --git a/frontend/src/AlertTemplate.js b/frontend/src/components/AlertTemplate.js
similarity index 100%
rename from frontend/src/AlertTemplate.js
rename to frontend/src/components/AlertTemplate.js
diff --git a/frontend/src/FooterNew.js b/frontend/src/components/FooterNew.js
similarity index 100%
rename from frontend/src/FooterNew.js
rename to frontend/src/components/FooterNew.js
diff --git a/frontend/src/Header.js b/frontend/src/components/Header.js
similarity index 99%
rename from frontend/src/Header.js
rename to frontend/src/components/Header.js
index 7a880bd5..54dfafc2 100644
--- a/frontend/src/Header.js
+++ b/frontend/src/components/Header.js
@@ -194,7 +194,7 @@ const Header = props => {
- {userdata.orgs.length <= 1 ? null :
+ {userdata === undefined || userdata.orgs.length <= 1 ? null :
+ label={
Exit on Error
}
control={
{
workflow.configuration.exit_on_error = !workflow.configuration.exit_on_error
@@ -4791,7 +4790,7 @@ const AngularWorkflow = (props) => {
/>
Start from top