Merge branch 'development' of github.com:Proskomma/scribe-scripture-e…

…ditor into development

.eslintrc.json

@@ -11,7 +11,14 @@
 		"airbnb",
 		"next"
 	],
+	"ignorePatterns": [
+		"**/*.ts",
+		"**/*.tsx"
+	],
 	"rules": {
+		"react-hooks/exhaustive-deps": "off",
+		"jsx-a11y/no-static-element-interactions": "off",
+		"no-tabs": 0,
 		"@next/next/no-html-link-for-pages": "off",
 		"@next/next/no-img-element": "off",
 		"react/react-in-jsx-scope": "off",
@@ -95,7 +102,10 @@
 			"all"
 		],
 		"template-curly-spacing": "off",
-		"indent": "off"
+		"indent": [
+			"error",
+			2
+		]
 	},
 	"env": {
 		"browser": true,
@@ -146,9 +156,7 @@
 				"node": {
 					"extensions": [
 						".js",
-						".jsx",
-						".ts",
-						".tsx"
+						".jsx"
 					]
 				}
 			}

.github/workflows/node.js.yml

@@ -95,67 +95,67 @@ jobs:
                 name: Scribe-${{ github.run_id }}-${{ github.sha }}
                 path: artifacts
                 overwrite: true
-
-    build-mac:
-        runs-on: macos-latest
-        env:
-            CI: false
-        strategy:
-            matrix:
-                node-version: [18.20.3]
-
-        steps:
-            - uses: actions/checkout@v2
-            - name: Use Node.js 18.20.3
-              uses: actions/setup-node@v1
-              with:
-                  node-version: 18.20.3
-            - run: |
-                  node --version
-                  yarn --version
-            - name: Increase file descriptor limit
-              run: sudo sysctl -w kern.maxfiles=10485760 && sudo sysctl -w kern.maxfilesperproc=1048576
-            - name: set @bitregistry translation-help
-              run: yarn config set '@bit:registry' https://node.bit.dev
-
-            - name: Install Homebrew
-              run: |
-                  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-                  echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.zprofile
-                  eval "$(/opt/homebrew/bin/brew shellenv)"
-
-            - name: Install canvas dependencies
-              run: |
-                  brew install pkg-config cairo pango libpng jpeg giflib librsvg [email protected]
-                  brew reinstall jpeg
-                  echo 'export PATH="/opt/homebrew/opt/jpeg/bin:$PATH"' >> $HOME/.zprofile
-                  echo 'export LDFLAGS="-L/opt/homebrew/opt/jpeg/lib"' >> $HOME/.zprofile
-                  echo 'export CPPFLAGS="-I/opt/homebrew/opt/jpeg/include"' >> $HOME/.zprofile
-                  echo 'export PKG_CONFIG_PATH="/opt/homebrew/opt/jpeg/lib/pkgconfig"' >> $HOME/.zprofile
-                  eval "$(/opt/homebrew/bin/brew shellenv)"
-                  brew install python-setuptools
+    # Commented the below code for getting the binaries build for windows and Ubuntu
+    # build-mac:
+    #     runs-on: macos-latest
+    #     env:
+    #         CI: false
+    #     strategy:
+    #         matrix:
+    #             node-version: [18.20.3]
+
+    #     steps:
+    #         - uses: actions/checkout@v2
+    #         - name: Use Node.js 18.20.3
+    #           uses: actions/setup-node@v1
+    #           with:
+    #               node-version: 18.20.3
+    #         - run: |
+    #               node --version
+    #               yarn --version
+    #         - name: Increase file descriptor limit
+    #           run: sudo sysctl -w kern.maxfiles=10485760 && sudo sysctl -w kern.maxfilesperproc=1048576
+    #         - name: set @bitregistry translation-help
+    #           run: yarn config set '@bit:registry' https://node.bit.dev
+
+    #         - name: Install Homebrew
+    #           run: |
+    #               /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+    #               echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> $HOME/.zprofile
+    #               eval "$(/opt/homebrew/bin/brew shellenv)"
+
+    #         - name: Install canvas dependencies
+    #           run: |
+    #               brew install pkg-config cairo pango libpng jpeg giflib librsvg [email protected]
+    #               brew reinstall jpeg
+    #               echo 'export PATH="/opt/homebrew/opt/jpeg/bin:$PATH"' >> $HOME/.zprofile
+    #               echo 'export LDFLAGS="-L/opt/homebrew/opt/jpeg/lib"' >> $HOME/.zprofile
+    #               echo 'export CPPFLAGS="-I/opt/homebrew/opt/jpeg/include"' >> $HOME/.zprofile
+    #               echo 'export PKG_CONFIG_PATH="/opt/homebrew/opt/jpeg/lib/pkgconfig"' >> $HOME/.zprofile
+    #               eval "$(/opt/homebrew/bin/brew shellenv)"
+    #               brew install python-setuptools
 
 
-            - name: set max memory allocation
-              run: export NODE_OPTIONS=-max_old_space_size=4096
-
-            - name: yarn install
-              run: yarn install --verbose
-
-            - name: install dmg-license
-              run: yarn add dmg-license
-
-            - name: package
-              id: package
-              run: |
-                  yarn dist
-
-            - name: Cleanup artifacts
-              run: |
-                  npx rimraf "dist/!(*.deb|*.AppImage|*.dmg)"
-            - name: Upload artifacts
-              uses: actions/upload-artifact@v4
-              with:
-                name: Scribe-${{ github.run_id }}-${{ github.sha }}
-                path: dist
-                overwrite: true
+    #         - name: set max memory allocation
+    #           run: export NODE_OPTIONS=-max_old_space_size=4096
+
+    #         - name: yarn install
+    #           run: yarn install --verbose
+
+    #         - name: install dmg-license
+    #           run: yarn add dmg-license
+
+    #         - name: package
+    #           id: package
+    #           run: |
+    #               yarn dist
+
+    #         - name: Cleanup artifacts
+    #           run: |
+    #               npx rimraf "dist/!(*.deb|*.AppImage|*.dmg)"
+    #         - name: Upload artifacts
+    #           uses: actions/upload-artifact@v4
+    #           with:
+    #             name: Scribe-${{ github.run_id }}-${{ github.sha }}
+    #             path: dist
+    #             overwrite: true

