fix: export setting .json

shinevue · Jun 27, 2024 · 61eb065 · 61eb065
1 parent 73b8435
commit 61eb065
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 28 deletions.
diff --git a/src/consts/BooksSetting.json → public/config/BooksSetting.json b/src/consts/BooksSetting.json → public/config/BooksSetting.json
diff --git a/src/consts/ChaptersSetting.json → public/config/ChaptersSetting.json b/src/consts/ChaptersSetting.json → public/config/ChaptersSetting.json
diff --git a/src/consts/VersesSetting.json → public/config/VersesSetting.json b/src/consts/VersesSetting.json → public/config/VersesSetting.json
diff --git a/src/libs/axios.js b/src/libs/axios.js
@@ -56,3 +56,21 @@ export const GetLanguages = () => {
 };
 
 export default instance;
+
+export const GetBooksSetting = async () => {
+
+  const res = await axios.get(`/config/BooksSetting.json`);
+  return res.data;
+}
+
+
+export const GetChaptersSetting = async () => {
+  const res = await axios.get(`/config/ChaptersSetting.json`);
+  return res.data;
+}
+
+
+export const GetVersesSetting = async () => {
+  const res = await axios.get(`/config/VersesSetting.json`);
+  return res.data;
+}
diff --git a/src/libs/getItemCount.js b/src/libs/getItemCount.js
@@ -1,10 +1,11 @@
-import CHPATER from "../consts/ChaptersSetting.json";
-import VERSE from "../consts/VersesSetting.json";
+import { GetChaptersSetting, GetVersesSetting } from "./axios";
+
 import getRandomNumber from "./getRandomNumber";
 
-export const getChapterCounts = (range) => {
+export const getChapterCounts = async (range) => {
+  let CHAPTER = await GetChaptersSetting();
   let result = 5;
-  CHPATER.map((item) => {
+  CHAPTER.map((item) => {
     let node = item.value.split("-").map((one) => +one);
     if (range > node[0] && range < node[1]) {
       let outrange = item.num.split("-").map((one) => +one);
@@ -14,7 +15,8 @@ export const getChapterCounts = (range) => {
   return result;
 };
 
-export const getVerseCounts = (range) => {
+export const getVerseCounts = async (range) => {
+  let VERSE = await GetVersesSetting();
   let result = 5;
   VERSE.map((item) => {
     let node = item.value.split("-").map((one) => +one);

diff --git a/src/pages/Prepare/index.js b/src/pages/Prepare/index.js
@@ -2,13 +2,14 @@ import React, { useState, useEffect, version } from "react";
 import { MDBBtn, MDBTypography } from "mdb-react-ui-kit";
 import Select from "react-select";
 import { useNavigate } from "react-router-dom";
-import Alert from "@mui/material/Alert";
 
 import LANG_DATA from "../../consts/LanguagesData.json";
-import SECTION_DATA from "../../consts/BooksSetting.json";
 
 import "./styles.css";
 import SchoolSharpIcon from "@mui/icons-material/SchoolSharp";
+import { GetBooksSetting } from "../../libs/axios";
+
+let SECTION_DATA;
 
 export default function PreparePage(props) {
   const [versionOptions, setVersionOptions] = useState([]);
@@ -18,28 +19,31 @@ export default function PreparePage(props) {
   const [selectedSection, setSelectedSection] = useState({});
 
   useEffect(() => {
-    const previewLang = localStorage.getItem("language");
-    setSelectedLanguage({
-      language: previewLang,
-    });
-
-    if (previewLang) {
-      setVersionOptions(
-        LANG_DATA.find((one) => one.language == previewLang).translations
-      );
-    }
-    if (localStorage.getItem("version-short")) {
-      setSelectedVersion({
-        short_name: localStorage.getItem("version-short"),
-        full_name: localStorage.getItem("version-full"),
+    (async () => {
+      SECTION_DATA = await GetBooksSetting();
+      const previewLang = localStorage.getItem("language");
+      setSelectedLanguage({
+        language: previewLang,
       });
-    }
-    if (localStorage.getItem("section-value")) {
-      setSelectedSection({
-        value: localStorage.getItem("section-value"),
-        bible: localStorage.getItem("section-label"),
-      });
-    }
+
+      if (previewLang) {
+        setVersionOptions(
+          LANG_DATA.find((one) => one.language == previewLang).translations
+        );
+      }
+      if (localStorage.getItem("version-short")) {
+        setSelectedVersion({
+          short_name: localStorage.getItem("version-short"),
+          full_name: localStorage.getItem("version-full"),
+        });
+      }
+      if (localStorage.getItem("section-value")) {
+        setSelectedSection({
+          value: localStorage.getItem("section-value"),
+          bible: localStorage.getItem("section-label"),
+        });
+      }
+    })();
   }, []);
 
   const navigate = useNavigate();