From 3a7501dcc6970acd435235f9d68ae4c56d1fb565 Mon Sep 17 00:00:00 2001
From: eraden <adrian.wozniak@ita-prog.pl>
Date: Fri, 29 Jul 2022 19:29:15 +0200
Subject: [PATCH] Add account id to every view

---
 server/assets/templates/businesses/editor.html   | 2 +-
 server/assets/templates/businesses/index.html    | 2 +-
 server/assets/templates/marketplace/edit.html    | 2 +-
 server/assets/templates/marketplace/index.html   | 8 +-------
 server/assets/templates/marketplace/new.html     | 2 +-
 server/assets/templates/news.html                | 2 +-
 server/assets/templates/offers/index.html        | 2 +-
 server/assets/templates/privacy-policy.html      | 2 +-
 server/assets/templates/register.html            | 2 +-
 server/assets/templates/sign-in.html             | 2 +-
 server/assets/templates/terms-and-condition.html | 4 ++--
 server/src/view/mod.rs                           | 7 +++++++
 12 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/server/assets/templates/businesses/editor.html b/server/assets/templates/businesses/editor.html
index f5d9d23..0f8bafc 100644
--- a/server/assets/templates/businesses/editor.html
+++ b/server/assets/templates/businesses/editor.html
@@ -1,7 +1,7 @@
 {% extends "../base.html" %}
 {% block content %}
 
-<contact-info-editor type="email" value="{{h.email(account)}}">
+<contact-info-editor type="email" value="{{h.email(account)}}" {{h.account_id_tag(account)}}>
     <contact-info-list>
         {% for contact in contacts %}
         <edit-contact-info contact-id="{{contact.id}}" mode="view">
diff --git a/server/assets/templates/businesses/index.html b/server/assets/templates/businesses/index.html
index e0dcfa5..06cb51b 100644
--- a/server/assets/templates/businesses/index.html
+++ b/server/assets/templates/businesses/index.html
@@ -1,7 +1,7 @@
 {% extends "../base.html" %}
 {% block content %}
 <h2 style="text-align: center">Lokalne usługi</h2>
-<local-business-list>
+<local-business-list {{h.account_id_tag(account)}}>
     {% for business in businesses %}
     <local-business
             slot="business"
diff --git a/server/assets/templates/marketplace/edit.html b/server/assets/templates/marketplace/edit.html
index 3935972..34b88c3 100644
--- a/server/assets/templates/marketplace/edit.html
+++ b/server/assets/templates/marketplace/edit.html
@@ -1,6 +1,6 @@
 {% extends "../base.html" %}
 {% block content %}
-<marketplace-offers>
+<marketplace-offers {{h.account_id_tag(account)}}>
     <h2>Edycja oferty</h2>
     <offer-form
             state="{{offer.state.as_str()}}"
diff --git a/server/assets/templates/marketplace/index.html b/server/assets/templates/marketplace/index.html
index 269fb5b..e461495 100644
--- a/server/assets/templates/marketplace/index.html
+++ b/server/assets/templates/marketplace/index.html
@@ -1,12 +1,6 @@
 {% extends "../base.html" %}
 {% block content %}
-<marketplace-offers
-    {% match account %}
-    {% when Some with (a) %}
-    account-id="{{a.id}}"
-    {% when None %}
-    {% endmatch %}
->
+<marketplace-offers {{h.account_id_tag(account)}}>
     <h2 style="text-align: center">Rzeczy wystawione na sprzedaż</h2>
 
     {% for offer in my_offers %}
diff --git a/server/assets/templates/marketplace/new.html b/server/assets/templates/marketplace/new.html
index 994eadc..ba9452a 100644
--- a/server/assets/templates/marketplace/new.html
+++ b/server/assets/templates/marketplace/new.html
@@ -1,6 +1,6 @@
 {% extends "../base.html" %}
 {% block content %}
