save font size and reload. Editor font size is resetting some times.

bible-technology · May 29, 2024 · 7628e08 · 7628e08
1 parent 5fb4cb6
commit 7628e08
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 14 deletions.
diff --git a/renderer/src/components/EditorPage/ObsEditor/ObsEditor.js b/renderer/src/components/EditorPage/ObsEditor/ObsEditor.js
@@ -19,7 +19,11 @@ import { getDetails } from './utils/getDetails';
 const ObsEditor = () => {
   const [mdData, setMdData] = useState();
   const [directoryName, setDirectoryName] = useState();
-  const { state: { obsNavigation, loadData }, actions: { setLoadData } } = useContext(ReferenceContext);
+  const {
+ state: {
+ obsNavigation, loadData,
+}, actions: { setLoadData },
+} = useContext(ReferenceContext);
 
   const updateStory = (story) => {
     logger.debug('ObsEditor.js', 'In updateStory for upadting the story to the backend md file');
@@ -89,6 +93,7 @@ const ObsEditor = () => {
                         );
                         localforage.setItem('projectmeta', value);
                         // This func will update the scribe-setting.json file
+                        // saveReferenceResource(selectedFont, editorFontSize);
                         saveReferenceResource();
                       });
                     });

diff --git a/renderer/src/components/EditorPage/TextEditor/EditorMenuBar.jsx b/renderer/src/components/EditorPage/TextEditor/EditorMenuBar.jsx
@@ -18,7 +18,7 @@ export default function EditorMenuBar(props) {
     setVerseNumber,
     handleSelectedFont,
     setTriggerVerseInsert,
-    setEditorFontSize,
+    handleEditorFontSize,
     editorFontSize,
   } = props;
 
