nuudel-core 0.1.168 → 0.1.169
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.
|
@@ -15,7 +15,7 @@ const UI_1 = __importDefault(require("../../common/UI"));
|
|
|
15
15
|
const nuudel_utils_2 = require("nuudel-utils");
|
|
16
16
|
const Query_1 = require("../../../lib/hocs/withUser/Query");
|
|
17
17
|
exports.store = (0, store_1.createStore)();
|
|
18
|
-
const initStore = async (lfs, user) => {
|
|
18
|
+
const initStore = async (lfs, user = undefined) => {
|
|
19
19
|
var _a, _b;
|
|
20
20
|
const state = exports.store.getState();
|
|
21
21
|
if (typeof state.user === 'undefined' || !state.user.token) {
|
|
@@ -38,7 +38,7 @@ const initStore = async (lfs, user) => {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (_c) { }
|
|
41
|
-
usr = Object.assign(Object.assign({}, usr), { type: (user === null || user === void 0 ? void 0 : user.type) || 'Guest', currency: !(user === null || user === void 0 ? void 0 : user.settings) ?
|
|
41
|
+
usr = Object.assign(Object.assign({}, usr), { type: (user === null || user === void 0 ? void 0 : user.type) || (usr === null || usr === void 0 ? void 0 : usr.type) || 'Guest', currency: (!(user === null || user === void 0 ? void 0 : user.settings) ? usr === null || usr === void 0 ? void 0 : usr.currency : user.settings.currency) || 'MNT', locale: (!(user === null || user === void 0 ? void 0 : user.settings) ? usr === null || usr === void 0 ? void 0 : usr.locale : user.settings.locale) || 'mn-MN', status: (user === null || user === void 0 ? void 0 : user._status) || (usr === null || usr === void 0 ? void 0 : usr.status) || 'Active' });
|
|
42
42
|
}
|
|
43
43
|
const locale = !usr.locale ? 'mn-MN' : nuudel_utils_2.Language[usr.locale];
|
|
44
44
|
if (i18n_1.I8.language !== locale) {
|
|
@@ -68,4 +68,4 @@ exports.initStore = initStore;
|
|
|
68
68
|
const withRedux = (WrappedComponent) => (props) => ((0, jsx_runtime_1.jsx)(react_redux_1.Provider, Object.assign({ store: exports.store }, { children: (0, jsx_runtime_1.jsx)(WrappedComponent, Object.assign({}, props), void 0) }), void 0));
|
|
69
69
|
exports.withRedux = withRedux;
|
|
70
70
|
exports.default = exports.withRedux;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aFJlZHV4L2luZGV4LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7O0FBQ0EsNkNBQXVDO0FBQ3ZDLDhDQUFpRDtBQUNqRCxtREFBK0Q7QUFDL0Qsb0RBQXlEO0FBQ3pELCtDQUFvRDtBQUNwRCx5Q0FBb0Q7QUFDcEQseURBQWlDO0FBQ2pDLCtDQUF3QztBQUN4Qyw0REFBb0U7QUFFdkQsUUFBQSxLQUFLLEdBQUcsSUFBQSxtQkFBVyxHQUFFLENBQUM7QUFFNUIsTUFBTSxTQUFTLEdBQUcsS0FBSyxFQUFFLEdBQVEsRUFBRSxPQUFZLFNBQVMsRUFBRSxFQUFFOztJQUNqRSxNQUFNLEtBQUssR0FBRyxhQUFLLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDL0IsSUFBSSxPQUFPLEtBQUssQ0FBQyxJQUFJLEtBQUssV0FBVyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUU7UUFDMUQsTUFBTSxLQUFLLEdBQUcsWUFBRSxDQUFDLE9BQU8sQ0FBQyx5QkFBVSxDQUFDLENBQUM7UUFDckMsTUFBTSxNQUFNLEdBQWtCLENBQUEsTUFBQSxJQUFBLHVCQUFRLEVBQUMsS0FBSyxDQUFDLDBDQUFFLEdBQUcsS0FBSSxJQUFJLENBQUM7UUFDM0QsSUFBSSxNQUFNLEtBQUssSUFBSSxFQUFFO1lBQ25CLElBQUksR0FBRyxHQUFRLEtBQUssQ0FBQyxJQUFJLElBQUksbUJBQVksQ0FBQztZQUMxQyxJQUFJLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQSxHQUFHLGFBQUgsR0FBRyx1QkFBSCxHQUFHLENBQUUsUUFBUSxDQUFBLEVBQUU7Z0JBQzdCLElBQUk7b0JBQ0YsSUFBSSxDQUFDLElBQUksRUFBRTt3QkFDVCxJQUFJLEdBQUcsTUFBTSxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztxQkFD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
|
|
@@ -9,7 +9,7 @@ import UI from '../../common/UI';
|
|
|
9
9
|
import { Language } from 'nuudel-utils';
|
|
10
10
|
import { currentUserQuery } from '../../../lib/hocs/withUser/Query';
|
|
11
11
|
export const store = createStore();
|
|
12
|
-
export const initStore = async (lfs, user) => {
|
|
12
|
+
export const initStore = async (lfs, user = undefined) => {
|
|
13
13
|
const state = store.getState();
|
|
14
14
|
if (typeof state.user === 'undefined' || !state.user.token) {
|
|
15
15
|
const token = UI.getItem(USER_TOKEN);
|
|
@@ -33,10 +33,10 @@ export const initStore = async (lfs, user) => {
|
|
|
33
33
|
catch { }
|
|
34
34
|
usr = {
|
|
35
35
|
...usr,
|
|
36
|
-
type: user?.type || 'Guest',
|
|
37
|
-
currency: !user?.settings ?
|
|
38
|
-
locale: !user?.settings ?
|
|
39
|
-
status: user?._status || 'Active',
|
|
36
|
+
type: user?.type || usr?.type || 'Guest',
|
|
37
|
+
currency: (!user?.settings ? usr?.currency : user.settings.currency) || 'MNT',
|
|
38
|
+
locale: (!user?.settings ? usr?.locale : user.settings.locale) || 'mn-MN',
|
|
39
|
+
status: user?._status || usr?.status || 'Active',
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
const locale = !usr.locale ? 'mn-MN' : Language[usr.locale];
|
|
@@ -65,4 +65,4 @@ export const initStore = async (lfs, user) => {
|
|
|
65
65
|
};
|
|
66
66
|
export const withRedux = (WrappedComponent) => (props) => (_jsx(Provider, { store: store, children: _jsx(WrappedComponent, { ...props }, void 0) }, void 0));
|
|
67
67
|
export default withRedux;
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9zcmMvbGliL2hvY3Mvd2l0aFJlZHV4L2luZGV4LnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDakQsT0FBTyxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDekQsT0FBTyxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDcEQsT0FBTyxFQUFFLEVBQUUsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUNqQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBRXBFLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxXQUFXLEVBQUUsQ0FBQztBQUVuQyxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsS0FBSyxFQUFFLEdBQVEsRUFBRSxPQUFZLFNBQVMsRUFBRSxFQUFFO0lBQ2pFLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUMvQixJQUFJLE9BQU8sS0FBSyxDQUFDLElBQUksS0FBSyxXQUFXLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtRQUMxRCxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3JDLE1BQU0sTUFBTSxHQUFrQixRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsR0FBRyxJQUFJLElBQUksQ0FB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
|