+
+ {/*
-
-
-
-
-
+
+
+
+
+ */}
+
+
+
);
});
diff --git a/frontend/src/components/AppCreationModal.jsx b/frontend/src/components/AppCreationModal.jsx
index f5a25169..80cf1711 100644
--- a/frontend/src/components/AppCreationModal.jsx
+++ b/frontend/src/components/AppCreationModal.jsx
@@ -59,6 +59,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
: "1px solid rgba(255,255,255,0.3)",
borderImage: makeFancy ? "linear-gradient(to right, #ff8544 0%, #ec517c 50%, #9c5af2 100%) 1" : "none",
transition: 'all 0.2s ease-in-out',
+ paddingBottom: isCloud ? 0 : 175,
}
return (
@@ -416,7 +417,7 @@ const AppCreationModal = ({ open, onClose, theme, globalUrl, isCloud }) => {
App Authentication Groups
@@ -1415,13 +1420,14 @@ const AppAuthTab = memo((props) => { ); } )} - -
+
{
diff --git a/frontend/src/components/EnvironmentTab.jsx b/frontend/src/components/EnvironmentTab.jsx
index cd0a9416..15efd2fc 100644
--- a/frontend/src/components/EnvironmentTab.jsx
+++ b/frontend/src/components/EnvironmentTab.jsx
@@ -1420,7 +1420,7 @@ const EnvironmentTab = memo((props) => {
-
+
Self-Hosted Orborus instance
diff --git a/frontend/src/components/TenantsTab.jsx b/frontend/src/components/TenantsTab.jsx
index 0d8c3df2..afeb9563 100644
--- a/frontend/src/components/TenantsTab.jsx
+++ b/frontend/src/components/TenantsTab.jsx
@@ -497,7 +497,9 @@ const TenantsTab = memo((props) => {
response.json().then((responseJson) => {
if (responseJson["success"] === false) {
if (responseJson.reason !== undefined) {
- toast(responseJson.reason);
+ toast.error(responseJson.reason, {
+ autoClose: 5000,
+ })
} else {
toast("Failed creating suborg. Please try again");
}
@@ -781,7 +783,7 @@ const TenantsTab = memo((props) => {
- {
style={{ display:'table-cell',verticalAlign: 'middle', padding: "8px", }}
/>
- {/*
{
}
style={{ display:'table-cell', verticalAlign: 'middle',padding: "8px", color: data.mfa_info.active ? "#02CB70" : "#F53434" }}
/>
- */}
{selectedOrganization?.child_orgs !== undefined &&
selectedOrganization?.child_orgs !== null &&
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 16d5e9d0..51812543 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -11446,7 +11446,7 @@ const AngularWorkflow = (defaultprops) => {
var type = "app"
const baseImage =
Organizations
+Tenants
Control sub organizations (tenants)! {" "} {isCloud diff --git a/frontend/src/components/UserManagmentTab.jsx b/frontend/src/components/UserManagmentTab.jsx index 2bb924b0..8aff24a5 100644 --- a/frontend/src/components/UserManagmentTab.jsx +++ b/frontend/src/components/UserManagmentTab.jsx @@ -1557,10 +1557,12 @@ const UserManagmentTab = memo((props) => { style={{ display:'table-cell', verticalAlign: 'middle' }} /> + {/*
+
-
{hits.length === 0 ?
Are you sure you want to PUBLISH this app?
{data.tags && (
{
{
}}
/>
{
{
- const {
- globalUrl,
- isLoaded,
- isLoggedIn,
- setIsLoggedIn,
- setCookie,
- register,
- checkLogin,
- } = props;
- let navigate = useNavigate();
- const classes = useStyles();
+const FreePlanCard = ({ classes }) => {
+ const features = [
+ "Access to All Apps",
+ "10,000 App Runs",
+ "Monthly Runs Refresh",
+ "Unlimited Users & Workflows",
+ "Multi-Tenancy & -Region",
+ "Support & Discord Access"
+ ];
- const [username, setUsername] = useState("");
- const [password, setPassword] = useState("");
- const [firstRequest, setFirstRequest] = useState(true);
- const [loginLoading, setLoginLoading] = useState(false);
- const [loginViewLoading, setLoginViewLoading] = useState(false);
- const [ssoUrl, setSSOUrl] = useState("");
+ return (
+ {formtitle}
+
+ const buttonBackground = "linear-gradient(89.83deg, #FF8444 0.13%, #F2643B 99.84%)"
+
+ const buttonStyle = { borderRadius: 25, height: 50, fontSize: 18, backgroundImage: handleValidateForm(username, password) || loginLoading || (checkboxClicked && register) ? buttonBackground : "grey", color: "white" }
+ //
+ ) : ();
- var formtitle = register ?
+ );
};
-export default LoginDialog;
+const MarketplaceCard = ({ classes }) => {
+ const marketplaceOptions = [
+ {
+ name: "Amazon Web Services",
+ logo: "https://cdn.cdnlogo.com/logos/a/19/aws.svg",
+ tooltipText: "Coming soon to AWS Marketplace!",
+ valid: false,
+ },
+ {
+ name: "Microsoft Azure",
+ logo: "https://cdn.cdnlogo.com/logos/a/12/azure.svg",
+ tooltipText: "Coming soon to Azure Marketplace!",
+ valid: false,
+ },
+ {
+ name: "Google Cloud Platform",
+ logo: "https://cdn.cdnlogo.com/logos/g/75/google-cloud.svg",
+ tooltipText: "Coming soon to Google Cloud Marketplace!",
+ valid: false,
+ }
+ ];
+
+ return (
+ + The free plan includes: +
- const [MFAField, setMFAField] = useState(false); - const [MFAValue, setMFAValue] = useState(""); - - - // Used to swap from login to register. True = login, false = register - - useEffect(() => { - checkAdmin() - }, [loginViewLoading]) - - // Error messages etc - const [loginInfo, setLoginInfo] = useState(""); - - const handleValidateForm = () => { - return username.length > 1 && password.length > 1; - }; - - if (isLoggedIn === true) { - //window.location.pathname = "/workflows"; - navigate("/workflows") - } - - const checkAdmin = () => { - const url = globalUrl + "/api/v1/checkusers"; - fetch(url, { - method: "GET", - headers: { - "Content-Type": "application/json", - }, - }) - .then((response) => - response.json().then((responseJson) => { - if (responseJson["success"] === false) { - setLoginInfo(responseJson["reason"]); - } else { - - if (responseJson.sso_url !== undefined && responseJson.sso_url !== null) { - setSSOUrl(responseJson.sso_url); - } - - if (loginViewLoading) { - setLoginViewLoading(false); - checkLogin(); - stop(); - - if ( - responseJson.reason !== undefined && - responseJson.reason !== null - ) { - setLoginInfo(responseJson.reason); - } - } - - if (responseJson.reason === "stay") { - navigate("/adminsetup") - } - } - }) - ) - .catch((error) => { - if (!loginViewLoading) { - setLoginViewLoading(true); - start(); - } - }); - }; - - const { start, stop } = useInterval({ - duration: 3000, - startImmediate: false, - callback: () => { - checkAdmin(); - }, - }); - - if (firstRequest) { - setFirstRequest(false); - checkAdmin(); - } - - const onSubmit = (e) => { - setLoginLoading(true); - e.preventDefault(); - setLoginInfo(""); - // FIXME - add some check here ROFL - - // Just use this one? - var data = { username: username, password: password }; - if (MFAValue !== undefined && MFAValue !== null && MFAValue.length > 0) { - data["mfa_code"] = MFAValue; - } - - var baseurl = globalUrl; - if (register) { - var url = baseurl + "/api/v1/login"; - fetch(url, { - mode: "cors", - method: "POST", - body: JSON.stringify(data), - credentials: "include", - crossDomain: true, - withCredentials: true, - headers: { - "Content-Type": "application/json; charset=utf-8", - }, - }) - .then((response) => - response.json().then((responseJson) => { - setLoginLoading(false); - if (responseJson["success"] === false) { - setLoginInfo(responseJson["reason"]); - } else { - if (responseJson["reason"] === "MFA_REDIRECT") { - setLoginInfo( - "MFA required. Please enter the 6-digit code from your authenticator" - ); - setMFAField(true); - return; - } else if (responseJson["reason"] === "MFA_SETUP") { - window.location.href = `/login/${responseJson.url}/mfa-setup`; - return; - } - - setLoginInfo("Successful login, rerouting"); - for (var key in responseJson["cookies"]) { - setCookie( - responseJson["cookies"][key].key, - responseJson["cookies"][key].value, - { path: "/" } - ); - } - - if (responseJson.tutorials === undefined || responseJson.tutorials === null || !responseJson.tutorials.includes("welcome")) { - console.log("RUN Welcome!!") - setTimeout(() => { - navigate("/welcome?tab=2") - },200) - // window.location.pathname = "" - return - } - - const tmpView = new URLSearchParams(window.location.search).get("view") - if (tmpView !== undefined && tmpView !== null) { - //const newUrl = `/${tmpView}${decodeURIComponent(window.location.search)}` - const newUrl = `/${tmpView}` - window.location.pathname = newUrl - } else { - window.location.pathname = "/workflows" - } - - setIsLoggedIn(true); - } - }) - ) - .catch((error) => { - setLoginLoading(false); - setLoginInfo("Error logging in: " + error); - }); - } else { - url = baseurl + "/api/v1/users/register"; - fetch(url, { - method: "POST", - body: JSON.stringify(data), - headers: { - "Content-Type": "application/json", - }, - }) - .then((response) => - response.json().then((responseJson) => { - if (responseJson["success"] === false) { - setLoginInfo(responseJson["reason"]); - } else { - setLoginInfo("Successful register!"); - } - }) - ) - .catch((error) => { - setLoginInfo("Error in from backend: ", error); - }); - } - }; - - const onChangeUser = (e) => { - setUsername(e.target.value); - }; - - const onChangePass = (e) => { - setPassword(e.target.value); - }; - - //const onClickRegister = () => { - // if (props.location.pathname === "/login") { - // window.location.pathname = "/register" - // } else { - // window.location.pathname = "/login" - // } - - // setLoginCheck(!register) - //} - - //var loginChange = register ? (Want to register? Click here.
Go back to login? Click here.
Login
: Register
;
- const imgsize = 100;
- const basedata = (
-
-
-
-
- );
-
- const loadedCheck = isLoaded ?
- 
-
-
- {loginViewLoading ? (
-
-
-
- Waiting for the Shuffle database to become available. This may
- take up to a minute.
-
-
- {loginInfo === undefined ||
- loginInfo === null ||
- loginInfo.length === 0 ? null : (
-
-
-
- Are you sure Shuffle is{" "}
-
- installed correctly
-
- ?
-
-
-
- 1. Make sure shuffle-database folder has correct access, and that you have a minimum of 2Gb of RAM available:{" "}
-
-
- sudo chown -R 1000:1000 shuffle-database -
-
- 2. Disable memory swap on the host:
-
-
- sudo swapoff -a -
-
- 3. Restart the database:
-
-
- sudo docker restart shuffle-opensearch -
-
-
- Need help?{" "}
-
- Join the Discord!
-
-
-
- ) : (
-
- )}
- Database Response: {loginInfo}
- )}
- -
- sudo chown -R 1000:1000 shuffle-database -
-
- sudo swapoff -a -
-
- sudo docker restart shuffle-opensearch -
{basedata}
: ;
-
- useEffect(() => {
- setTimeout(() => {
- if (ssoUrl !== undefined && ssoUrl !== null && ssoUrl.length > 0) {
- //id="sso_button"
- const ssoBtn = document.getElementById("sso_button");
- if (ssoBtn !== undefined && ssoBtn !== null) {
- //console.log("SSO BTN: ", ssoBtn)
- const cursearch = typeof window === "undefined" || window.location === undefined ? "" : window.location.search;
- var tmpView = new URLSearchParams(cursearch).get("autologin");
- if (tmpView !== undefined && tmpView !== null) {
- if (tmpView === "true") {
- console.log("Tmp: ", tmpView)
- ssoBtn.click()
- }
- }
- }
- }
- }, 200);
- }, [ssoUrl])
-
- return {loadedCheck}
;
+ {features.map((feature, index) => (
+
+
+ ))}
+
+
+
+
+ ))}
+
+
+ );
+};
+
+
+const LoginPage = props => {
+ const { globalUrl, isLoaded, isLoggedIn, setIsLoggedIn, setCookie, inregister, serverside } = props;
+ let navigate = useNavigate();
+ const [username, setUsername] = useState("");
+ const [password, setPassword] = useState("");
+ const [message, setMessage] = useState("");
+ const [loginLoading, setLoginLoading] = useState(false);
+
+ const [MFAField, setMFAField] = useState(false);
+ const [MFAValue, setMFAValue] = useState("");
+ const [register, setRegister] = useState(inregister);
+ const [checkboxClicked, setCheckboxClicked] = useState(false);
+ const [loginWithSSO, setLoginWithSSO] = useState(false)
+
+ const isCloud = window.location.host === "localhost:3002" || window.location.host === "shuffler.io" || window.location.host === "migration.shuffler.io";
+ const parsedsearch = serverside === true ? "" : window.location.search
+ if (serverside !== true) {
+ const tmpMessage = new URLSearchParams(window.location.search).get("message")
+ if (tmpMessage !== undefined && tmpMessage !== null && message !== tmpMessage) {
+ setMessage(tmpMessage)
+ }
+ }
+
+ if (document !== undefined) {
+ if (register) {
+ document.title = "Login to Shuffle SaaS"
+ } else {
+ document.title = "Register to Shuffle SaaS"
+ }
+ }
+
+ // Just a way to force location loading properly
+ // Register & login should be split :3
+ if (window !== undefined) {
+ const path = window.location.pathname;
+ if (path.includes("/login") && register === false) {
+ console.log("Should register instead of login!")
+ setRegister(!register)
+ } else if (path.includes("/register") && register === true) {
+ if (!isCloud) {
+ setRegister(true)
+ navigate("/login")
+ }
+
+ console.log("Should login instead of register!")
+ setRegister(!register)
+ } else {
+ console.log("Path: " + path, "Register: " + register)
+ }
+ }
+
+ const bodyDivStyle = {
+ marginTop: 100,
+ width: isMobile ? "100%" : "100%",
+ maxWidth: "1200px", // Increased max-width to accommodate larger cards
+ background: "#1A1A1A",
+ margin: "auto",
+ display: isMobile ? "block" : "flex",
+ padding: "40px",
+ gap: "40px",
+ overflow: "hidden",
+ alignItems: "center"
+ };
+
+ const boxStyle = {
+ color: "white",
+ padding: "40px",
+ flex: 1,
+ maxWidth: isMobile ? "100%" : "550px",
+ background: "#212121",
+ borderRadius: "12px",
+ display: "flex",
+ // flexDirection: "column",
+ };
+
+
+
+ const paperStyleReg = {
+ width: 300,
+ height: 350,
+ background: "#212121",
+ borderRadius: "8px",
+ marginLeft: isMobile ? 80 : register ? "455px" : "485px",
+ marginTop: isMobile ? 10 : 110,
+ position: isMobile ? "" : "absolute",
+
+ }
+ const paperStyleLog = {
+ position: "absolute",
+ width: isMobile ? "400px" : "532px",
+ padding: "0px 30px 0px",
+ // marginTop: "135px",
+ // background: "#212121",
+ borderRadius: "8px",
+ }
+ const createData = (icon, title) => {
+ return {
+ icon,
+ title,
+ }
+ }
+
+ // Used to swap from login to register. True = login, false = register
+ const activeIcon = + Self Host +
+ + {marketplaceOptions.map((option, index) => ( +
+ {/*
+
+ Read more about marketplaces
+
+ */}
+
+ Read more about self hosting
+
+
+
+ Want to register? Click here.
Go back to login? Click here.
Welcome Back!
: Create your account
+ var formButton = !isCloud ? "" : register ? Don’t have an account yet?
Register here
Already have an account?
Login here
Click here to Login
+
+ //