conflict resolved

bible-technology · Oct 2, 2023 · d99da80 · d99da80
2 parents ff5306f + 56fdfa6
commit d99da80
Show file tree

Hide file tree

Showing 145 changed files with 12,314 additions and 7,176 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/.gitignore b/.gitignore
@@ -47,7 +47,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-
+.env
 .env.local
 .env.development.local
 .env.test.local

diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/head.js b/app/head.js
@@ -0,0 +1,13 @@
+// import i18n from '../src/translations/i18n';
+import '../styles/nprogress.css';
+
+export default function Head() {
+  return (
+    <>
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
+      <meta charSet="utf-8" />
+      <link rel="icon" href="/favicon.ico" sizes="any" />
+      <title>Scribe Scripture editor</title>
+    </>
+  );
+}
diff --git a/app/home/layout.jsx b/app/home/layout.jsx
@@ -0,0 +1,22 @@
+'use client';
+
+import PropTypes from 'prop-types';
+import SubMenuBar from '@/layouts/editor/SubMenuBar';
+import MenuBar from '@/layouts/editor/WebMenuBar';
+
+export default function EditorLayout(props) {
+  const { children } = props;
+
+  return (
+    <>
+      <MenuBar />
+      <SubMenuBar />
+
+      <main className="bg-gray-50-x">{children}</main>
+    </>
+  );
+}
+
+EditorLayout.propTypes = {
+  children: PropTypes.any,
+};
diff --git a/app/home/page.jsx b/app/home/page.jsx
@@ -0,0 +1,12 @@
+'use client';
+
+import SectionContainer from '@/layouts/editor/WebSectionContainer';
+import ProtectedRoute from '@/components/Protected';
+
+export default function page() {
+  return (
+    <ProtectedRoute>
+      <SectionContainer />
+    </ProtectedRoute>
+  );
+}
diff --git a/app/layout.js b/app/layout.js
@@ -0,0 +1,16 @@
+import { Providers } from './providers';
+import '../styles/nprogress.css';
+import '../styles/globals.css';
+// import { initializeParse } from '@parse/react-ssr';
+import 'usfm-editor/dist/style.css';
+import '../styles/style-override.lazy.css';
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <Providers>
+        <body>{children}</body>
+      </Providers>
+    </html>
+  );
+}
diff --git a/app/loading.js b/app/loading.js
@@ -0,0 +1,7 @@
+import LoadingScreen from '@/components/Loading/LoadingScreen';
+
+const Loading = () => (
+  <LoadingScreen />
+);
+
+export default Loading;
diff --git a/app/login/page.jsx b/app/login/page.jsx
@@ -0,0 +1,5 @@
+import WebLogin from '@/components/Login/WebLogin';
+
+const login = () => <WebLogin />;
+
+export default login;
diff --git a/app/newproject/page.js b/app/newproject/page.js
@@ -0,0 +1,10 @@
+import ProtectedRoute from '@/components/Protected';
+import NewWebProject from '@/modules/projects/NewWebProject';
+
+const newproject = () => (
+  <ProtectedRoute>
+    <NewWebProject call="new" />
+  </ProtectedRoute>
+);
+
+export default newproject;
diff --git a/app/page.js b/app/page.js
@@ -0,0 +1,7 @@
+import WebHome from '../renderer/src/WebHome';
+
+const index = () => (
+  <WebHome />
+);
+
+export default index;
diff --git a/app/profile/page.js b/app/profile/page.js
@@ -0,0 +1,12 @@
+import React from 'react';
+// import Profile from '@/modules/projects/Profile';
+import ProtectedRoute from '@/components/Protected';
+
+const ProfilePage = () => (
+  <ProtectedRoute>
+    Profile page
+    {/* <Profile /> */}
+  </ProtectedRoute>
+);
+
+export default ProfilePage;
diff --git a/app/projects/page.jsx b/app/projects/page.jsx
@@ -0,0 +1,10 @@
+import ProjectList from '@/modules/projects/WebProjectList';
+import ProtectedRoute from '@/components/Protected';
+
+const projects = () => (
+  <ProtectedRoute>
+    <ProjectList />
+  </ProtectedRoute>
+);
+
+export default projects;
diff --git a/app/providers.js b/app/providers.js
@@ -0,0 +1,26 @@
+'use client';
+
+import SyncContextProvider from '@/components/Sync/SyncContextProvider';
+import ScribexContextProvider from '@/components/context/ScribexContext';
+import ProjectContextProvider from '../renderer/src/components/context/ProjectContext';
+import ReferenceContextProvider from '../renderer/src/components/context/ReferenceContext';
+import AuthenticationContextProvider from '../renderer/src/components/Login/AuthenticationContextProvider';
+import AutographaContextProvider from '../renderer/src/components/context/AutographaContext';
+
+export function Providers({ children }) {
+  return (
+    <AuthenticationContextProvider>
+      <ProjectContextProvider>
+        <ReferenceContextProvider>
+          <AutographaContextProvider>
+            <ScribexContextProvider>
+              <SyncContextProvider>
+                {children}
+              </SyncContextProvider>
+            </ScribexContextProvider>
+          </AutographaContextProvider>
+        </ReferenceContextProvider>
+      </ProjectContextProvider>
+    </AuthenticationContextProvider>
+  );
+}
diff --git a/app/resource/page.jsx b/app/resource/page.jsx
@@ -0,0 +1,12 @@
+import React from 'react';
+// import SectionPlaceholder1 from '../../renderer/src/layouts/editor/SectionPlaceholder1';
+// import SectionPlaceholder2 from '../../renderer/src/layouts/editor/SectionPlaceholder2';
+
+const Page = () => (
+  <div className="grid grid-flow-col auto-cols-fr m-3 gap-2">
+    {/* <SectionPlaceholder1 editor="textStories" />
+    <SectionPlaceholder2 editor="textStories" /> */}
+  </div>
+);
+
+export default Page;
diff --git a/app/signup/page.jsx b/app/signup/page.jsx
@@ -0,0 +1,8 @@
+/* eslint-disable no-tabs */
+import SignupPage from '@/components/Signup/WebSignup';
+
+function Page() {
+	return <SignupPage />;
+}
+
+export default Page;
diff --git a/app/sync/page.js b/app/sync/page.js
@@ -0,0 +1,11 @@
+import ProtectedRoute from '@/components/Protected';
+// import Sync from '@/modules/projects/Sync';
+
+const sync = () => (
+  <ProtectedRoute>
+    Sync page
+    {/* <Sync /> */}
+  </ProtectedRoute>
+);
+
+export default sync;