From f68f4f322aa64bd7f56e5479a268394a587fe7ba Mon Sep 17 00:00:00 2001
From: RemiZOffAlex <remizoffalex@gmail.com>
Date: Sun, 3 Mar 2024 20:56:09 +0300
Subject: [PATCH] Update

---
 myapp/ns_api/user.py                        | 2 +-
 myapp/ns_page/templates/guest/page.html     | 3 +--
 myapp/ns_page/views_guest.py                | 6 +-----
 myapp/templates/public/domains/user/menu.js | 0
 myapp/templates/public/domains/user/user.js | 4 ++--
 5 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 myapp/templates/public/domains/user/menu.js

diff --git a/myapp/ns_api/user.py b/myapp/ns_api/user.py
index 79156ec..43a8e8a 100644
--- a/myapp/ns_api/user.py
+++ b/myapp/ns_api/user.py
@@ -10,7 +10,7 @@ from ..mutations.user import user_as_dict
 @jsonrpc.method('user')
 def user_id(
     id: int,
-    fields: list = ['id', 'title']
+    fields: list = ['id', 'name']
 ) -> dict:
     """Статья
     """
diff --git a/myapp/ns_page/templates/guest/page.html b/myapp/ns_page/templates/guest/page.html
index 83b69b8..df52978 100644
--- a/myapp/ns_page/templates/guest/page.html
+++ b/myapp/ns_page/templates/guest/page.html
@@ -2,8 +2,7 @@
 {% block content %}
 
 <a href="/pages">Назад</a>
-<h3>
-{{ pagedata['page'].title }}</h3>
+<h1>{{ pagedata['page'].title }}</h1>
 <hr />
 
 <p>
diff --git a/myapp/ns_page/views_guest.py b/myapp/ns_page/views_guest.py
index 85708e6..a57a999 100644
--- a/myapp/ns_page/views_guest.py
+++ b/myapp/ns_page/views_guest.py
@@ -43,11 +43,7 @@ def page_id(id):
         app.config['TITLE']
     )
 
-    pagedata['page'] = page.as_dict()
-    pagedata['page']['user'] = page.user.as_dict()
-    pagedata['page']['tags'] = []
-    for tagLink in page.tags:
-        pagedata['page']['tags'].append(tagLink.tag.as_dict())
+    pagedata['page'] = page
 
     body = render_template('guest/page.html', pagedata=pagedata)
     return body
diff --git a/myapp/templates/public/domains/user/menu.js b/myapp/templates/public/domains/user/menu.js
new file mode 100644
index 0000000..e69de29
diff --git a/myapp/templates/public/domains/user/user.js b/myapp/templates/public/domains/user/user.js
index 097ad66..9af3f65 100644
--- a/myapp/templates/public/domains/user/user.js
+++ b/myapp/templates/public/domains/user/user.js
@@ -66,9 +66,9 @@ function User() {
                         ])
                     ),
                     m('hr'),
+                    m.trust(data.user.body),
+                    breadcrumbs_render(),
                 );
-                result.push(m.trust(data.user.body));
-                result.push(breadcrumbs_render());
             };
             return result
         }