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

Texteditor refactor #190

Merged
merged 7 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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: 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"
]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions public/icons/Xelah/XMark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 9 additions & 2 deletions renderer/jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,16 @@
"@/illustrations/*": [
"public/illustrations/*"
],
"@/hooks/*":[
"@/hooks/*": [
"src/components/hooks/*"
],
"@/hooks2/*": [
"src/hooks/*"
]
}
}
},
"exclude": [
"node_modules",
"dist"
]
}
3 changes: 3 additions & 0 deletions renderer/public/icons/Xelah/XMark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
206 changes: 0 additions & 206 deletions renderer/src/components/EditorPage/Scribex/Editor.jsx

This file was deleted.

65 changes: 0 additions & 65 deletions renderer/src/components/EditorPage/Scribex/GraftEditor.jsx

This file was deleted.

Loading
Loading