Refactor templates: update block names

Ehco1996 · Jan 19, 2024 · 5b2fbea · 5b2fbea
1 parent 1d67f77
commit 5b2fbea
Show file tree

Hide file tree

Showing 25 changed files with 117 additions and 212 deletions.
diff --git a/apps/sspanel/urls.py b/apps/sspanel/urls.py
@@ -6,7 +6,7 @@
 
 urlpatterns = [
     # 网站用户面板
-    path("", views.IndexView.as_view(), name="index"),
+    path("", views.UserLogInView.as_view(), name="index"),
     path("help/", views.HelpView.as_view(), name="help"),
     # 邀请
     path("invitecode/", views.InviteCodeView.as_view(), name="invite_code"),

diff --git a/apps/sspanel/views.py b/apps/sspanel/views.py
@@ -31,16 +31,9 @@
 from apps.utils import get_current_datetime, traffic_format
 
 
-class IndexView(View):
-    def get(self, request):
-        """跳转到首页"""
-        context = {"simple_extra_static": True}
-        return render(request, "web/index.html", context=context)
-
 
 class HelpView(View):
     def get(self, request):
-        """跳转到帮助界面"""
         context = {"simple_extra_static": True}
         return render(request, "web/help.html", context=context)
 

diff --git a/templates/base.html b/templates/base.html
@@ -55,7 +55,7 @@
                                 <hr class="navbar-divider" />
                                 <a class="navbar-item" href="{% url 'sspanel:logout' %}">
                                     <span class="icon">
-                                        <i class="fa fa-sign-out"></i>
+                                        <i class="fas fa-sign-out-alt"></i>
                                     </span>
                                     <span>注销登录</span>
                                 </a>
@@ -86,17 +86,18 @@
         <section class="hero is-small is-info">
             <div class="hero-body">
                 <div class="container has-text-centered">
-                    <h1 class="title">{% settings_value "SITE_SUBTITLE" %}</h1>
-                    <h2 class="subtitle">你说会发现什么呢？</h2>
+                    <h2 class="title">{% settings_value "SITE_TITLE" %}</h2>
+                    <h1 class="subtitle">{% settings_value "SITE_SUBTITLE" %}</h1>
                 </div>
             </div>
         </section>
         <hr />
         <div class="container">
             <div class="columns">
-                <div class="column is-2 is-hidden-mobile">
-                    <div class="box">
-                        {% if user.is_authenticated %}
+                <!-- 左侧导航栏 -->
+                {% if user.is_authenticated %}
+                    <div class="column is-2 is-hidden-mobile">
+                        <div class="box">
                             <aside class="menu">
                                 <ul class="menu-list">
                                     <p class="menu-label">我的信息</p>
@@ -146,45 +147,21 @@ <h2 class="subtitle">你说会发现什么呢？</h2>
                                         </li>
                                     </ul>
                                 {% endif %}
-
-                            {% else %}
-                                <article class="message is-primary">
-                                    <div class="message-header">
-                                        <p>幻想乡</p>
-                                        <button class="delete"></button>
-                                    </div>
-                                    <div class="message-body">幻想中的「地方」</div>
-                                </article>
-                                <article class="message is-info">
-                                    <div class="message-header">
-                                        <p>谜の屋</p>
-                                        <button class="delete"></button>
-                                    </div>
-                                    <div class="message-body">他不存于「地表」</div>
-                                </article>
-                                <article class="message is-success">
-                                    <div class="message-header">
-                                        <p>时之塔</p>
-                                        <button class="delete"></button>
-                                    </div>
-                                    <div class="message-body">这囚禁着「思想」</div>
-                                </article>
-                                <article class="message is-warning">
-                                    <div class="message-header">
-                                        <p>旧の桥</p>
-                                        <button class="delete"></button>
-                                    </div>
-                                    <div class="message-body">却连接着「自由」</div>
-                                </article>
-                            {% endif %}
-                        </aside>
+                            </aside>
+                        </div>
+                    </div>
+                    <!-- 右侧内容 -->
+                    <div class="column is-10">
+                        {% block authed %}
+                        {% endblock authed %}
                     </div>
                 </div>
-                <div class="column is-10">
-                    {% block main %}
-                    {% endblock main %}
+            {% else %}
+                <div class="column is-12">
+                    {% block un-authed %}
+                    {% endblock un-authed %}
                 </div>
-            </div>
+            {% endif %}
         </div>
     </body>
     {% settings_value "HIDE_FOOTER" as hide_footer %}

diff --git a/templates/registration/password_change_done.html b/templates/registration/password_change_done.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block main %}
+{% block authed %}
     <div class="flex-center">
         <div class="container">
             <div>
@@ -10,4 +10,4 @@
         </div>
     </div>
 </div>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block authed %}
     {% load ehcofilter %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
@@ -32,4 +32,4 @@ <h3 class="title">密码修改:</h3>
             </form>
         </div>
     </div>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block authed %}
     {% load ehcofilter %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
@@ -19,4 +19,4 @@ <h2 class="subtitle">这次要好好记住喔....</h2>
         </h1>
     </div>
 </div>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block authed %}
     {% load ehcofilter %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
@@ -32,4 +32,4 @@ <h3 class="title">设置新的密码:</h3>
             </form>
         </div>
     </div>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block un-authed %}
     {% load ehcofilter %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
@@ -44,4 +44,4 @@ <h2 class="subtitle">没收到的话请检查垃圾箱</h2>
         </div>
     </div>
 </div>
-{% endblock main %}
+{% endblock un-authed %}
diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block un-authed %}
     {% load ehcofilter %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
@@ -32,4 +32,4 @@ <h3 class="title">请输入注册邮箱:</h3>
             </form>
         </div>
     </div>
-{% endblock main %}
+{% endblock un-authed %}
diff --git a/templates/web/aff_invite.html b/templates/web/aff_invite.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block authed %}
     <div class="column is-12">
         <section class="hero is-warning is-smaill">
             <div class="hero-body">
@@ -77,4 +77,4 @@ <h2 class="subtitle">
     };
     genRefChart();
     </script>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/web/announcement.html b/templates/web/announcement.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block authed %}
     <div class="column is-12">
         <section class="hero is-success is-smaill">
             <div class="hero-body">
@@ -34,4 +34,4 @@ <h2 class="subtitle">暂时还没发出公告</h2>
             </div>
         </div>
     </div>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/web/charge_center.html b/templates/web/charge_center.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block authed %}
     {% load static %}
     {% load ehcofilter %}
     <div class="column is-12">
@@ -221,4 +221,4 @@ <h2 class="subtitle">捐赠的钱会自动打进你的账号余额....</h2>
         payquery(false);
     });
     </script>
-{% endblock main %}
+{% endblock authed %}
diff --git a/templates/web/help.html b/templates/web/help.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block un-authed %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
             <div class="hero-body">
@@ -46,4 +46,4 @@ <h2 class="title">注册了你就知道了 ʘʚʘ</h2>
             </div>
         </div>
     </div>
-{% endblock main %}
+{% endblock un-authed %}
diff --git a/templates/web/index.html b/templates/web/index.html
diff --git a/templates/web/invite.html b/templates/web/invite.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% block main %}
+{% block un-authed %}
     {% load ehcofilter %}
     <div class="column is-12">
         <section class="hero is-info is-smaill">
@@ -37,4 +37,4 @@ <h2 class="subtitle">哦哦哦，用完了！</h2>
             </div>
         </div>
     </div>
-{% endblock main %}
+{% endblock un-authed %}