@@ -31,10 +31,10 @@ export default function EditorMenuBar(props) {
 
   const handleFontSize = (status) => {
     if (status === 'dec' && editorFontSize > 0.70) {
-      setEditorFontSize(editorFontSize - 0.2);
+      handleEditorFontSize(editorFontSize - 0.2);
     }
     if (status === 'inc' && editorFontSize < 2) {
-      setEditorFontSize(editorFontSize + 0.2);
+      handleEditorFontSize(editorFontSize + 0.2);
     }
   };
 

diff --git a/renderer/src/components/EditorPage/TextEditor/index.jsx b/renderer/src/components/EditorPage/TextEditor/index.jsx
@@ -30,7 +30,7 @@ export default function TextEditor() {
   const {
     state: { bookId, selectedFont, editorFontSize },
     actions: {
-      handleSelectedFont, onChangeChapter, onChangeVerse, setEditorFontSize,
+      handleSelectedFont, onChangeChapter, onChangeVerse, handleEditorFontSize,
     },
   } = useContext(ReferenceContext);
 
@@ -104,7 +104,7 @@ export default function TextEditor() {
     bookName,
     bookChange,
     bookAvailable,
-    setEditorFontSize,
+    handleEditorFontSize,
     setBookChange,
     setChapterNumber,
     setVerseNumber,

diff --git a/renderer/src/components/Sync/Gitea/SyncFromGiteaUtils.js b/renderer/src/components/Sync/Gitea/SyncFromGiteaUtils.js
@@ -96,6 +96,11 @@ async function createOrUpdateAgSettings(sbDataObject, currentUser, projectName,
       } else {
         setting.project[sbDataObject.type.flavorType.flavor.name].font = (setting.project[sbDataObject.type.flavorType.flavor.name].font) ? (setting.project[sbDataObject.type.flavorType.flavor.name].font) : '';
       }
+      if (!setting.fontSize) {
+        setting.project[sbDataObject.type.flavorType.flavor.name].fontSize = 1;
+      } else {
+        setting.project[sbDataObject.type.flavorType.flavor.name].fontSize = (setting.project[sbDataObject.type.flavorType.flavor.name].fontSize) ? (setting.project[sbDataObject.type.flavorType.flavor.name].fontSize) : 1;
+      }
       settings = setting;
     }
     settings.project[sbDataObject.type.flavorType.flavor.name].lastSeen = moment().format();

diff --git a/renderer/src/components/context/ReferenceContext.js b/renderer/src/components/context/ReferenceContext.js
@@ -95,6 +95,15 @@ export default function ReferenceContextProvider({ children }) {
     }
   };
 
+  // define functon to change editor font size and call saveReference
+  const handleEditorFontSize = async (currentFontSize) => {
+    if (isElectron()) {
+      setEditorFontSize(currentFontSize);
+      // INFO : implement a debounce for this call if needed
+      saveReferenceResource(selectedFont, currentFontSize);
+    }
+  };
+
   useEffect(() => {
     localforage.getItem('currentProject').then(async (projectName) => {
       if (projectName) {
@@ -112,17 +121,20 @@ export default function ReferenceContextProvider({ children }) {
                         setBookmarksVerses(resources.project?.textTranslation.bookMarks);
                         setProjectScriptureDir(resources.project?.textTranslation?.scriptDirection?.toUpperCase());
                         setSelectedFont(resources.project?.textTranslation?.font);
+                        setEditorFontSize(resources.project?.textTranslation?.fontSize || 1);
                         break;
                       case 'textStories':
                         setBookmarksVerses(resources.project?.textStories.bookMarks);
                         setProjectScriptureDir(resources.project?.textStories?.scriptDirection?.toUpperCase());
                         setObsNavigation(resources.project?.textStories.navigation ? resources.project?.textStories.navigation : '1');
                         setSelectedFont(resources.project?.textStories?.font);
+                        setEditorFontSize(resources.project?.textStories?.fontSize);
                         break;
                       case 'audioTranslation':
                         setBookmarksVerses(resources.project?.audioTranslation.bookMarks);
                         setProjectScriptureDir(resources.project?.audioTranslation?.scriptDirection?.toUpperCase());
                         setSelectedFont(resources.project?.audioTranslation?.font);
+                        setEditorFontSize(resources.project?.audioTranslation?.fontSize || 1);
                         break;
                       default:
                         break;
@@ -237,6 +249,7 @@ export default function ReferenceContextProvider({ children }) {
       onChangeChapter,
       onChangeVerse,
       applyBooksFilter,
+      handleEditorFontSize,
       setAnchorEl,
       handleClick,
       setRefName,

diff --git a/renderer/src/core/burrito/importBurrito.js b/renderer/src/core/burrito/importBurrito.js
@@ -394,6 +394,11 @@ const importBurrito = async (filePath, currentUser, updateBurritoVersion, concat
           } else {
             setting.font = (setting.project[metadata.type.flavorType.flavor.name].font) ? (setting.project[metadata.type.flavorType.flavor.name].font) : '';
           }
+          if (!setting.project[metadata.type.flavorType.flavor.name]?.fontSize) {
+            setting.project[metadata.type.flavorType.flavor.name].fontSize = 1;
+          } else {
+            setting.fontSize = (setting.project[metadata.type.flavorType.flavor.name]?.fontSize) ? (setting.project[metadata.type.flavorType.flavor.name].fontSize) : 1;
+          }
           settings = setting;
         }
         settings.project[metadata.type.flavorType.flavor.name].lastSeen = moment().format();

diff --git a/renderer/src/core/editor/fetchSettingsResourceHistory.js b/renderer/src/core/editor/fetchSettingsResourceHistory.js
@@ -116,6 +116,7 @@ export async function fetchSettingsResourceHistory(
                                   owner: '',
                                   offlineResource: { offline: false },
                                   font: '',
+                                  fontSize: 1,
                                 }
                                 ));
                               } else if (_columnnum === historyColumn && _rownum === '2') {
@@ -134,6 +135,7 @@ export async function fetchSettingsResourceHistory(
                                   owner: '',
                                   offlineResource: { offline: false },
                                   font: '',
+                                  fontSize: 1,
                                 }
                                 ));
                               }
@@ -158,6 +160,7 @@ export async function fetchSettingsResourceHistory(
                             owner: _value?.owner,
                             offlineResource: _value?.offline,
                             font: _value?.font,
+                            fontSize: _value?.fontSize || 1,
                           });
                       }
                       if (_rownum === '2') {
@@ -170,6 +173,7 @@ export async function fetchSettingsResourceHistory(
                             owner: _value?.owner,
                             offlineResource: _value?.offline,
                             font: _value?.font,
+                            fontSize: _value?.fontSize || 1,
                           });
                       }
                   },

