Move account related views to a separate blueprint

calsocial/templates/account/follow-requests.html

@@ -7,7 +7,7 @@
         {% for req in requests %}
     <li>
         {{ req.follower }}
-        <a href="{{ url_for('accept_follow', follower_id=req.follower_id) }}" class="ui button">{% trans %}Accept{% endtrans %}</a>
+        <a href="{{ url_for('account.accept_follow', follower_id=req.follower_id) }}" class="ui button">{% trans %}Accept{% endtrans %}</a>
     </li>
         {% endfor %}
 </ul>

calsocial/templates/account/profile-edit.html

@@ -1,4 +1,4 @@
-{% extends 'settings-base.html' %}
+{% extends 'account/settings-base.html' %}
 {% from '_macros.html' import field %}
 
 {% block settings_content %}

calsocial/templates/account/settings-base.html

@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<div class="ui grid">
+    <div class="four wide column">
+        <div class="ui secondary pointing vertical menu">
+            <a class="item{% if request.endpoint == 'account.edit_profile' %} active{% endif %}" href="{{ url_for('account.edit_profile') }}">{% trans %}Edit profile{% endtrans %}</a>
+            <a class="item{% if request.endpoint == 'account.settings' %} active{% endif %}" href="{{ url_for('account.settings') }}">{% trans %}Settings{% endtrans %}</a>
+        </div>
+    </div>
+    <div class="twelve wide stretched column">
+    {% block settings_content %}{% endblock %}
+    </div>
+</div>
+{% endblock %}

calsocial/templates/account/user-settings.html

@@ -1,4 +1,4 @@
-{% extends 'settings-base.html' %}
+{% extends 'account/settings-base.html' %}
 {% from '_macros.html' import field %}
 
 {% block settings_content %}

calsocial/templates/base.html

@@ -34,8 +34,8 @@
     {%- endtrans %}
                     </div>
                     <a class="item" href="{{ url_for('hello') }}">{% trans %}Calendar view{% endtrans %}</a>
-                    <a class="item" href="{{ url_for('notifications') }}">{% trans %}Notifications{% endtrans %}</a>
-                    <a class="item" href="{{ url_for('settings') }}">{% trans %}Settings{% endtrans %}</a>
+                    <a class="item" href="{{ url_for('account.notifications') }}">{% trans %}Notifications{% endtrans %}</a>
+                    <a class="item" href="{{ url_for('account.settings') }}">{% trans %}Settings{% endtrans %}</a>
                     <a class="item" href="{{ url_for('security.logout') }}">{% trans %}Logout{% endtrans %}</a>
 {% endif %}
                 </div>
@@ -50,6 +50,6 @@
         </footer>
 {% block scripts %}{% endblock %}
         <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
-        <script src="{{ url_for('static', filename='semantic/semantic.min.js') }}"></script>        <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css">
+        <script src="{{ url_for('static', filename='semantic/semantic.min.js') }}"></script>
     </body>
 </html>

calsocial/templates/settings-base.html

@@ -1,15 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<div class="ui grid">
-    <div class="four wide column">
-        <div class="ui secondary pointing vertical menu">
-            <a class="item{% if request.endpoint == 'edit_profile' %} active{% endif %}" href="{{ url_for('edit_profile') }}">{% trans %}Edit profile{% endtrans %}</a>
-            <a class="item{% if request.endpoint == 'settings' %} active{% endif %}" href="{{ url_for('settings') }}">{% trans %}Settings{% endtrans %}</a>
-        </div>
-    </div>
-    <div class="twelve wide stretched column">
-    {% block settings_content %}{% endblock %}
-    </div>
-</div>
-{% endblock %}

calsocial/templates/welcome.html

@@ -18,7 +18,7 @@
             <div class="ui horizontal divider">
                 {% trans %}Or{% endtrans %}
             </div>
-            <a href="{{ url_for('register' ) }}" class="fluid ui button">{% trans %}Register an account{% endtrans %}</a>
+            <a href="{{ url_for('account.register_account' ) }}" class="fluid ui button">{% trans %}Register an account{% endtrans %}</a>
         {% endif %}
             <div class="ui horizontal divider"></div>
     {% endif %}