From bc0bdbcacc764b161cf361372e7127aa982609c4 Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 16:48:45 +0530 Subject: [PATCH 1/8] base user and dashboard --- file-descriptions.csv | 4 +- locale/de/LC_MESSAGES/django.po | 12 +- locale/fr/LC_MESSAGES/django.po | 12 +- locale/hi/LC_MESSAGES/django.po | 12 +- locale/ja/LC_MESSAGES/django.po | 12 +- locale/ru/LC_MESSAGES/django.po | 12 +- locale/zh_CN/LC_MESSAGES/django.po | 12 +- ...ashboard_user.html => base_dashboard.html} | 63 ++----- website/templates/base_dashboard_company.html | 166 ------------------ .../company_dashboard_domain_detail.html | 5 +- .../company_dashboard_hunt_detail.html | 5 +- .../company_dashboard_hunt_edit.html | 5 +- website/templates/company_domain_lists.html | 125 ++++++------- website/templates/company_hunt_results.html | 5 +- website/templates/company_settings.html | 7 +- website/templates/create_hunt.html | 5 +- website/templates/dashboard_profile.html | 5 +- website/templates/hunt2.html | 5 +- website/templates/hunt_drafts.html | 48 ++--- website/templates/hunt_previous.html | 51 +++--- website/templates/hunt_results.html | 8 +- website/templates/hunt_submittion.html | 9 +- website/templates/hunt_upcoming.html | 48 ++--- .../templates/includes/company_sideanv.html | 48 +++++ website/templates/includes/user_sideanv.html | 24 +++ website/templates/index_company.html | 141 +++++++-------- website/templates/index_user.html | 157 +++++++++-------- website/templates/view_hunt.html | 6 +- 28 files changed, 468 insertions(+), 544 deletions(-) rename website/templates/{base_dashboard_user.html => base_dashboard.html} (67%) delete mode 100644 website/templates/base_dashboard_company.html create mode 100644 website/templates/includes/company_sideanv.html create mode 100644 website/templates/includes/user_sideanv.html diff --git a/file-descriptions.csv b/file-descriptions.csv index 68da91df1d..8d681746dd 100644 --- a/file-descriptions.csv +++ b/file-descriptions.csv @@ -12,8 +12,8 @@ admin_dashboard_company_detail.html,the details about the company, admin_home.html,info regarding the home page for admin, base.html,this is the base file which all files extend from,https://www.figma.com/file/s0xuxeU6O2guoWEfA9OElZ/Design?node-id=340%3A209&t=pqxWpF3hcYxjEDrs-1 base_admin.html,is only for admin, -base_dashboard_company.html,, -base_dashboard_user.html,, +base_dashboard.html,, +base_dashboard.html,, base_home.html,, comments.html,info regarding the comments on bugs,https://www.figma.com/file/s0xuxeU6O2guoWEfA9OElZ/Design?node-id=4%3A1109&t=pqxWpF3hcYxjEDrs-1 company_dashboard_domain_detail.html,info regarding company dashboard details,https://www.figma.com/file/s0xuxeU6O2guoWEfA9OElZ/Design?node-id=3%3A76&t=pqxWpF3hcYxjEDrs-1 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 879a4566da..8eecfa6924 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -202,8 +202,8 @@ msgstr "Ja" #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 #: website/templates/base_admin.html:109 -#: website/templates/base_dashboard_company.html:134 -#: website/templates/base_dashboard_user.html:116 +#: website/templates/base_dashboard.html:134 +#: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 msgid "Change Password" msgstr "Passwort ändern" @@ -252,15 +252,15 @@ msgid "Sign Up" msgstr "Registrieren" #: website/templates/base_admin.html:107 -#: website/templates/base_dashboard_company.html:132 -#: website/templates/base_dashboard_user.html:114 +#: website/templates/base_dashboard.html:132 +#: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "Benutzerprofil" #: website/templates/base_admin.html:111 -#: website/templates/base_dashboard_company.html:136 -#: website/templates/base_dashboard_user.html:118 +#: website/templates/base_dashboard.html:136 +#: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 #: website/templates/includes/navbar.html:141 msgid "Logout" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 93e27ea03b..f1de12b94b 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -202,8 +202,8 @@ msgstr "Oui" #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 #: website/templates/base_admin.html:109 -#: website/templates/base_dashboard_company.html:134 -#: website/templates/base_dashboard_user.html:116 +#: website/templates/base_dashboard.html:134 +#: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 msgid "Change Password" msgstr "Changer le mot de passe" @@ -252,15 +252,15 @@ msgid "Sign Up" msgstr "S'inscrire" #: website/templates/base_admin.html:107 -#: website/templates/base_dashboard_company.html:132 -#: website/templates/base_dashboard_user.html:114 +#: website/templates/base_dashboard.html:132 +#: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "Profil de l'utilisateur" #: website/templates/base_admin.html:111 -#: website/templates/base_dashboard_company.html:136 -#: website/templates/base_dashboard_user.html:118 +#: website/templates/base_dashboard.html:136 +#: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 #: website/templates/includes/navbar.html:141 msgid "Logout" diff --git a/locale/hi/LC_MESSAGES/django.po b/locale/hi/LC_MESSAGES/django.po index 2f2b0f7836..5c20617fbf 100644 --- a/locale/hi/LC_MESSAGES/django.po +++ b/locale/hi/LC_MESSAGES/django.po @@ -198,8 +198,8 @@ msgstr "हाँ" #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 #: website/templates/base_admin.html:109 -#: website/templates/base_dashboard_company.html:134 -#: website/templates/base_dashboard_user.html:116 +#: website/templates/base_dashboard.html:134 +#: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 msgid "Change Password" msgstr "पासवर्ड बदलें" @@ -248,15 +248,15 @@ msgid "Sign Up" msgstr "साइन अप करें" #: website/templates/base_admin.html:107 -#: website/templates/base_dashboard_company.html:132 -#: website/templates/base_dashboard_user.html:114 +#: website/templates/base_dashboard.html:132 +#: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "उपयोगकर्ता प्रोफ़ाइल" #: website/templates/base_admin.html:111 -#: website/templates/base_dashboard_company.html:136 -#: website/templates/base_dashboard_user.html:118 +#: website/templates/base_dashboard.html:136 +#: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 #: website/templates/includes/navbar.html:141 msgid "Logout" diff --git a/locale/ja/LC_MESSAGES/django.po b/locale/ja/LC_MESSAGES/django.po index 97991c0a33..2a84ce2e0e 100644 --- a/locale/ja/LC_MESSAGES/django.po +++ b/locale/ja/LC_MESSAGES/django.po @@ -201,8 +201,8 @@ msgstr "はい" #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 #: website/templates/base_admin.html:109 -#: website/templates/base_dashboard_company.html:134 -#: website/templates/base_dashboard_user.html:116 +#: website/templates/base_dashboard.html:134 +#: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 msgid "Change Password" msgstr "パスワードを変更する" @@ -251,15 +251,15 @@ msgid "Sign Up" msgstr "サインアップ" #: website/templates/base_admin.html:107 -#: website/templates/base_dashboard_company.html:132 -#: website/templates/base_dashboard_user.html:114 +#: website/templates/base_dashboard.html:132 +#: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "ユーザープロフィール" #: website/templates/base_admin.html:111 -#: website/templates/base_dashboard_company.html:136 -#: website/templates/base_dashboard_user.html:118 +#: website/templates/base_dashboard.html:136 +#: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 #: website/templates/includes/navbar.html:141 msgid "Logout" diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index c987d4dbbd..6b2d2cc39c 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -205,8 +205,8 @@ msgstr "Да" #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 #: website/templates/base_admin.html:109 -#: website/templates/base_dashboard_company.html:134 -#: website/templates/base_dashboard_user.html:116 +#: website/templates/base_dashboard.html:134 +#: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 msgid "Change Password" msgstr "Изменить пароль" @@ -255,15 +255,15 @@ msgid "Sign Up" msgstr "Зарегистрироваться" #: website/templates/base_admin.html:107 -#: website/templates/base_dashboard_company.html:132 -#: website/templates/base_dashboard_user.html:114 +#: website/templates/base_dashboard.html:132 +#: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "Профиль пользователя" #: website/templates/base_admin.html:111 -#: website/templates/base_dashboard_company.html:136 -#: website/templates/base_dashboard_user.html:118 +#: website/templates/base_dashboard.html:136 +#: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 #: website/templates/includes/navbar.html:141 msgid "Logout" diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 7bc0ddcf4e..5a1f2c9dcb 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -199,8 +199,8 @@ msgstr "是的" #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 #: website/templates/base_admin.html:109 -#: website/templates/base_dashboard_company.html:134 -#: website/templates/base_dashboard_user.html:116 +#: website/templates/base_dashboard.html:134 +#: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 msgid "Change Password" msgstr "更改密码" @@ -249,15 +249,15 @@ msgid "Sign Up" msgstr "注册" #: website/templates/base_admin.html:107 -#: website/templates/base_dashboard_company.html:132 -#: website/templates/base_dashboard_user.html:114 +#: website/templates/base_dashboard.html:132 +#: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "用户资料" #: website/templates/base_admin.html:111 -#: website/templates/base_dashboard_company.html:136 -#: website/templates/base_dashboard_user.html:118 +#: website/templates/base_dashboard.html:136 +#: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 #: website/templates/includes/navbar.html:141 msgid "Logout" diff --git a/website/templates/base_dashboard_user.html b/website/templates/base_dashboard.html similarity index 67% rename from website/templates/base_dashboard_user.html rename to website/templates/base_dashboard.html index f2f7226a90..4d2a809845 100644 --- a/website/templates/base_dashboard_user.html +++ b/website/templates/base_dashboard.html @@ -1,6 +1,6 @@ {% load static %} -{% load gravatar %} {% load custom_tags %} +{% load gravatar %} {% load socialaccount %} {% load user_score %} {% providers_media_js %} @@ -33,7 +33,6 @@ - {% block style %} {% endblock %} @@ -44,36 +43,6 @@
-
- - - - -
- -
- - -
- - - - -
-
- - -
@@ -106,17 +75,14 @@

