Skip to content

Commit 23b695c

Browse files
vipinpaulvipinpaul
authored
Merge pull request #729 from sevenxhq/ft/refactored-resource-loader
Refactored resource loader
2 parents 2c1c174 + a0cd222 commit 23b695c

File tree

88 files changed

+18969
-20201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+18969
-20201
lines changed

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
"editor.codeActionsOnSave": {
2626
"source.fixAll.eslint": true
2727
},
28-
"eslint.workingDirectories": [],
28+
"eslint.workingDirectories": []
2929
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"@emotion/react": "^11.10.5",
121121
"@emotion/styled": "^11.10.5",
122122
"@headlessui/react": "^1.6.4",
123-
"@heroicons/react": "^1.0.6",
123+
"@heroicons/react": "^2.0.13",
124124
"@material-ui/core": "^4.12.4",
125125
"@material-ui/icons": "^4.11.3",
126126
"@material-ui/lab": "4.0.0-alpha.57",
@@ -196,4 +196,4 @@
196196
"word-aligner": "$word-aligner",
197197
"@mui/lab": "$@mui/lab"
198198
}
199-
}
199+
}

‎pages/wip/RowSection.js‎

Lines changed: 59 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { ViewGridAddIcon, CogIcon, XIcon } from '@heroicons/react/outline';
3+
import { SquaresPlusIcon, CogIcon, XMarkIcon } from '@heroicons/react/24/outline';
44

55
import { classNames } from '@/util/classNames';
66

@@ -15,82 +15,80 @@ export default function ColumnOne(props) {
1515
} = props;
1616

