@nakamura-123/pages 0.1.13 → 0.1.16

package/dist/component/Coin/CoinCheck.js

@@ -69,8 +69,11 @@ var isCheckRequired = function (allFreeState, lastCheckedDate, isCompoleteFree)
     if (allFreeState === "none")
         return false;
     var isOver3Days = lib_1.timeFnc.isOver3Days(lastCheckedDate);
+    var isOver1Day = lib_1.timeFnc.isOver1Day(lastCheckedDate);
     if (!isOver3Days && allFreeState === "paid")
         return false;
+    if (!isOver1Day && allFreeState === "wait")
+        return false;
     return true;
 };
 exports.isCheckRequired = isCheckRequired;

package/dist/hooks/quizActionHook.js

@@ -33,6 +33,7 @@ var useNextQuizAction = function () {
             dispatch(stores_1.quizAction.addActiveTurn());
             dispatch(stores_1.quizAction.nextTurn());
             dispatch(stores_1.quizAction.changeMode("quiz"));
+            dispatch(stores_1.saveStorage.saveQuizToStorage());
         }
     };
     return handleNextQuiz;
@@ -60,7 +61,6 @@ exports.useStartQuizAction = useStartQuizAction;
 var useChangeModeToCheck = function () {
     var dispatch = (0, react_redux_1.useDispatch)();
     var realm = (0, react_1.useRealm)();
-    var dailyLogDB = (0, react_1.useQuery)(db_1.DailyLogSchema);
     var playSound = common_1.commonHook.usePlaySound();
     // タグを探しておく
     var question = (0, quizHook_1.useQuestionData)();
@@ -80,6 +80,7 @@ var useChangeModeToCheck = function () {
         if (isCorrected)
             dispatch(stores_1.quizAction.addOnePoint());
         dispatch(db_1.DailyLogModel.addOneCntToday(realm));
+        dispatch(stores_1.saveStorage.saveQuizToStorage());
     };
     return handleModeChange;
 };

package/dist/index.d.ts

@@ -10,7 +10,6 @@ import GradePage from "./page/GradePage";
 import HistoryPage from "./page/HistoryPage";
 import ImgZoom from "./page/ImgZoom";
 import BadgePage from "./page/BadgePage";
-import ReturnSaveBtn from "./quiz/setting/ReturnSaveBtn";
 import GetBadgePage from "./page/GetBadgePage";
 import SettingPage from "./page/SettingPage";
 import ReportPage from "./page/ReportPage";
@@ -19,4 +18,5 @@ import FAQPage from "./page/FAQPage";
 import OnlineInputPage from "./page/OnlineInputPage";
 import * as basicHooks from "./hooks/basicHook";
 import * as quizHooks from "./hooks/quizHook";
-export { HomePage, BasicPage, TestPage, BootPage, QuizSetupPage, QuizPage, QuizSettingPage, ResultPage, GradePage, HistoryPage, ImgZoom, BadgePage, GetBadgePage, SettingPage, ReportPage, CoinPage, FAQPage, OnlineInputPage, basicHooks, quizHooks, ReturnSaveBtn, };
+import ReturnBtn from "./quiz/setting/ReturnBtn";
+export { HomePage, BasicPage, TestPage, BootPage, QuizSetupPage, QuizPage, QuizSettingPage, ResultPage, GradePage, HistoryPage, ImgZoom, BadgePage, GetBadgePage, SettingPage, ReportPage, CoinPage, FAQPage, OnlineInputPage, basicHooks, quizHooks, ReturnBtn, };

package/dist/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReturnSaveBtn = exports.quizHooks = exports.basicHooks = exports.OnlineInputPage = exports.FAQPage = exports.CoinPage = exports.ReportPage = exports.SettingPage = exports.GetBadgePage = exports.BadgePage = exports.ImgZoom = exports.HistoryPage = exports.GradePage = exports.ResultPage = exports.QuizSettingPage = exports.QuizPage = exports.QuizSetupPage = exports.BootPage = exports.TestPage = exports.BasicPage = exports.HomePage = void 0;
+exports.ReturnBtn = exports.quizHooks = exports.basicHooks = exports.OnlineInputPage = exports.FAQPage = exports.CoinPage = exports.ReportPage = exports.SettingPage = exports.GetBadgePage = exports.BadgePage = exports.ImgZoom = exports.HistoryPage = exports.GradePage = exports.ResultPage = exports.QuizSettingPage = exports.QuizPage = exports.QuizSetupPage = exports.BootPage = exports.TestPage = exports.BasicPage = exports.HomePage = void 0;
 var HomePage_1 = __importDefault(require("./page/HomePage"));
 exports.HomePage = HomePage_1.default;
 var BasicPage_1 = __importDefault(require("./page/BasicPage"));