docs/AutographaRefactDraft1.md

@@ -91,7 +91,7 @@ are moved from navbar to translation folder
 
     Sync
         Paratext
-    	Sign-in form splited from settings component to sync
+      Sign-in form splited from settings component to sync
         helpers functionalities eg: paratextAdapter moved from helper folder to sync
         Ahref component helps to handle external links
 

package.json

@@ -3,7 +3,7 @@
   "productName": "scribe-scripture-editor",
   "description": "A friendly assistant for Bible Translators.",
   "author": "Bible Technology <[email protected]>",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "license": "MIT",
   "private": true,
   "main": "main/index.js",
@@ -185,7 +185,7 @@
     "is-electron": "^2.2.1",
     "isomorphic-git": "^1.24.0",
     "js-yaml": "^4.1.0",
-    "jxl-pdf": "0.6.1",
+    "jxl-pdf": "0.6.3",
     "localforage": "1.10.0",
     "lodash.isequal": "^4.5.0",
     "markdown-translatable": "1.3.0",
@@ -249,4 +249,4 @@
     "word-aligner": "$word-aligner",
     "@mui/lab": "$@mui/lab"
   }
-}
+}

playwright.config.ts

@@ -7,16 +7,16 @@ const config: PlaywrightTestConfig = {
 	globalTimeout: 60 * 60 * 1000,
 	// Run all tests in parallel.
 	fullyParallel: false,
-	retries: 3,	
+	retries: 3,
 	use: {
 		// trace: 'on-first-retry', // record traces on first retry of each test
-		 
+
 		// Run browser in headless mode.
 		// headless: false,
-	  },
+	},
 	expect: {
 		timeout: 60 * 1000,
-	},  
+	},
 };
 
 export default config;

renderer/jsconfig.json

@@ -35,6 +35,8 @@
   },
   "exclude": [
     "node_modules",
-    "dist"
+    "dist",
+    "**/*.ts",
+    "**/*.tsx"
   ]
 }

renderer/pages/loader.css

@@ -1,83 +1,83 @@
 #app {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	height: 100%;
-	position: fixed;
-	width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  position: fixed;
+  width: 100%;
 }
 #loader-wrapper {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 1000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
 }
 #loader {
