Skip to content

Commit

Permalink
update local branch to latest branch - local merge approch
Browse files Browse the repository at this point in the history
  • Loading branch information
sijumoncy committed Dec 7, 2023
2 parents a3be7f2 + 927e5b1 commit 1310f75
Show file tree
Hide file tree
Showing 141 changed files with 4,315 additions and 2,360 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
10 changes: 7 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -27,4 +31,4 @@
},
"eslint.workingDirectories": [],
"editor.tabSize": 2
}
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<br />
<p align="center">
<a href="">
<img src="https://github.com/bible-technology/scribe-scripture-editor/blob/development/styles/Logo.png" alt="Logo" width="80" height="80">
<img src="https://github.com/bible-technology/scribe-scripture-editor/blob/development/styles/scribe-logo.png" alt="Logo" width="80" height="80">
</a>

<h3 align="center">Scribe Scripture Editor (Scribe SE)</h3>

<p align="center">
A Bible translation editor for everyone.
<br />
<a href="https://github.com/friendsofagape/autographa/issues">Report Issue</a>
<a href="https://github.com/bible-technology/scribe-scripture-editor/issues">Report Issue</a>
·
<a href="https://github.com/bible-technology/scribe-scripture-editor/issues">Feature Request</a>
</p>
Expand All @@ -41,7 +41,7 @@

## About The Project

Scribe SE is a standalone desktop application which aims to aid and be a friendly companion for the Bible Translator. It is composed of modes which support focus on specific use-cases e.g. text translation (USFM-based editor), Oral Bible translation (audio recorder) and Open Bible Story (in Markdown format) drafting mode. It supports syncing with online repositories for data backup and other such helpful features.
Scribe Scripture Editor is a free and open-licensed desktop application that is designed to support the Bible translator with drafting and checking scripture in both text and audio formats as well as provides support for translating Open Bible Stories in different modes. The features include multi-project support, revision control (cloud sync), audio recording and seamless basic USFM editing. It has a modular architecture and is poised to grow and support the evolving needs on the ground.

### Built With

Expand Down
725 changes: 445 additions & 280 deletions e2e-tests/base.test.ts

Large diffs are not rendered by default.

535 changes: 368 additions & 167 deletions e2e-tests/common.js

Large diffs are not rendered by default.

50 changes: 45 additions & 5 deletions e2e-tests/myFixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 5 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@
"app/*"
],
}
}
},
"exclude": [
"node_modules",
"dist"
]
}
Loading

0 comments on commit 1310f75

Please sign in to comment.