@@ -51,8 +51,6 @@ var ImgZoom_1 = __importDefault(require("./page/ImgZoom"));
 exports.ImgZoom = ImgZoom_1.default;
 var BadgePage_1 = __importDefault(require("./page/BadgePage"));
 exports.BadgePage = BadgePage_1.default;
-var ReturnSaveBtn_1 = __importDefault(require("./quiz/setting/ReturnSaveBtn"));
-exports.ReturnSaveBtn = ReturnSaveBtn_1.default;
 var GetBadgePage_1 = __importDefault(require("./page/GetBadgePage"));
 exports.GetBadgePage = GetBadgePage_1.default;
 var SettingPage_1 = __importDefault(require("./page/SettingPage"));
@@ -70,3 +68,6 @@ var basicHooks = __importStar(require("./hooks/basicHook"));
 exports.basicHooks = basicHooks;
 var quizHooks = __importStar(require("./hooks/quizHook"));
 exports.quizHooks = quizHooks;
+// components
+var ReturnBtn_1 = __importDefault(require("./quiz/setting/ReturnBtn"));
+exports.ReturnBtn = ReturnBtn_1.default;

package/dist/page/GradePage.js

@@ -40,11 +40,13 @@ var react_i18next_1 = require("react-i18next");
 var GradePage = function (_a) {
     var navigation = _a.navigation;
     var t = (0, react_i18next_1.useTranslation)().t;
+    var realm = (0, react_2.useRealm)();
     var DailyLogDB = (0, react_2.useQuery)(db_1.DailyLogSchema);
     var totalCnt = (0, gradeFnc_1.getTotalQuizCnt)(DailyLogDB);
     // レビューをリクエスト可能か確認
     (0, react_1.useEffect)(function () {
         (0, gradeFnc_1.promptStoreReview)(totalCnt);
+        db_1.DailyLogModel.mergeDuplicateDailyLogs(realm);
     }, []);
     return (<react_native_1.ScrollView style={styles.page} contentContainerStyle={styles.container}>
       <GradeCard_1.default DailyLogDB={DailyLogDB}/>

package/dist/page/ReportPage.js

@@ -99,8 +99,8 @@ var ReportPage = function (_a) {
                             appKey: appKey,
                             mail: mail,
                             comment: inquiry,
-                            selectedQuiz: selectedQuiz,
-                            device: device,
+                            thisQuiz: selectedQuiz,
+                            platform: device,
                             storeSetting: storeSetting,
                             errorLogs: errorLogs,
                         })];

package/dist/page/ResultPage.js