diff --git a/renderer/src/core/editor/saveSettingsResourceHistory.js b/renderer/src/core/editor/saveSettingsResourceHistory.js
@@ -19,6 +19,8 @@ export async function saveSettingsResourceHistory(
     setReferenceColumnData2,
     setOpenResourceR1,
     setOpenResourceR2,
+    selectedFont,
+    editorFontSize,
 ) {
     logger.debug('SaveSettingsResourceHistory.js', 'In save reference hsotory func');
     // removingSection : "1" and openResourceR2 :false and sectionPlaceholderNum: "1" -> reference 2 to reference 1
@@ -70,6 +72,7 @@ export async function saveSettingsResourceHistory(
                       owner: referenceColumnData2?.owner,
                       offlineResource: referenceColumnData2.offlineResource,
                       font: referenceColumnData2?.font,
+                      fontSize: referenceColumnData2?.fontSize || 1,
                     }
                     ));
                     setReferenceColumnData2((prev) => ({
@@ -81,6 +84,7 @@ export async function saveSettingsResourceHistory(
                       owner: '',
                       offlineResource: { offline: false },
                       font: '',
+                      fontSize: 1,
                     }
                     ));
                     setOpenResourceR1(false);
@@ -95,6 +99,7 @@ export async function saveSettingsResourceHistory(
                         navigation: { book: '1TI', chapter: '1' },
                         offline: referenceToUse.offlineResource,
                         font: referenceToUse?.font,
+                        fontSize: referenceToUse?.fontSize || 1,
                       },
                     };
                 }
@@ -111,6 +116,7 @@ export async function saveSettingsResourceHistory(
                       navigation: { book: '1TI', chapter: '1' },
                       offline: referenceColumnData1.offlineResource,
                       font: referenceColumnData1?.font,
+                      fontSize: referenceColumnData1?.fontSize || 1,
                     },
                     2: {
                       resouceId: referenceColumnData2?.selectedResource,
@@ -120,6 +126,7 @@ export async function saveSettingsResourceHistory(
                       navigation: { book: '1TI', chapter: '1' },
                       offline: referenceColumnData2.offlineResource,
                       font: referenceColumnData2?.font,
+                      fontSize: referenceColumnData2?.fontSize || 1,
                     },
                   };
                 }
@@ -139,7 +146,7 @@ export async function saveSettingsResourceHistory(
         setRemovingSection();
         setAddingSection();
         localforage.setItem('projectmeta', value).then(() => {
-          saveReferenceResource();
+          saveReferenceResource(selectedFont, editorFontSize);
             resolve();
         });
       }

