updating the branch and fixing the conflict

.eslintrc.json

@@ -96,7 +96,8 @@
 					["@/layouts", "./renderer/src/layouts/"],
 					["@/modules", "./renderer/src/modules/"],
 					["@/util", "./renderer/src/util/"],
-					["@/core", "./renderer/src/core/"]
+					["@/core", "./renderer/src/core/"],
+					["@/hooks", "./renderer/src/hooks/"]
 				],
 				"node": {
 					"extensions": [".js", ".jsx", ".ts", ".tsx"]

.vscode/settings.json

@@ -2,11 +2,15 @@
 	"[javascript]": {
 		"editor.formatOnSave": false
 	},
-	"editor.rulers": [100],
+	"editor.rulers": [
+		100
+	],
 	"editor.fontLigatures": true,
 	"prettier.tabWidth": 4,
 	"eslint.alwaysShowStatus": true,
-	"prettier.disableLanguages": ["js"],
+	"prettier.disableLanguages": [
+		"js"
+	],
 	"prettier.useTabs": true,
 	"editor.formatOnSave": true,
 	"editor.multiCursorModifier": "alt",
@@ -27,4 +31,4 @@
 	},
 	"eslint.workingDirectories": [],
 	"editor.tabSize": 2
-}
+}

e2e-tests/myFixtures.ts

@@ -12,21 +12,61 @@ type myFixture = {
   flavorObs: string
   textUnderscore: string,
   obsUnderscore: string,
-  obsUrduProject: string,
+  customTextProject: string,
+  customObsProject: string,
+  customAudioProject: string,
+  projectTextType: string,
+  projectObsType: string,
+  projectAudioType: string,
+  description: string,
+  textAbbreviation: string,
+  obsAbbreviation: string,
+  AudioAbbreviation: string,
+  starProject: string,
+  unstarProject: string,
+  currentLicense: string,
+  newLicense: string,
+  customTextLanguage: string,
+  customObsLanguage: string,
+  customAudioLanguage: string,
+  english: string,
+  hindi: string,
+  russian: string,
+  farsi: string
 }
 const myFixtureTest = myTest.extend<myFixture>({
   userName: "Playwright user",
-  textProject: "Translation test project",
-  obsProject: "Obs test project",
+  textProject: "Playwright text translation project",
+  obsProject: "Playwright obs translation project",
+  audioProject: "Playwright audio translation project",
+  projectTextType: "Bible Translation",
+  projectObsType: "OBS",
+  projectAudioType: "Audio",
+  description: "test description",
+  textAbbreviation: "pttp",
+  obsAbbreviation: "potp",
+  AudioAbbreviation: "patp",
+  starProject: "star-project",
+  unstarProject: "unstar-project",
+  currentLicense: "CC BY-SA",
+  newLicense: "CC BY",
+  customTextProject: "Custom text transaltion project",
+  customObsProject: "Custom obs project",
+  customAudioProject: "Custom audio project",
+  customTextLanguage: "custom text translation language",
+  customObsLanguage: "custom obs project language",
+  customAudioLanguage: "custom audio project language",
+  english: "English",
+  hindi: "Hindi",
+  russian: "Russian",
+  farsi: "Farsi",
   textUnderscore: "Translation_test_project",
   obsUnderscore: "Obs_test_project",
-  audioProject: "Audio test project",
   syncName: "Sync_Collab_Test",
   doorUser: "bobby",
   doorPassword: "Bobby@123",
   flavorText: "textTranslation",
   flavorObs: "textStories",
-  obsUrduProject: "Obs urdu project",
 })
 
 export const test = myFixtureTest;

jsconfig.json

@@ -28,5 +28,9 @@
         "app/*"
       ],
     }
-  }
+  },
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
 }

package.json

@@ -3,7 +3,7 @@
   "productName": "scribe-scripture-editor",
   "description": "A friendly assistant for Bible Translators.",
   "author": "Bible Technology <[email protected]>",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "license": "MIT",
   "private": true,
   "main": "main/index.js",
@@ -143,7 +143,7 @@
     "electron-log": "4.4.7",
     "electron-next": "^3.1.5",
     "electron-updater": "^5.0.1",
-    "epitelete": "0.2.20-beta.1",
+    "epitelete": "^0.2.20",
     "epitelete-html": "0.2.20-beta.2",
     "eslint-import-resolver-alias": "^1.1.2",
     "font-detect-rhl": "1.0.5-1",

renderer/environment.js

