diff --git a/client/src/ow-account/account-view.js b/client/src/ow-account/account-view.js
index 0928663..3f434f7 100644
--- a/client/src/ow-account/account-view.js
+++ b/client/src/ow-account/account-view.js
@@ -2,7 +2,7 @@ import { Component, FORM_STYLE } from "../shared";
customElements.define('account-view', class extends Component {
static get observedAttributes() {
- return ['facebook-id', 'id', 'name', 'email']
+ return ['facebook-id', 'id', 'name', 'email', 'register-success']
}
constructor() {
@@ -21,6 +21,10 @@ customElements.define('account-view', class extends Component {
display: flex;
padding: .375rem .75rem;
}
+ #register-success { display: none; text-align: center; color: darkgreen; }
+ :host([register-success]) #register-success {
+ display: block;
+ }
#fb-button {
display: none;
}
@@ -29,6 +33,7 @@ customElements.define('account-view', class extends Component {
}
${ FORM_STYLE }
+
Konto utworzone!
@@ -61,6 +66,11 @@ customElements.define('account-view', class extends Component {
});
}
+ connectedCallback() {
+ super.connectedCallback();
+ this.register_success = (location.search || '').includes('success');
+ }
+
get name() {
return this.getAttribute('name') || '';
}
@@ -87,4 +97,15 @@ customElements.define('account-view', class extends Component {
this.setAttribute('facebook-id', v);
this.shadowRoot.querySelector('#facebook_id').value = v;
}
+
+ get register_success() {
+ return this.getAttribute('register-success') === 'true'
+ }
+
+ set register_success(v) {
+ if (v === true || v === 'true')
+ this.setAttribute('register-success', 'true');
+ else
+ this.removeAttribute('register-success');
+ }
});
diff --git a/client/src/register-form/register-basic-form.js b/client/src/register-form/register-basic-form.js
index 36ebbc2..1fededf 100644
--- a/client/src/register-form/register-basic-form.js
+++ b/client/src/register-form/register-basic-form.js
@@ -22,6 +22,7 @@ customElements.define('register-basic-form', class extends PseudoForm {
+
`);
@@ -30,9 +31,10 @@ customElements.define('register-basic-form', class extends PseudoForm {
form.addEventListener('submit', ev => {
ev.preventDefault();
ev.stopPropagation();
- this.shadowRoot.querySelector('form-navigation').next();
- });
- this.shadowRoot.querySelector('form-navigation').addEventListener('form:next', ev => {
+
+ console.log(ev);
+ if (form.reportValidity())
+ this.shadowRoot.querySelector('form-navigation').next();
});
}
});
diff --git a/client/src/register-form/register-business-form.js b/client/src/register-form/register-business-form.js
index 43c73e6..1f83abb 100644
--- a/client/src/register-form/register-business-form.js
+++ b/client/src/register-form/register-business-form.js
@@ -1,4 +1,4 @@
-import { FORM_STYLE, PseudoForm } from "../shared";
+import { FORM_STYLE, TIP, PseudoForm } from "../shared";
customElements.define('register-business-form', class extends PseudoForm {
constructor() {
@@ -6,15 +6,18 @@ customElements.define('register-business-form', class extends PseudoForm {
@@ -26,4 +29,8 @@ customElements.define('register-business-form', class extends PseudoForm {
this.shadowRoot.querySelector('form-navigation').next();
});
}
+
+ connectedCallback() {
+ super.connectedCallback();
+ }
})
diff --git a/client/src/register-form/register-items-form.js b/client/src/register-form/register-items-form.js
index 0d31814..e94d960 100644
--- a/client/src/register-form/register-items-form.js
+++ b/client/src/register-form/register-items-form.js
@@ -30,6 +30,7 @@ customElements.define('register-items-form', class extends PseudoForm {
+
`);
@@ -39,6 +40,7 @@ customElements.define('register-items-form', class extends PseudoForm {
updateItems(this)
});
this.addEventListener('form:next', ev => {
+ updateItems(this);
for (const el of this.querySelectorAll('item-form-row')) {
if (!el.reportValidity()) {
ev.stopPropagation();
@@ -55,7 +57,7 @@ customElements.define('register-items-form', class extends PseudoForm {
ev.stopPropagation();
ev.preventDefault();
this.appendChild(document.createElement('register-item-form-row'));
- updateItems(this)
+ updateItems(this);
});
}
diff --git a/client/src/register-form/register-submit-form.js b/client/src/register-form/register-submit-form.js
index ac7bbd0..e1e664e 100644
--- a/client/src/register-form/register-submit-form.js
+++ b/client/src/register-form/register-submit-form.js
@@ -7,6 +7,7 @@ customElements.define('register-submit-form', class extends PseudoForm {
:host { display: block; }
* { font-family: 'Noto Sans', sans-serif; }
${ FORM_STYLE }
+ img[src=''] { display: none; }
@media only screen and (min-device-width: 1200px) {
.item-view {
display: flex;
@@ -72,7 +73,10 @@ customElements.define('register-submit-form', class extends PseudoForm {
const [name, price, img] = row;
el.innerHTML = `
-
+ ${ img.value !== ''
+ ? `
`
+ : `
Brak zdjęcia`
+ }
diff --git a/client/src/register-form/register-user-type.js b/client/src/register-form/register-user-type.js
index 84839b6..6ccfcb6 100644
--- a/client/src/register-form/register-user-type.js
+++ b/client/src/register-form/register-user-type.js
@@ -1,4 +1,4 @@
-import { Component, BUTTON_STYLE } from "../shared";
+import { Component, BUTTON_STYLE, TIP } from "../shared";
customElements.define('register-user-type', class extends Component {
constructor() {
@@ -52,7 +52,7 @@ customElements.define('register-user-type', class extends Component {
height: 200px;
}
}
- ${ BUTTON_STYLE }
+ ${ BUTTON_STYLE }${ TIP }