mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-08-06 06:47:38 +00:00
Merge branch 'add-cm-features' of https://github.com/naturalcrit/homebrewery into add-cm-features
This commit is contained in:
@@ -61,10 +61,10 @@ const Nav = {
|
|||||||
{icon}
|
{icon}
|
||||||
</a>;
|
</a>;
|
||||||
} else {
|
} else {
|
||||||
return <div {...props} className={classes} onClick={this.handleClick} >
|
return <button {...props} className={classes} onClick={this.handleClick} >
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
{icon}
|
{icon}
|
||||||
</div>;
|
</button>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -320,7 +320,7 @@ const EditPage = (props)=>{
|
|||||||
|
|
||||||
// #5 - No unsaved changes, and has never been saved, hide the button
|
// #5 - No unsaved changes, and has never been saved, hide the button
|
||||||
if(neverSaved)
|
if(neverSaved)
|
||||||
return <Nav.item className='save neverSaved'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
||||||
|
|
||||||
// DEFAULT - No unsaved changes, show SAVED
|
// DEFAULT - No unsaved changes, show SAVED
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ const HomePage =(props)=>{
|
|||||||
|
|
||||||
// #5 - No unsaved changes, and has never been saved, hide the button
|
// #5 - No unsaved changes, and has never been saved, hide the button
|
||||||
if(neverSaved)
|
if(neverSaved)
|
||||||
return <Nav.item className='save neverSaved'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
||||||
|
|
||||||
// DEFAULT - No unsaved changes, show SAVED
|
// DEFAULT - No unsaved changes, show SAVED
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ const NewPage = (props)=>{
|
|||||||
|
|
||||||
// #5 - No unsaved changes, and has never been saved, hide the button
|
// #5 - No unsaved changes, and has never been saved, hide the button
|
||||||
if(neverSaved)
|
if(neverSaved)
|
||||||
return <Nav.item className='save neverSaved'>save now</Nav.item>;
|
return <Nav.item className='save neverSaved' disabled={true}>save now</Nav.item>;
|
||||||
|
|
||||||
// DEFAULT - No unsaved changes, show SAVED
|
// DEFAULT - No unsaved changes, show SAVED
|
||||||
return <Nav.item className='save saved'>saved</Nav.item>;
|
return <Nav.item className='save saved'>saved</Nav.item>;
|
||||||
|
|||||||
Generated
+543
-799
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -105,7 +105,7 @@
|
|||||||
"@dmsnell/diff-match-patch": "^1.1.0",
|
"@dmsnell/diff-match-patch": "^1.1.0",
|
||||||
"@googleapis/drive": "^20.2.0",
|
"@googleapis/drive": "^20.2.0",
|
||||||
"@lezer/highlight": "^1.2.3",
|
"@lezer/highlight": "^1.2.3",
|
||||||
"@oddbird/css-anchor-positioning": "^0.9.0",
|
"@oddbird/css-anchor-positioning": "^0.10.1",
|
||||||
"@sanity/diff-match-patch": "^3.2.0",
|
"@sanity/diff-match-patch": "^3.2.0",
|
||||||
"@vitejs/plugin-react": "^5.1.2",
|
"@vitejs/plugin-react": "^5.1.2",
|
||||||
"body-parser": "^2.2.0",
|
"body-parser": "^2.2.0",
|
||||||
@@ -147,7 +147,7 @@
|
|||||||
"react": "^19.2.7",
|
"react": "^19.2.7",
|
||||||
"react-dom": "^19.2.7",
|
"react-dom": "^19.2.7",
|
||||||
"react-frame-component": "^5.3.2",
|
"react-frame-component": "^5.3.2",
|
||||||
"react-router": "^7.17.0",
|
"react-router": "^8.3.0",
|
||||||
"sanitize-filename": "1.6.4",
|
"sanitize-filename": "1.6.4",
|
||||||
"superagent": "^10.2.1"
|
"superagent": "^10.2.1"
|
||||||
},
|
},
|
||||||
@@ -168,6 +168,6 @@
|
|||||||
"stylelint-config-recess-order": "^7.7.0",
|
"stylelint-config-recess-order": "^7.7.0",
|
||||||
"stylelint-config-recommended": "^18.0.0",
|
"stylelint-config-recommended": "^18.0.0",
|
||||||
"supertest": "^7.1.4",
|
"supertest": "^7.1.4",
|
||||||
"vite": "^7.3.1"
|
"vite": "^8.1.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user