Fixed last minor bugs for open source 1.4
This commit is contained in:
Frikky
Binary file not shown.
|
Before Width: | Height: | Size: 831 B After Width: | Height: | Size: 433 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
@@ -194,6 +194,8 @@ const App = (message, props) => {
|
||||
|
||||
<div style={{ minHeight: 68, maxHeight: 68, }}>
|
||||
<Header
|
||||
billingInfo={{}}
|
||||
|
||||
notifications={notifications}
|
||||
setNotifications={setNotifications}
|
||||
checkLogin={checkLogin}
|
||||
|
||||
@@ -574,7 +574,7 @@ const Billing = (props) => {
|
||||
: null}
|
||||
</ul>
|
||||
</div>
|
||||
{(highlight === true && (subscription.name === "Pay as you go" && subscription.limit <= 10000) || subscription.name === "Open Source") ?
|
||||
{isCloud && (highlight === true && (subscription.name === "Pay as you go" && subscription.limit <= 10000) || subscription.name === "Open Source") ?
|
||||
<span>
|
||||
<Typography variant="body2" color="textSecondary" style={{ marginTop: 20, marginBottom: 10 }}>
|
||||
{subscription.name.includes("Scale") ?
|
||||
|
||||
@@ -444,7 +444,9 @@ const LicencePopup = (props) => {
|
||||
})
|
||||
: null}
|
||||
</ul>
|
||||
Billing email: {selectedOrganization.org}
|
||||
{isCloud ?
|
||||
<span>Billing email: {selectedOrganization.org}</span>
|
||||
: null}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
@@ -467,7 +469,7 @@ const LicencePopup = (props) => {
|
||||
action: "bookcall_upgread_popup",
|
||||
label: "",
|
||||
})};
|
||||
window.open("https://drift.me/frikky", "_blank");
|
||||
window.open("https://drift.me/frikky/meeting", "_blank");
|
||||
// if (isLoggedIn) {
|
||||
// isLoggedInHandler()
|
||||
// } else {
|
||||
@@ -475,7 +477,9 @@ const LicencePopup = (props) => {
|
||||
// }
|
||||
}}
|
||||
>
|
||||
Book a call
|
||||
<span style={{color: "#f85a3e",}}>
|
||||
Book a call
|
||||
</span>
|
||||
<span
|
||||
style={{
|
||||
position: "absolute",
|
||||
@@ -706,6 +710,10 @@ const LicencePopup = (props) => {
|
||||
clientReferenceId: props.userdata.active_org.id,
|
||||
}
|
||||
|
||||
if (stripe === undefined || stripe === null || stripe.redirectToCheckout === undefined) {
|
||||
window.open("https://shuffler.io/admin?admin_tab=billing&payment=stripe_error", "_self")
|
||||
}
|
||||
|
||||
stripe.redirectToCheckout(checkoutObject)
|
||||
.then(function (result) {
|
||||
console.log("SUCCESS STRIPE?: ", result)
|
||||
@@ -764,6 +772,7 @@ const LicencePopup = (props) => {
|
||||
}}
|
||||
highlight={true}
|
||||
/>
|
||||
{/*
|
||||
<SubscriptionObject
|
||||
index={1}
|
||||
globalUrl={globalUrl}
|
||||
@@ -783,6 +792,7 @@ const LicencePopup = (props) => {
|
||||
}}
|
||||
highlight={false}
|
||||
/>
|
||||
*/}
|
||||
</span>
|
||||
: null}
|
||||
|
||||
@@ -869,7 +879,7 @@ const LicencePopup = (props) => {
|
||||
<div style={{ display: 'flex', alignItems: 'center' }}>
|
||||
<span>{defaultTaskIcon}</span>
|
||||
<Typography style={{ fontSize: 14, marginLeft: 8 }}>
|
||||
{shuffleVariant === 0 ? "Multi-Tenant" : "Scalable Orborus"}
|
||||
{shuffleVariant === 0 ? "Multi-Tenant" : "Lightning-Fast Workflows"}
|
||||
</Typography>
|
||||
</div>
|
||||
<Divider />
|
||||
@@ -895,12 +905,16 @@ const LicencePopup = (props) => {
|
||||
style={{ borderRadius: "0px", textTransform: "capitalize" }}
|
||||
onClick={() => {
|
||||
if (isCloud) {
|
||||
ReactGA.event({
|
||||
category: "header",
|
||||
action: "viewplan_upgread_popup",
|
||||
label: "",
|
||||
})};
|
||||
navigate("/pricing")
|
||||
ReactGA.event({
|
||||
category: "header",
|
||||
action: "viewplan_upgread_popup",
|
||||
label: "",
|
||||
})
|
||||
|
||||
navigate("/pricing")
|
||||
} else {
|
||||
window.open("https://shuffler.io/pricing?tab=onprem", "_blank")
|
||||
}
|
||||
setModalOpen(false)
|
||||
}}
|
||||
color="primary"
|
||||
@@ -912,16 +926,24 @@ const LicencePopup = (props) => {
|
||||
style={{ borderRadius: 20, width: 120, textTransform: "capitalize" }}
|
||||
onClick={() => {
|
||||
if (isCloud) {
|
||||
ReactGA.event({
|
||||
category: "header",
|
||||
action: "upgread_clicks_popup",
|
||||
label: "",
|
||||
})};
|
||||
if (isLoggedIn) {
|
||||
isLoggedInHandler()
|
||||
} else {
|
||||
navigate(`/register?view=pricing&message=You need to create a user to continue`)
|
||||
}
|
||||
ReactGA.event({
|
||||
category: "header",
|
||||
action: "upgread_clicks_popup",
|
||||
label: "",
|
||||
})
|
||||
|
||||
if (isLoggedIn) {
|
||||
isLoggedInHandler()
|
||||
} else {
|
||||
navigate(`/register?view=pricing&message=You need to create a user to continue`)
|
||||
}
|
||||
} else {
|
||||
if (window.drift !== undefined) {
|
||||
window.drift.api.startInteraction({
|
||||
interactionId: 386403,
|
||||
})
|
||||
}
|
||||
}
|
||||
}}
|
||||
color="primary"
|
||||
>
|
||||
|
||||
@@ -66,7 +66,6 @@ const Header = (props) => {
|
||||
billingInfo
|
||||
} = props;
|
||||
|
||||
|
||||
const [HomeHoverColor, setHomeHoverColor] = useState(hoverOutColor);
|
||||
const [SoarHoverColor, setSoarHoverColor] = useState(hoverOutColor);
|
||||
const [LoginHoverColor, setLoginHoverColor] = useState(hoverOutColor);
|
||||
@@ -683,22 +682,7 @@ const Header = (props) => {
|
||||
marginRight: 10,
|
||||
};
|
||||
|
||||
const modalView = (
|
||||
<>
|
||||
{modalOpen && (
|
||||
<div
|
||||
style={{
|
||||
position: "fixed",
|
||||
top: 0,
|
||||
left: 0,
|
||||
width: "100%",
|
||||
height: "100%",
|
||||
backgroundColor: "rgba(0, 0, 0, 0.5)",
|
||||
zIndex: 1299,
|
||||
backdropFilter: "blur(5px)",
|
||||
}}
|
||||
></div>
|
||||
)}
|
||||
const modalView =
|
||||
<Dialog
|
||||
open={modalOpen}
|
||||
onClose={() => {
|
||||
@@ -709,7 +693,7 @@ const Header = (props) => {
|
||||
color: "white",
|
||||
minWidth: 850,
|
||||
minHeight: 370,
|
||||
padding: 10,
|
||||
padding: 20,
|
||||
backgroundColor: "rgba(0, 0, 0, 1)",
|
||||
borderRadius: theme.palette.borderRadius,
|
||||
},
|
||||
@@ -746,7 +730,9 @@ const Header = (props) => {
|
||||
isLoaded={isLoaded}
|
||||
isLoggedIn={isLoggedIn}
|
||||
globalUrl={globalUrl}
|
||||
|
||||
billingInfo={billingInfo}
|
||||
|
||||
userdata={userdata}
|
||||
stripeKey={stripeKey}
|
||||
setModalOpen={setModalOpen}
|
||||
@@ -754,8 +740,6 @@ const Header = (props) => {
|
||||
/>
|
||||
</div>
|
||||
</Dialog>
|
||||
</>
|
||||
);
|
||||
|
||||
// Handle top bar or something
|
||||
const defaultTop = -2
|
||||
@@ -1247,7 +1231,7 @@ const Header = (props) => {
|
||||
title={""}
|
||||
placement="left"
|
||||
>
|
||||
<div style={{ display: "flex", marginLeft: 85, }}>
|
||||
<div style={{ display: "flex", marginLeft: 50, marginRight: 50, }}>
|
||||
<AddIcon />
|
||||
<span style={{ marginLeft: 8 }}>
|
||||
Add suborgs
|
||||
|
||||
@@ -3279,7 +3279,7 @@ const Workflows = (props) => {
|
||||
<Button
|
||||
color="secondary"
|
||||
style={{}}
|
||||
disabled={true}
|
||||
disabled={isCloud}
|
||||
variant="text"
|
||||
onClick={() => {
|
||||
exportAllWorkflows(workflows);
|
||||
|
||||
Reference in New Issue
Block a user