Thanks to visit codestin.com
Credit goes to github.com

Skip to content

From 5 Base files to 2 Base Files #1800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DonnieBLT merged 11 commits into from
Feb 23, 2024
Merged

From 5 Base files to 2 Base Files #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bc0bdbc
base user and dashboard
HanilJain Feb 18, 2024
b62a0e1
base_admin
HanilJain Feb 18, 2024
9163f1b
no base_admin
HanilJain Feb 18, 2024
e8a753b
one base.html
HanilJain Feb 18, 2024
478d3a9
anv to nav
HanilJain Feb 18, 2024
3f9cc71
commit
HanilJain Feb 18, 2024
fc48fad
leaderboard nav
HanilJain Feb 18, 2024
44b2b1b
leaderboard nav
HanilJain Feb 18, 2024
36ceb98
Merge branch 'main' into issue-721
HanilJain Feb 19, 2024
4c92f5b
Merge branch 'main' into issue-721
HanilJain Feb 22, 2024
567c865
Merge branch 'main' into issue-721
DonnieBLT Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions file-descriptions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ 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_company.html,,
base_dashboard_user.html,,
base_dashboard.html,is only for admin,
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
Expand Down
18 changes: 9 additions & 9 deletions locale/de/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ 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_company.html:134
#: website/templates/base_dashboard_user.html:116
#: website/templates/base_dashboard.html:109
#: website/templates/base_dashboard.html:134
#: website/templates/base_dashboard.html:116
#: website/templates/includes/navbar.html:125
msgid "Change Password"
msgstr "Passwort ändern"
Expand Down Expand Up @@ -251,16 +251,16 @@ msgstr "Konto anmelden"
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: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_company.html:136
#: website/templates/base_dashboard_user.html:118
#: website/templates/base_dashboard.html:111
#: 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"
Expand Down
18 changes: 9 additions & 9 deletions locale/fr/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ 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_company.html:134
#: website/templates/base_dashboard_user.html:116
#: website/templates/base_dashboard.html:109
#: 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"
Expand Down Expand Up @@ -251,16 +251,16 @@ msgstr "Inscription au compte"
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: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_company.html:136
#: website/templates/base_dashboard_user.html:118
#: website/templates/base_dashboard.html:111
#: 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"
Expand Down
18 changes: 9 additions & 9 deletions locale/hi/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ 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_company.html:134
#: website/templates/base_dashboard_user.html:116
#: website/templates/base_dashboard.html:109
#: website/templates/base_dashboard.html:134
#: website/templates/base_dashboard.html:116
#: website/templates/includes/navbar.html:125
msgid "Change Password"
msgstr "पासवर्ड बदलें"
Expand Down Expand Up @@ -247,16 +247,16 @@ msgstr "खाता साइन अप"
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: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_company.html:136
#: website/templates/base_dashboard_user.html:118
#: website/templates/base_dashboard.html:111
#: 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"
Expand Down
18 changes: 9 additions & 9 deletions locale/ja/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ 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_company.html:134
#: website/templates/base_dashboard_user.html:116
#: website/templates/base_dashboard.html:109
#: website/templates/base_dashboard.html:134
#: website/templates/base_dashboard.html:116
#: website/templates/includes/navbar.html:125
msgid "Change Password"
msgstr "パスワードを変更する"
Expand Down Expand Up @@ -250,16 +250,16 @@ msgstr "アカウント登録"
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: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_company.html:136
#: website/templates/base_dashboard_user.html:118
#: website/templates/base_dashboard.html:111
#: 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"
Expand Down
18 changes: 9 additions & 9 deletions locale/ru/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@ 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_company.html:134
#: website/templates/base_dashboard_user.html:116
#: website/templates/base_dashboard.html:109
#: website/templates/base_dashboard.html:134
#: website/templates/base_dashboard.html:116
#: website/templates/includes/navbar.html:125
msgid "Change Password"
msgstr "Изменить пароль"
Expand Down Expand Up @@ -254,16 +254,16 @@ msgstr "Регистрация учетной записи"
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: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_company.html:136
#: website/templates/base_dashboard_user.html:118
#: website/templates/base_dashboard.html:111
#: 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"
Expand Down
18 changes: 9 additions & 9 deletions locale/zh_CN/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ 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_company.html:134
#: website/templates/base_dashboard_user.html:116
#: website/templates/base_dashboard.html:109
#: website/templates/base_dashboard.html:134
#: website/templates/base_dashboard.html:116
#: website/templates/includes/navbar.html:125
msgid "Change Password"
msgstr "更改密码"
Expand Down Expand Up @@ -248,16 +248,16 @@ msgstr "注册帐号"
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: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_company.html:136
#: website/templates/base_dashboard_user.html:118
#: website/templates/base_dashboard.html:111
#: 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"
Expand Down
143 changes: 73 additions & 70 deletions website/templates/admin_dashboard_company.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,78 @@
{% extends "base_admin.html" %}
{% extends "base_dashboard.html" %}
{% load static %}
{% block content %}
<div>
<div class="col_3">
{% if companys %}
<div class="list-group">
<a href="#" class="list-group-item active">Company</a>
{% for company in companys %}
{% if company.is_active %}
<a href="/dashboard/admin/company/{{company.pk}}" class="list-group-item">{{company.name}}</a>
{% else %}
<a href="/dashboard/admin/company/{{company.pk}}" class="list-group-item list-group-item-danger ">{{company.name}}</a>
{% endif %}