@@ -15,4 +15,5 @@ export const environment = {
     AG_MINIMUM_BURRITO_VERSION: '0.3.0',
     OBS_IMAGE_DIR: 'obs-images',
     MERGE_DIR_NAME: '.merge-staging-area',
+    SCRIBE_SUPPORT_MAIL: '[email protected]',
 };

renderer/jsconfig.json

@@ -23,9 +23,16 @@
       "@/illustrations/*": [
         "public/illustrations/*"
       ],
-      "@/hooks/*":[
+      "@/hooks/*": [
         "src/components/hooks/*"
+      ],
+      "@/hooks2/*": [
+        "src/hooks/*"
       ]
     }
-  }
+  },
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
 }

renderer/src/components/EditorPage/Navigation/reference/SelectBook.js

@@ -13,6 +13,7 @@ export default function SelectBook({
   selectedBooks,
   setSelectedBooks,
   scope,
+  existingScope = [],
 }) {
   const [openNT, setOpenNT] = useState(true);
   const [openOT, setOpenOT] = useState(true);
@@ -46,7 +47,9 @@ export default function SelectBook({
     } else {
       const _selectedBooks = [...selectedBooks];
       const selectedIndex = _selectedBooks.indexOf(bookID.toUpperCase());
+      if (!(scope === 'Other' && existingScope?.length > 0 && existingScope.includes(bookID.toUpperCase()))) {
       _selectedBooks.splice(selectedIndex, 1);
+      }
       setSelectedBooks(_selectedBooks);
     }
   }

renderer/src/components/EditorPage/Navigation/reference/SelectVerse.js

@@ -50,8 +50,6 @@ export default function SelectVerse({
       document.getElementById('editor').querySelector(`#ch${chapter}v${verseNum}`)?.scrollIntoView();
       setVerseNumber(verseNum);
     }
-     // window.location.href = `#ch${chapter}v${verseNum}`;
-    // document.getElementById(`ch${chapter}v${verseNum}`).scrollIntoView();
   };
 
   const onMultiSelectVerse = async (e, verses) => {
@@ -116,6 +114,7 @@ export default function SelectVerse({
                 <div
                   key={chapter.key}
                   role="presentation"
+                  id={`chapter-${chapter.name}`}
                   onClick={(e) => { onChapterSelect(e, chapter.key); }}
                   className={styles.select}
                 >
@@ -144,6 +143,7 @@ export default function SelectVerse({
                 <div
                   key={verse.key}
                   role="presentation"
+                  id={`verse-${verse.name}`}
                   style={{ color: controlVerseSelect.includes(parseInt(verse.key, 10)) ? 'seagreen' : '' }}
                   onClick={(e) => (
                     multiSelectVerse

renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js

@@ -82,12 +82,12 @@ const { t } = useTranslation();
             stories?.map((story, index) => (
               <div
                 key={story.id}
-                className={`flex gap-5 mb-5 items-center justify-center ${story.id === selectedStory && 'bg-light'}`}
+                className={`flex gap-5 mb-5 items-center  ${story.id === selectedStory && 'bg-light'}`}
                 ref={(element) => addtoItemEls(element, story.id)}
               >
                 {
                   Object.prototype.hasOwnProperty.call(story, 'title') && (
-                  <p className="text-xl text-gray-600" style={style.bold}>
+                  <p className="text-xl text-gray-600 w-full text-center" style={style.bold}>
                     {story.title}
                   </p>
                   )
@@ -101,7 +101,7 @@ const { t } = useTranslation();
                   {/* <img className="w-1/4 rounded-lg" src={story.img} alt="" /> */}
                   <ObsImage story={story} online={networkState.online} />
                   <p
-                    className="text-sm text-gray-600 text-justify"
+                    className="text-sm text-gray-600 text-justify w-full break-words overflow-hidden"
                     style={{
                       fontFamily: font || 'sans-serif',
                       fontSize: `${fontSize}rem`,

renderer/src/components/EditorPage/Reference/ReferenceBible/ReferenceBibleX.js

@@ -6,7 +6,7 @@ import LoadingScreen from '@/components/Loading/LoadingScreen';
 import { SnackBar } from '@/components/SnackBar';
 import EmptyScreen from '@/components/Loading/EmptySrceen';
 import { useReadReferenceUsfmFile } from '@/components/EditorPage/Reference/ReferenceBible/useReadReferenceUsfmFile';
-import ReferenceScribex from '../../Scribex/ReferenceScribex';
+import ReferenceScribex from '../../TextEditor/ReferenceScribex';
 
 const ReferenceBibleX = ({
   languageId,