@nakamura-123/pages 0.1.2 → 0.1.6

package/dist/component/Coin/CoinCheck.d.ts

@@ -1,7 +1,7 @@
 import { Storage } from "@nakamura-123/types";
 export declare const coinCheckFnc: import("@reduxjs/toolkit").AsyncThunk<void, string, {
     state?: unknown;
-    dispatch?: import("redux").Dispatch;
+    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
     extra?: unknown;
     rejectValue?: unknown;
     serializedErrorType?: unknown;

package/dist/component/Coin/CoinFnc.d.ts

@@ -1,4 +1,4 @@
-import RNIap, { ProductPurchase } from "react-native-iap";
+import RNIap, { Product, ProductPurchase } from "react-native-iap";
 import { Storage } from "@nakamura-123/types";
 export declare const initializeIAP: (paymentItems: string[] | undefined, setProducts: (products: RNIap.Product[]) => void, setLoading: (loading: boolean) => void) => Promise<void>;
 export declare const handlePurchase: (productId: string, dispatch: (action: any) => void) => Promise<ProductPurchase | null>;

package/dist/component/Grade/ShareBtn.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/component/Home/OpeningMsg.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const OpeningMsg: React.FC;
+export default OpeningMsg;

package/dist/component/Home/OpeningMsg.js

@@ -0,0 +1,57 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importStar(require("react"));
+var react_redux_1 = require("react-redux");
+var common_1 = require("@nakamura-123/common");
+var OpeningMsg = function () {
+    var dispatch = (0, react_redux_1.useDispatch)();
+    var _a = (0, react_1.useState)(false), isShowed = _a[0], setIsShowed = _a[1];
+    var _b = (0, react_1.useState)(null), msg = _b[0], setMsg = _b[1];
+    var openingMsgs = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.information.openingMsgs; });
+    var showedMsgIds = (0, react_redux_1.useSelector)(function (state) { return state.setting.showedMsgIds; });
+    var settingAsyncLoaded = (0, react_redux_1.useSelector)(function (state) { return state.setting.asyncLoaded; });
+    var unshowedMsgs = Array.isArray(openingMsgs) && Array.isArray(showedMsgIds)
+        ? openingMsgs.filter(function (m) { return !showedMsgIds.includes(m.id); })
+        : [];
+    (0, react_1.useEffect)(function () {
+        if (unshowedMsgs.length === 0)
+            return;
+        if (openingMsgs.length === 0)
+            return;
+        if (!settingAsyncLoaded)
+            return;
+        setMsg(unshowedMsgs[0]);
+        setIsShowed(true);
+    }, [unshowedMsgs.length, settingAsyncLoaded]);
+    var handleClose = function () {
+        if (msg) {
+            dispatch({ type: "setting/addShowedMsgId", payload: msg.id });
+            setIsShowed(false);
+        }
+    };
+    return (<common_1.MsgModal title={(msg === null || msg === void 0 ? void 0 : msg.title) || ""} msg={(msg === null || msg === void 0 ? void 0 : msg.msg) || ""} onClose={handleClose} isVisible={isShowed}/>);
+};
+exports.default = OpeningMsg;

package/dist/component/Home/OpenningMsg.d.ts

@@ -0,0 +1,3 @@
+import React from "react";
+declare const OpeningMsg: React.FC;
+export default OpeningMsg;

package/dist/component/Home/OpenningMsg.js

@@ -0,0 +1,52 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var react_1 = __importStar(require("react"));
+var react_redux_1 = require("react-redux");
+var common_1 = require("@nakamura-123/common");
+var OpeningMsg = function () {
+    var dispatch = (0, react_redux_1.useDispatch)();
+    var _a = (0, react_1.useState)(false), isShowed = _a[0], setIsShowed = _a[1];
+    var _b = (0, react_1.useState)(null), msg = _b[0], setMsg = _b[1];
+    var openingMsgs = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.information.openingMsgs; });
+    var showedMsgIds = (0, react_redux_1.useSelector)(function (state) { return state.setting.showedMsgIds; });
+    var unshowedMsgs = Array.isArray(openingMsgs) && Array.isArray(showedMsgIds)
+        ? openingMsgs.filter(function (m) { return !showedMsgIds.includes(m.id); })
+        : [];
+    (0, react_1.useEffect)(function () {
+        if (unshowedMsgs.length === 0)
+            return;
+        setMsg(unshowedMsgs[0]);
+        setIsShowed(true);
+    }, [unshowedMsgs]);
+    var handleClose = function () {
+        if (msg) {
+            dispatch({ type: "setting/addShowedMsgId", payload: msg.id });
+            setIsShowed(false);
+        }
+    };
+    return (<common_1.MsgModal title={(msg === null || msg === void 0 ? void 0 : msg.title) || ""} msg={(msg === null || msg === void 0 ? void 0 : msg.msg) || ""} onClose={handleClose} isVisible={isShowed}/>);
+};
+exports.default = OpeningMsg;