{% endfor %}
</div>
{% else %}
</br> no company found !
{% endif %}
<section>
{% include 'includes/admin_sidenav.html' %}
</section>
<div>
<div class="col_3">
{% if companys %}
<div class="list-group">
<a href="#" class="list-group-item active">Company</a>
{% for company in companys %}
{% if company.is_active %}
<a href="/dashboard/admin/company/{{company.pk}}" class="list-group-item">{{company.name}}</a>
{% else %}
<a href="/dashboard/admin/company/{{company.pk}}" class="list-group-item list-group-item-danger ">{{company.name}}</a>
{% endif %}

<div class="clearfix"> </div>
</div>
</div>
<div id="addDomainModal" class="modal fade" role="dialog">
<div class="modal-dialog">

<!-- Modal content-->
<form id="add-or-update-company">
{% csrf_token %}
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Create Company</h4>
</div>
<div class="modal-body">
<div class="form-group">
<label for="name">Name:</label>
<input type="text" name="name" required class="form-control" id="name" value="">
</div>
<div class="form-group">
<label for="url">Website:</label>
<input type="url" name="url" class="form-control" id="url" value="">
</div>
<div class="form-group">
<label for="admin">Admin:</label>
<input type="email" name="admin" class="form-control" id="admin" value="">
</div>
<div class="form-group">
<label for="logo">Logo:</label>
<input type="file" name="logo" class="form-control" id="logo" value="">
</div>
<div class="form-group">
<label for="email">Email address:</label>
<input type="email" name="email" required class="form-control" id="email" value="">
</div>
<div class="form-group">
<label for="github">Github:</label>
<input type="url" name="github" class="form-control" id="github" value="">
</div>
<div class="form-group">
<label for="subscription">Subscription:</label>
<input type="text" name="subscription" class="form-control" id="subscription" value="">
</div>
</div>
<div class="modal-footer">
<input type="submit" class="btn btn-primary btn_5 btn-lg btn-danger role-submit-button" value="Create" />
<input type="reset" data-dismiss="modal" class="btn btn-primary btn_5 btn-lg btn-danger role-submit-button" value="Reset" />
</div>
</div>
</form>
{% endfor %}
</div>
</div>
<button type="button" class="btn btn_5 btn-lg btn-success add-admin-button" data-toggle="modal" data-target="#addDomainModal"><i class="lnr lnr-plus-circle"> </i></button>
{% else %}
</br> no company found !
{% endif %}

<div class="clearfix"> </div>
</div>
</div>
<div id="addDomainModal" class="modal fade" role="dialog">
<div class="modal-dialog">

<!-- Modal content-->
<form id="add-or-update-company">
{% csrf_token %}
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Create Company</h4>
</div>
<div class="modal-body">
<div class="form-group">
<label for="name">Name:</label>
<input type="text" name="name" required class="form-control" id="name" value="">
</div>
<div class="form-group">
<label for="url">Website:</label>
<input type="url" name="url" class="form-control" id="url" value="">
</div>
<div class="form-group">
<label for="admin">Admin:</label>
<input type="email" name="admin" class="form-control" id="admin" value="">
</div>
<div class="form-group">
<label for="logo">Logo:</label>
<input type="file" name="logo" class="form-control" id="logo" value="">
</div>
<div class="form-group">
<label for="email">Email address:</label>
<input type="email" name="email" required class="form-control" id="email" value="">
</div>
<div class="form-group">
<label for="github">Github:</label>
<input type="url" name="github" class="form-control" id="github" value="">
</div>
<div class="form-group">
<label for="subscription">Subscription:</label>
<input type="text" name="subscription" class="form-control" id="subscription" value="">
</div>
</div>
<div class="modal-footer">
<input type="submit" class="btn btn-primary btn_5 btn-lg btn-danger role-submit-button" value="Create" />
<input type="reset" data-dismiss="modal" class="btn btn-primary btn_5 btn-lg btn-danger role-submit-button" value="Reset" />
</div>
</div>
</form>
</div>
</div>
<button type="button" class="btn btn_5 btn-lg btn-success add-admin-button" data-toggle="modal" data-target="#addDomainModal"><i class="lnr lnr-plus-circle"> </i></button>
{% endblock %}
Loading