Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Factorize the code to make it easier to add new modes AND added a Juxtalinear edition mode #303

Merged
merged 54 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1d1626d
- added a Juxta mode that creates a translation burrito
Jan 16, 2024
620a9cb
Refactorization of 'saveProjectsMeta.js'
Jan 23, 2024
d8c1202
merging changes for PR
Jan 23, 2024
f77dfd3
Scripture Burrito as a resource : added the poissibility for the user…
Feb 2, 2024
34d947a
removed checkbox from the UI and query sb resource everytime
Feb 5, 2024
70b68c0
Added a juxtalinear editor along with a new mode.
Feb 12, 2024
234998d
created a juxtaBurrito creator and a function to add juxta content. A…
Feb 13, 2024
5c9eef4
ADDED juxta support for SB creation and fixed some typos
Feb 19, 2024
15ba171
merged with dev
Feb 19, 2024
716d72b
ADDED support for usfm import for a juxta project. Now we have to cha…
Feb 21, 2024
12aadc0
juxtalineat mode functionnal
Feb 21, 2024
f77d94b
Merge branch 'development' into dcn/refactor_modes
DanielC-N Feb 21, 2024
034dca5
UPDATE : now the interface handle corectly a json juxta file and upda…
Feb 22, 2024
8d39efc
function to update a json juxta file if needed
Feb 22, 2024
3a20921
Merge branch 'dcn/refactor_modes' of github.com:Proskomma/scribe-scri…
Feb 22, 2024
17ec0a9
checksums ok for each modifications of the juxta
Feb 22, 2024
00bd137
bugfix : juxta was still using a translation settings
Feb 22, 2024
0dd7e17
quick fix
Feb 24, 2024
a947db3
Merge branch 'bible-technology:development' into development
DanielC-N Feb 27, 2024
4f13526
Merge branch 'development' into dcn/refactor_modes
Feb 27, 2024
fd96649
added new kewboard shortcuts : 'Tab' to navigate through line chuncks…
Feb 27, 2024
e906685
removing a useless 'console.log'
Feb 28, 2024
97d0ada
FIXED font size when aditing a chunck, ADDED a bit of css and added a…
Mar 6, 2024
d24564b
I put the sentences loading one layer outside the main editor, to avo…
Mar 20, 2024
7eafc20
Many bugfixes https://github.com/bible-technology/scribe-scripture-ed…
Apr 3, 2024
4b84d64
add a check if the folder exists
Apr 3, 2024
6258289
added a little bit of secure code for OBS loading
Apr 3, 2024
fd7a42c
changed the behavior of the Snackbar. If error === 'failure' the snac…
Apr 3, 2024
001d249
changed the behavior of the Snackbar. If error === 'failure' the snac…
Apr 3, 2024
d262561
bold text 'CREATE PROJECT' for better visibility and start to check '…
Apr 3, 2024
8a7feb3
added the feature that download resources not imported by the user fo…
Apr 5, 2024
e554082
Now the user is correctly notified when the imported books does not m…
Apr 10, 2024
16850f6
minor bugfixes and code cleaning
Apr 10, 2024
34b9bb8
changed place of the 'nprogress' by few px
Apr 10, 2024
8e7ca37
added a better user-friendly messages to nugde the user to import at …
Apr 11, 2024
a0f4b91
FIXED : archive a Text Translation project OK.
Apr 11, 2024
58605c8
star/unstar a juxtalinear project works now
Apr 12, 2024
d8a22bc
FIX : bug that prevented some resources to show up. and FIX : bug tha…
Apr 18, 2024
77b7d4a
deleted package-lock.json and updated yarn.lock
Apr 26, 2024
be223cc
Merge branch 'bible-technology:development' into development
DanielC-N Apr 26, 2024
d1b7193
resolved conficts
Apr 26, 2024
8ba5a49
updated french translation
Apr 26, 2024
2b422a2
bugfix : you can now edit a juxta project properly
May 1, 2024
e5fd90b
fixed bug where on book change, the sentences where wronly saved unde…
May 2, 2024
9097f27
Merge branch 'development' into dcn/refactor_modes
DanielC-N May 2, 2024
10e17eb
make 'jsonFileContent.bookCode' to upper case for safety reasons
May 2, 2024
7056433
Merge branch 'development' into dcn/refactor_modes
DanielC-N May 7, 2024
b4d8e3c
FIX : export/import now works properly for juxtalinear projects
May 16, 2024
8f8d561
Merge branch 'dcn/refactor_modes' of github.com:Proskomma/scribe-scri…
May 16, 2024
3dda2e5
fix obs auto zipping on export
May 30, 2024
96b88dc
spinner and 'create project' button css fix.
May 31, 2024
04a093f
'create project' button reverted
May 31, 2024
767381b
Merge branch 'bible-technology:development' into development
DanielC-N Jun 12, 2024
e0f7d29
resolving conflict merge, it was due to a renaming of a variable to a…
Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
435 changes: 212 additions & 223 deletions e2e-tests/common.js

Large diffs are not rendered by default.