package/dist/functions/createQuizFnc.d.ts

@@ -1,13 +1,20 @@
 import { dQuestionSchema } from "@nakamura-123/db";
-import { CfgInitial, QuizInitial } from "@nakamura-123/stores";
+import { QuizInitial } from "@nakamura-123/stores";
 import { Results } from "realm";
 import { Store } from "@nakamura-123/types";
 type QuestionType = typeof dQuestionSchema.prototype;
 type QuestionResult = Results<QuestionType>;
-type startCfg = CfgInitial["startCfg"];
 type Selected = QuizInitial["selected"];
-export declare const getBasicQuizList: (QuestionDB: QuestionResult, startCfg: startCfg, selected: Selected) => Store.DQInStore[];
+export declare const getBasicQuizList: (QuestionDB: QuestionResult, startCfg: {
+    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
+    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
+    outOfYearRange: number[];
+}, selected: Selected) => Store.DQInStore[];
 export declare const getMiniTestQuestions: (QuestionDB: QuestionResult, subjectType: "unit" | "year", key: number, cnt: number) => Store.DQInStore[];
 export declare const getTestQuestions: (QuestionDB: QuestionResult, cnt: number) => Store.DQInStore[];
-export declare const getBootQuestions: (QuestionDB: QuestionResult, startCfg: startCfg, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
+export declare const getBootQuestions: (QuestionDB: QuestionResult, startCfg: {
+    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
+    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
+    outOfYearRange: number[];
+}, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
 export {};

package/dist/functions/oldStorageFnc.js

@@ -54,6 +54,8 @@ var handleOldData = function (realm, oldInfo, dispatch, msg) { return __awaiter(
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        dispatch({ type: "setting/guideStateFalse", payload: "loadOldData" });
+                        dispatch(stores_1.settingStorage.saveSetting());
                         if (!oldInfo) return [3 /*break*/, 4];
                         return [4 /*yield*/, loadingAllOldData(realm, oldInfo)];
                     case 1:
@@ -69,10 +71,7 @@ var handleOldData = function (realm, oldInfo, dispatch, msg) { return __awaiter(
                     case 4:
                         react_native_1.Alert.alert("エラー", "このアプリはデータを引き継ぐことはできません。");
                         _a.label = 5;
-                    case 5:
-                        dispatch({ type: "setting/guideStateFalse", payload: "loadOldData" });
-                        dispatch(stores_1.settingStorage.saveSetting());
-                        return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         }); }, "実行する", function () {

package/dist/functions/questionFilter.d.ts

@@ -1,16 +1,18 @@
 import { Results } from "realm";
 import { dQuestionSchema } from "@nakamura-123/db";
-import { CfgInitial } from "@nakamura-123/stores";
 import { Store } from "@nakamura-123/types";
 type QuestionType = typeof dQuestionSchema.prototype;
 type QR = Results<QuestionType>;
-type startCfg = CfgInitial["startCfg"];
 export declare const getUnitQuestions: (questions: QR, unitId: number) => QR;
 export declare const getSubUnitQuestions: (questions: QR, unitId: number, subUnitId: number) => QR;
 export declare const getYearQuestions: (questions: QR, year: number) => QR;
 export declare const getSubYearQuestions: (questions: QR, year: number, key: number) => QR;
 export declare const filterByOutOfYearRange: (questions: QR, outOfYearRange: number[]) => QR;
 export declare const filterByOutOfUnitRange: (questions: QR, outOfUnitRange: number[]) => QR;
-export declare const filterByTags: (questions: QR, startCfg: startCfg) => QR;
+export declare const filterByTags: (questions: QR, startCfg: {
+    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
+    option: import("@nakamura-123/lib/dist/config/startOption").QuizStartOptionValue;
+    outOfYearRange: number[];
+}) => QR;
 export declare const commonFilter: (questions: Store.DQInStore[], quizCnt: number, isShuffle: boolean) => Store.DQInStore[];
 export {};

package/dist/page/CoinPage.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/page/GetBadgePage.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/page/HomePage.js

@@ -37,6 +37,7 @@ var db_1 = require("@nakamura-123/db");
 var GradeCard_1 = __importDefault(require("../component/Grade/GradeCard/GradeCard"));
 var WaitingPayBanner_1 = __importDefault(require("../component/Coin/WaitingPayBanner"));
 var oldStorageFnc_1 = require("../functions/oldStorageFnc");
+var OpeningMsg_1 = __importDefault(require("../component/Home/OpeningMsg"));
 var MenuRectangle = function (_a) {
     var menu = _a.menu, navigation = _a.navigation;
     var title = menu.title, note = menu.note, icon = menu.icon, color = menu.color, link = menu.link;
@@ -50,27 +51,30 @@ var MenuRectangle = function (_a) {
 var LOAD_OLD_MSG = "  旧システムのデータ引き継ぎを実施いたします。ふせんデータや模擬試験の成績など、可能な限りデータを移行いたしますが、仕様上一部移行ができない項目があります。あらかじめご了承ください。\n\n  なお、引き継ぎをキャンセルされた場合でも、設定ページより再度手続きを行うことが可能です。";
 var HomePage = function (_a) {
     var menuLists = _a.menuLists, navigation = _a.navigation;
+    var dispatch = (0, react_redux_1.useDispatch)();
     var DailyLogDB = (0, react_2.useQuery)(db_1.DailyLogSchema);
     // ここは、データの引き継ぎを行うための処理です。
     var realm = (0, react_2.useRealm)();
     var showLoadOldData = (0, react_redux_1.useSelector)(function (state) { return state.setting.guide.loadOldData; });
+    var settingAsyncLoaded = (0, react_redux_1.useSelector)(function (state) { return state.setting.asyncLoaded; });
     var oldInfo = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.oldInfo; });
-    var dispatch = (0, react_redux_1.useDispatch)();
     (0, react_1.useEffect)(function () {
+        if (!settingAsyncLoaded)
+            return;
         if (showLoadOldData && oldInfo.testInfo.length > 0) {
             (0, oldStorageFnc_1.handleOldData)(realm, oldInfo, dispatch, LOAD_OLD_MSG);
         }
-    }, [showLoadOldData]);
+    }, [showLoadOldData, settingAsyncLoaded]);
     // これはデバッグ用です。
     if (__DEV__)
         console.log(realm_1.default.defaultPath);
+    if (common_1.commonHook.useIsOverFreeDate())
+        return <common_1.MyText>ストアから、アプリの更新を行ってください。</common_1.MyText>;
     return (<react_native_1.ScrollView>
       <react_native_1.View style={styles.container}>
+        <OpeningMsg_1.default />
         <WaitingPayBanner_1.default currentPage="home"/>
         <GradeCard_1.default DailyLogDB={DailyLogDB}/>
-        {/* <RoundRectangle title={T.txt.title} size="md" color="ltBlack">
-          <MyText style={styles.msg}>{T.txt.msg}</MyText>
-        </RoundRectangle> */}
 
         {menuLists.map(function (menu, i) {
             return <MenuRectangle key={i} menu={menu} navigation={navigation}/>;

package/dist/quiz/explain/Explain.js

@@ -12,6 +12,7 @@ var RenderImgOrText_1 = __importDefault(require("../common/RenderImgOrText"));
 var quizHook_1 = require("../../hooks/quizHook");
 var ExplainLogic_1 = require("./ExplainLogic");
 var ZoomableImage_1 = __importDefault(require("../common/ZoomableImage"));
+var MyTextqqyy_1 = __importDefault(require("../common/MyTextqqyy"));
 var Explain = function (_a) {
     var navigation = _a.navigation;
     var question = (0, quizHook_1.useQuestionData)();
@@ -24,6 +25,14 @@ var Explain = function (_a) {
         return (0, ExplainLogic_1.getExplainDatas)(word, question);
     });
     var formIsImpot = question.form === "input";
+    // 解説がない場合
+    if (explainInfos.length === 0)
+        return (<react_native_1.View style={styles.container}>
+        <MyTextqqyy_1.default>
+          こちらの問題の解説は掲載しておりません。過去問題集やWEBサイトなどでご確認ください。
+        </MyTextqqyy_1.default>
+      </react_native_1.View>);
+    // 解説表示
     return (<react_native_1.View style={styles.container}>
       {/* 解説表示 */}
       {explainInfos.map(function (I, index) {