@@ -48,7 +48,7 @@ var ResultPage = function (_a) {
     (0, react_1.useEffect)(function () {
         var isCheckRequir = (0, CoinCheck_1.isCheckRequired)(allFreeState, lastCheckedDate, isCompletelyFree);
         if (isCheckRequir) {
-            // 最終チェック日を更新・成功しようがしまいが、1日1回以上やらないようにこれを実行してしまう.
+            // 最終チェック日を更新・成功しようがしまいが、1日1回以上やらないようにする.
             var todayStr = lib_1.timeFnc.getTodayString();
             dispatch({ type: "setting/updateLastCheckedDate", payload: todayStr });
             // ここで復元処理を行う

package/dist/quiz/save/QuizSaveData.js

@@ -29,7 +29,7 @@ var react_redux_1 = require("react-redux");
 var Animatable = __importStar(require("react-native-animatable"));
 var common_1 = require("@nakamura-123/common");
 var stores_1 = require("@nakamura-123/stores");
-var loadQuizFromStorage = stores_1.saveStorage.loadQuizFromStorage, deleteQuizInStorage = stores_1.saveStorage.deleteQuizInStorage;
+var loadQuizFromStorage = stores_1.saveStorage.loadQuizFromStorage;
 var QuizSaveData = function (_a) {
     var navigation = _a.navigation, saveKey = _a.saveKey;
     var dispatch = (0, react_redux_1.useDispatch)();
@@ -44,7 +44,6 @@ var QuizSaveData = function (_a) {
     var title = "つづきからはじめる";
     var note = "\u3010".concat(lessonTitle, "\u3011\u7B2C").concat(turn + 1, "\u554F\u304B\u3089");
     var onPress = function () {
-        dispatch(deleteQuizInStorage(saveKey));
         navigation.navigate("Quiz");
     };
     return (<Animatable.View style={styles.fixedBottom} animation="fadeIn" duration={500} useNativeDriver>

package/dist/quiz/setting/ReturnBtn.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { Nav } from "@nakamura-123/types";
-interface QuizPageProps {
+interface ReturnBtnProps {
     navigation: Nav.NavigationProp<"Quiz">;
 }
-declare const ModalWithButton: React.FC<QuizPageProps>;
-export default ModalWithButton;
+declare const ReturnBtn: React.FC<ReturnBtnProps>;
+export default ReturnBtn;

package/dist/quiz/setting/ReturnBtn.js

@@ -1,77 +1,33 @@
 "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;
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importStar(require("react"));
+var react_1 = __importDefault(require("react"));
 var react_native_1 = require("react-native");
-var react_redux_1 = require("react-redux");
 var common_1 = require("@nakamura-123/common");
 var lib_1 = require("@nakamura-123/lib");
-var stores_1 = require("@nakamura-123/stores");
-var ModalWithButton = function (_a) {
+var ReturnBtn = function (_a) {
     var navigation = _a.navigation;
-    var dispatch = (0, react_redux_1.useDispatch)();
-    var _b = (0, react_1.useState)(false), isModalVisible = _b[0], setModalVisible = _b[1];
-    var openModal = function () { return setModalVisible(true); };
-    var closeModal = function () { return setModalVisible(false); };
-    var msg = "学習を中断しますか？\nクイズの進行状況は保存され、途中から再開することができます。";
-    var handlePress = function () {
-        dispatch(stores_1.saveStorage.saveQuizToStorage());
-        navigation.goBack();
-    };
-    return (<react_native_1.View style={styles.container}>
-      {/* 通常状態で表示されるボタン */}
-      <common_1.IconInCircle name="times" size={20} iconColor="red" cStyle={styles.circle} onPress={openModal}/>
-
-      {/* モーダル */}
-      <common_1.BaseModal isVisible={isModalVisible} onClose={closeModal}>
-        {/* モーダル内のシンプルなサンプルコンテンツ */}
-        <common_1.MyText fsize="md">{msg}</common_1.MyText>
-        <react_native_1.View style={styles.btnBox}>
-          <common_1.MiniIconBtn onPress={function () { return closeModal(); }} icon="ban" title="キャンセル" color="ltBlack"/>
-          <common_1.MiniIconBtn onPress={function () { return handlePress(); }} icon="stop" title="中断する" color="red"/>
-        </react_native_1.View>
-      </common_1.BaseModal>
-    </react_native_1.View>);
+    // resultモード時のボタン設定
+    var goBack = function () { return navigation.goBack(); };
+    return (<common_1.IconInCircle name="times" size={20} iconColor="red" cStyle={__assign(__assign({}, styles.circle), { borderColor: lib_1.colors["red"] })} onPress={goBack}/>);
 };
 var styles = react_native_1.StyleSheet.create({
-    container: {
-        flex: 1,
-        justifyContent: "center",
-        alignItems: "center",
-    },
     circle: {
         marginLeft: 20,
         borderWidth: 1,
-        borderColor: lib_1.colors.ltRed,
-    },
-    btnBox: {
-        width: "100%",
-        flexDirection: "row",
-        justifyContent: "space-around",
-        alignItems: "center",
-        marginTop: 20,
     },
 });
-exports.default = ModalWithButton;
+exports.default = ReturnBtn;