Skip to content

Commit 94cdf6f

Browse files
committed
Changes caused by PWA-Core updates
1 parent 763c0b7 commit 94cdf6f

17 files changed

+114
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mono-pwa",
3-
"version": "4.0.0-dev.2",
3+
"version": "4.0.0-dev.3",
44
"description": "monobank PWA",
55
"main": "index.html",
66
"config": {

src/app/loaders/Modules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import "@App/modules/mono/menu"
55
import "@App/modules/mono/statementUI"
66
import "@App/modules/mono/currencyUI"
77
import "@App/modules/mono/partners"
8-
import "@App/modules/main/settings"
8+
import "@App/modules/main/settings/settings"
99
import "@App/modules/main/flags"

src/app/loaders/SettingsLayout/DBPresence.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ import fileSizeForHuman from "@Core/Tools/transformation/text/fileSizeForHuman"
22
import DOM from "@DOMPath/DOM/Classes/dom"
33
import { $$, $ } from "@Core/Services/Language/handler"
44
import IconSide from "@Environment/Library/DOM/object/iconSide"
5-
import { SettingsSectionElement, SettingsGroupContainer } from "@Environment/Library/DOM/settings"
65
import { CardList } from "@Environment/Library/DOM/object/card"
76
import { Button } from "@Environment/Library/DOM/object/input"
87
import DBUserPresence from "@Core/Services/DBUserPresence"
8+
import { SettingsSectionElement, SettingsGroupContainer } from "@App/modules/main/settings"
9+
910

1011
export default function generateDBSettingsLayout(act) {
1112
const list = DBUserPresence.getAll()

src/app/loaders/SettingsLayout/LanguageList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import LanguageCore from "@Core/Services/Language/core"
22
import DOM from "@DOMPath/DOM/Classes/dom"
33
import SettingsStorage from "@Core/Services/Settings/SettingsStorage"
44
import reloadToast from "@App/tools/interaction/reloadToast"
5-
import { SettingsSectionElement, SettingsGroupContainer } from "@Environment/Library/DOM/settings"
5+
import { SettingsSectionElement, SettingsGroupContainer } from "@App/modules/main/settings"
66
import { RadioLabel } from "@Environment/Library/DOM/object/input"
77
import Design from "@Core/Services/design"
88

src/app/loaders/SettingsLayout/Notifications.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import DOM from "@DOMPath/DOM/Classes/dom"
22
import { $$, $ } from "@Core/Services/Language/handler"
33
import IconSide from "@Environment/Library/DOM/object/iconSide"
4-
import { SettingsSectionElement, SettingsGroupContainer } from "@Environment/Library/DOM/settings"
4+
import { SettingsSectionElement, SettingsGroupContainer } from "@App/modules/main/settings"
55
import { CardList, CardContent } from "@Environment/Library/DOM/object/card"
66
import Push from "@Core/Services/Push"
77
import { SwitchLabel, SelectInput } from "@Environment/Library/DOM/object/input"

src/app/loaders/SettingsLayout/Transformators.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import DOM from "@DOMPath/DOM/Classes/dom"
22
import { $$ } from "@Core/Services/Language/handler"
33
import IconSide from "@Environment/Library/DOM/object/iconSide"
4-
import { SettingsSectionElement, SettingsGroupContainer } from "@Environment/Library/DOM/settings"
4+
import { SettingsSectionElement, SettingsGroupContainer } from "@App/modules/main/settings"
55
import { CardList } from "@Environment/Library/DOM/object/card"
66
import TransformatorsRegistry from "@Core/Services/Transformators/TransformatorsRegistry"
77

src/app/loaders/UI/SettingsLayoutLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {
22
SettingsActContainer, SettingsSectionElement, SettingsGroupContainer, SettingsActLink,
3-
} from "@Environment/Library/DOM/settings"
3+
} from "@App/modules/main/settings"
44
import { isRecoveryMode } from "@App/debug/recovery"
55
import WarningConstructor from "@Environment/Library/DOM/object/warnings/WarningConstructor"
66
import SettingsLayout from "@Core/Services/Settings/user/layout"

src/app/modules/main/PWA.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import WindowManager from "@Core/Services/SimpleWindowManager"
1212
import getCounter from "@Core/Tools/objects/counter"
1313
import AlignedContent from "@Environment/Library/DOM/object/AlignedContent"
1414
import { CoreLoader } from "@Core/Init/CoreLoader"
15-
import { SettingsActLink } from "@Environment/Library/DOM/settings"
1615
import Prompt from "@Environment/Library/DOM/elements/prompt"
1716
import FlagsUI from "./flags"
17+
import { SettingsActLink } from "./settings"
1818

1919
export default class PWA extends App {
2020
static get isWG() {
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import DOM from "@DOMPath/DOM/Classes/dom"
2+
import FieldsContainer from "@Core/Tools/validation/fieldsContainer"
3+
import FieldChecker from "@Core/Tools/validation/fieldChecker"
4+
import { Title } from "@Environment/Library/DOM/object"
5+
6+
export default class SettingsActContainer {
7+
constructor(data, object) {
8+
new FieldsContainer([
9+
["name"],
10+
{
11+
name: new FieldChecker({ type: "string" }),
12+
},
13+
]).set(data)
14+
15+
return new DOM({
16+
new: "div",
17+
class: ["settings-act-container"],
18+
content: [
19+
new Title(data.name),
20+
],
21+
...(data.lock ? {
22+
style: { pointerEvents: "none", opacity: 0.7 },
23+
} : {}),
24+
onRender(p, e) {
25+
},
26+
})
27+
}
28+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import DOM from "@DOMPath/DOM/Classes/dom"
2+
import ucFirst from "@Core/Tools/transformation/text/ucFirst"
3+
import Navigation from "@Core/Services/navigation"
4+
import { CardList } from "@Environment/Library/DOM/object/card"
5+
import { TwoSidesWrapper, Icon } from "@Environment/Library/DOM/object"
6+
7+
export default class SettingsActLink {
8+
constructor([act, sign, custom = false, disabled = false]) {
9+
if (typeof act === "string") act = [act]
10+
sign = sign || (typeof act === "string" ? ucFirst(act[0]) : "(...)")
11+
const signElement = new DOM({ new: "div", content: sign })
12+
return new CardList([
13+
{
14+
content: new TwoSidesWrapper(signElement, new Icon((custom || "chevron_right"), { marginLeft: "15px" })),
15+
handler: (typeof act === "function"
16+
? act
17+
: () => { Navigation.url = { module: "settings", params: act } }),
18+
object: [
19+
{
20+
name: "changeSign",
21+
handler(n) { signElement.clear(n) },
22+
},
23+
],
24+
...(disabled ? { style: { opacity: "0.4" } } : {}),
25+
},
26+
], true)
27+
}
28+
}

0 commit comments

Comments
 (0)