Cleaning up the web code and other fixes too (#387)

* Removed unused web code * Updated from material-ui v4 to mui v5 and also removed the unwanted files/codes * Improved the component loading * Re-arranged the UI and fixed the issue with tN loading
bible-technology · Dec 12, 2024 · cd0d38c · cd0d38c
1 parent 629e838
commit cd0d38c
Show file tree

Hide file tree

Showing 114 changed files with 473 additions and 5,314 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,7 +7,6 @@
 		"plugin:import/errors",
 		"plugin:import/warnings",
 		"plugin:jsx-a11y/recommended",
-		"plugin:react-hooks/recommended",
 		"airbnb",
 		"next"
 	],

diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/head.js b/app/head.js
diff --git a/app/home/layout.jsx b/app/home/layout.jsx
diff --git a/app/home/page.jsx b/app/home/page.jsx
diff --git a/app/layout.js b/app/layout.js
diff --git a/app/loading.js b/app/loading.js
diff --git a/app/login/page.jsx b/app/login/page.jsx
diff --git a/app/newproject/page.js b/app/newproject/page.js
diff --git a/app/page.js b/app/page.js
diff --git a/app/profile/page.js b/app/profile/page.js
diff --git a/app/projects/page.jsx b/app/projects/page.jsx
diff --git a/app/providers.js b/app/providers.js
diff --git a/app/resource/page.jsx b/app/resource/page.jsx
diff --git a/app/signup/page.jsx b/app/signup/page.jsx
diff --git a/app/sync/page.js b/app/sync/page.js
diff --git a/e2e-tests/base.test.ts b/e2e-tests/base.test.ts
@@ -132,7 +132,7 @@ test("Click the view users button and delete the playwright user from the active
         await archiveDiv.nth(i).click()
       }
       await window.locator('//*[@id="active-tab"]').click()
-      await window.locator(`//*[@dataId="${userName.toLowerCase()}"]`).click()
+      await window.locator(`//*[@data-id="${userName.toLowerCase()}"]`).click()
       break
     }
   }

diff --git a/package.json b/package.json
@@ -142,8 +142,6 @@
     "@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",
     "@mui/lab": "^5.0.0-alpha.104",
     "@mui/material": "^5.15.15",
@@ -153,7 +151,6 @@
     "@radix-ui/react-dialog": "^1.0.3",
     "@radix-ui/react-dropdown-menu": "^2.0.4",
     "@react-pdf/renderer": "^3.4.0",
-    "@supabase/supabase-js": "^2.26.0",
     "@tailwindcss/forms": "^0.5.2",
     "@tailwindcss/typography": "^0.5.9",
     "@types/jest": "^29.5.5",

diff --git a/renderer/pages/_document.js b/renderer/pages/_document.js
@@ -12,7 +12,7 @@ export default class MyDocument extends Document {
     return (
       <Html>
         <Head>
-          <link rel="stylesheet" />
+          <link />
         </Head>
         <body>
           <Main />

diff --git a/renderer/pages/signup.js b/renderer/pages/signup.js
diff --git a/renderer/src/Meta.js b/renderer/src/Meta.js
@@ -7,7 +7,7 @@ const Meta = () => (
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta charSet="utf-8" />
     {/* <link rel="shortcut icon" href="/static/favicon.png" /> */}
-    <link rel="stylesheet" type="text/css" href="/static/nprogress.css" />
+    <link type="text/css" />
     <title>{i18n.t('app-name')}</title>
   </Head>
 );

diff --git a/renderer/src/WebHome.js b/renderer/src/WebHome.js
diff --git a/renderer/src/components/AudioRecorder/components/EditorPage.js b/renderer/src/components/AudioRecorder/components/EditorPage.js
@@ -222,7 +222,7 @@ const EditorPage = ({
 };
 export default EditorPage;
 EditorPage.propTypes = {
-  content: PropTypes.object,
+  content: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
   onChangeVerse: PropTypes.any,
   verse: PropTypes.string,
   location: PropTypes.string,

diff --git a/renderer/src/components/AudioRecorder/components/WaveForm.js b/renderer/src/components/AudioRecorder/components/WaveForm.js
@@ -10,7 +10,7 @@ import MicrophonePlugin from 'wavesurfer.js/dist/plugin/wavesurfer.microphone.js
 
 // eslint-disable-next-line prefer-const
 let microphone = MicrophonePlugin.create();
-const AudioWaveForm = (props) => {
+const AudioWaveForm = ((props, ref) => {
   const {
     height,
     waveColor,
@@ -38,6 +38,7 @@ const AudioWaveForm = (props) => {
   // eslint-disable-next-line prefer-const
   // let microphone = useRef(null);
   const [playing, setPlaying] = useState(false);
+  const combinedRef = ref || waveformRef;
   const formWaveSurferOptions = (ref) => ({
     container: ref || '#waveform',
     waveColor,
@@ -59,7 +60,7 @@ const AudioWaveForm = (props) => {
   });
 
   const createForm = async (currentUrl) => {
-    const options = formWaveSurferOptions(waveformRef.current);
+    const options = formWaveSurferOptions(combinedRef.current);
     wavesurfer.current = WaveSurfer.create(options);
     // Below url is for testing/development purpose
     // const currentUrl = 'https://www.mfiles.co.uk/mp3-downloads/brahms-st-anthony-chorale-theme-two-pianos.mp3';
@@ -85,7 +86,7 @@ const AudioWaveForm = (props) => {
   };
 
   const createRecForm = async () => {
-    const options = formWaveSurferOptions(waveformRef.current);
+    const options = formWaveSurferOptions(combinedRef.current);
     wavesurfer.current = WaveSurfer.create(options);
     wavesurfer.current?.microphone.on('deviceReady', (stream) => {
       // eslint-disable-next-line no-console
@@ -208,7 +209,7 @@ const AudioWaveForm = (props) => {
         && (
           <>
             <div className="w-full">
-              <div id="waveform" ref={waveformRef} />
+              <div id="waveform" ref={combinedRef} />
             </div>
             {show
             && (
@@ -234,7 +235,7 @@ const AudioWaveForm = (props) => {
         )}
     </div>
   );
-};
+});
 export default forwardRef(AudioWaveForm);
 AudioWaveForm.propTypes = {
   height: PropTypes.number,

diff --git a/renderer/src/components/AutoCompleteSearch/AutoComplete.test.js b/renderer/src/components/AutoCompleteSearch/AutoComplete.test.js