mirror of
https://github.com/FJurmanovic/wallet-web.git
synced 2026-02-06 06:08:10 +00:00
implemented dropdowns
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import { attr, controller, target } from "@github/catalyst";
|
import { attr, controller, target } from "@github/catalyst";
|
||||||
import { firstUpper } from "core/utils";
|
import { findMethod, firstUpper } from "core/utils";
|
||||||
import { html, TemplateResult } from "@github/jtml";
|
import { html, TemplateResult } from "@github/jtml";
|
||||||
import { RouterService } from "core/services";
|
import { RouterService } from "core/services";
|
||||||
import randomId from "core/utils/random-id";
|
import randomId from "core/utils/random-id";
|
||||||
@@ -10,20 +10,98 @@ import { BaseComponentElement } from "common/";
|
|||||||
@controller
|
@controller
|
||||||
class AppDropdownElement extends BaseComponentElement {
|
class AppDropdownElement extends BaseComponentElement {
|
||||||
@attr name: string;
|
@attr name: string;
|
||||||
@attr type: string;
|
|
||||||
@attr label: string;
|
@attr label: string;
|
||||||
@attr rules: string;
|
@attr rules: string;
|
||||||
@target main: HTMLElement;
|
@target main: HTMLElement;
|
||||||
@target inp: HTMLElement;
|
@target inp: HTMLElement;
|
||||||
|
@attr displaykey: string;
|
||||||
|
@attr valuekey: string;
|
||||||
|
@attr fetch: string;
|
||||||
|
fetchFunc: any;
|
||||||
error: string;
|
error: string;
|
||||||
randId: string;
|
randId: string;
|
||||||
|
|
||||||
|
items: Array<any>;
|
||||||
|
totalItems: number;
|
||||||
|
page: number = 1;
|
||||||
|
rpp: number = 30;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
getItems = async (options?: any): Promise<void> => {
|
||||||
|
if (typeof this.fetchFunc !== "function") return;
|
||||||
|
try {
|
||||||
|
const response = await this.fetchFunc(options);
|
||||||
|
this.setItems(response);
|
||||||
|
} catch (err) {
|
||||||
|
this.update();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
setItems = (response): void => {
|
||||||
|
if (response) {
|
||||||
|
let items = [];
|
||||||
|
if (Array.isArray(response)) {
|
||||||
|
items = response;
|
||||||
|
} else if (Array.isArray(response.items)) {
|
||||||
|
items = response.items;
|
||||||
|
this.totalItems = response?.totalRecords;
|
||||||
|
} else {
|
||||||
|
items = [];
|
||||||
|
}
|
||||||
|
this.items = items;
|
||||||
|
this.renderOptions(items);
|
||||||
|
this.renderOptions(items);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
private renderOptions = (items) => {
|
||||||
|
const displayKey = this.displaykey || "name";
|
||||||
|
const valueKey = this.valuekey || "id";
|
||||||
|
|
||||||
|
const options = items?.map((item) => {
|
||||||
|
const val = { name: item[displayKey], value: item[valueKey] };
|
||||||
|
if (
|
||||||
|
this.optionValues.some((value) => {
|
||||||
|
if (value.name == val.name && value.value == val.value) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
})
|
||||||
|
)
|
||||||
|
return;
|
||||||
|
const _option = document.createElement("option");
|
||||||
|
_option.setAttribute("value", val.value);
|
||||||
|
_option.innerText = val.name;
|
||||||
|
this.inp?.appendChild(_option);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
get optionValues() {
|
||||||
|
let values = [];
|
||||||
|
this.inp.childNodes.forEach((item: HTMLElement) => {
|
||||||
|
const value = item.getAttribute("value");
|
||||||
|
const name = item.innerText;
|
||||||
|
values.push({ name, value });
|
||||||
|
});
|
||||||
|
return values;
|
||||||
|
}
|
||||||
|
|
||||||
|
onChange = () => {
|
||||||
|
this.renderOptions(this.items);
|
||||||
|
};
|
||||||
|
|
||||||
public elementConnected = (): void => {
|
public elementConnected = (): void => {
|
||||||
this.randId = `${name}${randomId()}`;
|
this.randId = `${name}${randomId()}`;
|
||||||
|
this.fetchFunc = findMethod(this.fetch, this.appMain);
|
||||||
this.update();
|
this.update();
|
||||||
|
|
||||||
|
const options = {
|
||||||
|
rpp: this.rpp,
|
||||||
|
page: this.page,
|
||||||
|
};
|
||||||
|
this.getItems(options);
|
||||||
};
|
};
|
||||||
|
|
||||||
get valid(): boolean {
|
get valid(): boolean {
|
||||||
@@ -37,7 +115,8 @@ class AppDropdownElement extends BaseComponentElement {
|
|||||||
validate(): boolean {
|
validate(): boolean {
|
||||||
let _return = true;
|
let _return = true;
|
||||||
const rules = this.rules?.split("|").filter((a) => a);
|
const rules = this.rules?.split("|").filter((a) => a);
|
||||||
const value = (this.inp as HTMLInputElement)?.value;
|
const value = (this.inp as HTMLSelectElement)?.value;
|
||||||
|
console.log(_return, rules, value);
|
||||||
rules
|
rules
|
||||||
.slice()
|
.slice()
|
||||||
.reverse()
|
.reverse()
|
||||||
@@ -67,7 +146,12 @@ class AppDropdownElement extends BaseComponentElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render = (): TemplateResult => {
|
render = (): TemplateResult => {
|
||||||
return html``;
|
return html`<div data-target="app-dropdown.main">
|
||||||
|
<select
|
||||||
|
data-target="app-dropdown.inp"
|
||||||
|
data-action="change:app-dropdown#onChange"
|
||||||
|
></select>
|
||||||
|
</div>`;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { attr, controller, target } from "@github/catalyst";
|
|||||||
import { html, TemplateResult, unsafeHTML } from "@github/jtml";
|
import { html, TemplateResult, unsafeHTML } from "@github/jtml";
|
||||||
import { BaseComponentElement } from "common/";
|
import { BaseComponentElement } from "common/";
|
||||||
import { InputFieldElement } from "components/input-field/InputFieldElement";
|
import { InputFieldElement } from "components/input-field/InputFieldElement";
|
||||||
import { isTrue, querys } from "core/utils";
|
import { findMethod, isTrue, querys } from "core/utils";
|
||||||
|
|
||||||
@controller
|
@controller
|
||||||
class AppFormElement extends BaseComponentElement {
|
class AppFormElement extends BaseComponentElement {
|
||||||
@@ -29,16 +29,8 @@ class AppFormElement extends BaseComponentElement {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const actionString = this.custom;
|
const actionString = this.custom;
|
||||||
if (actionString) {
|
const submitFunc = findMethod(actionString, this.appMain);
|
||||||
const methodSep = actionString.lastIndexOf("#");
|
submitFunc?.(e);
|
||||||
const tag = actionString.slice(0, methodSep);
|
|
||||||
const method = actionString.slice(methodSep + 1);
|
|
||||||
|
|
||||||
const element = this.appMain.querySelector(tag);
|
|
||||||
if (element) {
|
|
||||||
element?.[method]?.(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -71,7 +63,7 @@ class AppFormElement extends BaseComponentElement {
|
|||||||
get valid() {
|
get valid() {
|
||||||
let _valid = 0;
|
let _valid = 0;
|
||||||
this.inputField?.forEach((input) => {
|
this.inputField?.forEach((input) => {
|
||||||
if (input.required && (input.inp as HTMLInputElement).value) {
|
if (input.required && (input.inp as HTMLSelectElement).value) {
|
||||||
_valid++;
|
_valid++;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ class AppMenuElement extends BaseComponentElement {
|
|||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
openModal = (): void => {
|
modalWallet = (): void => {
|
||||||
const _modal = this.appMain.appModal;
|
const _modal = this.appMain.appModal;
|
||||||
if (_modal) {
|
if (_modal) {
|
||||||
this.appMain.closeModal();
|
this.appMain.closeModal();
|
||||||
@@ -80,6 +80,15 @@ class AppMenuElement extends BaseComponentElement {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
modalTransaction = (): void => {
|
||||||
|
const _modal = this.appMain.appModal;
|
||||||
|
if (_modal) {
|
||||||
|
this.appMain.closeModal();
|
||||||
|
} else {
|
||||||
|
this.appMain.createModal("transaction-create");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
render = (): TemplateResult => {
|
render = (): TemplateResult => {
|
||||||
const { isAuth, totalWallets, walletData } = this;
|
const { isAuth, totalWallets, walletData } = this;
|
||||||
|
|
||||||
@@ -132,11 +141,15 @@ class AppMenuElement extends BaseComponentElement {
|
|||||||
return html`
|
return html`
|
||||||
<div data-target="app-menu.sidebar">
|
<div data-target="app-menu.sidebar">
|
||||||
${menuHeader(__CONFIG__.appName)} ${regularMenu("/", "Home")}
|
${menuHeader(__CONFIG__.appName)} ${regularMenu("/", "Home")}
|
||||||
${authMenu("/history", "Transaction History")}
|
${authMenu(
|
||||||
|
"/history",
|
||||||
|
"Transaction History",
|
||||||
|
"click:app-menu#modalTransaction"
|
||||||
|
)}
|
||||||
${authMenu(
|
${authMenu(
|
||||||
"/wallet/all",
|
"/wallet/all",
|
||||||
"My Wallets",
|
"My Wallets",
|
||||||
"click:app-menu#openModal"
|
"click:app-menu#modalWallet"
|
||||||
)}
|
)}
|
||||||
${renderWallets(walletData)}
|
${renderWallets(walletData)}
|
||||||
<span class="menu-item divider"></span>
|
<span class="menu-item divider"></span>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ export * from "./app-root/AppRootElement";
|
|||||||
export * from "./app-slot/AppSlotElement";
|
export * from "./app-slot/AppSlotElement";
|
||||||
export * from "./app-menu/AppMenuElement";
|
export * from "./app-menu/AppMenuElement";
|
||||||
export * from "./input-field/InputFieldElement";
|
export * from "./input-field/InputFieldElement";
|
||||||
|
export * from "./app-dropdown/AppDropdownElement";
|
||||||
export * from "./app-loader/AppLoaderElement";
|
export * from "./app-loader/AppLoaderElement";
|
||||||
export * from "./circle-loader/CircleLoaderElement";
|
export * from "./circle-loader/CircleLoaderElement";
|
||||||
export * from "./app-form/AppFormElement";
|
export * from "./app-form/AppFormElement";
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ class InputFieldElement extends BaseComponentElement {
|
|||||||
public elementConnected = (): void => {
|
public elementConnected = (): void => {
|
||||||
this.randId = `${name}${randomId()}`;
|
this.randId = `${name}${randomId()}`;
|
||||||
this.update();
|
this.update();
|
||||||
|
this.validate();
|
||||||
};
|
};
|
||||||
|
|
||||||
get valid(): boolean {
|
get valid(): boolean {
|
||||||
|
|||||||
18
src/core/utils/find-method.ts
Normal file
18
src/core/utils/find-method.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { AppMainElement } from "components/";
|
||||||
|
|
||||||
|
export default function findMethod(
|
||||||
|
actionString: string,
|
||||||
|
appMain: AppMainElement
|
||||||
|
): Function {
|
||||||
|
if (actionString) {
|
||||||
|
const methodSep = actionString.lastIndexOf("#");
|
||||||
|
const tag = actionString.slice(0, methodSep);
|
||||||
|
const method = actionString.slice(methodSep + 1);
|
||||||
|
|
||||||
|
const element = appMain.querySelector(tag);
|
||||||
|
if (element) {
|
||||||
|
return element?.[method];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return () => {};
|
||||||
|
}
|
||||||
@@ -6,3 +6,4 @@ export { default as isTrue } from "./isTrue";
|
|||||||
export { default as firstUpper } from "./first-upper";
|
export { default as firstUpper } from "./first-upper";
|
||||||
export { default as query } from "./query-deco";
|
export { default as query } from "./query-deco";
|
||||||
export { default as querys } from "./querys-deco";
|
export { default as querys } from "./querys-deco";
|
||||||
|
export { default as findMethod } from "./find-method";
|
||||||
|
|||||||
@@ -6,3 +6,4 @@ export * from "./not-found/NotFoundElement";
|
|||||||
export * from "./history-page/HistoryPageElement";
|
export * from "./history-page/HistoryPageElement";
|
||||||
export * from "./wallet-list/WalletListElement";
|
export * from "./wallet-list/WalletListElement";
|
||||||
export * from "./wallet-create/WalletCreateElement";
|
export * from "./wallet-create/WalletCreateElement";
|
||||||
|
export * from "./transaction-create/TransactionCreateElement";
|
||||||
|
|||||||
116
src/pages/transaction-create/TransactionCreateElement.ts
Normal file
116
src/pages/transaction-create/TransactionCreateElement.ts
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
import { targets, controller } from "@github/catalyst";
|
||||||
|
import { html, TemplateResult } from "@github/jtml";
|
||||||
|
import { AuthService, TransactionsService, WalletService } from "services/";
|
||||||
|
import { InputFieldElement } from "components/";
|
||||||
|
import { RouterService } from "core/services";
|
||||||
|
import { BasePageElement } from "common/";
|
||||||
|
import { AppDropdownElement } from "components/app-dropdown/AppDropdownElement";
|
||||||
|
|
||||||
|
@controller
|
||||||
|
class TransactionCreateElement extends BasePageElement {
|
||||||
|
@targets inputs: Array<InputFieldElement | AppDropdownElement>;
|
||||||
|
private transactionService: TransactionsService;
|
||||||
|
private walletService: WalletService;
|
||||||
|
authService: AuthService;
|
||||||
|
errorMessage: string;
|
||||||
|
constructor() {
|
||||||
|
super({
|
||||||
|
title: "New Transaction",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
elementConnected = (): void => {
|
||||||
|
this.walletService = new WalletService(this.appMain?.appService);
|
||||||
|
this.transactionService = new TransactionsService(
|
||||||
|
this.appMain?.appService
|
||||||
|
);
|
||||||
|
this.authService = new AuthService(this.appMain.appService);
|
||||||
|
this.update();
|
||||||
|
};
|
||||||
|
|
||||||
|
get nameInput(): InputFieldElement | AppDropdownElement {
|
||||||
|
for (const i in this.inputs) {
|
||||||
|
if (this.inputs[i]?.name == "name") {
|
||||||
|
return this.inputs[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get values(): any {
|
||||||
|
const formObject: any = {};
|
||||||
|
this.inputs.forEach((input: InputFieldElement) => {
|
||||||
|
const inputType = input.inp;
|
||||||
|
formObject[input.name] = (inputType as HTMLInputElement).value;
|
||||||
|
});
|
||||||
|
return formObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
getWallets = async (options): Promise<void> => {
|
||||||
|
try {
|
||||||
|
const response = await this.walletService.getAll(options);
|
||||||
|
return response;
|
||||||
|
} catch (err) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
onSubmit = async (): Promise<void> => {
|
||||||
|
try {
|
||||||
|
if (!this.validate()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const { name: description, wallet: walletId } = this.values;
|
||||||
|
const response = await this.transactionService.post({
|
||||||
|
description,
|
||||||
|
walletId,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response?.id) {
|
||||||
|
this.appMain.triggerWalletUpdate();
|
||||||
|
this.routerService.goTo("/history", {
|
||||||
|
walletId: response.id,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.errorMessage = "Unable to create transaction!";
|
||||||
|
this.update();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
validate(): boolean {
|
||||||
|
let _return = true;
|
||||||
|
this.inputs.forEach((input: InputFieldElement) => {
|
||||||
|
const valid: boolean = input.validate();
|
||||||
|
if (!valid) _return = false;
|
||||||
|
});
|
||||||
|
return _return;
|
||||||
|
}
|
||||||
|
|
||||||
|
render = (): TemplateResult => {
|
||||||
|
return html`
|
||||||
|
<div>Create wallet</div>
|
||||||
|
<app-form
|
||||||
|
data-custom="transaction-create#onSubmit"
|
||||||
|
data-has-cancel="true"
|
||||||
|
>
|
||||||
|
<input-field
|
||||||
|
data-type="text"
|
||||||
|
data-name="name"
|
||||||
|
data-label="Name"
|
||||||
|
data-targets="transaction-create.inputs"
|
||||||
|
data-rules="required"
|
||||||
|
></input-field>
|
||||||
|
<app-dropdown
|
||||||
|
data-name="wallet"
|
||||||
|
data-label="Wallet"
|
||||||
|
data-targets="transaction-create.inputs"
|
||||||
|
data-rules="required"
|
||||||
|
data-fetch="transaction-create#getWallets"
|
||||||
|
>
|
||||||
|
</app-dropdown>
|
||||||
|
${this.errorMessage
|
||||||
|
? html`<div>${this.errorMessage}</div>`
|
||||||
|
: html``}
|
||||||
|
</app-form>
|
||||||
|
`;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export type { TransactionCreateElement };
|
||||||
@@ -2,7 +2,6 @@ app-main {
|
|||||||
* {
|
* {
|
||||||
font-family: Roboto;
|
font-family: Roboto;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: $white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
input,
|
input,
|
||||||
|
|||||||
Reference in New Issue
Block a user