@underpostnet/underpost 2.8.1 → 2.8.4
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/.dockerignore +1 -0
- package/.github/workflows/ghpkg.yml +14 -11
- package/.github/workflows/pwa-microservices-template.page.yml +10 -3
- package/.vscode/extensions.json +17 -71
- package/.vscode/settings.json +10 -4
- package/AUTHORS.md +16 -5
- package/CHANGELOG.md +63 -3
- package/Dockerfile +41 -62
- package/README.md +1 -28
- package/bin/build.js +278 -0
- package/bin/db.js +2 -24
- package/bin/deploy.js +105 -55
- package/bin/file.js +33 -4
- package/bin/index.js +33 -51
- package/bin/ssl.js +19 -11
- package/bin/util.js +9 -89
- package/bin/vs.js +25 -2
- package/conf.js +31 -138
- package/docker-compose.yml +1 -1
- package/manifests/core/kustomization.yaml +11 -0
- package/manifests/core/underpost-engine-backup-access.yaml +16 -0
- package/manifests/core/underpost-engine-backup-pv-pvc.yaml +22 -0
- package/manifests/core/underpost-engine-headless-service.yaml +10 -0
- package/manifests/core/underpost-engine-mongodb-backup-cronjob.yaml +40 -0
- package/manifests/core/underpost-engine-mongodb-configmap.yaml +26 -0
- package/manifests/core/underpost-engine-pv-pvc.yaml +23 -0
- package/manifests/core/underpost-engine-statefulset.yaml +91 -0
- package/manifests/deployment/mongo-express.yaml +60 -0
- package/manifests/deployment/phpmyadmin.yaml +54 -0
- package/manifests/kind-config.yaml +12 -0
- package/manifests/letsencrypt-prod.yaml +15 -0
- package/manifests/mariadb/config.yaml +10 -0
- package/manifests/mariadb/kustomization.yaml +9 -0
- package/manifests/mariadb/pv.yaml +12 -0
- package/manifests/mariadb/pvc.yaml +10 -0
- package/manifests/mariadb/secret.yaml +8 -0
- package/manifests/mariadb/service.yaml +10 -0
- package/manifests/mariadb/statefulset.yaml +55 -0
- package/manifests/valkey/kustomization.yaml +7 -0
- package/manifests/valkey/underpost-engine-valkey-service.yaml +17 -0
- package/manifests/valkey/underpost-engine-valkey-statefulset.yaml +39 -0
- package/package.json +7 -28
- package/src/api/user/user.model.js +16 -3
- package/src/api/user/user.service.js +1 -1
- package/src/client/components/core/CalendarCore.js +115 -49
- package/src/client/components/core/CommonJs.js +150 -19
- package/src/client/components/core/CssCore.js +6 -0
- package/src/client/components/core/DropDown.js +5 -1
- package/src/client/components/core/Input.js +17 -3
- package/src/client/components/core/Modal.js +10 -5
- package/src/client/components/core/Panel.js +84 -25
- package/src/client/components/core/PanelForm.js +4 -18
- package/src/client/components/core/Translate.js +43 -9
- package/src/client/components/core/Validator.js +9 -1
- package/src/client/services/default/default.management.js +4 -2
- package/src/db/mongo/MongooseDB.js +13 -1
- package/src/index.js +8 -1
- package/src/runtime/lampp/Lampp.js +1 -13
- package/src/runtime/xampp/Xampp.js +0 -13
- package/src/server/auth.js +3 -3
- package/src/server/client-build.js +3 -13
- package/src/server/conf.js +296 -29
- package/src/server/dns.js +2 -3
- package/src/server/logger.js +10 -5
- package/src/server/network.js +0 -36
- package/src/server/process.js +25 -2
- package/src/server/project.js +39 -0
- package/src/server/proxy.js +4 -26
- package/src/server/runtime.js +6 -7
- package/src/server/ssl.js +1 -1
- package/src/server/valkey.js +2 -0
- package/startup.cjs +12 -0
- package/src/server/prompt-optimizer.js +0 -28
- package/startup.js +0 -11
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getId } from './CommonJs.js';
|
|
1
|
+
import { getId, isValidDate, newInstance } from './CommonJs.js';
|
|
2
2
|
import { LoadingAnimation } from '../core/LoadingAnimation.js';
|
|
3
3
|
import { Validator } from '../core/Validator.js';
|
|
4
4
|
import { Input } from '../core/Input.js';
|
|
@@ -51,8 +51,6 @@ const Panel = {
|
|
|
51
51
|
<i style="font-size: 25px" class="fa-solid fa-cloud"></i>
|
|
52
52
|
</div>`;
|
|
53
53
|
|
|
54
|
-
let editId;
|
|
55
|
-
|
|
56
54
|
const openPanelForm = () => {
|
|
57
55
|
s(`.${idPanel}-form-body`).classList.remove('hide');
|
|
58
56
|
s(`.btn-${idPanel}-add`).classList.add('hide');
|
|
@@ -72,7 +70,7 @@ const Panel = {
|
|
|
72
70
|
};
|
|
73
71
|
|
|
74
72
|
const renderPanel = async (payload) => {
|
|
75
|
-
const obj = payload;
|
|
73
|
+
const obj = newInstance(payload);
|
|
76
74
|
if ('_id' in obj) obj.id = obj._id;
|
|
77
75
|
const { id } = obj;
|
|
78
76
|
|
|
@@ -98,8 +96,8 @@ const Panel = {
|
|
|
98
96
|
});
|
|
99
97
|
EventsUI.onClick(`.${idPanel}-btn-edit-${id}`, async () => {
|
|
100
98
|
logger.warn('edit', obj);
|
|
101
|
-
if (obj._id) editId = obj._id;
|
|
102
|
-
else if (obj.id) editId = obj.id;
|
|
99
|
+
if (obj._id) Panel.Tokens[idPanel].editId = obj._id;
|
|
100
|
+
else if (obj.id) Panel.Tokens[idPanel].editId = obj.id;
|
|
103
101
|
|
|
104
102
|
s(`.btn-${idPanel}-label-edit`).classList.remove('hide');
|
|
105
103
|
s(`.btn-${idPanel}-label-add`).classList.add('hide');
|
|
@@ -171,6 +169,10 @@ const Panel = {
|
|
|
171
169
|
const valueIcon = formObjData?.panel?.icon?.value ? formObjData.panel.icon.value : '';
|
|
172
170
|
const keyIcon = formObjData?.panel?.icon?.key ? formObjData.panel.icon.key : '';
|
|
173
171
|
|
|
172
|
+
if (formObjData && ['datetime-local'].includes(formObjData.inputType) && isValidDate(obj[infoKey])) {
|
|
173
|
+
obj[infoKey] = `${obj[infoKey]}`.replace('T', ' ').replace('.000Z', '');
|
|
174
|
+
}
|
|
175
|
+
|
|
174
176
|
if (formData.find((f) => f.model === infoKey && f.panel && f.panel.type === 'tags')) {
|
|
175
177
|
setTimeout(async () => {
|
|
176
178
|
let tagRender = html``;
|
|
@@ -186,22 +188,50 @@ const Panel = {
|
|
|
186
188
|
});
|
|
187
189
|
return html``;
|
|
188
190
|
}
|
|
191
|
+
{
|
|
192
|
+
const formDataObj = formData.find((f) => f.model === infoKey && f.panel && f.panel.type === 'list');
|
|
193
|
+
if (obj[infoKey] && obj[infoKey].length > 0 && formDataObj)
|
|
194
|
+
return html`<div class="in ${idPanel}-row">
|
|
195
|
+
<span class="${idPanel}-row-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
|
|
196
|
+
${keyIcon} ${Translate.Render(infoKey)}:</span
|
|
197
|
+
>
|
|
198
|
+
<span class="${idPanel}-row-value"
|
|
199
|
+
>${valueIcon} ${obj[infoKey].map((k) => Translate.Render(k)).join(', ')}</span
|
|
200
|
+
>
|
|
201
|
+
</div> `;
|
|
202
|
+
}
|
|
189
203
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
204
|
+
{
|
|
205
|
+
const formDataObj = formData.find(
|
|
206
|
+
(f) => f.model === infoKey && f.panel && f.panel.type === 'info-row-pin',
|
|
207
|
+
);
|
|
208
|
+
if (obj[infoKey] && formDataObj)
|
|
209
|
+
return html`<div class="in ${idPanel}-row">
|
|
210
|
+
<span class="${idPanel}-row-pin-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
|
|
211
|
+
${keyIcon}
|
|
212
|
+
${formDataObj.translateCode
|
|
213
|
+
? Translate.Render(formDataObj.translateCode)
|
|
214
|
+
: Translate.Render(infoKey)}:</span
|
|
215
|
+
>
|
|
216
|
+
<span class="${idPanel}-row-pin-value">${valueIcon} ${obj[infoKey]}</span>
|
|
217
|
+
</div> `;
|
|
218
|
+
}
|
|
197
219
|
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
220
|
+
{
|
|
221
|
+
const formDataObj = formData.find(
|
|
222
|
+
(f) => f.model === infoKey && f.panel && f.panel.type === 'info-row',
|
|
223
|
+
);
|
|
224
|
+
if (obj[infoKey] && formDataObj)
|
|
225
|
+
return html`<div class="in ${idPanel}-row">
|
|
226
|
+
<span class="${idPanel}-row-key capitalize ${formObjData.label?.disabled ? 'hide' : ''}">
|
|
227
|
+
${keyIcon}
|
|
228
|
+
${formDataObj.translateCode
|
|
229
|
+
? Translate.Render(formDataObj.translateCode)
|
|
230
|
+
: Translate.Render(infoKey)}:</span
|
|
231
|
+
>
|
|
232
|
+
<span class="${idPanel}-row-value"> ${valueIcon} ${obj[infoKey]}</span>
|
|
233
|
+
</div> `;
|
|
234
|
+
}
|
|
205
235
|
|
|
206
236
|
return html``;
|
|
207
237
|
})
|
|
@@ -224,6 +254,30 @@ const Panel = {
|
|
|
224
254
|
for (const modelData of formData) {
|
|
225
255
|
if (modelData.disableRender) continue;
|
|
226
256
|
switch (modelData.inputType) {
|
|
257
|
+
case 'dropdown-checkbox': {
|
|
258
|
+
renderForm += html`<div class="in section-mp">
|
|
259
|
+
${await DropDown.Render({
|
|
260
|
+
id: `${modelData.id}`,
|
|
261
|
+
label: html`${Translate.Render(modelData.model)}`,
|
|
262
|
+
type: 'checkbox',
|
|
263
|
+
value: modelData.dropdown.options[0],
|
|
264
|
+
resetOption: true,
|
|
265
|
+
containerClass: `${idPanel}-dropdown-checkbox`,
|
|
266
|
+
data: modelData.dropdown.options.map((dKey) => {
|
|
267
|
+
return {
|
|
268
|
+
value: dKey,
|
|
269
|
+
data: dKey,
|
|
270
|
+
checked: false,
|
|
271
|
+
display: html`${Translate.Render(dKey)}`,
|
|
272
|
+
onClick: function () {
|
|
273
|
+
logger.info('DropDown onClick', this.checked);
|
|
274
|
+
},
|
|
275
|
+
};
|
|
276
|
+
}),
|
|
277
|
+
})}
|
|
278
|
+
</div>`;
|
|
279
|
+
break;
|
|
280
|
+
}
|
|
227
281
|
case 'dropdown':
|
|
228
282
|
renderForm += html` <div class="in section-mp">
|
|
229
283
|
${await DropDown.Render({
|
|
@@ -418,21 +472,23 @@ const Panel = {
|
|
|
418
472
|
obj.id = `${data.length}`;
|
|
419
473
|
let documents;
|
|
420
474
|
if (options && options.on && options.on.add) {
|
|
421
|
-
const { status, data } = await options.on.add({ data: obj, editId });
|
|
475
|
+
const { status, data } = await options.on.add({ data: obj, editId: Panel.Tokens[idPanel].editId });
|
|
422
476
|
if (status === 'error') return;
|
|
423
477
|
documents = data;
|
|
424
478
|
}
|
|
425
479
|
s(`.btn-${idPanel}-clean`).click();
|
|
426
|
-
if (editId && s(`.${idPanel}-${
|
|
480
|
+
if (Panel.Tokens[idPanel].editId && s(`.${idPanel}-${Panel.Tokens[idPanel].editId}`))
|
|
481
|
+
s(`.${idPanel}-${Panel.Tokens[idPanel].editId}`).remove();
|
|
427
482
|
if (Array.isArray(documents)) {
|
|
428
483
|
htmls(`.${idPanel}-render`, '');
|
|
429
484
|
for (const doc of documents) {
|
|
430
485
|
append(`.${idPanel}-render`, await renderPanel(doc));
|
|
431
486
|
}
|
|
432
|
-
} else htmls(`.${idPanel}-render`, await renderPanel(obj));
|
|
487
|
+
} else htmls(`.${idPanel}-render`, await renderPanel({ ...obj, ...documents }));
|
|
433
488
|
Input.cleanValues(formData);
|
|
434
489
|
s(`.btn-${idPanel}-close`).click();
|
|
435
490
|
s(`.${scrollClassContainer}`).scrollTop = 0;
|
|
491
|
+
if (s(`.${scrollClassContainer}`)) s(`.${scrollClassContainer}`).style.overflow = 'auto';
|
|
436
492
|
});
|
|
437
493
|
s(`.btn-${idPanel}-clean`).onclick = () => {
|
|
438
494
|
Input.cleanValues(formData);
|
|
@@ -458,13 +514,14 @@ const Panel = {
|
|
|
458
514
|
s(`.btn-${idPanel}-add`).onclick = (e) => {
|
|
459
515
|
e.preventDefault();
|
|
460
516
|
// s(`.btn-${idPanel}-clean`).click();
|
|
461
|
-
editId = undefined;
|
|
517
|
+
Panel.Tokens[idPanel].editId = undefined;
|
|
462
518
|
s(`.btn-${idPanel}-label-add`).classList.remove('hide');
|
|
463
519
|
s(`.btn-${idPanel}-label-edit`).classList.add('hide');
|
|
464
520
|
s(`.${scrollClassContainer}`).scrollTop = 0;
|
|
465
521
|
|
|
466
522
|
openPanelForm();
|
|
467
523
|
};
|
|
524
|
+
if (s(`.${scrollClassContainer}`)) s(`.${scrollClassContainer}`).style.overflow = 'auto';
|
|
468
525
|
});
|
|
469
526
|
|
|
470
527
|
if (data.length > 0) for (const obj of data) render += await renderPanel(obj);
|
|
@@ -597,7 +654,9 @@ const Panel = {
|
|
|
597
654
|
>
|
|
598
655
|
<div class="in ${idPanel}-form-header">
|
|
599
656
|
${await BtnIcon.Render({
|
|
600
|
-
class: `section-mp btn-custom btn-${idPanel}-add
|
|
657
|
+
class: `section-mp btn-custom btn-${idPanel}-add ${
|
|
658
|
+
options?.role?.add ? (!options.role.add() ? 'hide' : '') : ''
|
|
659
|
+
}`,
|
|
601
660
|
label: html`<i class="fas fa-plus"></i> ${Translate.Render('add')}`,
|
|
602
661
|
type: 'button',
|
|
603
662
|
})}
|
|
@@ -90,16 +90,7 @@ const PanelForm = {
|
|
|
90
90
|
},
|
|
91
91
|
},
|
|
92
92
|
];
|
|
93
|
-
|
|
94
|
-
html`<span
|
|
95
|
-
style="${renderCssAttr({
|
|
96
|
-
style: {
|
|
97
|
-
'font-size': '14px',
|
|
98
|
-
color: '#888',
|
|
99
|
-
},
|
|
100
|
-
})}"
|
|
101
|
-
>${new Date(date).toLocaleString().replaceAll(',', '')}</span
|
|
102
|
-
>`;
|
|
93
|
+
|
|
103
94
|
const titleIcon = html`<i class="fa-solid fa-quote-left"></i>`;
|
|
104
95
|
const panelRender = async ({ data }) =>
|
|
105
96
|
await Panel.Render({
|
|
@@ -271,7 +262,7 @@ const PanelForm = {
|
|
|
271
262
|
fileId: file ? URL.createObjectURL(file) : undefined,
|
|
272
263
|
_id: documentData._id,
|
|
273
264
|
id: documentData._id,
|
|
274
|
-
createdAt:
|
|
265
|
+
createdAt: documentData.createdAt,
|
|
275
266
|
};
|
|
276
267
|
|
|
277
268
|
if (documentStatus === 'error') status = 'error';
|
|
@@ -376,7 +367,7 @@ const PanelForm = {
|
|
|
376
367
|
PanelForm.Data[idPanel].data.push({
|
|
377
368
|
id: documentObject._id,
|
|
378
369
|
title: documentObject.title,
|
|
379
|
-
createdAt:
|
|
370
|
+
createdAt: documentObject.createdAt,
|
|
380
371
|
tags: documentObject.tags.filter((t) => !prefixTags.includes(t)),
|
|
381
372
|
mdFileId: marked.parse(mdFileId),
|
|
382
373
|
userId: documentObject.userId._id,
|
|
@@ -431,14 +422,9 @@ const PanelForm = {
|
|
|
431
422
|
})),
|
|
432
423
|
});
|
|
433
424
|
|
|
434
|
-
let lastCid;
|
|
435
|
-
let lasUserId;
|
|
436
425
|
this.Data[idPanel].updatePanel = async () => {
|
|
437
426
|
const cid = getQueryParams().cid ? getQueryParams().cid : '';
|
|
438
|
-
if (lastCid === cid && lasUserId === Elements.Data.user.main.model.user._id) return;
|
|
439
427
|
if (options.route === 'home') Modal.homeCid = newInstance(cid);
|
|
440
|
-
lastCid = cid;
|
|
441
|
-
lasUserId = newInstance(Elements.Data.user.main.model.user._id);
|
|
442
428
|
htmls(`.${options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body'}`, await renderSrrPanelData());
|
|
443
429
|
await getPanelData();
|
|
444
430
|
htmls(
|
|
@@ -451,7 +437,7 @@ const PanelForm = {
|
|
|
451
437
|
id: options.parentIdModal ? 'html-' + options.parentIdModal : 'main-body',
|
|
452
438
|
routeId: options.route,
|
|
453
439
|
event: async (path) => {
|
|
454
|
-
await this.Data[idPanel].updatePanel();
|
|
440
|
+
if (!PanelForm.Data[idPanel].sessionIn) await this.Data[idPanel].updatePanel();
|
|
455
441
|
},
|
|
456
442
|
});
|
|
457
443
|
|
|
@@ -11,35 +11,49 @@ const Translate = {
|
|
|
11
11
|
Data: {},
|
|
12
12
|
Token: {},
|
|
13
13
|
Event: {},
|
|
14
|
+
Options: {},
|
|
14
15
|
Parse: function (lang) {
|
|
15
16
|
s('html').lang = lang;
|
|
16
17
|
Object.keys(this.Token).map((translateHash) => {
|
|
17
18
|
if (translateHash in this.Token && lang in this.Token[translateHash]) {
|
|
18
|
-
if (!('placeholder' in this.
|
|
19
|
-
htmls(
|
|
19
|
+
if (!('placeholder' in this.Options[translateHash]) && s(`.${translateHash}`))
|
|
20
|
+
htmls(
|
|
21
|
+
`.${translateHash}`,
|
|
22
|
+
this.Options[translateHash]?.disableTextFormat
|
|
23
|
+
? this.Token[translateHash][lang]
|
|
24
|
+
: textFormatted(this.Token[translateHash][lang]),
|
|
25
|
+
);
|
|
20
26
|
else if ('placeholder' in this.Token[translateHash] && s(this.Token[translateHash].placeholder))
|
|
21
|
-
s(this.Token[translateHash].placeholder).placeholder =
|
|
27
|
+
s(this.Token[translateHash].placeholder).placeholder = this.Options[translateHash]?.disableTextFormat
|
|
28
|
+
? this.Token[translateHash][lang]
|
|
29
|
+
: textFormatted(this.Token[translateHash][lang]);
|
|
22
30
|
}
|
|
23
31
|
});
|
|
24
32
|
for (const keyEvent of Object.keys(this.Event)) this.Event[keyEvent]();
|
|
25
33
|
},
|
|
26
|
-
Render: function (keyLang, placeholder) {
|
|
34
|
+
Render: function (keyLang, placeholder, options = { disableTextFormat: false }) {
|
|
27
35
|
if (!(keyLang in this.Data)) {
|
|
28
36
|
// TODO: add translate package or library for this case
|
|
29
37
|
logger.warn('translate key lang does not exist: ', keyLang);
|
|
30
|
-
return textFormatted(keyLang);
|
|
38
|
+
return options.disableTextFormat ? keyLang : textFormatted(keyLang);
|
|
31
39
|
}
|
|
32
40
|
if (placeholder) this.Data[keyLang].placeholder = placeholder;
|
|
33
41
|
keyLang = this.Data[keyLang];
|
|
34
42
|
const translateHash = getId(this.Token, 'trans');
|
|
43
|
+
this.Options[translateHash] = options;
|
|
35
44
|
this.Token[translateHash] = newInstance(keyLang);
|
|
36
45
|
if ('placeholder' in keyLang) {
|
|
37
|
-
if (s('html').lang in keyLang)
|
|
38
|
-
|
|
46
|
+
if (s('html').lang in keyLang)
|
|
47
|
+
return options.disableTextFormat ? keyLang[s('html').lang] : textFormatted(keyLang[s('html').lang]);
|
|
48
|
+
return options.disableTextFormat ? keyLang['en'] : textFormatted(keyLang['en']);
|
|
39
49
|
}
|
|
40
50
|
if (s('html').lang in keyLang)
|
|
41
|
-
return html`<span class="${translateHash}"
|
|
42
|
-
|
|
51
|
+
return html`<span class="${translateHash}"
|
|
52
|
+
>${options.disableTextFormat ? keyLang[s('html').lang] : textFormatted(keyLang[s('html').lang])}</span
|
|
53
|
+
>`;
|
|
54
|
+
return html`<span class="${translateHash}"
|
|
55
|
+
>${options.disableTextFormat ? keyLang['en'] : textFormatted(keyLang['en'])}</span
|
|
56
|
+
>`;
|
|
43
57
|
},
|
|
44
58
|
renderLang: function (language) {
|
|
45
59
|
localStorage.setItem('lang', language);
|
|
@@ -474,6 +488,26 @@ const TranslateCore = {
|
|
|
474
488
|
Translate.Data['friday'] = { es: 'Viernes', en: 'Friday' };
|
|
475
489
|
Translate.Data['saturday'] = { es: 'Sábado', en: 'Saturday' };
|
|
476
490
|
Translate.Data['sunday'] = { es: 'Domingo', en: 'Sunday' };
|
|
491
|
+
|
|
492
|
+
Translate.Data['description'] = { es: 'Descripción', en: 'Description' };
|
|
493
|
+
Translate.Data['daysOfWeek'] = { es: 'Días de la semana', en: 'Days of the week' };
|
|
494
|
+
Translate.Data['startTime'] = { es: 'Hora de inicio', en: 'Start time' };
|
|
495
|
+
Translate.Data['endTime'] = { es: 'Hora de finalizacion', en: 'End time' };
|
|
496
|
+
Translate.Data['appointment-scheduled'] = {
|
|
497
|
+
en: 'Your appointment has been scheduled',
|
|
498
|
+
es: 'Tu cita ha sido programada',
|
|
499
|
+
};
|
|
500
|
+
Translate.Data['info'] = { es: 'Información', en: 'Info' };
|
|
501
|
+
Translate.Data['complete-name'] = { es: 'Nombre completo', en: 'Complete name' };
|
|
502
|
+
Translate.Data['identityDocument'] = { es: 'Rut', en: 'Identity document' };
|
|
503
|
+
Translate.Data['day'] = { es: 'Día', en: 'Day' };
|
|
504
|
+
Translate.Data['month'] = { es: 'Mes', en: 'Month' };
|
|
505
|
+
Translate.Data['year'] = { es: 'Año', en: 'Year' };
|
|
506
|
+
Translate.Data['phone'] = { es: 'Teléfono', en: 'Phone' };
|
|
507
|
+
Translate.Data['invalid-identity-document'] = {
|
|
508
|
+
en: 'Invalid identity document',
|
|
509
|
+
es: 'Documento de identidad inválido',
|
|
510
|
+
};
|
|
477
511
|
},
|
|
478
512
|
};
|
|
479
513
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { validatePassword } from './CommonJs.js';
|
|
1
|
+
import { isChileanIdentityDocument, validatePassword } from './CommonJs.js';
|
|
2
2
|
import { renderStatus } from './Css.js';
|
|
3
3
|
import { loggerFactory } from './Logger.js';
|
|
4
4
|
import { textFormatted, Translate } from './Translate.js';
|
|
@@ -58,6 +58,14 @@ const Validator = {
|
|
|
58
58
|
if (!validator.isLength(s(`.${validatorData.id}`).value, rule.options))
|
|
59
59
|
errorMessage += this.renderErrorMessage(rule);
|
|
60
60
|
break;
|
|
61
|
+
|
|
62
|
+
case 'isChileanIdentityDocument': {
|
|
63
|
+
if (!isChileanIdentityDocument(s(`.${validatorData.id}`).value)) {
|
|
64
|
+
errorMessage += this.renderErrorMessage(undefined, Translate.Render('invalid-identity-document'));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
61
69
|
default:
|
|
62
70
|
if (
|
|
63
71
|
validator[rule.type] &&
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AgGrid } from '../../components/core/AgGrid.js';
|
|
2
2
|
import { BtnIcon } from '../../components/core/BtnIcon.js';
|
|
3
|
-
import { getId, timer } from '../../components/core/CommonJs.js';
|
|
3
|
+
import { getId, getValueFromJoinString, timer } from '../../components/core/CommonJs.js';
|
|
4
4
|
import { darkTheme } from '../../components/core/Css.js';
|
|
5
5
|
import { EventsUI } from '../../components/core/EventsUI.js';
|
|
6
6
|
import { loggerFactory } from '../../components/core/Logger.js';
|
|
@@ -88,7 +88,9 @@ const DefaultManagement = {
|
|
|
88
88
|
${Translate.Render('confirm-delete-item')}
|
|
89
89
|
${Object.keys(params.data).length > 0
|
|
90
90
|
? html`<br />
|
|
91
|
-
"${
|
|
91
|
+
"${options.defaultColKeyFocus
|
|
92
|
+
? getValueFromJoinString(params.data, options.defaultColKeyFocus)
|
|
93
|
+
: params.data[Object.keys(params.data)[0]]}"`
|
|
92
94
|
: ''}
|
|
93
95
|
</div>
|
|
94
96
|
`;
|
|
@@ -9,7 +9,12 @@ const MongooseDB = {
|
|
|
9
9
|
connect: async (host, name) => {
|
|
10
10
|
const uri = `${host}/${name}`;
|
|
11
11
|
// logger.info('MongooseDB connect', { host, name, uri });
|
|
12
|
-
return await mongoose
|
|
12
|
+
return await mongoose
|
|
13
|
+
.createConnection(uri, {
|
|
14
|
+
// useNewUrlParser: true,
|
|
15
|
+
// useUnifiedTopology: true,
|
|
16
|
+
})
|
|
17
|
+
.asPromise();
|
|
13
18
|
return new Promise((resolve, reject) =>
|
|
14
19
|
mongoose
|
|
15
20
|
.connect(
|
|
@@ -67,8 +72,15 @@ const MongooseDB = {
|
|
|
67
72
|
shellExec(`sudo rm -r /var/lib/mongodb`);
|
|
68
73
|
// restore lib
|
|
69
74
|
// shellExec(`sudo chown -R mongodb:mongodb /var/lib/mongodb/*`);
|
|
75
|
+
// mongod --repair
|
|
70
76
|
|
|
71
77
|
if (process.argv.includes('legacy')) {
|
|
78
|
+
// TODO:
|
|
79
|
+
if (process.argv.includes('rocky')) {
|
|
80
|
+
// https://github.com/mongodb/mongodb-selinux
|
|
81
|
+
// https://www.mongodb.com/docs/v7.0/tutorial/install-mongodb-enterprise-on-red-hat/
|
|
82
|
+
shellExec(`sudo chown -R mongod:mongod /var/lib/mongo`);
|
|
83
|
+
}
|
|
72
84
|
logger.info('install legacy 4.4');
|
|
73
85
|
shellExec(`wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -`);
|
|
74
86
|
|
package/src/index.js
CHANGED
|
@@ -4,7 +4,9 @@
|
|
|
4
4
|
* @namespace Underpost
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
+
import { runTest } from './server/conf.js';
|
|
7
8
|
import { loggerFactory, setUpInfo } from './server/logger.js';
|
|
9
|
+
import Project from './server/project.js';
|
|
8
10
|
|
|
9
11
|
const logger = loggerFactory(import.meta);
|
|
10
12
|
|
|
@@ -20,7 +22,8 @@ class Underpost {
|
|
|
20
22
|
* @type {String}
|
|
21
23
|
* @memberof Underpost
|
|
22
24
|
*/
|
|
23
|
-
static version = 'v2.8.
|
|
25
|
+
static version = 'v2.8.4';
|
|
26
|
+
static project = Project;
|
|
24
27
|
|
|
25
28
|
constructor() {}
|
|
26
29
|
|
|
@@ -40,6 +43,10 @@ class Underpost {
|
|
|
40
43
|
static async setUpInfo() {
|
|
41
44
|
return await setUpInfo(logger);
|
|
42
45
|
}
|
|
46
|
+
|
|
47
|
+
static runTest() {
|
|
48
|
+
return runTest(Underpost.version);
|
|
49
|
+
}
|
|
43
50
|
}
|
|
44
51
|
|
|
45
52
|
const up = Underpost;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
|
-
import { network } from '../../server/network.js';
|
|
3
2
|
import { shellCd, shellExec } from '../../server/process.js';
|
|
4
3
|
import { timer } from '../../client/components/core/CommonJs.js';
|
|
5
4
|
import { loggerFactory } from '../../server/logger.js';
|
|
@@ -39,20 +38,9 @@ const Lampp = {
|
|
|
39
38
|
);
|
|
40
39
|
|
|
41
40
|
shellExec(cmd);
|
|
42
|
-
await network.port.portClean(3306);
|
|
43
|
-
for (const port of this.ports) await network.port.portClean(port);
|
|
44
41
|
cmd = `sudo /opt/lampp/lampp start`;
|
|
45
42
|
if (this.router) fs.writeFileSync(`./tmp/lampp-router.conf`, this.router, 'utf-8');
|
|
46
|
-
shellExec(cmd
|
|
47
|
-
if (options && options.daemon) this.daemon();
|
|
48
|
-
},
|
|
49
|
-
daemon: async function () {
|
|
50
|
-
await timer(1000 * 60 * 2); // 2 minutes
|
|
51
|
-
for (const port of this.ports) {
|
|
52
|
-
const [portStatus] = await network.port.status([port]);
|
|
53
|
-
if (!portStatus.open) return await this.initService();
|
|
54
|
-
}
|
|
55
|
-
this.daemon();
|
|
43
|
+
shellExec(cmd);
|
|
56
44
|
},
|
|
57
45
|
enabled: () => fs.existsSync(`/opt/lampp/apache2/conf/httpd.conf`),
|
|
58
46
|
appendRouter: function (render) {
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
|
-
import { network } from '../../server/network.js';
|
|
3
2
|
import { shellExec } from '../../server/process.js';
|
|
4
|
-
import { timer } from '../../client/components/core/CommonJs.js';
|
|
5
3
|
|
|
6
4
|
const Xampp = {
|
|
7
5
|
ports: [],
|
|
@@ -16,20 +14,9 @@ const Xampp = {
|
|
|
16
14
|
fs.writeFileSync(`C:/xampp/apache/conf/extra/httpd-ssl.conf`, this.router || '', 'utf8');
|
|
17
15
|
cmd = `C:/xampp/xampp_stop.exe`;
|
|
18
16
|
shellExec(cmd);
|
|
19
|
-
await network.port.portClean(3306);
|
|
20
|
-
for (const port of this.ports) await network.port.portClean(port);
|
|
21
17
|
cmd = `C:/xampp/xampp_start.exe`;
|
|
22
18
|
if (this.router) fs.writeFileSync(`./tmp/xampp-router.conf`, this.router, 'utf-8');
|
|
23
19
|
shellExec(cmd);
|
|
24
|
-
if (options && options.daemon) this.daemon();
|
|
25
|
-
},
|
|
26
|
-
daemon: async function () {
|
|
27
|
-
await timer(1000 * 60 * 2); // 2 minutes
|
|
28
|
-
for (const port of this.ports) {
|
|
29
|
-
const [portStatus] = await network.port.status([port]);
|
|
30
|
-
if (!portStatus.open) return await this.initService();
|
|
31
|
-
}
|
|
32
|
-
this.daemon();
|
|
33
20
|
},
|
|
34
21
|
enabled: () => fs.existsSync(`C:/xampp/apache/conf/httpd.conf`),
|
|
35
22
|
appendRouter: function (render) {
|
package/src/server/auth.js
CHANGED
|
@@ -9,7 +9,7 @@ import jwt from 'jsonwebtoken';
|
|
|
9
9
|
import { loggerFactory } from './logger.js';
|
|
10
10
|
import crypto from 'crypto';
|
|
11
11
|
import { userRoleEnum } from '../api/user/user.model.js';
|
|
12
|
-
import { validatePassword } from '../client/components/core/CommonJs.js';
|
|
12
|
+
import { commonAdminGuard, commonModeratorGuard, validatePassword } from '../client/components/core/CommonJs.js';
|
|
13
13
|
|
|
14
14
|
dotenv.config();
|
|
15
15
|
|
|
@@ -162,7 +162,7 @@ const authMiddleware = (req, res, next) => {
|
|
|
162
162
|
*/
|
|
163
163
|
const adminGuard = (req, res, next) => {
|
|
164
164
|
try {
|
|
165
|
-
if (!(
|
|
165
|
+
if (!commonAdminGuard(req.auth.user.role))
|
|
166
166
|
return res.status(403).json({ status: 'error', message: 'Insufficient permission' });
|
|
167
167
|
return next();
|
|
168
168
|
} catch (error) {
|
|
@@ -194,7 +194,7 @@ const adminGuard = (req, res, next) => {
|
|
|
194
194
|
*/
|
|
195
195
|
const moderatorGuard = (req, res, next) => {
|
|
196
196
|
try {
|
|
197
|
-
if (!(
|
|
197
|
+
if (!commonModeratorGuard(req.auth.user.role))
|
|
198
198
|
return res.status(403).json({ status: 'error', message: 'Insufficient permission' });
|
|
199
199
|
return next();
|
|
200
200
|
} catch (error) {
|
|
@@ -50,10 +50,10 @@ const fullBuild = async ({
|
|
|
50
50
|
buildAcmeChallengePath(acmeChallengeFullPath);
|
|
51
51
|
|
|
52
52
|
if (publicClientId && publicClientId.startsWith('html-website-templates')) {
|
|
53
|
-
if (!fs.existsSync(`/dd/html-website-templates/`))
|
|
54
|
-
shellExec(`cd /dd && git clone https://github.com/designmodo/html-website-templates.git`);
|
|
53
|
+
if (!fs.existsSync(`/home/dd/html-website-templates/`))
|
|
54
|
+
shellExec(`cd /home/dd && git clone https://github.com/designmodo/html-website-templates.git`);
|
|
55
55
|
if (!fs.existsSync(`${rootClientPath}/index.php`)) {
|
|
56
|
-
fs.copySync(`/dd/html-website-templates/${publicClientId.split('-publicClientId-')[1]}`, rootClientPath);
|
|
56
|
+
fs.copySync(`/home/dd/html-website-templates/${publicClientId.split('-publicClientId-')[1]}`, rootClientPath);
|
|
57
57
|
shellExec(`cd ${rootClientPath} && git init && git add . && git commit -m "Base template implementation"`);
|
|
58
58
|
// git remote add origin git@github.com:<username>/<repo>.git
|
|
59
59
|
fs.writeFileSync(`${rootClientPath}/.git/.htaccess`, `Deny from all`, 'utf8');
|
|
@@ -545,17 +545,7 @@ const buildClient = async (options = { liveClientBuildPaths: [], instances: [] }
|
|
|
545
545
|
let siteMapSrc = await new Promise((resolve) =>
|
|
546
546
|
streamToPromise(Readable.from(siteMapLinks).pipe(siteMapStream)).then((data) => resolve(data.toString())),
|
|
547
547
|
);
|
|
548
|
-
switch (publicClientId) {
|
|
549
|
-
case 'underpost':
|
|
550
|
-
siteMapSrc = siteMapSrc.replaceAll(
|
|
551
|
-
`</urlset>`,
|
|
552
|
-
`${fs.readFileSync(`./src/client/public/underpost/sitemap-template.txt`, 'utf8')} </urlset>`,
|
|
553
|
-
);
|
|
554
|
-
break;
|
|
555
548
|
|
|
556
|
-
default:
|
|
557
|
-
break;
|
|
558
|
-
}
|
|
559
549
|
// Return a promise that resolves with your XML string
|
|
560
550
|
fs.writeFileSync(`${rootClientPath}/sitemap.xml`, siteMapSrc, 'utf8');
|
|
561
551
|
if (xslUrl)
|