diff --git a/renderer/src/core/projects/updateAgSettings.js b/renderer/src/core/projects/updateAgSettings.js
@@ -12,7 +12,7 @@ import {
 //   const newPath = require('../../../../supabase').newPath
 // }
 
-export const updateAgSettings = async (username, projectName, data, font) => {
+export const updateAgSettings = async (username, projectName, data, font, fontSize = 1) => {
   logger.debug('updateAgSettings.js', 'In updateAgSettings');
   const newpath = localStorage.getItem('userPath');
   const fs = window.require('fs');
@@ -31,10 +31,15 @@ export const updateAgSettings = async (username, projectName, data, font) => {
     if (!setting.project[data.type.flavorType.flavor.name].font) {
       setting.project[data.type.flavorType.flavor.name].font = font || '';
     }
+    if (!setting.project[data.type.flavorType.flavor.name].fontSize) {
+      setting.project[data.type.flavorType.flavor.name].fontSize = fontSize || 1;
+    }
   }
   const savedFont = JSON.stringify(setting.project[data.type.flavorType.flavor.name].font);
+  const savedFontSize = JSON.stringify(setting.project[data.type.flavorType.flavor.name].fontSize);
   setting.project[data.type.flavorType.flavor.name] = data.project[data.type.flavorType.flavor.name];
   setting.project[data.type.flavorType.flavor.name].font = font || JSON.parse(savedFont);
+  setting.project[data.type.flavorType.flavor.name].fontSize = fontSize || JSON.parse(savedFontSize);
   logger.debug('updateAgSettings.js', `Updating the ${environment.PROJECT_SETTING_FILE}`);
   await fs.writeFileSync(folder, JSON.stringify(setting));
 };
@@ -57,14 +62,19 @@ export const updateWebAgSettings = async (username, projectName, data) => {
     } else {
       setting.project[data.type.flavorType.flavor.name].font = (setting.project[data.type.flavorType.flavor.name].font) ? (setting.project[data.type.flavorType.flavor.name].font) : '';
     }
+    if (!setting.project[data.type.flavorType.flavor.name].fontSize) {
+      setting.project[data.type.flavorType.flavor.name].fontSize = 1;
+    } else {
+      setting.project[data.type.flavorType.flavor.name].fontSize = (setting.project[data.type.flavorType.flavor.name].fontSize) ? (setting.project[data.type.flavorType.flavor.name].fontSize) : 1;
+    }
   }
   await sbStorageUpload(folder, JSON.stringify(setting), {
     // cacheControl: '3600',
     upsert: true,
   });
 };
 
