Skip to content

Commit

Permalink
resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bobbykumar706584
Bobbykumar706584 committed Nov 20, 2023
2 parents 790b95e + 4d61456 commit 25fba4f
Show file tree
Hide file tree
Showing 38 changed files with 1,628 additions and 266 deletions.
2 changes: 1 addition & 1 deletion renderer/environment.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const environment = {
PROJECT_SETTING_FILE: 'scribe-settings.json',
USER_SETTING_FILE: 'scribe-user-settings.json',
production: false,
AG_SETTING_VERSION: '1.2.1',
AG_SETTING_VERSION: '1.2.2',
AG_USER_SETTING_VERSION: '1.2.0',
APPLICATION_ID: 'AutographaEditor',
JAVASCRIPT_KEY: 'C3925DFBCF06DF5291AC',
Expand Down
9 changes: 9 additions & 0 deletions renderer/public/illustrations/AudioEditor.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions renderer/public/illustrations/BibleEditor.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions renderer/public/illustrations/OBSEditor.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions renderer/src/components/EditorPage/ObsEditor/ReferenceObs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@ const style = {
fontStyle: 'italic',
},
};
const ReferenceObs = ({ stories, panelNo }) => {
const ReferenceObs = ({ stories, font, panelNo }) => {
const [isLoading, setIsLoading] = useState(true);
const [networkState, setNetworkState] = useState({ online: true });
const {
state: {
selectedStory,
selectedFont,
fontSize,
},
actions: {
Expand Down Expand Up @@ -104,7 +103,7 @@ const { t } = useTranslation();
<p
className="text-sm text-gray-600 text-justify w-full break-words overflow-hidden"
style={{
fontFamily: selectedFont || 'sans-serif',
fontFamily: font || 'sans-serif',
fontSize: `${fontSize}rem`,
lineHeight: (fontSize > 1.3) ? 1.5 : '',
}}
Expand Down
27 changes: 15 additions & 12 deletions renderer/src/components/EditorPage/Reference/OBS/ObsResourceCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function ObsResourceCard({
languageId,
isLoading,
setIndex,
font,
}) {
const {
state: { filters, markdownView },
Expand All @@ -35,18 +36,20 @@ function ObsResourceCard({
itemIndex={index}
setItemIndex={setIndex}
/>
<CardContent
item={[]}
items={items}
filters={filters}
markdown={markdown}
languageId={languageId}
markdownView={markdownView}
isLoading={isLoading}
selectedQuote={selectedQuote}
setQuote={setQuote}
viewMode={viewMode}
/>
<div style={{ fontFamily: font || 'sans-serif' }}>
<CardContent
item={[]}
items={items}
filters={filters}
markdown={markdown}
languageId={languageId}
markdownView={markdownView}
isLoading={isLoading}
selectedQuote={selectedQuote}
setQuote={setQuote}
viewMode={viewMode}
/>
</div>
</>
);
}
Expand Down
2 changes: 2 additions & 0 deletions renderer/src/components/EditorPage/Reference/OBS/ObsTn.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function ObsTnCard({
owner,
resourceId,
offlineResource,
font,
...props
}) {
const [index, setIndex] = useState(0);
Expand Down Expand Up @@ -141,6 +142,7 @@ function ObsTnCard({
shouldSetQuoteOnClick
index={index}
setIndex={(v) => setIndex(v)}
font={font}
/>
) : <LoadingScreen />
);
Expand Down
2 changes: 2 additions & 0 deletions renderer/src/components/EditorPage/Reference/OBS/ObsTwlCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function ObsTwlCard({
owner,
resourceId,
offlineResource,
font,
...props
}) {
const [index, setIndex] = useState(1);
Expand Down Expand Up @@ -102,6 +103,7 @@ function ObsTwlCard({
shouldSetQuoteOnClick
index={index}
setIndex={(v) => setIndex(v)}
font={font}
/>
) : (
<LoadingScreen />
Expand Down
28 changes: 16 additions & 12 deletions renderer/src/components/EditorPage/Reference/ReferenceCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,23 @@ const ReferenceCard = ({
setQuote,
viewMode,
isLoading,
font,
}) => (
<CardContent
item={item}
items={items}
filters={filters}
markdown={markdown}
languageId={languageId}
markdownView={markdownView}
isLoading={isLoading}
selectedQuote={selectedQuote}
setQuote={setQuote}
viewMode={viewMode}
/>
<div style={{ fontFamily: font || 'sans-serif' }}>
<CardContent
item={item}
items={items}
filters={filters}
markdown={markdown}
languageId={languageId}
markdownView={markdownView}
isLoading={isLoading}
selectedQuote={selectedQuote}
setQuote={setQuote}
viewMode={viewMode}
/>
</div>

);

export default ReferenceCard;
Expand Down
13 changes: 12 additions & 1 deletion renderer/src/components/EditorPage/Reference/TranslationHelps.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ObsTnCard from './OBS/ObsTn';
import ObsTwlCard from './OBS/ObsTwlCard';

const TranslationHelps = ({
selectedResource, languageId, refName, bookId, chapter, verse, owner, story, offlineResource,
selectedResource, languageId, refName, bookId, chapter, verse, owner, story, offlineResource, font,
}) => {
const {
state: {
Expand Down Expand Up @@ -39,6 +39,7 @@ const TranslationHelps = ({
owner={owner}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
case 'twl':
Expand All @@ -54,6 +55,7 @@ const TranslationHelps = ({
resourceId="twl"
owner="test_org"
server="https://git.door43.org"
font={font}
/>
);
case 'twlm':
Expand All @@ -69,6 +71,7 @@ const TranslationHelps = ({
resourceId="twl"
owner={owner}
server="https://git.door43.org"
font={font}
/>
);
case 'tq':
Expand All @@ -86,6 +89,7 @@ const TranslationHelps = ({
owner={owner}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
case 'tw':
Expand All @@ -101,6 +105,7 @@ const TranslationHelps = ({
filePath={offlineResource?.twSelected?.folder}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
case 'ta':
Expand All @@ -117,6 +122,7 @@ const TranslationHelps = ({
filePath={filePathTa}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
case 'bible':
Expand All @@ -128,6 +134,7 @@ const TranslationHelps = ({
bookId={bookId}
chapter={chapter}
verse={verse}
font={font}
/>
);
case 'obs':
Expand All @@ -139,6 +146,7 @@ const TranslationHelps = ({
bookId={bookId}
chapter={chapter}
verse={verse}
font={font}
/>
);
case 'obs-tn':
Expand All @@ -154,6 +162,7 @@ const TranslationHelps = ({
owner={owner}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
case 'obs-tq':
Expand All @@ -169,6 +178,7 @@ const TranslationHelps = ({
owner={owner}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
case 'obs-twlm':
Expand All @@ -184,6 +194,7 @@ const TranslationHelps = ({
owner={owner}
server="https://git.door43.org"
offlineResource={offlineResource}
font={font}
/>
);
default:
Expand Down
2 changes: 2 additions & 0 deletions renderer/src/components/EditorPage/Reference/TranslationHelpsCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default function TranslationHelpsCard({
selectedQuote,
viewMode,
offlineResource,
font,
}) {
const [offlineItems, setOfflineItems] = useState([]);
const [offlineItemsDisable, setOfflineItemsDisable] = useState(false);
Expand Down Expand Up @@ -182,6 +183,7 @@ export default function TranslationHelpsCard({
viewMode={viewMode}
selectedQuote={selectedQuote}
setQuote={setQuote}
font={font}
/>
</>
);
Expand Down
Loading

0 comments on commit 25fba4f

Please sign in to comment.