1717
return (
18-
<>
19-
<div className={classNames(!ishidden ? 'hidden' : '', 'relative first:mt-0 pb-12 border bg-white border-gray-200 rounded shadow-sm overflow-hidden group')}>
18+
<div className={classNames(!ishidden ? 'hidden' : '', 'relative first:mt-0 pb-12 border bg-white border-gray-200 rounded shadow-sm overflow-hidden group')}>
2019

21-
<div className="bg-gray-200 rounded-t text-center text-gray-600 relative overflow-hidden">
22-
<div className="bg-gray-200 z-50 rounded-t overflow-hidden">
23-
<div className="flex items-center">
24-
<div className="ml-4 h-8 flex justify-center items-center text-xxs uppercase tracking-wider font-bold leading-3 truncate">
25-
Bible
26-
</div>
27-
28-
<div className="flex bg-gray-300 absolute h-full -right-0 rounded-tr invisible group-hover:visible">
29-
<button type="button">
30-
<CogIcon className="mx-3 h-5 w-5 text-gray-800" />
31-
</button>
32-
33-
<button
34-
type="button"
35-
onClick={expandRow}
36-
>
37-
<img
38-
className="px-2 py-2"
39-
src="/illustrations/minimize.svg"
40-
alt=""
41-
/>
42-
</button>
43-
44-
<button
45-
type="button"
46-
onClick={removeRow}
47-
>
48-
<XIcon className="mx-3 h-5 w-5 text-gray-800" />
49-
</button>
50-
</div>
20+
<div className="bg-gray-200 rounded-t text-center text-gray-600 relative overflow-hidden">
21+
<div className="bg-gray-200 z-50 rounded-t overflow-hidden">
22+
<div className="flex items-center">
23+
<div className="ml-4 h-8 flex justify-center items-center text-xxs uppercase tracking-wider font-bold leading-3 truncate">
24+
Bible
5125
</div>
52-
</div>
53-
</div>
5426

55-
<div className="prose-sm p-4 text-xl h-full overflow-y-scroll no-scrollbars">
27+
<div className="flex bg-gray-300 absolute h-full -right-0 rounded-tr invisible group-hover:visible">
28+
<button type="button">
29+
<CogIcon className="mx-3 h-5 w-5 text-gray-800" />
30+
</button>
5631

57-
<div className="w-full">
58-
<h1>asf</h1>
59-
<h1>asf</h1>
60-
<h1>asf</h1>
61-
<h1>asf</h1>
62-
<h1>asf</h1>
63-
<h1>asf</h1>
64-
<h1>asf</h1>
65-
</div>
32+
<button
33+
type="button"
34+
onClick={expandRow}
35+
>
36+
<img
37+
className="px-2 py-2"
38+
src="/illustrations/minimize.svg"
39+
alt=""
40+
/>
41+
</button>
6642

67-
<div className="w-full h-full flex items-center justify-center">
68-
<div className="text-center">
69-
<div className="text-xs uppercase pb-4">
70-
Load a Module
71-
{rowCount}
72-
</div>
7343
<button
7444
type="button"
75-
className="p-4 bg-gray-200 rounded-lg ring-offset-1"
45+
onClick={removeRow}
7646
>
77-
<ViewGridAddIcon className="h-5 w-5" aria-hidden="true" />
47+
<XMarkIcon className="mx-3 h-5 w-5 text-gray-800" />
7848
</button>
7949
</div>
8050
</div>
51+
</div>
52+
</div>
8153

54+
<div className="prose-sm p-4 text-xl h-full overflow-y-scroll no-scrollbars">
55+
56+
<div className="w-full">
57+
<h1>asf</h1>
58+
<h1>asf</h1>
59+
<h1>asf</h1>
60+
<h1>asf</h1>
61+
<h1>asf</h1>
62+
<h1>asf</h1>
63+
<h1>asf</h1>
8264
</div>
8365

84-
<button
85-
type="button"
86-
onClick={addRow}
87-
className="absolute p-2 bg-primary rounded bottom-0 -right-0 invisible group-hover:visible group-last:hidden"
88-
>
89-
<ViewGridAddIcon className="h-6 w-6 text-white" aria-hidden="true" />
90-
</button>
66+
<div className="w-full h-full flex items-center justify-center">
67+
<div className="text-center">
68+
<div className="text-xs uppercase pb-4">
69+
Load a Module
70+
{rowCount}
71+
</div>
72+
<button
73+
type="button"
74+
className="p-4 bg-gray-200 rounded-lg ring-offset-1"
75+
>
76+
<SquaresPlusIcon className="h-5 w-5" aria-hidden="true" />
77+
</button>
78+
</div>
79+
</div>
9180

9281
</div>
93-
</>
82+
83+
<button
84+
type="button"
85+
onClick={addRow}
86+
className="absolute p-2 bg-primary rounded bottom-0 -right-0 invisible group-hover:visible group-last:hidden"
87+
>
88+
<SquaresPlusIcon className="h-6 w-6 text-white" aria-hidden="true" />
89+
</button>
90+
91+
</div>
9492
);
9593
}
9694

‎pages/wip/WaveForm.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useEffect, useRef, useState } from 'react';
22
import PropTypes from 'prop-types';
33

4-
import { PlayIcon, PauseIcon } from '@heroicons/react/solid';
4+
import { PlayIcon, PauseIcon } from '@heroicons/react/24/solid';
55

