Merge pull request #120 from HelloYeew/fix-bug-from-release

Fix another bug from release
Rurusetto · Oct 10, 2021 · 0ec5798 · 0ec5798
2 parents 201f0dd + f0f0952
commit 0ec5798
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/rurusetto/users/templates/account/signup.html b/rurusetto/users/templates/account/signup.html
@@ -1,5 +1,7 @@
 {% load static %}
 {% load crispy_forms_tags %}
+{% load socialaccount %}
+{% get_providers as socialaccount_providers %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -45,13 +47,19 @@
            <p></p>
           <h1>Sign Up</h1>
           <p></p>
+            {% for provider in socialaccount_providers %}
+            <p>
+              <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}} text-decoration-none text-center spacing-hover-short hvr-icon-bounce"
+                 href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}"><img src="{% static 'logo/osu-logo-pink.png' %}" alt="osu! logo" width="20px" height="20px" class="icon-menu hvr-icon"> Sign up with {{provider.name}}</a>
+            </p>
+            {% endfor %}
             <form method="post">
                 {% csrf_token %}
                 {{ form|crispy }}
                 <p></p>
                 <button type="submit" class="btn btn-rurusetto hvr-sweep-to-right">Submit</button>
             </form>
-          <div style="line-height: 5">
+          <div>
             <p>Already have an account? <a href="{% url 'account_login' %}" class="text-decoration-none spacing-hover">Login instead</a></p>
           </div>
         </div>

diff --git a/rurusetto/wiki/function.py b/rurusetto/wiki/function.py
@@ -77,7 +77,7 @@ def fetch_created_ruleset(creator_id):
     :return: A list of ruleset with the User object of that ruleset.
     """
     created_ruleset = []
-    for ruleset in Ruleset.objects.filter(owner=str(creator_id)):
+    for ruleset in Ruleset.objects.filter(owner=str(creator_id), hidden=False):
         try:
             ruleset_owner = User.objects.get(id=ruleset.owner)
             created_ruleset.append([ruleset, ruleset_owner])

diff --git a/rurusetto/wiki/templates/wiki/base.html b/rurusetto/wiki/templates/wiki/base.html
@@ -209,6 +209,7 @@ <h5 class="modal-title" id="exampleModalLabel">Alert</h5>
           <p>Made with ❤️ by <a class="text-decoration-none hvr-underline-from-center made-by-footer" target="_blank" href="https://github.com/HelloYeew">HelloYeew</a> and <a class="text-decoration-none hvr-underline-from-center made-by-footer" target="_blank" href="https://github.com/Rurusetto">Rūrusetto</a></p>
         </div>
         <div class="col text-end github-footer">
+            <a target="_blank" href="https://discord.gg/BTsSt8W8qh"><i class="fab fa-discord hvr-grow github-footer"></i></a>
           <a target="_blank" href="https://github.com/Rurusetto/rurusetto"><i class="fab fa-github hvr-grow github-footer"></i></a>
         </div>
       </div>

diff --git a/rurusetto/wiki/templates/wiki/home.html b/rurusetto/wiki/templates/wiki/home.html
@@ -36,19 +36,6 @@ <h1 class="display-5 fw-bold" id="home-welcome" data-aos="fade-up" data-aos-dura
         This website is under heavy development and in the test phase. Some functions will not be processed or won't work properly. All pictures that are used in the current version have not been finalized.
       </div>
     </div>
-    <div class="row mb-3">
-      <div class="alert alert-danger" role="alert">
-       <p class="text-danger">To Beta Testers (?):</p>
-       <p class="text-danger">This update adds sign up and login by using osu! account, add an opengraph and all that is necessary for SEO.</p>
-       <p class="text-danger">1. Please try loging in with your osu! account and check that all information from your osu! account is completely transfered to your new rūrusetto account.</p>
-       <p class="text-danger">2. Please test the 'Update Profile Every Login Session' function. You can use it by turning it on at the settings page.</p>
-       <p class="text-danger">3. If an opengraph detail or a website icon on some page is wrong please tell me. (You can try it by try sending it on discord or try viewing a preview on twitter.)</p>
-       <p class="text-danger">If you find more bugs or a problem with this website please tell it to me on the discord channel.</p>
-       <p class="text-danger">Ps. After finishing the beta phase and deploying the finished website to the main domain, all account information and all wiki information will be reseted and deleted or all data will still be here but this server will be converted to a test server when the stable version of the website is released.</p>
-          <p class="text-danger">Ps2. Note that the form design is not final but it can be used now so if you have some idea on form design please tell it to me on discord.</p>
-       <p class="text-danger">HelloYeew</p>
-      </div>
-    </div>
   </div>
     {% endif %}
 

diff --git a/rurusetto/wiki/templates/wiki/wiki_page.html b/rurusetto/wiki/templates/wiki/wiki_page.html
@@ -171,8 +171,10 @@ <h5 class="modal-title" id="supportModalLabel">Support {{ user_detail.1.username
                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                       </div>
                       <div class="modal-body">
+                        {% if user_detail.1.profile.support_message != "" %}
                         <h3>Message from {{ user_detail.1.username }}</h3>
                           <p>{{ user_detail.1.profile.support_message }}</p>
+                        {% endif %}
                           {% if user_detail.1.profile.support_patreon != "" %}
                           <p><a class="text-decoration-none text-center spacing-hover-short hvr-icon-bounce" target="_blank" href="{{ user_detail.1.profile.support_patreon }}"><i class="fab fa-patreon icon-menu hvr-icon"></i> Patreon</a></p>
                           {% endif %}

diff --git a/rurusetto/wiki/views.py b/rurusetto/wiki/views.py
@@ -37,7 +37,7 @@ def home(request):
     latest_add_rulesets = []
     for i in range(3):
         try:
-            latest_add_rulesets.append(Ruleset.objects.all().order_by('-created_at')[i])
+            latest_add_rulesets.append(Ruleset.objects.filter(hidden=False).order_by('-created_at')[i])
         except:
             continue