-export const saveReferenceResource = (font = '') => {
+export const saveReferenceResource = (font = '', fontSize = 1) => {
   logger.debug('updateAgSettings.js', 'In saveReferenceResource for saving the reference data');
   localforage.getItem('currentProject').then(async (projectName) => {
     const _projectname = await splitStringByLastOccurance(projectName, '_');
@@ -78,7 +88,7 @@ export const saveReferenceResource = (font = '') => {
               if (id[0] === _projectname[1]) {
                 localforage.getItem('userProfile').then(async (value) => {
                   if (isElectron()) {
-                    await updateAgSettings(value?.username, projectName, resources, font);
+                    await updateAgSettings(value?.username, projectName, resources, font, fontSize);
                   } else {
                     await updateWebAgSettings(value?.user?.email, projectName, resources);
                   }

diff --git a/renderer/src/layouts/editor/SectionPlaceholder1.js b/renderer/src/layouts/editor/SectionPlaceholder1.js
@@ -69,6 +69,8 @@ const SectionPlaceholder1 = ({ editor }) => {
       font2,
       fontSize1,
       fontSize2,
+      editorFontSize,
+      selectedFont,
     },
     actions: {
       setRow,
@@ -229,6 +231,8 @@ const SectionPlaceholder1 = ({ editor }) => {
         setReferenceColumnOneData2,
         setOpenResource1,
         setOpenResource2,
+        selectedFont,
+        editorFontSize,
       );
     })();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -238,7 +242,9 @@ const SectionPlaceholder1 = ({ editor }) => {
     referenceColumnOneData2?.owner, removingSection, addingSection, referenceColumnOneData2?.offlineResource,
     referenceColumnOneData1?.offlineResource, referenceColumnOneData2?.font,
     referenceColumnOneData1?.font, resetResourceOnDeleteOffline?.referenceColumnOneData1Reset,
-    resetResourceOnDeleteOffline?.referenceColumnOneData2Reset, referenceColumnOneData2, referenceColumnOneData1]);
+    resetResourceOnDeleteOffline?.referenceColumnOneData2Reset, referenceColumnOneData2, referenceColumnOneData1,
+    referenceColumnOneData1?.fontSize, referenceColumnOneData2?.fontSize,
+  ]);
 
   // referenceColumnOneData2 referenceColumnOneData1
   const CustomNavigation1 = (
@@ -299,6 +305,8 @@ const SectionPlaceholder1 = ({ editor }) => {
     if (referenceColumnOneData2.font) {
       setFont2(referenceColumnOneData2?.font);
     }
+    setFontsize1(referenceColumnOneData1?.fontSize);
+    setFontsize2(referenceColumnOneData2?.fontSize);
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [_obsNavigation1, _obsNavigation2, referenceColumnOneData1, referenceColumnOneData2]);
 

diff --git a/renderer/src/layouts/editor/SectionPlaceholder2.js b/renderer/src/layouts/editor/SectionPlaceholder2.js
@@ -71,6 +71,8 @@ const SectionPlaceholder2 = ({ editor }) => {
       font4,
       fontSize3,
       fontSize4,
+      selectedFont,
+      editorFontSize,
     },
     actions: {
       setRow,
@@ -234,6 +236,8 @@ const SectionPlaceholder2 = ({ editor }) => {
         setReferenceColumnTwoData2,
         setOpenResource3,
         setOpenResource4,
+        selectedFont,
+        editorFontSize,
       );
     })();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -244,6 +248,7 @@ const SectionPlaceholder2 = ({ editor }) => {
     referenceColumnTwoData1.offlineResource, referenceColumnTwoData2.offlineResource,
     referenceColumnTwoData1.font, referenceColumnTwoData2.font,
     resetResourceOnDeleteOffline?.referenceColumnTwoData1Reset, resetResourceOnDeleteOffline?.referenceColumnTwoData2Reset,
+    referenceColumnTwoData1.fontSize, referenceColumnTwoData2.fontSize,
   ]);
 
   // referenceColumnTwoData1, referenceColumnTwoData2 openResource1, openResource2,
@@ -299,6 +304,8 @@ const SectionPlaceholder2 = ({ editor }) => {
     if (referenceColumnTwoData2.font) {
       setFont4(referenceColumnTwoData2?.font);
     }
+    setFontsize3(referenceColumnTwoData1?.fontSize || 1);
+    setFontsize4(referenceColumnTwoData2?.fontSize || 1);
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [_obsNavigation1, _obsNavigation2, referenceColumnTwoData1, referenceColumnTwoData2]);
 

diff --git a/renderer/src/modules/editor/Editor.js b/renderer/src/modules/editor/Editor.js
@@ -43,7 +43,7 @@ export default function Editor({
       setBookmarksVerses,
       setObsNavigation,
       handleSelectedFont,
-      setEditorFontSize,
+      handleEditorFontSize,
     },
   } = useContext(ReferenceContext);
   const [bookMarked, setBookMarks] = useState(false);
@@ -55,10 +55,10 @@ export default function Editor({
 
   const handleFontSize = (status) => {
     if (status === 'dec' && editorFontSize > 0.70) {
-      setEditorFontSize(editorFontSize - 0.2);
+      handleEditorFontSize(editorFontSize - 0.2);
     }
     if (status === 'inc' && editorFontSize < 2) {
-      setEditorFontSize(editorFontSize + 0.2);
+      handleEditorFontSize(editorFontSize + 0.2);
     }
   };
 

diff --git a/renderer/src/util/createAudioVersification.js b/renderer/src/util/createAudioVersification.js
@@ -77,6 +77,7 @@ export const createAudioVersification = (
               refResources: call === 'edit' ? currentBurrito.project.audioTranslation.refResources : [],
               bookMarks: call === 'edit' ? currentBurrito.project.audioTranslation.bookMarks : [],
               font: '',
+              fontSize: 1,
             },
           },
           sync: { services: { door43: [] } },

diff --git a/renderer/src/util/createObsContent.js b/renderer/src/util/createObsContent.js
@@ -192,6 +192,7 @@ export const createObsContent = (
           refResources: call === 'edit' ? currentBurrito.project.textStories.refResources : [],
           bookMarks: call === 'edit' ? currentBurrito.project.textStories.bookMarks : [],
           font: '',
+          fontSize: 1,
         },
       },
       sync: { services: { door43: [] } },
@@ -372,6 +373,7 @@ export const createObsContent = (
         },
         sync: { services: { door43: [] } },
         font: '',
+        fontSize: 1,
       };
       const stat = await uploadFileToSupabase(`${supabasePath}/${environment.PROJECT_SETTING_FILE}`, JSON.stringify(settings));
       ingredients[path.join('ingredients', environment.PROJECT_SETTING_FILE)] = {