unfoldingWord · PhotoNomad0 · Dec 11, 2023 · Dec 11, 2023 · Dec 11, 2023 · Dec 12, 2023
diff --git a/.babelrc → .babelrc.old b/.babelrc → .babelrc.old
@@ -1,5 +1,4 @@
 {
-  "presets": ["next/babel"],
   "env": {
     "test": {
       "plugins": [

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.19.0]
+        node-version: [18.17.1]
     steps:
       - uses: actions/[email protected]
         with:

diff --git a/README.md b/README.md
@@ -73,70 +73,77 @@ yarn test:headless
 
 - Structure of the React components in this app
 
-Application (in pages/\_app.js) contains:
+**Startup** is main.jsx which renders the Application (App)
+
+**Application** (App.jsx) contains:
 
 - AuthContext context
 - StoreContext context:
 
-Home (in pages/index.js) contains:
-<Layout>
-<WorkspaceContainer />
-</Layout>
-
-WorkspaceContainer component manages the Resource workspace
-
-- Contains Workspace component (resource workspace rcl) that contains several:
-  - ScriptureCard components
-  - ResourceCard components
+  <AuthContextProvider>
+    <StoreContextProvider>
+      <Layout>
+        <WorkspaceContainer />
+      </Layout>
+    </StoreContextProvider>
+  </AuthContextProvider>
 
-Layout component:
+**Layout** component:
 
 - accesses authentication context and store context
 - Manages server selection through url variables
 - Displays Onboarding component if login is required
+- displays the settings page if selected
 - Contains the header and footer
 
-BibleReference component:
+**WorkspaceContainer** component manages the workspace containing the resource cards
+
+- Contains Workspace component (resource workspace rcl) that contains several cards of type:
+  - ScriptureCard components
+  - ResourceCard components
+
+**BibleReference** component:
 
 - Uses bible Reference RCL
 - Updates reference store context
 
-Onboarding component
+**Onboarding** component
 
 - Displays the AccountSetup component when login is required
 
-Header component:
+**Header** component:
 
 - Contains BibleReference component
 
-Footer component:
+**Footer** component:
 
 - Shows app version/build
 
-Drawer component (hamburger menu):
+**Drawer** component (hamburger menu):
 
 - Shows
 
-TranslationSettings component:
+**TranslationSettings** component:
 
 - Prompts for organization and language
 
-ResourceCard component:
+**ResourceCard** component:
 
 - Card that displays translationHelps content
 
-ScriptureCard component:
+**ScriptureCard** component:
 
 - Card that displays scripture content
 
-AuthContext context:
+**AuthContext** context:
 
 - Initializes the authentication context (defined in gitea-react-toolkit)
 
 StoreContext context:
 
-- Manages and persists application state data into local storage
+- Manages and persists the rest of the application state data into local storage
 
 useLocalStorage - custom hook that persists generic application data into local storage
 
 useUserLocalStorage - custom hook that application data for logged in user into local storage
+
diff --git a/index.html b/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel='icon' href='/static/favicon.ico' />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>gatewayEdit</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>
diff --git a/jest.config.js b/jest.config.js
diff --git a/netlify.toml b/netlify.toml
@@ -2,8 +2,5 @@
   command = "npm run build"
   publish = "out"
 
-[[plugins]]
-  package = "@netlify/plugin-nextjs"
-
 [[plugins]]
   package = "/scripts/zulip-notification"
diff --git a/package.json b/package.json
@@ -2,18 +2,19 @@
   "name": "gateway-edit",
   "version": "2.3.0",
   "scripts": {
-    "dev": "bash -c \"source ./scripts/set-env.sh && next\"",
-    "build": "bash -c \"source ./scripts/set-env.sh && next build\"",
-    "start": "bash -c \"source ./scripts/set-env.sh && next start\"",
-    "export": "next export",
+    "dev": "bash -c \"source ./scripts/set-env.sh && vite\"",
+    "build": "bash -c \"source ./scripts/set-env.sh && vite build\"",
+    "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
+    "preview": "bash -c \"source ./scripts/set-env.sh && vite preview",
+    "exportx": "next export",
     "postinstall": "husky install",
     "increment-build": "bash scripts/increment-build.sh && git add -A",
     "cypress": "cross-env NODE_ENV=test cypress open",
     "cypress:headless": "cross-env NODE_ENV=test cypress run",
     "test": "cross-env NODE_ENV=test start-server-and-test dev http://localhost:3000 cypress",
     "test:headless": "cross-env NODE_ENV=test start-server-and-test dev http://localhost:3000 cypress:headless",
-    "test:unit": "cross-env NODE_ENV='test' jest --coverage __tests__",
-    "test:unit-nocov": "cross-env NODE_ENV='test' jest",
+    "test:unit": "cross-env NODE_ENV='test' vitest --coverage __tests__",
+    "test:unit-nocov": "cross-env NODE_ENV='test' vitest",
     "coverage-summary": "yarn nyc report --reporter=text-summary",
     "mkdir:reports": "mkdir reports || true",
     "precopy:reports": "yarn mkdir:reports",
@@ -41,7 +42,6 @@
     "gitea-react-toolkit": "2.4.0",
     "localforage": "^1.9.0",
     "markdown-translatable": "2.0.3",
-    "next": "10.2.0",
     "postcss": "^8.2.1",
     "react": "^17.0.2",
     "react-bootstrap": "0.32.4",
@@ -52,7 +52,7 @@
     "resource-workspace-rcl": "2.1.4",
     "scripture-resources-rcl": "5.5.9",
     "scripture-tsv": "0.4.0",
-    "single-scripture-rcl": "3.4.17",
+    "single-scripture-rcl": "3.4.19-beta.2",
     "tailwindcss": "^2.0.4",
     "tc-ui-toolkit": "5.3.3",
     "translation-helps-rcl": "3.5.14",
@@ -61,16 +61,12 @@
     "word-aligner-rcl": "1.0.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.8",
-    "@babel/preset-env": "^7.15.8",
     "@cypress/code-coverage": "^3.9.11",
     "@cypress/instrument-cra": "^1.4.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.1.2",
     "@types/jest": "^27.0.2",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.3.1",
-    "babel-plugin-istanbul": "^6.1.1",
+    "@vitejs/plugin-react": "^4.2.0",
     "cross-env": "7.0.3",
     "cypress": "^8.6.0",
     "eslint": "^7.16.0",
@@ -86,12 +82,13 @@
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-react-hooks": "^4.2.0",
     "husky": "^5.2.0",
-    "jest": "^27.3.1",
     "nyc": "^15.1.0",
     "prettier": "^2.2.1",
     "prop-types": "^15.7.2",
     "react-icons": "^4.8.0",
-    "start-server-and-test": "^1.14.0"
+    "start-server-and-test": "^1.14.0",
+    "vite": "4.5.1",
+    "vitest": "0.34.6"
   },
   "nyc": {
     "report-dir": "cypress-coverage"

diff --git a/pages/404.js b/pages/404.js
diff --git a/pages/_app.js b/pages/_app.js