-	display: block;
-	position: relative;
-	left: 50%;
-	top: 50%;
-	width: 150px;
-	height: 150px;
-	margin: -75px 0 0 -75px;
-	border-radius: 50%;
-	border: 3px solid transparent;
-	border-top-color: #3498db;
-	-webkit-animation: spin 2s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
-	animation: spin 2s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
+  display: block;
+  position: relative;
+  left: 50%;
+  top: 50%;
+  width: 150px;
+  height: 150px;
+  margin: -75px 0 0 -75px;
+  border-radius: 50%;
+  border: 3px solid transparent;
+  border-top-color: #3498db;
+  -webkit-animation: spin 2s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
+  animation: spin 2s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
 }
 
 #loader:before {
-	content: '';
-	position: absolute;
-	top: 5px;
-	left: 5px;
-	right: 5px;
-	bottom: 5px;
-	border-radius: 50%;
-	border: 3px solid transparent;
-	border-top-color: #e74c3c;
-	-webkit-animation: spin 3s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
-	animation: spin 3s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
+  content: '';
+  position: absolute;
+  top: 5px;
+  left: 5px;
+  right: 5px;
+  bottom: 5px;
+  border-radius: 50%;
+  border: 3px solid transparent;
+  border-top-color: #e74c3c;
+  -webkit-animation: spin 3s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
+  animation: spin 3s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
 }
 
 #loader:after {
-	content: '';
-	position: absolute;
-	top: 15px;
-	left: 15px;
-	right: 15px;
-	bottom: 15px;
-	border-radius: 50%;
-	border: 3px solid transparent;
-	border-top-color: #f9c922;
-	-webkit-animation: spin 1.5s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
-	animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
+  content: '';
+  position: absolute;
+  top: 15px;
+  left: 15px;
+  right: 15px;
+  bottom: 15px;
+  border-radius: 50%;
+  border: 3px solid transparent;
+  border-top-color: #f9c922;
+  -webkit-animation: spin 1.5s linear infinite; /* Chrome, Opera 15+, Safari 5+ */
+  animation: spin 1.5s linear infinite; /* Chrome, Firefox 16+, IE 10+, Opera */
 }
 
 @-webkit-keyframes spin {
-	0% {
-		-webkit-transform: rotate(0deg); /* Chrome, Opera 15+, Safari 3.1+ */
-		-ms-transform: rotate(0deg); /* IE 9 */
-		transform: rotate(0deg); /* Firefox 16+, IE 10+, Opera */
-	}
-	100% {
-		-webkit-transform: rotate(360deg); /* Chrome, Opera 15+, Safari 3.1+ */
-		-ms-transform: rotate(360deg); /* IE 9 */
-		transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
-	}
+  0% {
+    -webkit-transform: rotate(0deg); /* Chrome, Opera 15+, Safari 3.1+ */
+    -ms-transform: rotate(0deg); /* IE 9 */
+    transform: rotate(0deg); /* Firefox 16+, IE 10+, Opera */
+  }
+  100% {
+    -webkit-transform: rotate(360deg); /* Chrome, Opera 15+, Safari 3.1+ */
+    -ms-transform: rotate(360deg); /* IE 9 */
+    transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
+  }
 }
 @keyframes spin {
-	0% {
-		-webkit-transform: rotate(0deg); /* Chrome, Opera 15+, Safari 3.1+ */
-		-ms-transform: rotate(0deg); /* IE 9 */
-		transform: rotate(0deg); /* Firefox 16+, IE 10+, Opera */
-	}
-	100% {
-		-webkit-transform: rotate(360deg); /* Chrome, Opera 15+, Safari 3.1+ */
-		-ms-transform: rotate(360deg); /* IE 9 */
-		transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
-	}
+  0% {
+    -webkit-transform: rotate(0deg); /* Chrome, Opera 15+, Safari 3.1+ */
+    -ms-transform: rotate(0deg); /* IE 9 */
+    transform: rotate(0deg); /* Firefox 16+, IE 10+, Opera */
+  }
+  100% {
+    -webkit-transform: rotate(360deg); /* Chrome, Opera 15+, Safari 3.1+ */
+    -ms-transform: rotate(360deg); /* IE 9 */
+    transform: rotate(360deg); /* Firefox 16+, IE 10+, Opera */
+  }
 }

renderer/pages/projects.js

@@ -15,6 +15,6 @@ const Projects = () => (
       </AutographaContextProvider>
     </AuthenticationContextProvider>
   </>
-  );
+);
 
 export default Projects;