Merge branch 'nightly' of https://github.com/shuffle/shuffle into nightly
This commit is contained in:
@@ -189,6 +189,7 @@ const App = (message, props) => {
|
||||
color: "rgba(255, 255, 255, 0.65)",
|
||||
minHeight: "100vh",
|
||||
}}
|
||||
className='parent-component'
|
||||
>
|
||||
<ScrollToTop
|
||||
getUserNotifications={getUserNotifications}
|
||||
@@ -371,6 +372,7 @@ const App = (message, props) => {
|
||||
element={
|
||||
<Admin
|
||||
isLoggedIn={isLoggedIn}
|
||||
userdata={userdata}
|
||||
setIsLoggedIn={setIsLoggedIn}
|
||||
register={true}
|
||||
isLoaded={isLoaded}
|
||||
|
||||
@@ -302,6 +302,7 @@ const EditWorkflow = (props) => {
|
||||
<Button
|
||||
variant="contained"
|
||||
style={{}}
|
||||
id="save_workflow_button"
|
||||
disabled={name.length === 0 || submitLoading === true}
|
||||
onClick={() => {
|
||||
setSubmitLoading(true)
|
||||
@@ -406,6 +407,7 @@ const EditWorkflow = (props) => {
|
||||
label="Name"
|
||||
autoFocus
|
||||
fullWidth
|
||||
id="Enter-Workflow-Name"
|
||||
/>
|
||||
|
||||
<div style={{ display: "flex", marginTop: 10, }}>
|
||||
|
||||
@@ -461,7 +461,6 @@ const LoginPage = props => {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const onSubmit = (e) => {
|
||||
//toast("Testing from login page")
|
||||
|
||||
|
||||
@@ -4616,6 +4616,7 @@ const Workflows2 = (props) => {
|
||||
variant="contained"
|
||||
color="primary"
|
||||
onClick={handleCreateWorkflow}
|
||||
id="create_workflow_button"
|
||||
style={{
|
||||
borderRadius: 4,
|
||||
flex: 0.8,
|
||||
|
||||
Reference in New Issue
Block a user