53 changes: 49 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
"deploy": "yarn build && electron-builder -p always"
},
"eslintIgnore": [
"*.test.js"
"*.test.js",
"*.tsx",
"*.ts"
],
"build": {
"asar": true,
Expand Down Expand Up @@ -83,13 +85,17 @@
"@babel/eslint-parser": "^7.5.4",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@capacitor/cli": "5.4.2",
"@netlify/plugin-nextjs": "^4.8.0",
"@playwright/test": "^1.36.2",
"@svgr/webpack": "^5.5.0",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "14.2.0",
"@types/file-saver": "^2.0.5",
"@typescript-eslint/eslint-plugin": "^6.7.4",
"@typescript-eslint/parser": "^6.7.4",
"ajv": "^6.12.2",
"autoprefixer": "^10.4.13",
"babel-jest": "^28.1.1",
Expand All @@ -112,14 +118,23 @@
"null-loader": "^4.0.1",
"postcss": "^8.4.21",
"prettier": "^2.8.3",
"source-map-explorer": "^2.5.3",
"tailwindcss": "^3.2.4"
},
"dependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@capacitor/app": "5.0.6",
"@capacitor/core": "5.4.2",
"@capacitor/haptics": "5.0.6",
"@capacitor/keyboard": "5.0.6",
"@capacitor/status-bar": "5.0.6",
"@electron/remote": "^2.0.8",
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@headlessui/react": "^1.7.8",
"@heroicons/react": "^2.0.14",
"@ionic/react": "^7.0.0",
"@ionic/react-router": "^7.0.0",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@material-ui/lab": "4.0.0-alpha.57",
Expand All @@ -132,6 +147,13 @@
"@supabase/supabase-js": "^2.26.0",
"@tailwindcss/forms": "^0.5.2",
"@tailwindcss/typography": "^0.5.9",
"@types/jest": "^29.5.5",
"@types/node": "^20.8.2",
"@types/react": "^18.2.25",
"@types/react-beautiful-dnd": "^13.1.5",
"@types/react-dom": "^18.2.10",
"@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.3.3",
"@xelah/type-perf-html": "^1.0.1",
"adm-zip": "^0.5.9",
"audiobuffer-to-wav": "^1.0.0",
Expand All @@ -146,12 +168,15 @@
"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",
"file-saver": "^2.0.5",
"font-detect-rhl": "1.0.8",
"font-list": "^1.4.5",
"fs-extra": "^10.1.0",
"get-system-fonts": "^2.0.2",
"gitea-react-toolkit": "2.1.2",
"history": "^5.3.0",
"i18next": "^21.8.9",
"ionicons": "^7.1.2",
"is-electron": "^2.2.1",
"isomorphic-git": "^1.24.0",
"js-yaml": "^4.1.0",
Expand All @@ -169,16 +194,24 @@
"postcss-import": "^15.1.0",
"postcss-nested": "^6.0.0",
"prop-types": "15.8.1",
"proskomma-core": "^0.10.4",
"proskomma-json-tools": "^0.8.8",
"proskomma-react-hooks": "2.4.0",
"raw-loader": "^4.0.2",
"react": "^18.2.0",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^18.2.0",
"react-i18next": "^11.17.1",
"react-icons": "^4.11.0",
"react-markdown": "^9.0.0",
"react-media-recorder": "^1.6.6",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "5.0.1",
"styled-components": "^5.3.6",
"tc-ui-toolkit": "5.3.3",
"translation-helps-rcl": "3.5.12",
"typescript": "^4.9.5",
"use-deep-compare": "^1.1.0",
"usfm-editor": "0.8.7",
"usfm-grammar": "^2.3.0",
Expand All @@ -187,12 +220,24 @@
"webpack-node-externals": "^3.0.0",
"winston": "^3.7.2",
"word-aligner": "1.0.0",
"workbox-background-sync": "^7.0.0",
"workbox-broadcast-update": "^7.0.0",
"workbox-cacheable-response": "^7.0.0",
"workbox-core": "^7.0.0",
"workbox-expiration": "^7.0.0",
"workbox-google-analytics": "^7.0.0",
"workbox-navigation-preload": "^7.0.0",
"workbox-precaching": "^7.0.0",
"workbox-range-requests": "^7.0.0",
"workbox-routing": "^7.0.0",
"workbox-strategies": "^7.0.0",
"workbox-streams": "^7.0.0",
"ws": "^8.8.0",
"xregexp": "^5.1.1",
"yarn": "^1.22.19"
},
"optionalDependencies": {
"bufferutil": "^4.0.6",
"react-icons": "4.10.1",
"scripture-resources-rcl": "5.1.0",
"utf-8-validate": "^5.0.9"
},
Expand All @@ -204,4 +249,4 @@
"word-aligner": "$word-aligner",
"@mui/lab": "$@mui/lab"
}
}
}
2 changes: 2 additions & 0 deletions renderer/jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"compilerOptions": {
"jsx": "react",
"resolveJsonModule": true,
"baseUrl": ".",
"paths": {
"@/components/*": [
Expand Down
Loading
Loading