-<marketplace-offers>
+<marketplace-offers {{h.account_id_tag(account)}}>
     <h2>Tworzenie oferty</h2>
     <offer-form></offer-form>
 </marketplace-offers>
diff --git a/server/assets/templates/news.html b/server/assets/templates/news.html
index cdef87b..670b7fc 100644
--- a/server/assets/templates/news.html
+++ b/server/assets/templates/news.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<ow-articles>
+<ow-articles {{h.account_id_tag(account)}}>
     {% for article in news %}
     <news-article
             article-id="{{ article.id }}"
diff --git a/server/assets/templates/offers/index.html b/server/assets/templates/offers/index.html
index 942f94d..f043dea 100644
--- a/server/assets/templates/offers/index.html
+++ b/server/assets/templates/offers/index.html
@@ -1,6 +1,6 @@
 {% extends "../base.html" %}
 {% block content %}
-<marketplace-offers>
+<marketplace-offers {{h.account_id_tag(account)}}>
     <h2>Sprzedaż niepotrzebnych rzeczy</h2>
 
     <offer-form></offer-form>
diff --git a/server/assets/templates/privacy-policy.html b/server/assets/templates/privacy-policy.html
index 00dc2c7..d512703 100644
--- a/server/assets/templates/privacy-policy.html
+++ b/server/assets/templates/privacy-policy.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<privacy-policy>
+<privacy-policy {{h.account_id_tag(account)}}>
     <h2>POLITYKA PRYWATNOŚCI STRONY INTERNETOWEJ <br/>https://oswilno.pl/</h2>
     <ol>
         <li>
diff --git a/server/assets/templates/register.html b/server/assets/templates/register.html
index 5707c77..be928e5 100644
--- a/server/assets/templates/register.html
+++ b/server/assets/templates/register.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<ow-account>
+<ow-account {{h.account_id_tag(account)}}>
     <register-form
             page="{{register_page.as_str()}}"
     >
diff --git a/server/assets/templates/sign-in.html b/server/assets/templates/sign-in.html
index a3a7fbc..1080b89 100644
--- a/server/assets/templates/sign-in.html
+++ b/server/assets/templates/sign-in.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<ow-account>
+<ow-account {{h.account_id_tag(account)}}>
     <login-form></login-form>
 </ow-account>
 {% endblock %}
diff --git a/server/assets/templates/terms-and-condition.html b/server/assets/templates/terms-and-condition.html
index ba0dd1c..47e71bd 100644
--- a/server/assets/templates/terms-and-condition.html
+++ b/server/assets/templates/terms-and-condition.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<terms-and-conditions>
+<terms-and-conditions {{h.account_id_tag(account)}}>
     <h3 style="text-align: center;">REGULAMIN SERIWSU INTERNETOWEGO<br> oswilno.pl</h3>
     <p>&nbsp;</p>
     <h3>§ 1. DEFINICJE</h3>
@@ -16,7 +16,7 @@
             Mieszkaniec - osoba zamieszkująca dzielnicę Elsnerów w Warszawie.
         </li>
         <li>
-            Upoważniony użytkownik - osoba zarejestrowana i nie będąca Mieszkańcem.
+            Upoważniony użytkownik — osoba zarejestrowana i nie będąca Mieszkańcem.
         </li>
         <li>
             Gość - osoba niezarejestrowana korzystająca z serwisu.
diff --git a/server/src/view/mod.rs b/server/src/view/mod.rs
index dd0d4bc..88a8850 100644
--- a/server/src/view/mod.rs
+++ b/server/src/view/mod.rs
@@ -29,6 +29,13 @@ impl Helper {
             .unwrap_or_default()
     }
 
+    pub fn account_id_tag(&self, account: &Option<crate::model::db::Account>) -> String {
+        account
+            .as_ref()
+            .map(|a| format!("account-id={}", a.id))
+            .unwrap_or_default()
+    }
+
     pub fn email<'a>(&self, account: &'a Option<crate::model::db::Account>) -> &'a str {
         account
             .as_ref()