@nakamura-123/pages 0.1.29 → 0.1.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/component/OnlineInput/OnlineSaveBtn.js +1 -1
- package/dist/component/OnlineInput/PasswardModal.js +5 -3
- package/dist/component/OnlineInput/PasswordIdModal.js +4 -3
- package/dist/functions/gradeFnc.js +2 -2
- package/dist/functions/oldStorageFnc.js +15 -17
- package/dist/functions/testFnc.js +3 -4
- package/dist/page/HomePage.js +2 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -7,7 +7,7 @@ var common_1 = require("@nakamura-123/common");
|
|
|
7
7
|
var react_1 = __importDefault(require("react"));
|
|
8
8
|
var react_native_1 = require("react-native");
|
|
9
9
|
var TITLE = "新しい保存データを作成";
|
|
10
|
-
var NOTE = "
|
|
10
|
+
var NOTE = "バックアップデータをオンライン上に作成します。";
|
|
11
11
|
var OnlineSaveBtn = function (_a) {
|
|
12
12
|
var onPress = _a.onPress;
|
|
13
13
|
return (<common_1.RectangleCard title={TITLE} note={NOTE} color="green" left={<common_1.IconInCircle name="plus" size={25}/>} onPress={onPress} outerStyle={styles.button}/>);
|
|
@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
-
return g =
|
|
35
|
+
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);
|
|
36
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
37
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
38
|
function step(op) {
|
|
39
39
|
if (f) throw new TypeError("Generator is already executing.");
|
|
@@ -73,6 +73,8 @@ var PasswordModal = function (_a) {
|
|
|
73
73
|
var realm = (0, react_2.useRealm)();
|
|
74
74
|
var dispatch = (0, react_redux_1.useDispatch)();
|
|
75
75
|
var saveUrl = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.api.inputSave; }) || "";
|
|
76
|
+
var appKey = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.quizName.appKey; }) ||
|
|
77
|
+
"";
|
|
76
78
|
var _b = (0, react_1.useState)(""), password = _b[0], setPassword = _b[1];
|
|
77
79
|
var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
|
|
78
80
|
// セーブ時の動作
|
|
@@ -89,7 +91,7 @@ var PasswordModal = function (_a) {
|
|
|
89
91
|
case 1:
|
|
90
92
|
_a.trys.push([1, 3, 4, 5]);
|
|
91
93
|
inputSaveData = db_1.InputModel.getAllInput(realm);
|
|
92
|
-
sendData = { password: password, saveData: inputSaveData };
|
|
94
|
+
sendData = { appKey: appKey, password: password, saveData: inputSaveData };
|
|
93
95
|
return [4 /*yield*/, stores_1.inputApi.inputSaveApi(sendData, saveUrl)];
|
|
94
96
|
case 2:
|
|
95
97
|
res = _a.sent();
|
|
@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
-
return g =
|
|
35
|
+
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);
|
|
36
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
37
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
38
|
function step(op) {
|
|
39
39
|
if (f) throw new TypeError("Generator is already executing.");
|
|
@@ -71,6 +71,7 @@ var PasswordIdModal = function (_a) {
|
|
|
71
71
|
var isVisible = _a.isVisible, onClose = _a.onClose, id = _a.id, setId = _a.setId;
|
|
72
72
|
var realm = (0, react_2.useRealm)();
|
|
73
73
|
var loadUrl = (0, react_redux_1.useSelector)(function (state) { var _a; return (_a = state.app.appSetting.setting) === null || _a === void 0 ? void 0 : _a.api.inputLoad; }) || "";
|
|
74
|
+
var appKey = (0, react_redux_1.useSelector)(function (state) { return state.app.appSetting.quizName.appKey; });
|
|
74
75
|
var _b = (0, react_1.useState)(""), password = _b[0], setPassword = _b[1];
|
|
75
76
|
var _c = (0, react_1.useState)(false), loading = _c[0], setLoading = _c[1];
|
|
76
77
|
// セーブ時の動作
|
|
@@ -87,7 +88,7 @@ var PasswordIdModal = function (_a) {
|
|
|
87
88
|
_a.label = 1;
|
|
88
89
|
case 1:
|
|
89
90
|
_a.trys.push([1, 3, 4, 5]);
|
|
90
|
-
return [4 /*yield*/, stores_1.inputApi.inputLoadApi({ id: id, password: password }, loadUrl)];
|
|
91
|
+
return [4 /*yield*/, stores_1.inputApi.inputLoadApi({ id: id, password: password, appKey: appKey }, loadUrl)];
|
|
91
92
|
case 2:
|
|
92
93
|
res = _a.sent();
|
|
93
94
|
// 成功レスポンスの処理
|
|
@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
-
return g =
|
|
35
|
+
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);
|
|
36
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
37
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
38
|
function step(op) {
|
|
39
39
|
if (f) throw new TypeError("Generator is already executing.");
|
|
@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
-
return g =
|
|
12
|
+
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);
|
|
13
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
@@ -194,23 +194,21 @@ var replaceOldInputData = function (realm) { return __awaiter(void 0, void 0, vo
|
|
|
194
194
|
});
|
|
195
195
|
}); };
|
|
196
196
|
// 60. inputIdの読み込み(reduxThunk)
|
|
197
|
-
var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", function (
|
|
198
|
-
var
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
if (!id)
|
|
207
|
-
return [2 /*return*/];
|
|
208
|
-
dispatch({ type: "setting/updateOldId", payload: id[0] });
|
|
197
|
+
var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", function (_1, _a) { return __awaiter(void 0, [_1, _a], void 0, function (_, _b) {
|
|
198
|
+
var id;
|
|
199
|
+
var dispatch = _b.dispatch;
|
|
200
|
+
return __generator(this, function (_c) {
|
|
201
|
+
switch (_c.label) {
|
|
202
|
+
case 0: return [4 /*yield*/, loadOldData("id")];
|
|
203
|
+
case 1:
|
|
204
|
+
id = _c.sent();
|
|
205
|
+
if (!id)
|
|
209
206
|
return [2 /*return*/];
|
|
210
|
-
|
|
211
|
-
|
|
207
|
+
dispatch({ type: "setting/updateOldId", payload: id[0] });
|
|
208
|
+
return [2 /*return*/];
|
|
209
|
+
}
|
|
212
210
|
});
|
|
213
|
-
});
|
|
211
|
+
}); });
|
|
214
212
|
// 90. 旧データの存在をMarkデータから確認
|
|
215
213
|
var existOldData = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
216
214
|
var markData;
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getMiniTestLevelCnts = getMiniTestLevelCnts;
|
|
4
|
+
exports.getTestLevelCnts = getTestLevelCnts;
|
|
5
|
+
exports.countByLevel = countByLevel;
|
|
4
6
|
var lib_1 = require("@nakamura-123/lib");
|
|
5
7
|
function getMiniTestLevelCnts(MiniTestDB, subject, key) {
|
|
6
8
|
return MiniTestDB.filtered("subject == $0 && categoryKey == $1", subject, String(key)).map(function (item) { return item.level; });
|
|
7
9
|
}
|
|
8
|
-
exports.getMiniTestLevelCnts = getMiniTestLevelCnts;
|
|
9
10
|
function getTestLevelCnts(TestDB, subject) {
|
|
10
11
|
return TestDB.filtered("subject == $0", subject).map(function (item) { return item.level; });
|
|
11
12
|
}
|
|
12
|
-
exports.getTestLevelCnts = getTestLevelCnts;
|
|
13
13
|
// タグをレベル別に集計し、色と数を返す
|
|
14
14
|
function countByLevel(levels) {
|
|
15
15
|
var levelInfos = lib_1.scoreLevels.map(function (_a) {
|
|
@@ -19,4 +19,3 @@ function countByLevel(levels) {
|
|
|
19
19
|
});
|
|
20
20
|
return levelInfos;
|
|
21
21
|
}
|
|
22
|
-
exports.countByLevel = countByLevel;
|
package/dist/page/HomePage.js
CHANGED
|
@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
34
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
35
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
36
|
-
return g =
|
|
35
|
+
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);
|
|
36
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
37
37
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
38
38
|
function step(op) {
|
|
39
39
|
if (f) throw new TypeError("Generator is already executing.");
|