66
export default function AudioWaveForm(props) {
77
const {

‎pages/wip/editor-audio.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import {
99
CogIcon,
1010
MinusIcon,
1111
PlusIcon,
12-
AnnotationIcon,
12+
ChatBubbleBottomCenterTextIcon,
1313
SpeakerphoneIcon,
1414
ArrowNarrowRightIcon,
1515
CheckIcon,
16-
XIcon,
16+
XMarkIcon,
1717
PencilIcon,
18-
} from '@heroicons/react/outline';
18+
} from '@heroicons/react/24/outline';
1919

2020
import AuthenticationContextProvider from '@/components/Login/AuthenticationContextProvider';
2121
import ProjectContextProvider from '@/components/context/ProjectContext';
@@ -203,7 +203,7 @@ export default function ReferenceSelector() {
203203
className="w-4 h-4 mr-1"
204204
aria-hidden="true"
205205
/>
206-
<AnnotationIcon
206+
<ChatBubbleBottomCenterTextIcon
207207
className="w-4 h-4 mr-1"
208208
aria-hidden="true"
209209
/>
@@ -233,7 +233,7 @@ export default function ReferenceSelector() {
233233
type="button"
234234
className="flex p-1 px-2 items-center justify-center bg-error rounded-lg text-xxs font-bold text-white uppercase tracking-wider"
235235
>
236-
<XIcon
236+
<XMarkIcon
237237
className="w-4 h-4 mr-1"
238238
aria-hidden="true"
239239
/>

‎pages/wip/editor-obs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from 'react';
22

3-
import { EyeIcon, EyeOffIcon } from '@heroicons/react/outline';
3+
import { EyeIcon, EyeOffIcon } from '@heroicons/react/24/outline';
44
import AuthenticationContextProvider from '@/components/Login/AuthenticationContextProvider';
55
import ProjectContextProvider from '@/components/context/ProjectContext';
66
import ReferenceContextProvider from '@/components/context/ReferenceContext';

‎renderer/src/components/AudioRecorder/components/EditorPage.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const EditorPage = ({
5353
className="w-4 h-4 mr-1"
5454
aria-hidden="true"
5555
/>
56-
<AnnotationIcon
56+
<ChatBubbleBottomCenterTextIcon
5757
className="w-4 h-4 mr-1"
5858
aria-hidden="true"
5959
/>
@@ -87,7 +87,7 @@ const EditorPage = ({
8787
type="button"
8888
className="flex p-1 px-2 items-center justify-center bg-error rounded-lg text-xxs font-bold text-white uppercase tracking-wider"
8989
>
90-
<XIcon
90+
<XMarkIcon
9191
className="w-4 h-4 mr-1"
9292
aria-hidden="true"
9393
/>

‎renderer/src/components/AudioRecorder/components/Player.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import {
1212
MinusIcon,
1313
PlusIcon,
1414
StopIcon,
15-
AnnotationIcon,
15+
ChatBubbleBottomCenterTextIcon,
1616
SpeakerphoneIcon,
1717
ArrowNarrowRightIcon,
1818
CheckIcon,
19-
XIcon,
19+
XMarkIcon,
2020
PencilIcon,
21-
} from '@heroicons/react/outline';
21+
} from '@heroicons/react/24/outline';
2222
import { Listbox } from '@headlessui/react';
2323
import dynamic from 'next/dynamic';
2424
import PropTypes from 'prop-types';

‎renderer/src/components/AudioRecorder/components/WaveForm.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
} from 'react';
55
import PropTypes from 'prop-types';
66
import WaveSurfer from 'wavesurfer.js';
7-
import { PlayIcon, PauseIcon } from '@heroicons/react/solid';
7+
import { PlayIcon, PauseIcon } from '@heroicons/react/24/solid';
88
// eslint-disable-next-line import/extensions
99
import MicrophonePlugin from 'wavesurfer.js/dist/plugin/wavesurfer.microphone.js';
1010

‎renderer/src/components/EditorPage/Navigation/CustomNavigation.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import {
44
Fragment, useEffect, useRef, useState,
55
} from 'react';
66
import {
7-
XIcon,
7+
XMarkIcon,
88
ChevronDownIcon,
9-
} from '@heroicons/react/solid';
9+
} from '@heroicons/react/24/solid';
1010
import { useBibleReference } from 'bible-reference-rcl';
1111
import SelectBook from '@/components/EditorPage/Navigation/reference/SelectBook';
1212
import SelectVerse from '@/components/EditorPage/Navigation/reference/SelectVerse';
@@ -172,7 +172,7 @@ export default function CustomNavigation({
172172
className="focus:outline-none w-9 h-9 bg-black p-2"
173173
onClick={closeBooks}
174174
>
175-
<XIcon />
175+
<XMarkIcon />
176176
</button>
177177
</SelectBook>
178178
</div>
@@ -225,7 +225,7 @@ export default function CustomNavigation({
225225
className="focus:outline-none w-9 h-9 bg-black p-2"
226226
onClick={closeVerses}
227227
>
228-
<XIcon />
228+
<XMarkIcon />
229229
</button>
230230
</SelectVerse>
231231
</div>

0 commit comments

Comments
 (0)