Dashboard

{% endif %} {{ request.user.username }} -
  • Balance - {{wallet.current_balance}}$ -
    • - - +
    @@ -127,13 +93,10 @@

    Dashboard

    - -
    + +
    {% block content %} {% endblock %}
    diff --git a/website/templates/base_dashboard_company.html b/website/templates/base_dashboard_company.html deleted file mode 100644 index 0ef0e4ea34..0000000000 --- a/website/templates/base_dashboard_company.html +++ /dev/null @@ -1,166 +0,0 @@ -{% load static %} -{% load custom_tags %} -{% load gravatar %} -{% load socialaccount %} -{% load user_score %} -{% providers_media_js %} -{% load i18n %} - - - - - Codestin Search App - - - - - - - - - - - - - - - - - - - - - - {% block style %} - {% endblock %} - - - - - - -
    - -
    - - - -
    - -
    - - -
    - - - - -
    -
    - - - -
    - -
    - - - - - - -
    -
    - - -
    Report Issue, Win Prizes
    -     - -
    - - - - -
    -
    -
    -
    - -
    - - -
    - {% block content %} - {% endblock %} -
    - -
    - - - -
    - - - - - - \ No newline at end of file diff --git a/website/templates/company_dashboard_domain_detail.html b/website/templates/company_dashboard_domain_detail.html index ddc5237243..c62c8355a9 100644 --- a/website/templates/company_dashboard_domain_detail.html +++ b/website/templates/company_dashboard_domain_detail.html @@ -1,7 +1,10 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% load tz_detect %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    diff --git a/website/templates/company_dashboard_hunt_detail.html b/website/templates/company_dashboard_hunt_detail.html index aee7287f10..f468d18d11 100644 --- a/website/templates/company_dashboard_hunt_detail.html +++ b/website/templates/company_dashboard_hunt_detail.html @@ -1,6 +1,9 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    diff --git a/website/templates/company_dashboard_hunt_edit.html b/website/templates/company_dashboard_hunt_edit.html index 187845d195..f6af0e4162 100644 --- a/website/templates/company_dashboard_hunt_edit.html +++ b/website/templates/company_dashboard_hunt_edit.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} @@ -62,6 +62,9 @@ {% block content %} {% localtime on %} +
    + {% include 'includes/company_sideanv.html' %} +
    diff --git a/website/templates/company_domain_lists.html b/website/templates/company_domain_lists.html index f0adb4b334..0474b91d4c 100644 --- a/website/templates/company_domain_lists.html +++ b/website/templates/company_domain_lists.html @@ -1,68 +1,71 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} -
    -
    - {% if domains %} - {% for domain in domains %} -
    -
    - -
    -
    {{domain.name}}
    -
    -

    {{domain.email}}$

    -
    -
    -
    +
    + {% include 'includes/company_sideanv.html' %} +
    +
    +
    + {% if domains %} + {% for domain in domains %} +
    +
    + +
    +
    {{domain.name}}
    +
    +

    {{domain.email}}$

    - {% endfor %} - {% else %} -
    no domain found ! - {% endif %} -
    -
    -
    - + {% endfor %} + {% else %} +
    no domain found ! + {% endif %} +
    +
    +
    + + {% endblock %} diff --git a/website/templates/company_hunt_results.html b/website/templates/company_hunt_results.html index 3681ad2d9e..0b177c7ce9 100644 --- a/website/templates/company_hunt_results.html +++ b/website/templates/company_hunt_results.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    diff --git a/website/templates/company_settings.html b/website/templates/company_settings.html index d4fca86a7c..df4885d5be 100644 --- a/website/templates/company_settings.html +++ b/website/templates/company_settings.html @@ -1,10 +1,13 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load socialaccount %} {% load gravatar %} {% load static %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    -
    +
    {% csrf_token %} diff --git a/website/templates/create_hunt.html b/website/templates/create_hunt.html index 78fbc10144..6e46ce7cb4 100644 --- a/website/templates/create_hunt.html +++ b/website/templates/create_hunt.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% load tz_detect %} {% block style %} @@ -71,6 +71,9 @@ {% endblock %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    diff --git a/website/templates/dashboard_profile.html b/website/templates/dashboard_profile.html index a81b4a4558..094364be2f 100644 --- a/website/templates/dashboard_profile.html +++ b/website/templates/dashboard_profile.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_user.html" %} +{% extends "base_dashboard.html" %} {% load gravatar %} {% load static %} {% load ratings %} @@ -1025,6 +1025,9 @@ } +
    + {% include 'includes/user_sideanv.html'%} +
    diff --git a/website/templates/hunt2.html b/website/templates/hunt2.html index 78fbc10144..6e46ce7cb4 100644 --- a/website/templates/hunt2.html +++ b/website/templates/hunt2.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% load tz_detect %} {% block style %} @@ -71,6 +71,9 @@ {% endblock %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    diff --git a/website/templates/hunt_drafts.html b/website/templates/hunt_drafts.html index de7a636f1b..7631d67306 100644 --- a/website/templates/hunt_drafts.html +++ b/website/templates/hunt_drafts.html @@ -1,29 +1,31 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    - -
    -
    -

    Drafts

    - {% if hunts %} - {% for hunt in hunts %} -
    -
    - -
    -
    {{hunt.name}}
    -
    -

    {{hunt.url}}$

    -
    -
    -
    -
    - {% endfor %} - {% else %} -
    no drafts found ! - {% endif %} -
    +
    +
    +

    Drafts

    + {% if hunts %} + {% for hunt in hunts %} +
    +
    + +
    +
    {{hunt.name}}
    +
    +

    {{hunt.url}}$

    +
    +
    + {% endfor %} + {% else %} +
    no drafts found ! + {% endif %} +
    +
    +
    {% endblock %} diff --git a/website/templates/hunt_previous.html b/website/templates/hunt_previous.html index ab300a257b..0e43bbbc03 100644 --- a/website/templates/hunt_previous.html +++ b/website/templates/hunt_previous.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} +
    + {% include 'includes/company_sideanv.html' %} +
    - {% if hunts %} -
    -

    Previous Hunt

    -
      - {% for hunt in hunts %} -
    • -
      - {% if hunt.logo %} -
      - {% endif %} -
      -

      {{hunt.name}}

      -

      {{hunt.domain.name}}, {{hunt.domain.company.name}} - Starts on {{hunt.starts_on}}

      - - - -
      -
      -
      • - {% endfor %} -
    -
    + {% if hunts %} +
    +

    Previous Hunt

    +
      + {% for hunt in hunts %} +
    • +
      + {% if hunt.logo %} +
      + {% endif %} +
      +

      {{hunt.name}}

      +

      {{hunt.domain.name}}, {{hunt.domain.company.name}} - Starts on {{hunt.starts_on}}

      + + +
      - {% endif %} +
      +
      • + {% endfor %} +
    +
    +
    + {% endif %} {% endblock %} diff --git a/website/templates/hunt_results.html b/website/templates/hunt_results.html index dba71c8752..40ce42a695 100644 --- a/website/templates/hunt_results.html +++ b/website/templates/hunt_results.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_user.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} + - + +
    + {% include 'includes/user_sideanv.html'%} +
    diff --git a/website/templates/hunt_submittion.html b/website/templates/hunt_submittion.html index 83d32700c1..e8d3aa041f 100644 --- a/website/templates/hunt_submittion.html +++ b/website/templates/hunt_submittion.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_user.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% load custom_tags %} {% load gravatar %} @@ -94,6 +94,10 @@ } } +
    + {% include 'includes/user_sideanv.html'%} +
    + {% endblock %} {% block content %} @@ -109,6 +113,9 @@

    Report a bug

    +
    + {% include 'includes/user_sideanv.html' %} +
    diff --git a/website/templates/hunt_upcoming.html b/website/templates/hunt_upcoming.html index eb91496b69..a5cf05b122 100644 --- a/website/templates/hunt_upcoming.html +++ b/website/templates/hunt_upcoming.html @@ -1,29 +1,31 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} - -
    -
    -

    Upcoming Hunts

    - {% if hunts %} - {% for hunt in hunts %} -
    -
    - -
    -
    {{hunt.url}}
    -
    -

    {{hunt.prize}}$

    -
    -
    -
    -
    - {% endfor %} - {% else %} -
    no upcoming hunts ! - {% endif %} -
    +
    + {% include 'includes/company_sideanv.html' %} +
    +
    +
    +

    Upcoming Hunts

    + {% if hunts %} + {% for hunt in hunts %} +
    +
    + +
    +
    {{hunt.url}}
    +
    +

    {{hunt.prize}}$

    +
    +
    + {% endfor %} + {% else %} +
    no upcoming hunts ! + {% endif %} +
    +
    +
    {% endblock %} diff --git a/website/templates/includes/company_sideanv.html b/website/templates/includes/company_sideanv.html new file mode 100644 index 0000000000..049a0b3b66 --- /dev/null +++ b/website/templates/includes/company_sideanv.html @@ -0,0 +1,48 @@ + +
    + + + + +
    \ No newline at end of file diff --git a/website/templates/includes/user_sideanv.html b/website/templates/includes/user_sideanv.html new file mode 100644 index 0000000000..c33fdc4188 --- /dev/null +++ b/website/templates/includes/user_sideanv.html @@ -0,0 +1,24 @@ + + +
    + + + +
    + + diff --git a/website/templates/index_company.html b/website/templates/index_company.html index 8a8fb1ab4a..3e547f70af 100644 --- a/website/templates/index_company.html +++ b/website/templates/index_company.html @@ -1,72 +1,75 @@ -{% extends "base_dashboard_company.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} -
    -
    -

    Ongoing Hunt

    - {% if ongoing_hunt %} - {% for hunt in ongoing_hunt %} -
    -
    - -
    -
    {{hunt.url}}
    -
    -

    {{hunt.prize}}$

    -
    -
    -
    -
    - {% endfor %} - {% else %} -
    no ongoing hunts ! - {% endif %} -
    -
    -
    -
    -

    Upcoming Hunt

    - {% if upcoming_hunts %} - {% for hunt in upcoming_hunts %} -
    -
    - -
    -
    {{hunt.url}}
    -
    -

    {{hunt.prize}}$

    -
    -
    -
    -
    - {% endfor %} - {% else %} -
    no upcoming hunts ! - {% endif %} -
    -
    -
    -
    -
    -

    Previous Hunt

    - {% if previous_hunt %} - {% for hunt in previous_hunt %} -
    -
    - -
    -
    {{hunt.url}}
    -
    -

    {{hunt.prize}}$

    -
    -
    -
    -
    - {% endfor %} - {% else %} -
    no previous hunts ! - {% endif %} -
    -
    -
    +
    + {% include 'includes/company_sideanv.html' %} +
    +
    +
    +

    Ongoing Hunt

    + {% if ongoing_hunt %} + {% for hunt in ongoing_hunt %} +
    +
    + +
    +
    {{hunt.url}}
    +
    +

    {{hunt.prize}}$

    +
    +
    +
    +
    + {% endfor %} + {% else %} +
    no ongoing hunts ! + {% endif %} +
    +
    +
    +
    +

    Upcoming Hunt

    + {% if upcoming_hunts %} + {% for hunt in upcoming_hunts %} +
    +
    + +
    +
    {{hunt.url}}
    +
    +

    {{hunt.prize}}$

    +
    +
    +
    +
    + {% endfor %} + {% else %} +
    no upcoming hunts ! + {% endif %} +
    +
    +
    +
    +
    +

    Previous Hunt

    + {% if previous_hunt %} + {% for hunt in previous_hunt %} +
    +
    + +
    +
    {{hunt.url}}
    +
    +

    {{hunt.prize}}$

    +
    +
    +
    +
    + {% endfor %} + {% else %} +
    no previous hunts ! + {% endif %} +
    +
    +
    {% endblock %} diff --git a/website/templates/index_user.html b/website/templates/index_user.html index 7eef4431f1..ebf533747a 100644 --- a/website/templates/index_user.html +++ b/website/templates/index_user.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_user.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% load gravatar %} {% load socialaccount %} @@ -89,83 +89,86 @@ font-weight: 400; } -
    - {% if upcoming_hunts %} -
    -

    Upcoming Hunt

    -
      - {% for hunt in upcoming_hunts %} -
    • -
      - {% if hunt.logo %} -
      - {% endif %} -
      -

      {{hunt.name}}

      -

      {{hunt.domain.name}}, {{hunt.domain.company.name}} - Starts on {{hunt.starts_on}}

      - - - -
      -
      -
      • - {% endfor %} -
    -
    +
    + {% include 'includes/user_sideanv.html'%} +
    +
    + {% if upcoming_hunts %} +
    +

    Upcoming Hunt

    +
      + {% for hunt in upcoming_hunts %} +
    • +
      + {% if hunt.logo %} +
      + {% endif %} +
      +

      {{hunt.name}}

      +

      {{hunt.domain.name}}, {{hunt.domain.company.name}} - Starts on {{hunt.starts_on}}

      + + +
      - {% endif %} -
      -
      - {% if ongoing_hunt %} -
      -

      Ongoing Hunt

      -
        - {% for hunt in ongoing_hunt %} -
      • -
        - {% if hunt.logo %} -
        - {% endif %} -
        -

        {{hunt.name}}

        -

        {{hunt.domain.name}}, {{hunt.domain.company.name}} - Already Started

        - - - -
        -
        -
        • - {% endfor %} -
      -
      +
      +
      • + {% endfor %} +
    +
    +
    + {% endif %} +
    +
    + {% if ongoing_hunt %} +
    +

    Ongoing Hunt

    +
      + {% for hunt in ongoing_hunt %} +
    • +
      + {% if hunt.logo %} +
      + {% endif %} +
      +

      {{hunt.name}}

      +

      {{hunt.domain.name}}, {{hunt.domain.company.name}} - Already Started

      + + +
      - {% endif %} -
      -
      - {% if previous_hunt %} -
      -

      Previous Hunt

      -
        - {% for hunt in previous_hunt %} -
      • -
        - {% if hunt.logo %} -
        - {% endif %} -
        -

        {{hunt.name}}

        -

        {{hunt.domain.name}}, {{hunt.domain.company.name}} - Ended on {{hunt.end_on}}

        - - - -
        -
        -
        • - {% endfor %} -
      -
      +
      +
      • + {% endfor %} +
    +
    +
    + {% endif %} +
    +
    + {% if previous_hunt %} +
    +

    Previous Hunt

    +
      + {% for hunt in previous_hunt %} +
    • +
      + {% if hunt.logo %} +
      + {% endif %} +
      +

      {{hunt.name}}

      +

      {{hunt.domain.name}}, {{hunt.domain.company.name}} - Ended on {{hunt.end_on}}

      + + +
      - {% endif %} -
      - +
    + + {% endfor %} + +
    +
    + {% endif %} +
    + {% endblock %} diff --git a/website/templates/view_hunt.html b/website/templates/view_hunt.html index b52b28941b..eace6706bc 100644 --- a/website/templates/view_hunt.html +++ b/website/templates/view_hunt.html @@ -1,4 +1,4 @@ -{% extends "base_dashboard_user.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} +
    + {% include 'includes/user_sideanv.html'%} +
    + From b62a0e1e5bc2582a829d3b96db985e9c4ed653ed Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 16:58:34 +0530 Subject: [PATCH 2/8] base_admin --- file-descriptions.csv | 2 +- locale/de/LC_MESSAGES/django.po | 6 +- locale/fr/LC_MESSAGES/django.po | 6 +- locale/hi/LC_MESSAGES/django.po | 6 +- locale/ja/LC_MESSAGES/django.po | 6 +- locale/ru/LC_MESSAGES/django.po | 6 +- locale/zh_CN/LC_MESSAGES/django.po | 6 +- .../templates/admin_dashboard_company.html | 143 +++++++++--------- .../admin_dashboard_company_detail.html | 119 ++++++++------- website/templates/base_admin.html | 26 ---- website/templates/includes/admin_sideanv.html | 22 +++ 11 files changed, 175 insertions(+), 173 deletions(-) create mode 100644 website/templates/includes/admin_sideanv.html diff --git a/file-descriptions.csv b/file-descriptions.csv index 8d681746dd..c136b7c3ba 100644 --- a/file-descriptions.csv +++ b/file-descriptions.csv @@ -11,7 +11,7 @@ admin_dashboard_company.html,the info regarding the company dashboard, admin_dashboard_company_detail.html,the details about the company, admin_home.html,info regarding the home page for admin, base.html,this is the base file which all files extend from,https://www.figma.com/file/s0xuxeU6O2guoWEfA9OElZ/Design?node-id=340%3A209&t=pqxWpF3hcYxjEDrs-1 -base_admin.html,is only for admin, +base_dashboard.html,is only for admin, base_dashboard.html,, base_dashboard.html,, base_home.html,, diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 8eecfa6924..495f0e5770 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -201,7 +201,7 @@ msgstr "Ja" #: website/templates/account/password_change.html:67 #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 -#: website/templates/base_admin.html:109 +#: website/templates/base_dashboard.html:109 #: website/templates/base_dashboard.html:134 #: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 @@ -251,14 +251,14 @@ msgstr "Konto anmelden" msgid "Sign Up" msgstr "Registrieren" -#: website/templates/base_admin.html:107 +#: website/templates/base_dashboard.html:107 #: website/templates/base_dashboard.html:132 #: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "Benutzerprofil" -#: website/templates/base_admin.html:111 +#: website/templates/base_dashboard.html:111 #: website/templates/base_dashboard.html:136 #: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f1de12b94b..c75eca4ff7 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -201,7 +201,7 @@ msgstr "Oui" #: website/templates/account/password_change.html:67 #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 -#: website/templates/base_admin.html:109 +#: website/templates/base_dashboard.html:109 #: website/templates/base_dashboard.html:134 #: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 @@ -251,14 +251,14 @@ msgstr "Inscription au compte" msgid "Sign Up" msgstr "S'inscrire" -#: website/templates/base_admin.html:107 +#: website/templates/base_dashboard.html:107 #: website/templates/base_dashboard.html:132 #: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "Profil de l'utilisateur" -#: website/templates/base_admin.html:111 +#: website/templates/base_dashboard.html:111 #: website/templates/base_dashboard.html:136 #: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 diff --git a/locale/hi/LC_MESSAGES/django.po b/locale/hi/LC_MESSAGES/django.po index 5c20617fbf..e093ebe228 100644 --- a/locale/hi/LC_MESSAGES/django.po +++ b/locale/hi/LC_MESSAGES/django.po @@ -197,7 +197,7 @@ msgstr "हाँ" #: website/templates/account/password_change.html:67 #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 -#: website/templates/base_admin.html:109 +#: website/templates/base_dashboard.html:109 #: website/templates/base_dashboard.html:134 #: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 @@ -247,14 +247,14 @@ msgstr "खाता साइन अप" msgid "Sign Up" msgstr "साइन अप करें" -#: website/templates/base_admin.html:107 +#: website/templates/base_dashboard.html:107 #: website/templates/base_dashboard.html:132 #: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "उपयोगकर्ता प्रोफ़ाइल" -#: website/templates/base_admin.html:111 +#: website/templates/base_dashboard.html:111 #: website/templates/base_dashboard.html:136 #: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 diff --git a/locale/ja/LC_MESSAGES/django.po b/locale/ja/LC_MESSAGES/django.po index 2a84ce2e0e..dbff86b5a0 100644 --- a/locale/ja/LC_MESSAGES/django.po +++ b/locale/ja/LC_MESSAGES/django.po @@ -200,7 +200,7 @@ msgstr "はい" #: website/templates/account/password_change.html:67 #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 -#: website/templates/base_admin.html:109 +#: website/templates/base_dashboard.html:109 #: website/templates/base_dashboard.html:134 #: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 @@ -250,14 +250,14 @@ msgstr "アカウント登録" msgid "Sign Up" msgstr "サインアップ" -#: website/templates/base_admin.html:107 +#: website/templates/base_dashboard.html:107 #: website/templates/base_dashboard.html:132 #: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "ユーザープロフィール" -#: website/templates/base_admin.html:111 +#: website/templates/base_dashboard.html:111 #: website/templates/base_dashboard.html:136 #: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 6b2d2cc39c..cf19863f9c 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -204,7 +204,7 @@ msgstr "Да" #: website/templates/account/password_change.html:67 #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 -#: website/templates/base_admin.html:109 +#: website/templates/base_dashboard.html:109 #: website/templates/base_dashboard.html:134 #: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 @@ -254,14 +254,14 @@ msgstr "Регистрация учетной записи" msgid "Sign Up" msgstr "Зарегистрироваться" -#: website/templates/base_admin.html:107 +#: website/templates/base_dashboard.html:107 #: website/templates/base_dashboard.html:132 #: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "Профиль пользователя" -#: website/templates/base_admin.html:111 +#: website/templates/base_dashboard.html:111 #: website/templates/base_dashboard.html:136 #: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 5a1f2c9dcb..43806a0ef3 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -198,7 +198,7 @@ msgstr "是的" #: website/templates/account/password_change.html:67 #: website/templates/account/password_reset_from_key.html:41 #: website/templates/account/password_reset_from_key.html:67 -#: website/templates/base_admin.html:109 +#: website/templates/base_dashboard.html:109 #: website/templates/base_dashboard.html:134 #: website/templates/base_dashboard.html:116 #: website/templates/includes/navbar.html:125 @@ -248,14 +248,14 @@ msgstr "注册帐号" msgid "Sign Up" msgstr "注册" -#: website/templates/base_admin.html:107 +#: website/templates/base_dashboard.html:107 #: website/templates/base_dashboard.html:132 #: website/templates/base_dashboard.html:114 #: website/templates/includes/navbar.html:102 msgid "User Profile" msgstr "用户资料" -#: website/templates/base_admin.html:111 +#: website/templates/base_dashboard.html:111 #: website/templates/base_dashboard.html:136 #: website/templates/base_dashboard.html:118 #: website/templates/includes/navbar.html:36 diff --git a/website/templates/admin_dashboard_company.html b/website/templates/admin_dashboard_company.html index 724d87768c..5b21aa700e 100644 --- a/website/templates/admin_dashboard_company.html +++ b/website/templates/admin_dashboard_company.html @@ -1,75 +1,78 @@ -{% extends "base_admin.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} -
    -
    - {% if companys %} -
    - Company - {% for company in companys %} - {% if company.is_active %} - {{company.name}} - {% else %} - {{company.name}} - {% endif %} - - {% endfor %} -
    - {% else %} -
    no company found ! - {% endif %} +
    + {% include 'includes/admin_sideanv.html' %} +
    +
    +
    + {% if companys %} +
    + Company + {% for company in companys %} + {% if company.is_active %} + {{company.name}} + {% else %} + {{company.name}} + {% endif %} -
    -
    -
    - - + {% else %} +
    no company found ! + {% endif %} + +
    +
    +
    + + {% endblock %} diff --git a/website/templates/admin_dashboard_company_detail.html b/website/templates/admin_dashboard_company_detail.html index ad0a026bdd..c6ae16bc7b 100644 --- a/website/templates/admin_dashboard_company_detail.html +++ b/website/templates/admin_dashboard_company_detail.html @@ -1,61 +1,64 @@ -{% extends "base_admin.html" %} +{% extends "base_dashboard.html" %} {% load static %} {% block content %} -
    -
    -
    - {% csrf_token %} -
    -
    - -

    Edit Company

    -
    -
    - -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - {% else %} - Verify - {% endif %} -
    -
    -
    - - -
    -
    -
    -
    -
    -
    +
    + {% include 'includes/admin_sideanv.html' %} +
    +
    +
    +
    + {% csrf_token %} +
    +
    + +

    Edit Company

    +
    +
    + +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + {% else %} + Verify + {% endif %} +
    +
    +
    + + +
    +
    +
    +
    +
    +
    {% endblock %} diff --git a/website/templates/base_admin.html b/website/templates/base_admin.html index c6360e7c41..a4aa801de3 100644 --- a/website/templates/base_admin.html +++ b/website/templates/base_admin.html @@ -44,32 +44,6 @@
    -
    - - - -
    - -
    - - -
    - - - - -
    -
    - - -
    diff --git a/website/templates/includes/admin_sideanv.html b/website/templates/includes/admin_sideanv.html new file mode 100644 index 0000000000..518f9f31b8 --- /dev/null +++ b/website/templates/includes/admin_sideanv.html @@ -0,0 +1,22 @@ + + +
    + + + +
    \ No newline at end of file From 9163f1b5ac743dc98da8aa58600a501a6926e97d Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 16:59:01 +0530 Subject: [PATCH 3/8] no base_admin --- website/templates/base_admin.html | 112 ------------------------------ 1 file changed, 112 deletions(-) delete mode 100644 website/templates/base_admin.html diff --git a/website/templates/base_admin.html b/website/templates/base_admin.html deleted file mode 100644 index a4aa801de3..0000000000 --- a/website/templates/base_admin.html +++ /dev/null @@ -1,112 +0,0 @@ -{% load static %} -{% load custom_tags %} -{% load gravatar %} -{% load socialaccount %} -{% load user_score %} -{% providers_media_js %} -{% load i18n %} - - - - - Codestin Search App - - - - - - - - - - - - - - - - - - - - - - - {% block style %} - {% endblock %} - - - - - - -
    - -
    - -
    - - - - - - -
    -
    - - -
    Report Issue, Win Prizes
    -     - -
    - - - - -
    -
    -
    -
    - -
    - -
    - {% block content %} - {% endblock %} -
    - -
    - - - -
    - - - - - - \ No newline at end of file From e8a753b06727f3e08a6fbe395f5870007b6b87e2 Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 18:13:35 +0530 Subject: [PATCH 4/8] one base.html --- website/templates/base.html | 31 +++--- website/templates/base_new.html | 145 ----------------------------- website/templates/domain_list.html | 5 +- website/templates/hunt_list.html | 6 +- website/templates/issue2.html | 5 +- website/templates/new_home.html | 5 +- website/templates/report.html | 6 +- 7 files changed, 32 insertions(+), 171 deletions(-) delete mode 100644 website/templates/base_new.html diff --git a/website/templates/base.html b/website/templates/base.html index 4fbadbb08f..bf2ea82af2 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -16,6 +16,8 @@ + + + + + + + @@ -53,25 +60,21 @@ - + - {% comment %} navbar {% endcomment %} - {% include "includes/navbar.html" %} - {% comment %} navbar {% endcomment %} - -
    -
    -
    - {% block content %} - {% endblock %} -
    -
    + {% comment %} navigation {% endcomment %} + {% include "includes/header.html" %} + {% comment %} navigation {% endcomment %} + +
    + {% block content %} + {% endblock %}
    + {% comment %} block with no bootstrap wrappers {% endcomment %} {% block natural_content %} {% endblock %} - {% include "includes/footer.html" %} @@ -117,7 +120,7 @@ }); - {% if messages %} + {% if messages %} {% for message in messages %} $.notify("{{ message }}", { style: "custom", diff --git a/website/templates/base_new.html b/website/templates/base_new.html deleted file mode 100644 index 742ea13334..0000000000 --- a/website/templates/base_new.html +++ /dev/null @@ -1,145 +0,0 @@ -{% load static %} -{% load custom_tags %} -{% load gravatar %} -{% load socialaccount %} -{% load user_score %} -{% providers_media_js %} -{% load i18n %} - - - - - Codestin Search App - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% block head %} - {% endblock %} - - {% block style %} - {% endblock %} - - - - - - {% comment %} navigation {% endcomment %} - {% include "includes/header.html" %} - {% include "includes/sidenav.html" %} - {% comment %} navigation {% endcomment %} - -
    - {% block hero %} - {% endblock %} -
    - - {% comment %} block with no bootstrap wrappers {% endcomment %} - {% block natural_content %} - {% endblock %} - - - - - -{% block after_js %} -{% endblock %} - - - - - - - - diff --git a/website/templates/domain_list.html b/website/templates/domain_list.html index d48daebac5..33946ecb46 100644 --- a/website/templates/domain_list.html +++ b/website/templates/domain_list.html @@ -1,7 +1,8 @@ -{% extends "base_new.html" %} +{% extends "base.html" %} {% load static %} -{% block hero %} +{% block content %} +{% include "includes/sidenav.html" %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/company_settings.html b/website/templates/company_settings.html index df4885d5be..2ff1e4f923 100644 --- a/website/templates/company_settings.html +++ b/website/templates/company_settings.html @@ -4,7 +4,7 @@ {% load static %} {% block content %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/create_hunt.html b/website/templates/create_hunt.html index 6e46ce7cb4..fbf9dce5a9 100644 --- a/website/templates/create_hunt.html +++ b/website/templates/create_hunt.html @@ -72,7 +72,7 @@ {% block content %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/dashboard_profile.html b/website/templates/dashboard_profile.html index 094364be2f..2b468379cf 100644 --- a/website/templates/dashboard_profile.html +++ b/website/templates/dashboard_profile.html @@ -1026,7 +1026,7 @@
    - {% include 'includes/user_sideanv.html'%} + {% include 'includes/user_sidenav.html'%}
    diff --git a/website/templates/hunt2.html b/website/templates/hunt2.html index 6e46ce7cb4..fbf9dce5a9 100644 --- a/website/templates/hunt2.html +++ b/website/templates/hunt2.html @@ -72,7 +72,7 @@ {% block content %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/hunt_drafts.html b/website/templates/hunt_drafts.html index 7631d67306..71368f35b8 100644 --- a/website/templates/hunt_drafts.html +++ b/website/templates/hunt_drafts.html @@ -2,7 +2,7 @@ {% load static %} {% block content %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/hunt_previous.html b/website/templates/hunt_previous.html index 0e43bbbc03..f8c964bded 100644 --- a/website/templates/hunt_previous.html +++ b/website/templates/hunt_previous.html @@ -85,7 +85,7 @@ }
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    {% if hunts %} diff --git a/website/templates/hunt_results.html b/website/templates/hunt_results.html index 40ce42a695..79b0cd1667 100644 --- a/website/templates/hunt_results.html +++ b/website/templates/hunt_results.html @@ -78,7 +78,7 @@
    - {% include 'includes/user_sideanv.html'%} + {% include 'includes/user_sidenav.html'%}
    diff --git a/website/templates/hunt_submittion.html b/website/templates/hunt_submittion.html index e8d3aa041f..409ed4b7a2 100644 --- a/website/templates/hunt_submittion.html +++ b/website/templates/hunt_submittion.html @@ -95,7 +95,7 @@ }
    - {% include 'includes/user_sideanv.html'%} + {% include 'includes/user_sidenav.html'%}
    {% endblock %} @@ -114,7 +114,7 @@

    Report a bug

    - {% include 'includes/user_sideanv.html' %} + {% include 'includes/user_sidenav.html' %}
    diff --git a/website/templates/hunt_upcoming.html b/website/templates/hunt_upcoming.html index a5cf05b122..bff5682ddc 100644 --- a/website/templates/hunt_upcoming.html +++ b/website/templates/hunt_upcoming.html @@ -3,7 +3,7 @@ {% block content %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/includes/admin_sideanv.html b/website/templates/includes/admin_sidenav.html similarity index 100% rename from website/templates/includes/admin_sideanv.html rename to website/templates/includes/admin_sidenav.html diff --git a/website/templates/includes/company_sideanv.html b/website/templates/includes/company_sidenav.html similarity index 100% rename from website/templates/includes/company_sideanv.html rename to website/templates/includes/company_sidenav.html diff --git a/website/templates/includes/user_sideanv.html b/website/templates/includes/user_sidenav.html similarity index 100% rename from website/templates/includes/user_sideanv.html rename to website/templates/includes/user_sidenav.html diff --git a/website/templates/index_company.html b/website/templates/index_company.html index 3e547f70af..a30642dc95 100644 --- a/website/templates/index_company.html +++ b/website/templates/index_company.html @@ -2,7 +2,7 @@ {% load static %} {% block content %}
    - {% include 'includes/company_sideanv.html' %} + {% include 'includes/company_sidenav.html' %}
    diff --git a/website/templates/index_user.html b/website/templates/index_user.html index ebf533747a..bf0bcb6099 100644 --- a/website/templates/index_user.html +++ b/website/templates/index_user.html @@ -90,7 +90,7 @@ }
    - {% include 'includes/user_sideanv.html'%} + {% include 'includes/user_sidenav.html'%}
    {% if upcoming_hunts %} diff --git a/website/templates/view_hunt.html b/website/templates/view_hunt.html index eace6706bc..6e8ab1e7c7 100644 --- a/website/templates/view_hunt.html +++ b/website/templates/view_hunt.html @@ -74,7 +74,7 @@
    - {% include 'includes/user_sideanv.html'%} + {% include 'includes/user_sidenav.html'%}
    From 3f9cc716dc9b0d06b9ad22c619a231334cbce384 Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 18:21:45 +0530 Subject: [PATCH 6/8] commit --- website/templates/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/website/templates/base.html b/website/templates/base.html index c05ec857a6..bf2ea82af2 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -67,6 +67,7 @@ {% comment %} navigation {% endcomment %}
    + {% block content %} {% endblock %}
    From fc48fad6dccf4a8cf97fa0f94c1488bb35db8bb3 Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 18:25:38 +0530 Subject: [PATCH 7/8] leaderboard nav --- website/templates/leaderboard_global.html | 1 + 1 file changed, 1 insertion(+) diff --git a/website/templates/leaderboard_global.html b/website/templates/leaderboard_global.html index c69c13fbe7..333b0356dd 100644 --- a/website/templates/leaderboard_global.html +++ b/website/templates/leaderboard_global.html @@ -58,6 +58,7 @@ {% endblock %} {% block content %} +{% include 'includes/sidenav.html' %}

    Global Leaderboard

    From 44b2b1b19947612a98ec83645aeb678053e99b8c Mon Sep 17 00:00:00 2001 From: HanilJain Date: Sun, 18 Feb 2024 18:28:25 +0530 Subject: [PATCH 8/8] leaderboard nav --- website/templates/leaderboard_eachmonth.html | 1 + website/templates/leaderboard_specific_month.html | 1 + 2 files changed, 2 insertions(+) diff --git a/website/templates/leaderboard_eachmonth.html b/website/templates/leaderboard_eachmonth.html index aa56eaf0d8..b41848f05d 100644 --- a/website/templates/leaderboard_eachmonth.html +++ b/website/templates/leaderboard_eachmonth.html @@ -45,6 +45,7 @@ {% endblock %} {% block content %} +{% include 'includes/sidenav.html' %}

    Monthly Leaderboard

    diff --git a/website/templates/leaderboard_specific_month.html b/website/templates/leaderboard_specific_month.html index 1363de2081..2cad29810b 100644 --- a/website/templates/leaderboard_specific_month.html +++ b/website/templates/leaderboard_specific_month.html @@ -130,6 +130,7 @@ {%endblock%} {% block content %} +{% include 'includes/sidenav.html' %}

    Monthly Leaderboard