Skip to content
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.

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

From 5 Base files to 2 Base Files #1800

Merged
merged 11 commits into from
Feb 23, 2024
Merged

Conversation

HanilJain
Copy link
Contributor

@HanilJain HanilJain commented Feb 18, 2024

Fixed #721

In the previous code we were having 5 base files:

  • base_new.html
  • base.html
  • base_dashboard_company.html
  • base_dashboard_user.html
  • base_admin.html

which were brought down to 2 common base files in this PR :

  • base.html
  • base_dashboard.html

all these html files had difference in there side navbar

if any of us have to include any of the sidebar could easily be done with

{% include ' includes/admin_sidenav.html' %}

into

{% block content %} 
{% endblock %}

sidenav we have

  • admin_sidenav.html
  • company_sidenav.html
  • user_sidenav.html
  • footer.html
  • sidenav.html

Note :
Also replaced

{% block hero %}

to

{% block content %}

it helps to keep similarity in all the codes.
so if you will using hero with any of the base file it wont work.

Screenshots

base.html
Screenshot 2024-02-18 184319

base_dashboard.html
Screenshot 2024-02-18 184454

sidenav.html
Screenshot 2024-02-18 184340

user_sidenav.html
Screenshot 2024-02-18 184402

company_sidenav.html
Screenshot 2024-02-18 184420

admin_sidenav.html
Screenshot 2024-02-18 184434

@HanilJain
Copy link
Contributor Author

@DonnieBLT @fredfalcon could please review ?

Copy link
Collaborator

@DonnieBLT DonnieBLT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work

@DonnieBLT DonnieBLT enabled auto-merge (squash) February 23, 2024 06:29
@DonnieBLT DonnieBLT merged commit 500305e into OWASP-BLT:main Feb 23, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Task: Make one base file for everything - currently we have 4
2 participants