@akinon/next 1.14.0 → 1.14.1
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/.eslintrc.js +40 -40
- package/.prettierrc +13 -13
- package/CHANGELOG.md +6 -0
- package/api/auth.ts +231 -231
- package/api/cache.ts +44 -44
- package/api/client.ts +174 -174
- package/api/logout.ts +42 -42
- package/bin/pz-check-dependencies.js +98 -98
- package/bin/pz-install-plugins.js +33 -33
- package/bin/pz-install-theme.js +58 -58
- package/bin/pz-postbuild.js +1 -1
- package/bin/pz-postdev.js +1 -1
- package/bin/pz-postinstall.js +6 -6
- package/bin/pz-poststart.js +1 -1
- package/bin/pz-prebuild.js +4 -4
- package/bin/pz-predev.js +4 -4
- package/bin/pz-prestart.js +1 -1
- package/bin/run-script.js +44 -44
- package/components/accordion.tsx +52 -52
- package/components/button.tsx +46 -46
- package/components/client-root.tsx +19 -19
- package/components/icon.tsx +18 -18
- package/components/image.tsx +133 -133
- package/components/index.ts +17 -17
- package/components/input.tsx +110 -110
- package/components/lazy-component.tsx +33 -33
- package/components/loader-spinner.tsx +23 -23
- package/components/mobile-app-toggler.tsx +26 -26
- package/components/oauth-login.tsx +24 -24
- package/components/price.tsx +55 -55
- package/components/pz-providers.tsx +24 -24
- package/components/pz-root.tsx +21 -21
- package/components/radio.tsx +18 -18
- package/components/react-portal.tsx +45 -45
- package/components/redirect-three-d/content/index.tsx +74 -74
- package/components/redirect-three-d/index.tsx +17 -17
- package/components/trans.tsx +39 -39
- package/data/client/account.ts +208 -208
- package/data/client/api.ts +85 -85
- package/data/client/basket.ts +82 -82
- package/data/client/misc.ts +101 -101
- package/data/client/product.ts +89 -89
- package/data/client/user.ts +99 -99
- package/data/client/wishlist.ts +118 -118
- package/data/server/category.ts +132 -132
- package/data/server/flatpage.ts +21 -21
- package/data/server/form.ts +22 -22
- package/data/server/index.ts +10 -10
- package/data/server/landingpage.ts +24 -24
- package/data/server/list.ts +67 -67
- package/data/server/menu.ts +35 -35
- package/data/server/product.ts +86 -86
- package/data/server/seo.ts +48 -48
- package/data/server/special-page.ts +47 -47
- package/data/server/widget.ts +27 -27
- package/data/urls.ts +221 -221
- package/hocs/client/index.ts +1 -1
- package/hocs/client/with-segment-defaults.tsx +25 -25
- package/hocs/server/index.ts +1 -1
- package/hocs/server/with-segment-defaults.tsx +85 -85
- package/hooks/index.ts +10 -10
- package/hooks/use-captcha.tsx +76 -76
- package/hooks/use-common-product-attributes.ts +36 -36
- package/hooks/use-debounce.ts +20 -20
- package/hooks/use-localization.ts +78 -78
- package/hooks/use-media-query.ts +36 -36
- package/hooks/use-mobile-iframe-handler.ts +23 -23
- package/hooks/use-on-click-outside.tsx +28 -28
- package/hooks/use-router.ts +45 -45
- package/hooks/use-translation.ts +14 -14
- package/lib/cache.ts +215 -215
- package/localization/index.ts +5 -5
- package/localization/provider.tsx +58 -58
- package/middlewares/currency.ts +100 -100
- package/middlewares/default.ts +256 -256
- package/middlewares/index.ts +29 -29
- package/middlewares/locale.ts +68 -68
- package/middlewares/oauth-login.ts +79 -79
- package/middlewares/pretty-url.ts +104 -104
- package/middlewares/redirection-payment.ts +160 -160
- package/middlewares/three-d-redirection.ts +159 -159
- package/middlewares/url-redirection.ts +65 -65
- package/package.json +2 -2
- package/redux/hooks.ts +7 -7
- package/redux/middlewares/index.ts +50 -50
- package/redux/reducers/checkout.ts +184 -184
- package/redux/reducers/config.ts +28 -28
- package/redux/reducers/header.ts +59 -59
- package/redux/reducers/root.ts +61 -61
- package/sentry/index.ts +27 -27
- package/tailwind/rtl.js +137 -137
- package/types/commerce/account.ts +64 -64
- package/types/commerce/address.ts +94 -94
- package/types/commerce/basket.ts +43 -43
- package/types/commerce/category.ts +114 -114
- package/types/commerce/checkout.ts +143 -143
- package/types/commerce/flatpage.ts +7 -7
- package/types/commerce/form.ts +66 -66
- package/types/commerce/index.ts +12 -12
- package/types/commerce/landingpage.ts +7 -7
- package/types/commerce/misc.ts +127 -127
- package/types/commerce/order.ts +119 -119
- package/types/commerce/product.ts +109 -109
- package/types/commerce/widget.ts +28 -28
- package/types/gtm.ts +16 -16
- package/types/index.ts +274 -274
- package/types/metadata.ts +7 -7
- package/types/next-auth.d.ts +24 -24
- package/utils/app-fetch.ts +69 -69
- package/utils/deep-merge.js +24 -24
- package/utils/image-loader.ts +31 -31
- package/utils/index.ts +150 -150
- package/utils/localization.ts +29 -29
- package/utils/log.ts +138 -138
- package/utils/menu-generator.ts +27 -27
- package/utils/mobile-3d-iframe.ts +77 -77
- package/utils/server-translation.ts +57 -57
- package/utils/server-variables.ts +9 -9
- package/with-pz-config.js +94 -94
package/utils/log.ts
CHANGED
|
@@ -1,138 +1,138 @@
|
|
|
1
|
-
enum LogLevel {
|
|
2
|
-
TRACE = 'trace',
|
|
3
|
-
DEBUG = 'debug',
|
|
4
|
-
INFO = 'info',
|
|
5
|
-
WARN = 'warn',
|
|
6
|
-
ERROR = 'error',
|
|
7
|
-
FATAL = 'fatal',
|
|
8
|
-
SILENT = 'silent'
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
const LOG_LEVELS = new Map([
|
|
12
|
-
['trace', 10],
|
|
13
|
-
['debug', 20],
|
|
14
|
-
['info', 30],
|
|
15
|
-
['warn', 40],
|
|
16
|
-
['error', 50],
|
|
17
|
-
['fatal', 60],
|
|
18
|
-
['silent', 1000]
|
|
19
|
-
]);
|
|
20
|
-
|
|
21
|
-
interface LoggerFn {
|
|
22
|
-
(message: string, payload?: any): void;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
interface Message {
|
|
26
|
-
message: string;
|
|
27
|
-
level?: LogLevel;
|
|
28
|
-
payload?: any;
|
|
29
|
-
details?: any;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
const LOG_COLORS = new Map([
|
|
33
|
-
[LogLevel.TRACE, '\x1b[45m'],
|
|
34
|
-
[LogLevel.DEBUG, '\x1b[44m'],
|
|
35
|
-
[LogLevel.INFO, '\x1b[42m'],
|
|
36
|
-
[LogLevel.WARN, '\x1b[43m'],
|
|
37
|
-
[LogLevel.ERROR, '\x1b[41m'],
|
|
38
|
-
[LogLevel.FATAL, '\x1b[41m']
|
|
39
|
-
]);
|
|
40
|
-
|
|
41
|
-
let LOG_LEVEL = LOG_LEVELS.get(LogLevel.INFO);
|
|
42
|
-
|
|
43
|
-
if (process.env.NODE_ENV === 'development') {
|
|
44
|
-
LOG_LEVEL = LOG_LEVELS.get(process.env.LOG_LEVEL_DEV ?? LogLevel.INFO);
|
|
45
|
-
}
|
|
46
|
-
|
|
47
|
-
if (process.env.NODE_ENV === 'production') {
|
|
48
|
-
LOG_LEVEL = LOG_LEVELS.get(process.env.LOG_LEVEL ?? LogLevel.INFO);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
const writeMsg = ({ level, message, payload }: Message) => {
|
|
52
|
-
if (LOG_LEVELS.get(level) < LOG_LEVEL) {
|
|
53
|
-
return;
|
|
54
|
-
}
|
|
55
|
-
|
|
56
|
-
let log: Message | string = { message };
|
|
57
|
-
|
|
58
|
-
if (payload) {
|
|
59
|
-
log.details = payload;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
if (process.env.NODE_ENV === 'production') {
|
|
63
|
-
log.level = level;
|
|
64
|
-
log = `PZ LOG ----${level.toUpperCase()}---- ${JSON.stringify(log)}`;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
if (process.env.NODE_ENV === 'development') {
|
|
68
|
-
console.log(
|
|
69
|
-
'\n\n' + LOG_COLORS.get(level),
|
|
70
|
-
`▼ PZ ${level.toUpperCase()}${
|
|
71
|
-
message.length < 250 ? ` ━━ ${message}` : ''
|
|
72
|
-
} \x1b[0m\n`,
|
|
73
|
-
log,
|
|
74
|
-
'\n\n'
|
|
75
|
-
);
|
|
76
|
-
} else {
|
|
77
|
-
console.log(log);
|
|
78
|
-
}
|
|
79
|
-
};
|
|
80
|
-
|
|
81
|
-
const info: LoggerFn = (message, payload) => {
|
|
82
|
-
writeMsg({
|
|
83
|
-
level: LogLevel.INFO,
|
|
84
|
-
message,
|
|
85
|
-
payload
|
|
86
|
-
});
|
|
87
|
-
};
|
|
88
|
-
|
|
89
|
-
const error: LoggerFn = (message, payload) => {
|
|
90
|
-
writeMsg({
|
|
91
|
-
level: LogLevel.ERROR,
|
|
92
|
-
message,
|
|
93
|
-
payload
|
|
94
|
-
});
|
|
95
|
-
};
|
|
96
|
-
|
|
97
|
-
const warn: LoggerFn = (message, payload) => {
|
|
98
|
-
writeMsg({
|
|
99
|
-
level: LogLevel.WARN,
|
|
100
|
-
message,
|
|
101
|
-
payload
|
|
102
|
-
});
|
|
103
|
-
};
|
|
104
|
-
|
|
105
|
-
const debug: LoggerFn = (message, payload) => {
|
|
106
|
-
writeMsg({
|
|
107
|
-
level: LogLevel.DEBUG,
|
|
108
|
-
message,
|
|
109
|
-
payload
|
|
110
|
-
});
|
|
111
|
-
};
|
|
112
|
-
|
|
113
|
-
const trace: LoggerFn = (message, payload) => {
|
|
114
|
-
writeMsg({
|
|
115
|
-
level: LogLevel.TRACE,
|
|
116
|
-
message,
|
|
117
|
-
payload
|
|
118
|
-
});
|
|
119
|
-
};
|
|
120
|
-
|
|
121
|
-
const fatal: LoggerFn = (message, payload) => {
|
|
122
|
-
writeMsg({
|
|
123
|
-
level: LogLevel.FATAL,
|
|
124
|
-
message,
|
|
125
|
-
payload
|
|
126
|
-
});
|
|
127
|
-
};
|
|
128
|
-
|
|
129
|
-
const logger = {
|
|
130
|
-
trace,
|
|
131
|
-
debug,
|
|
132
|
-
info,
|
|
133
|
-
warn,
|
|
134
|
-
error,
|
|
135
|
-
fatal
|
|
136
|
-
};
|
|
137
|
-
|
|
138
|
-
export default logger;
|
|
1
|
+
enum LogLevel {
|
|
2
|
+
TRACE = 'trace',
|
|
3
|
+
DEBUG = 'debug',
|
|
4
|
+
INFO = 'info',
|
|
5
|
+
WARN = 'warn',
|
|
6
|
+
ERROR = 'error',
|
|
7
|
+
FATAL = 'fatal',
|
|
8
|
+
SILENT = 'silent'
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
const LOG_LEVELS = new Map([
|
|
12
|
+
['trace', 10],
|
|
13
|
+
['debug', 20],
|
|
14
|
+
['info', 30],
|
|
15
|
+
['warn', 40],
|
|
16
|
+
['error', 50],
|
|
17
|
+
['fatal', 60],
|
|
18
|
+
['silent', 1000]
|
|
19
|
+
]);
|
|
20
|
+
|
|
21
|
+
interface LoggerFn {
|
|
22
|
+
(message: string, payload?: any): void;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
interface Message {
|
|
26
|
+
message: string;
|
|
27
|
+
level?: LogLevel;
|
|
28
|
+
payload?: any;
|
|
29
|
+
details?: any;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
const LOG_COLORS = new Map([
|
|
33
|
+
[LogLevel.TRACE, '\x1b[45m'],
|
|
34
|
+
[LogLevel.DEBUG, '\x1b[44m'],
|
|
35
|
+
[LogLevel.INFO, '\x1b[42m'],
|
|
36
|
+
[LogLevel.WARN, '\x1b[43m'],
|
|
37
|
+
[LogLevel.ERROR, '\x1b[41m'],
|
|
38
|
+
[LogLevel.FATAL, '\x1b[41m']
|
|
39
|
+
]);
|
|
40
|
+
|
|
41
|
+
let LOG_LEVEL = LOG_LEVELS.get(LogLevel.INFO);
|
|
42
|
+
|
|
43
|
+
if (process.env.NODE_ENV === 'development') {
|
|
44
|
+
LOG_LEVEL = LOG_LEVELS.get(process.env.LOG_LEVEL_DEV ?? LogLevel.INFO);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if (process.env.NODE_ENV === 'production') {
|
|
48
|
+
LOG_LEVEL = LOG_LEVELS.get(process.env.LOG_LEVEL ?? LogLevel.INFO);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
const writeMsg = ({ level, message, payload }: Message) => {
|
|
52
|
+
if (LOG_LEVELS.get(level) < LOG_LEVEL) {
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
let log: Message | string = { message };
|
|
57
|
+
|
|
58
|
+
if (payload) {
|
|
59
|
+
log.details = payload;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
if (process.env.NODE_ENV === 'production') {
|
|
63
|
+
log.level = level;
|
|
64
|
+
log = `PZ LOG ----${level.toUpperCase()}---- ${JSON.stringify(log)}`;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (process.env.NODE_ENV === 'development') {
|
|
68
|
+
console.log(
|
|
69
|
+
'\n\n' + LOG_COLORS.get(level),
|
|
70
|
+
`▼ PZ ${level.toUpperCase()}${
|
|
71
|
+
message.length < 250 ? ` ━━ ${message}` : ''
|
|
72
|
+
} \x1b[0m\n`,
|
|
73
|
+
log,
|
|
74
|
+
'\n\n'
|
|
75
|
+
);
|
|
76
|
+
} else {
|
|
77
|
+
console.log(log);
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
|
|
81
|
+
const info: LoggerFn = (message, payload) => {
|
|
82
|
+
writeMsg({
|
|
83
|
+
level: LogLevel.INFO,
|
|
84
|
+
message,
|
|
85
|
+
payload
|
|
86
|
+
});
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
const error: LoggerFn = (message, payload) => {
|
|
90
|
+
writeMsg({
|
|
91
|
+
level: LogLevel.ERROR,
|
|
92
|
+
message,
|
|
93
|
+
payload
|
|
94
|
+
});
|
|
95
|
+
};
|
|
96
|
+
|
|
97
|
+
const warn: LoggerFn = (message, payload) => {
|
|
98
|
+
writeMsg({
|
|
99
|
+
level: LogLevel.WARN,
|
|
100
|
+
message,
|
|
101
|
+
payload
|
|
102
|
+
});
|
|
103
|
+
};
|
|
104
|
+
|
|
105
|
+
const debug: LoggerFn = (message, payload) => {
|
|
106
|
+
writeMsg({
|
|
107
|
+
level: LogLevel.DEBUG,
|
|
108
|
+
message,
|
|
109
|
+
payload
|
|
110
|
+
});
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
const trace: LoggerFn = (message, payload) => {
|
|
114
|
+
writeMsg({
|
|
115
|
+
level: LogLevel.TRACE,
|
|
116
|
+
message,
|
|
117
|
+
payload
|
|
118
|
+
});
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
const fatal: LoggerFn = (message, payload) => {
|
|
122
|
+
writeMsg({
|
|
123
|
+
level: LogLevel.FATAL,
|
|
124
|
+
message,
|
|
125
|
+
payload
|
|
126
|
+
});
|
|
127
|
+
};
|
|
128
|
+
|
|
129
|
+
const logger = {
|
|
130
|
+
trace,
|
|
131
|
+
debug,
|
|
132
|
+
info,
|
|
133
|
+
warn,
|
|
134
|
+
error,
|
|
135
|
+
fatal
|
|
136
|
+
};
|
|
137
|
+
|
|
138
|
+
export default logger;
|
package/utils/menu-generator.ts
CHANGED
|
@@ -1,27 +1,27 @@
|
|
|
1
|
-
import { MenuItemType } from '../types';
|
|
2
|
-
import logger from './log';
|
|
3
|
-
|
|
4
|
-
export const menuGenerator = (arr: MenuItemType[]) => {
|
|
5
|
-
const tree: MenuItemType[] = [];
|
|
6
|
-
|
|
7
|
-
try {
|
|
8
|
-
const data: { [key: string]: MenuItemType } = {};
|
|
9
|
-
|
|
10
|
-
arr.forEach((item) => {
|
|
11
|
-
const newData = { ...item, children: [] };
|
|
12
|
-
data[item.pk] = newData;
|
|
13
|
-
});
|
|
14
|
-
|
|
15
|
-
Object.values(data).forEach((item) => {
|
|
16
|
-
if (item.parent) {
|
|
17
|
-
data[item.parent.pk].children.push(item);
|
|
18
|
-
} else {
|
|
19
|
-
tree.push(item);
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
} catch (error) {
|
|
23
|
-
logger.error(error, 'menuGenerator');
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
return tree;
|
|
27
|
-
};
|
|
1
|
+
import { MenuItemType } from '../types';
|
|
2
|
+
import logger from './log';
|
|
3
|
+
|
|
4
|
+
export const menuGenerator = (arr: MenuItemType[]) => {
|
|
5
|
+
const tree: MenuItemType[] = [];
|
|
6
|
+
|
|
7
|
+
try {
|
|
8
|
+
const data: { [key: string]: MenuItemType } = {};
|
|
9
|
+
|
|
10
|
+
arr.forEach((item) => {
|
|
11
|
+
const newData = { ...item, children: [] };
|
|
12
|
+
data[item.pk] = newData;
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
Object.values(data).forEach((item) => {
|
|
16
|
+
if (item.parent) {
|
|
17
|
+
data[item.parent.pk].children.push(item);
|
|
18
|
+
} else {
|
|
19
|
+
tree.push(item);
|
|
20
|
+
}
|
|
21
|
+
});
|
|
22
|
+
} catch (error) {
|
|
23
|
+
logger.error(error, 'menuGenerator');
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
return tree;
|
|
27
|
+
};
|
|
@@ -1,77 +1,77 @@
|
|
|
1
|
-
const iframeURLChange = (iframe, callback) => {
|
|
2
|
-
iframe.addEventListener('load', () => {
|
|
3
|
-
setTimeout(() => {
|
|
4
|
-
if (iframe?.contentWindow?.location) {
|
|
5
|
-
callback(iframe.contentWindow.location);
|
|
6
|
-
}
|
|
7
|
-
}, 0);
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
|
-
|
|
11
|
-
const removeIframe = async () => {
|
|
12
|
-
const iframeSelector = document.querySelector(
|
|
13
|
-
'.checkout-payment-iframe-wrapper'
|
|
14
|
-
);
|
|
15
|
-
|
|
16
|
-
if (!iframeSelector) {
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
iframeSelector.remove();
|
|
21
|
-
document.body.style.overflow = 'auto';
|
|
22
|
-
};
|
|
23
|
-
|
|
24
|
-
export const showMobile3dIframe = (redirectUrl: string) => {
|
|
25
|
-
const iframeWrapper = document.createElement('div');
|
|
26
|
-
const iframe = document.createElement('iframe');
|
|
27
|
-
const closeButton = document.createElement('div');
|
|
28
|
-
|
|
29
|
-
iframeWrapper.className = 'checkout-payment-iframe-wrapper';
|
|
30
|
-
closeButton.className = 'close-button';
|
|
31
|
-
|
|
32
|
-
// iframe param is used to prevent header and footer rendering
|
|
33
|
-
iframe.setAttribute(
|
|
34
|
-
'src',
|
|
35
|
-
redirectUrl.match(new RegExp(`^/orders/redirect-three-d/$`))
|
|
36
|
-
? `${redirectUrl}?iframe=true`
|
|
37
|
-
: redirectUrl
|
|
38
|
-
);
|
|
39
|
-
closeButton.innerHTML = '✕';
|
|
40
|
-
closeButton.addEventListener('click', removeIframe);
|
|
41
|
-
|
|
42
|
-
iframeWrapper.append(iframe, closeButton);
|
|
43
|
-
document.body.appendChild(iframeWrapper);
|
|
44
|
-
document.body.style.overflow = 'hidden';
|
|
45
|
-
|
|
46
|
-
iframeURLChange(iframe, (location) => {
|
|
47
|
-
if (location.origin !== window.location.origin) {
|
|
48
|
-
return false;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
const searchParams = new URLSearchParams(location.search);
|
|
52
|
-
const isOrderCompleted = location.href.includes('/orders/completed');
|
|
53
|
-
|
|
54
|
-
if (isOrderCompleted) {
|
|
55
|
-
(window.parent as any)?.ReactNativeWebView?.postMessage?.(
|
|
56
|
-
JSON.stringify({
|
|
57
|
-
url: location.pathname
|
|
58
|
-
})
|
|
59
|
-
);
|
|
60
|
-
|
|
61
|
-
if (localStorage.isMobileApp !== 'true') {
|
|
62
|
-
window.location.href = location.pathname;
|
|
63
|
-
return;
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
if (
|
|
68
|
-
searchParams.has('success') ||
|
|
69
|
-
isOrderCompleted ||
|
|
70
|
-
location.href.includes('/orders/checkout')
|
|
71
|
-
) {
|
|
72
|
-
setTimeout(() => {
|
|
73
|
-
removeIframe();
|
|
74
|
-
}, 0);
|
|
75
|
-
}
|
|
76
|
-
});
|
|
77
|
-
};
|
|
1
|
+
const iframeURLChange = (iframe, callback) => {
|
|
2
|
+
iframe.addEventListener('load', () => {
|
|
3
|
+
setTimeout(() => {
|
|
4
|
+
if (iframe?.contentWindow?.location) {
|
|
5
|
+
callback(iframe.contentWindow.location);
|
|
6
|
+
}
|
|
7
|
+
}, 0);
|
|
8
|
+
});
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
const removeIframe = async () => {
|
|
12
|
+
const iframeSelector = document.querySelector(
|
|
13
|
+
'.checkout-payment-iframe-wrapper'
|
|
14
|
+
);
|
|
15
|
+
|
|
16
|
+
if (!iframeSelector) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
iframeSelector.remove();
|
|
21
|
+
document.body.style.overflow = 'auto';
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
export const showMobile3dIframe = (redirectUrl: string) => {
|
|
25
|
+
const iframeWrapper = document.createElement('div');
|
|
26
|
+
const iframe = document.createElement('iframe');
|
|
27
|
+
const closeButton = document.createElement('div');
|
|
28
|
+
|
|
29
|
+
iframeWrapper.className = 'checkout-payment-iframe-wrapper';
|
|
30
|
+
closeButton.className = 'close-button';
|
|
31
|
+
|
|
32
|
+
// iframe param is used to prevent header and footer rendering
|
|
33
|
+
iframe.setAttribute(
|
|
34
|
+
'src',
|
|
35
|
+
redirectUrl.match(new RegExp(`^/orders/redirect-three-d/$`))
|
|
36
|
+
? `${redirectUrl}?iframe=true`
|
|
37
|
+
: redirectUrl
|
|
38
|
+
);
|
|
39
|
+
closeButton.innerHTML = '✕';
|
|
40
|
+
closeButton.addEventListener('click', removeIframe);
|
|
41
|
+
|
|
42
|
+
iframeWrapper.append(iframe, closeButton);
|
|
43
|
+
document.body.appendChild(iframeWrapper);
|
|
44
|
+
document.body.style.overflow = 'hidden';
|
|
45
|
+
|
|
46
|
+
iframeURLChange(iframe, (location) => {
|
|
47
|
+
if (location.origin !== window.location.origin) {
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
const searchParams = new URLSearchParams(location.search);
|
|
52
|
+
const isOrderCompleted = location.href.includes('/orders/completed');
|
|
53
|
+
|
|
54
|
+
if (isOrderCompleted) {
|
|
55
|
+
(window.parent as any)?.ReactNativeWebView?.postMessage?.(
|
|
56
|
+
JSON.stringify({
|
|
57
|
+
url: location.pathname
|
|
58
|
+
})
|
|
59
|
+
);
|
|
60
|
+
|
|
61
|
+
if (localStorage.isMobileApp !== 'true') {
|
|
62
|
+
window.location.href = location.pathname;
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
if (
|
|
68
|
+
searchParams.has('success') ||
|
|
69
|
+
isOrderCompleted ||
|
|
70
|
+
location.href.includes('/orders/checkout')
|
|
71
|
+
) {
|
|
72
|
+
setTimeout(() => {
|
|
73
|
+
removeIframe();
|
|
74
|
+
}, 0);
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
};
|
|
@@ -1,57 +1,57 @@
|
|
|
1
|
-
import 'server-only';
|
|
2
|
-
import path from 'path';
|
|
3
|
-
import fs from 'fs';
|
|
4
|
-
import { getTranslateFn } from '../utils';
|
|
5
|
-
import { Translations } from '../types';
|
|
6
|
-
import settings from 'settings';
|
|
7
|
-
import logger from './log';
|
|
8
|
-
|
|
9
|
-
export const translations: Translations = {};
|
|
10
|
-
|
|
11
|
-
// TODO: Read translations from cache
|
|
12
|
-
export async function getTranslations(locale_: string) {
|
|
13
|
-
try {
|
|
14
|
-
const locale = settings.localization.locales.find(
|
|
15
|
-
(locale) => locale.value === locale_
|
|
16
|
-
);
|
|
17
|
-
const localeDirPath = path.resolve(
|
|
18
|
-
`public/locales/${locale.localePath ?? locale.value}`
|
|
19
|
-
);
|
|
20
|
-
const fileNames = fs.readdirSync(localeDirPath);
|
|
21
|
-
|
|
22
|
-
const fileImports = fileNames.map(
|
|
23
|
-
(fileName) =>
|
|
24
|
-
new Promise<string>((resolve, reject) => {
|
|
25
|
-
fs.readFile(
|
|
26
|
-
path.join(localeDirPath, `/${fileName}`),
|
|
27
|
-
'utf-8',
|
|
28
|
-
(error, data) => {
|
|
29
|
-
if (error) {
|
|
30
|
-
console.error(error);
|
|
31
|
-
reject(error.message);
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
resolve(data);
|
|
35
|
-
}
|
|
36
|
-
);
|
|
37
|
-
})
|
|
38
|
-
);
|
|
39
|
-
|
|
40
|
-
let index = 0;
|
|
41
|
-
|
|
42
|
-
for await (const fileImport of fileImports) {
|
|
43
|
-
translations[
|
|
44
|
-
fileNames[index].substring(0, fileNames[index].lastIndexOf('.'))
|
|
45
|
-
] = JSON.parse(fileImport);
|
|
46
|
-
index++;
|
|
47
|
-
}
|
|
48
|
-
} catch (error) {
|
|
49
|
-
logger.error('Failed to read translations', error);
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
return translations;
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
export function t(path: string) {
|
|
56
|
-
return getTranslateFn(path, translations);
|
|
57
|
-
}
|
|
1
|
+
import 'server-only';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import fs from 'fs';
|
|
4
|
+
import { getTranslateFn } from '../utils';
|
|
5
|
+
import { Translations } from '../types';
|
|
6
|
+
import settings from 'settings';
|
|
7
|
+
import logger from './log';
|
|
8
|
+
|
|
9
|
+
export const translations: Translations = {};
|
|
10
|
+
|
|
11
|
+
// TODO: Read translations from cache
|
|
12
|
+
export async function getTranslations(locale_: string) {
|
|
13
|
+
try {
|
|
14
|
+
const locale = settings.localization.locales.find(
|
|
15
|
+
(locale) => locale.value === locale_
|
|
16
|
+
);
|
|
17
|
+
const localeDirPath = path.resolve(
|
|
18
|
+
`public/locales/${locale.localePath ?? locale.value}`
|
|
19
|
+
);
|
|
20
|
+
const fileNames = fs.readdirSync(localeDirPath);
|
|
21
|
+
|
|
22
|
+
const fileImports = fileNames.map(
|
|
23
|
+
(fileName) =>
|
|
24
|
+
new Promise<string>((resolve, reject) => {
|
|
25
|
+
fs.readFile(
|
|
26
|
+
path.join(localeDirPath, `/${fileName}`),
|
|
27
|
+
'utf-8',
|
|
28
|
+
(error, data) => {
|
|
29
|
+
if (error) {
|
|
30
|
+
console.error(error);
|
|
31
|
+
reject(error.message);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
resolve(data);
|
|
35
|
+
}
|
|
36
|
+
);
|
|
37
|
+
})
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
let index = 0;
|
|
41
|
+
|
|
42
|
+
for await (const fileImport of fileImports) {
|
|
43
|
+
translations[
|
|
44
|
+
fileNames[index].substring(0, fileNames[index].lastIndexOf('.'))
|
|
45
|
+
] = JSON.parse(fileImport);
|
|
46
|
+
index++;
|
|
47
|
+
}
|
|
48
|
+
} catch (error) {
|
|
49
|
+
logger.error('Failed to read translations', error);
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
return translations;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export function t(path: string) {
|
|
56
|
+
return getTranslateFn(path, translations);
|
|
57
|
+
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import settings from 'settings';
|
|
2
|
-
|
|
3
|
-
const { locales, defaultLocaleValue, defaultCurrencyCode } =
|
|
4
|
-
settings.localization;
|
|
5
|
-
|
|
6
|
-
export const ServerVariables = {
|
|
7
|
-
locale: locales.find((l) => l.value === defaultLocaleValue)?.value ?? '',
|
|
8
|
-
currency: defaultCurrencyCode
|
|
9
|
-
};
|
|
1
|
+
import settings from 'settings';
|
|
2
|
+
|
|
3
|
+
const { locales, defaultLocaleValue, defaultCurrencyCode } =
|
|
4
|
+
settings.localization;
|
|
5
|
+
|
|
6
|
+
export const ServerVariables = {
|
|
7
|
+
locale: locales.find((l) => l.value === defaultLocaleValue)?.value ?? '',
|
|
8
|
+
currency: defaultCurrencyCode
|
|
9
|
+
};
|