mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-11-18 20:29:43 +00:00
Move googleDrive button into common hook
This commit is contained in:
@@ -10,13 +10,9 @@ import { DEFAULT_BREW_LOAD } from '../../../../server/brewDefau
|
|||||||
|
|
||||||
import useCommonEditPageFunctions from '../../utils/commonEditPageFunctions.jsx';
|
import useCommonEditPageFunctions from '../../utils/commonEditPageFunctions.jsx';
|
||||||
|
|
||||||
import Nav from '@navbar/nav.jsx';
|
|
||||||
|
|
||||||
// Page specific imports
|
// Page specific imports
|
||||||
import { gzipSync, strToU8 } from 'fflate';
|
import { gzipSync, strToU8 } from 'fflate';
|
||||||
|
|
||||||
import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
|
import { updateHistory, versionHistoryGarbageCollection } from '../../utils/versionHistory.js';
|
||||||
import googleDriveIcon from '../../googleDrive.svg';
|
|
||||||
|
|
||||||
const useLocalStorage = false;
|
const useLocalStorage = false;
|
||||||
const sandbox = false;
|
const sandbox = false;
|
||||||
@@ -31,42 +27,7 @@ const EditPage = (props)=>{
|
|||||||
};
|
};
|
||||||
|
|
||||||
const [currentBrew, setCurrentBrew] = useState(props.brew);
|
const [currentBrew, setCurrentBrew] = useState(props.brew);
|
||||||
const [saveGoogle, setSaveGoogle] = useState(!!props.brew.googleId);
|
|
||||||
const [error, setError] = useState(null);
|
const [error, setError] = useState(null);
|
||||||
const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(props.brew.trashed);
|
|
||||||
const [alertNoGoogleToTransfer, setAlertNoGoogleToTransfer] = useState(false);
|
|
||||||
const [alertOwnershipToTransfer, setAlertOwnershipToTransfer] = useState(false);
|
|
||||||
const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false);
|
|
||||||
|
|
||||||
const handleGoogleClick = ()=>{
|
|
||||||
if(currentBrew.authors.length > 0 && global.account?.username !== currentBrew.authors[0]) {
|
|
||||||
setAlertOwnershipToTransfer(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if(!global.account?.googleId) {
|
|
||||||
setAlertNoGoogleToTransfer(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setConfirmGoogleTransfer((prev)=>!prev);
|
|
||||||
setError(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const closeAlerts = (e)=>{
|
|
||||||
e.stopPropagation(); //Only handle click once so alert doesn't reopen
|
|
||||||
setAlertTrashedGoogleBrew(false);
|
|
||||||
setAlertNoGoogleToTransfer(false);
|
|
||||||
setConfirmGoogleTransfer(false);
|
|
||||||
setAlertOwnershipToTransfer(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleGoogleStorage = (e)=>{
|
|
||||||
closeAlerts(e);
|
|
||||||
const newSaveGoogle = !saveGoogle;
|
|
||||||
setSaveGoogle((prev)=>!prev);
|
|
||||||
setError(null);
|
|
||||||
trySave(true, true, newSaveGoogle);
|
|
||||||
};
|
|
||||||
|
|
||||||
const save = async (brew, saveToGoogle)=>{
|
const save = async (brew, saveToGoogle)=>{
|
||||||
await updateHistory(brew).catch(console.error);
|
await updateHistory(brew).catch(console.error);
|
||||||
@@ -101,56 +62,9 @@ const EditPage = (props)=>{
|
|||||||
history.replaceState(null, null, `/edit/${savedBrew.editId}`);;
|
history.replaceState(null, null, `/edit/${savedBrew.editId}`);;
|
||||||
};
|
};
|
||||||
|
|
||||||
const renderGoogleDriveIcon = ()=>(
|
|
||||||
<Nav.item className='googleDriveStorage' onClick={handleGoogleClick}>
|
|
||||||
<img src={googleDriveIcon} className={saveGoogle ? '' : 'inactive'} alt='Google Drive icon' />
|
|
||||||
|
|
||||||
{alertOwnershipToTransfer && (
|
|
||||||
<div className='errorContainer'>
|
|
||||||
You must be the Owner to transfer between the Homebrewery and Google Drive!
|
|
||||||
The owner of this file is {currentBrew.authors[0]}.
|
|
||||||
<br></br>
|
|
||||||
<div className='confirm' onClick={closeAlerts}> Okay </div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{alertNoGoogleToTransfer && (
|
|
||||||
<div className='errorContainer'>
|
|
||||||
You must be signed in to a Google account to transfer between the Homebrewery and Google Drive!
|
|
||||||
<a target='_blank' rel='noopener noreferrer' href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
|
|
||||||
<div className='confirm' onClick={closeAlerts}> Sign In </div>
|
|
||||||
</a>
|
|
||||||
<div className='deny' onClick={closeAlerts}> Not Now </div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{alertTrashedGoogleBrew && (
|
|
||||||
<div className='errorContainer'>
|
|
||||||
This brew is currently in your Trash folder on Google Drive!<br />
|
|
||||||
If you want to keep it, make sure to move it before it is deleted permanently!<br />
|
|
||||||
<div className='confirm' onClick={toggleGoogleStorage}> Save my brew </div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{confirmGoogleTransfer && (
|
|
||||||
<div className='errorContainer'>
|
|
||||||
{saveGoogle
|
|
||||||
? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?'
|
|
||||||
: 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'}
|
|
||||||
<br />
|
|
||||||
<div className='confirm' onClick={toggleGoogleStorage}> Yes </div>
|
|
||||||
<div className='deny' onClick={closeAlerts}> No </div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</Nav.item>
|
|
||||||
);
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
renderPanels,
|
renderPanels,
|
||||||
trySave,
|
|
||||||
} = useCommonEditPageFunctions({
|
} = useCommonEditPageFunctions({
|
||||||
saveGoogle,
|
|
||||||
setSaveGoogle,
|
|
||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
currentBrew,
|
currentBrew,
|
||||||
@@ -162,7 +76,6 @@ const EditPage = (props)=>{
|
|||||||
onSaveSuccess,
|
onSaveSuccess,
|
||||||
pageName,
|
pageName,
|
||||||
showEditorButtons,
|
showEditorButtons,
|
||||||
renderGoogleDriveIcon,
|
|
||||||
userThemes : props.userThemes
|
userThemes : props.userThemes
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -23,12 +23,11 @@ const HomePage =(props)=>{
|
|||||||
};
|
};
|
||||||
|
|
||||||
const [currentBrew, setCurrentBrew] = useState(props.brew);
|
const [currentBrew, setCurrentBrew] = useState(props.brew);
|
||||||
const [saveGoogle, setSaveGoogle] = useState(global.account?.googleId ? true : false);
|
|
||||||
const [error, setError] = useState(undefined);
|
const [error, setError] = useState(undefined);
|
||||||
|
|
||||||
const save = async (brew, saveToGoogle)=>{
|
const save = async (brew, saveToGoogle)=>{
|
||||||
const res = await request
|
const res = await request
|
||||||
.post(`/api${saveGoogle ? '?saveToGoogle=true' : ''}`)
|
.post(`/api${saveToGoogle ? '?saveToGoogle=true' : ''}`)
|
||||||
.send(brew)
|
.send(brew)
|
||||||
.catch((err)=>{
|
.catch((err)=>{
|
||||||
console.error('Error Updating Local Brew');
|
console.error('Error Updating Local Brew');
|
||||||
@@ -47,8 +46,6 @@ const HomePage =(props)=>{
|
|||||||
const {
|
const {
|
||||||
renderPanels
|
renderPanels
|
||||||
} = useCommonEditPageFunctions({
|
} = useCommonEditPageFunctions({
|
||||||
saveGoogle,
|
|
||||||
setSaveGoogle,
|
|
||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
currentBrew,
|
currentBrew,
|
||||||
|
|||||||
@@ -23,12 +23,11 @@ const NewPage = (props)=>{
|
|||||||
};
|
};
|
||||||
|
|
||||||
const [currentBrew, setCurrentBrew] = useState(props.brew);
|
const [currentBrew, setCurrentBrew] = useState(props.brew);
|
||||||
const [saveGoogle, setSaveGoogle] = useState(global.account?.googleId ? true : false);
|
|
||||||
const [error, setError] = useState(null);
|
const [error, setError] = useState(null);
|
||||||
|
|
||||||
const save = async (brew, saveToGoogle)=>{
|
const save = async (brew, saveToGoogle)=>{
|
||||||
const res = await request
|
const res = await request
|
||||||
.post(`/api${saveGoogle ? '?saveToGoogle=true' : ''}`)
|
.post(`/api${saveToGoogle ? '?saveToGoogle=true' : ''}`)
|
||||||
.send(brew)
|
.send(brew)
|
||||||
.catch((err)=>{
|
.catch((err)=>{
|
||||||
console.error('Error Updating Local Brew');
|
console.error('Error Updating Local Brew');
|
||||||
@@ -47,8 +46,6 @@ const NewPage = (props)=>{
|
|||||||
const {
|
const {
|
||||||
renderPanels
|
renderPanels
|
||||||
} = useCommonEditPageFunctions({
|
} = useCommonEditPageFunctions({
|
||||||
saveGoogle,
|
|
||||||
setSaveGoogle,
|
|
||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
currentBrew,
|
currentBrew,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import PrintNavItem from '@navbar/print.navitem.jsx';
|
|||||||
import ShareNavItem from '@navbar/share.navitem.jsx';
|
import ShareNavItem from '@navbar/share.navitem.jsx';
|
||||||
import RecentNavItems from '@navbar/recent.navitem.jsx';
|
import RecentNavItems from '@navbar/recent.navitem.jsx';
|
||||||
const { both: RecentNavItem } = RecentNavItems;
|
const { both: RecentNavItem } = RecentNavItems;
|
||||||
|
import googleDriveIcon from '../../googleDrive.svg';
|
||||||
|
|
||||||
const AUTOSAVE_KEY = 'HB_editor_autoSaveOn';
|
const AUTOSAVE_KEY = 'HB_editor_autoSaveOn';
|
||||||
const BREWKEY = 'HB_newPage_content';
|
const BREWKEY = 'HB_newPage_content';
|
||||||
@@ -38,8 +39,6 @@ const UNSAVED_WARNING_POPUP_TIMEOUT = 4000; //Show the warning for 4 seconds
|
|||||||
|
|
||||||
export default function useCommonEditPageFunctions(dependencies) {
|
export default function useCommonEditPageFunctions(dependencies) {
|
||||||
const {
|
const {
|
||||||
saveGoogle,
|
|
||||||
setSaveGoogle,
|
|
||||||
error,
|
error,
|
||||||
setError,
|
setError,
|
||||||
currentBrew,
|
currentBrew,
|
||||||
@@ -50,7 +49,6 @@ export default function useCommonEditPageFunctions(dependencies) {
|
|||||||
save,
|
save,
|
||||||
onSaveSuccess,
|
onSaveSuccess,
|
||||||
pageName,
|
pageName,
|
||||||
renderGoogleDriveIcon = ()=>{},
|
|
||||||
showEditorButtons,
|
showEditorButtons,
|
||||||
userThemes = {}
|
userThemes = {}
|
||||||
} = dependencies;
|
} = dependencies;
|
||||||
@@ -62,6 +60,12 @@ export default function useCommonEditPageFunctions(dependencies) {
|
|||||||
const [unsavedChanges, setUnsavedChanges] = useState(false);
|
const [unsavedChanges, setUnsavedChanges] = useState(false);
|
||||||
const [themeBundle, setThemeBundle] = useState({});
|
const [themeBundle, setThemeBundle] = useState({});
|
||||||
const [HTMLErrors, setHTMLErrors] = useState(hbfm.validate(currentBrew.text));
|
const [HTMLErrors, setHTMLErrors] = useState(hbfm.validate(currentBrew.text));
|
||||||
|
const [saveGoogle, setSaveGoogle] = useState(currentBrew.googleId);
|
||||||
|
|
||||||
|
const [alertTrashedGoogleBrew, setAlertTrashedGoogleBrew] = useState(currentBrew.trashed);
|
||||||
|
const [alertNoGoogleToTransfer, setAlertNoGoogleToTransfer] = useState(false);
|
||||||
|
const [alertOwnershipToTransfer, setAlertOwnershipToTransfer] = useState(false);
|
||||||
|
const [confirmGoogleTransfer, setConfirmGoogleTransfer] = useState(false);
|
||||||
|
|
||||||
const [currentEditorViewPageNum, setCurrentEditorViewPageNum] = useState(1);
|
const [currentEditorViewPageNum, setCurrentEditorViewPageNum] = useState(1);
|
||||||
const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
|
const [currentEditorCursorPageNum, setCurrentEditorCursorPageNum] = useState(1);
|
||||||
@@ -276,13 +280,89 @@ export default function useCommonEditPageFunctions(dependencies) {
|
|||||||
snippets : newData.snippets
|
snippets : newData.snippets
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
//======----- Google Toggle Button -----======
|
||||||
|
const closeAlerts = (e)=>{
|
||||||
|
e.stopPropagation(); //Only handle click once so alert doesn't reopen
|
||||||
|
setAlertTrashedGoogleBrew(false);
|
||||||
|
setAlertNoGoogleToTransfer(false);
|
||||||
|
setConfirmGoogleTransfer(false);
|
||||||
|
setAlertOwnershipToTransfer(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleGoogleClick = ()=>{
|
||||||
|
if(currentBrew.authors.length > 0 && global.account?.username !== currentBrew.authors[0]) {
|
||||||
|
setAlertOwnershipToTransfer(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(!global.account?.googleId) {
|
||||||
|
setAlertNoGoogleToTransfer(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setConfirmGoogleTransfer((prev)=>!prev);
|
||||||
|
setError(null);
|
||||||
|
};
|
||||||
|
|
||||||
|
const toggleGoogleStorage = (e)=>{
|
||||||
|
closeAlerts(e);
|
||||||
|
const newSaveGoogle = !saveGoogle;
|
||||||
|
setSaveGoogle((prev)=>!prev);
|
||||||
|
setError(null);
|
||||||
|
trySave(true, true, newSaveGoogle);
|
||||||
|
};
|
||||||
|
|
||||||
|
const renderGoogleDriveIcon = ()=>(
|
||||||
|
<Nav.item className='googleDriveStorage' onClick={handleGoogleClick}>
|
||||||
|
<img src={googleDriveIcon} className={saveGoogle ? '' : 'inactive'} alt='Google Drive icon' />
|
||||||
|
|
||||||
|
{alertOwnershipToTransfer && (
|
||||||
|
<div className='errorContainer'>
|
||||||
|
You must be the Owner to transfer between the Homebrewery and Google Drive!
|
||||||
|
The owner of this file is {currentBrew.authors[0]}.
|
||||||
|
<br></br>
|
||||||
|
<div className='confirm' onClick={closeAlerts}> Okay </div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{alertNoGoogleToTransfer && (
|
||||||
|
<div className='errorContainer'>
|
||||||
|
You must be signed in to a Google account to transfer between the Homebrewery and Google Drive!
|
||||||
|
<a target='_blank' rel='noopener noreferrer' href={`https://www.naturalcrit.com/login?redirect=${window.location.href}`}>
|
||||||
|
<div className='confirm' onClick={closeAlerts}> Sign In </div>
|
||||||
|
</a>
|
||||||
|
<div className='deny' onClick={closeAlerts}> Not Now </div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{alertTrashedGoogleBrew && (
|
||||||
|
<div className='errorContainer'>
|
||||||
|
This brew is currently in your Trash folder on Google Drive!<br />
|
||||||
|
If you want to keep it, make sure to move it before it is deleted permanently!<br />
|
||||||
|
<div className='confirm' onClick={toggleGoogleStorage}> Save my brew </div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{confirmGoogleTransfer && (
|
||||||
|
<div className='errorContainer'>
|
||||||
|
{saveGoogle
|
||||||
|
? 'Would you like to transfer this brew from your Google Drive storage back to the Homebrewery?'
|
||||||
|
: 'Would you like to transfer this brew from the Homebrewery to your personal Google Drive storage?'}
|
||||||
|
<br />
|
||||||
|
<div className='confirm' onClick={toggleGoogleStorage}> Yes </div>
|
||||||
|
<div className='deny' onClick={closeAlerts}> No </div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Nav.item>
|
||||||
|
);
|
||||||
|
|
||||||
|
//======----- Navbar -----======
|
||||||
const renderNavbar = ()=>(
|
const renderNavbar = ()=>(
|
||||||
<Navbar>
|
<Navbar>
|
||||||
<Nav.section>
|
<Nav.section>
|
||||||
<Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
|
<Nav.item className='brewTitle'>{currentBrew.title}</Nav.item>
|
||||||
</Nav.section>
|
</Nav.section>
|
||||||
<Nav.section>
|
<Nav.section>
|
||||||
{renderGoogleDriveIcon()}
|
{(pageName = 'editPage') && renderGoogleDriveIcon()}
|
||||||
{error
|
{error
|
||||||
? <ErrorNavItem error={error} clearError={clearError} />
|
? <ErrorNavItem error={error} clearError={clearError} />
|
||||||
: <Nav.dropdown className='save-menu'>
|
: <Nav.dropdown className='save-menu'>
|
||||||
|
|||||||
Reference in New Issue
Block a user