Skip to content

Commit

Permalink
Migrate UI (#1055)
Browse files Browse the repository at this point in the history 
* fix link in readme

* fix captcha not visible

* footer in tailwind
  • Loading branch information
@AtmegaBuzz
AtmegaBuzz authored Feb 10, 2023
1 parent a3df197 commit cb27b08
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 47 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Please follow the development server setup procedure [here](https://github.com/O
Please follow the [black](https://github.com/psf/black) code style for the project. It helps us in keeping the codebase consistent and improves readibility for other developers.

### License
The BLT code is released under [GNU Affero General Public License v3.0 (AGPL-3.0)](https://github.com/OWASP/BLT/blob/master/LICENSE.
The BLT code is released under [GNU Affero General Public License v3.0 (AGPL-3.0)](https://github.com/OWASP/BLT/blob/master/LICENSE).

## Notes

Expand Down
121 changes: 77 additions & 44 deletions website/templates/includes/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,86 @@
{% load static %}
{% load i18n %}

<footer id="pageFooter" class="bg-black" > <!-- style="background: #010102; " -->
<div class="w-full text-white">
<div class="h-80 sm:h-60 md:h-48 flex flex-wrap justify-around items-center flex-row">
<img style="width: 200px;" src="{% static 'img/logo_white.png' %}">
<ul class="mx-5 flex gap-1 sm:gap-10 font-bold whitespace-nowrap flex-wrap flex-col sm:flex-row order-1 sm:order-none">
<li><a href="/about" target="_new">{% trans "About" %}</a></li>
<li><a href="/stats">{% trans "Stats" %}</a></li>
<li><a href="/scoreboard" target="_new">{% trans "Company Scoreboard" %}</a></li>
<li><a href="/terms">{% trans "Terms of Service" %}</a></li>

<form id="footerForm" class="flex items-center" action="{% url 'set_language' %}" method="post">
{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
<input name="language" id="footerLanguage" type="hidden" value=""/>
<li class="dropup">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}

<a class="dropdown-toggle flex gap-1" data-toggle="dropdown" href="#">
<div class="flag-{{ LANGUAGE_CODE }} w-8 rounded h-6"></div>
<i class="fa fa-caret-down"></i>
</a>
<ul class="bg-black dropdown-menu">
{% for lang in LANGUAGES %}
{% if lang.0 != LANGUAGE_CODE %}
<li> <a onclick='{
$("#footerLanguage").val("{{ lang.0 }}");
$("#footerForm").submit();}'>
<div class="flag-{{ lang.0 }} w-8 rounded h-6"></div>
</a> </li>
{% endif %}
{% endfor %}
</ul>
</li>
</form>
<footer class="bg-black text-white pt-12 pb-8 px-12">
<div class="mx-auto px-4 container overflow-hidden flex flex-col lg:flex-row justify-between">
<a href="/" class="block mr-4 w-1/2">
<img src="{% static 'img/logo_white.png' %}" class="w-[200px] ml-4 lg:ml-0" alt="footer logo">
</a>
<div class="w-2/3 block sm:flex text-2xl mt-6 lg:mt-0">
<ul class="text-gray-700 list-none p-0 font-thin flex flex-col text-left w-full">
<li class="inline-block py-2 px-3 text-white uppercase font-medium tracking-wide">Company</li>
<li><a href="https://github.com/OWASP/BLT/releases" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Features</a></li>
<li><a href="/stats" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Stats</a></li>
<li><a href="/scoreboard" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Company Scoreboard</a></li>
</ul>
<ul class="text-gray-700 list-none p-0 font-thin flex flex-col text-left w-full">
<li class="inline-block py-2 px-3 text-white uppercase font-medium tracking-wide">Legal</li>
<li><a href="/about" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">About</a></li>
<li><a href="/privacypolicy" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Privacy</a></li>
<li><a href="/terms" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Terms of Service</a></li>
</ul>
<div class="social-networks text-5xl flex gap-8">
<a href="http://twitter.com/bugheist" target="_new"><i class="fa fa-twitter"></i></a>
<a href="http://facebook.com/bugheist" target="_new"><i class="fa fa-facebook"></i></a>
<a href="http://github.com/bugheist/website" target="_new"><i class="fa fa-github"></i></a>
<ul class="text-gray-700 list-none p-0 font-thin flex flex-col text-left w-full">
<li class="inline-block py-2 px-3 text-white uppercase font-medium tracking-wide">Get Started</li>
<li><a href="https://www.bugheist.com/swagger/" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Developer API</a></li>
<li><a href="https://github.com/OWASP/BLT/blob/main/Setup.md" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Documentation</a></li>
<li><a href="https://github.com/OWASP/BLT#readme" class="inline-block py-2 px-3 text-gray-500 hover:text-white no-underline">Guides</a></li>
</li>
</ul>
<div class="text-gray-700 flex flex-col w-full">
<div class="inline-block py-2 px-3 text-white uppercase font-medium tracking-wide">Follow Us</div>
<div class="flex pl-4 justify-start mt-2">
<a class="block flex items-center text-gray-300 hover:text-white mr-6 no-underline" href="http://facebook.com/bugheist" target="_new">
<svg viewBox="0 0 24 24" class="fill-current w-10 h-10" xmlns="http://www.w3.org/2000/svg">
<path d="M23.998 12c0-6.628-5.372-12-11.999-12C5.372 0 0 5.372 0 12c0 5.988 4.388 10.952 10.124 11.852v-8.384H7.078v-3.469h3.046V9.356c0-3.008 1.792-4.669 4.532-4.669 1.313 0 2.686.234 2.686.234v2.953H15.83c-1.49 0-1.955.925-1.955 1.874V12h3.328l-.532 3.469h-2.796v8.384c5.736-.9 10.124-5.864 10.124-11.853z" /></svg>
</a>
<a class="block flex items-center text-gray-300 hover:text-white mr-6 no-underline" href="http://twitter.com/bugheist" target="_new">
<svg viewBox="0 0 24 24" class="fill-current w-10 h-10" xmlns="http://www.w3.org/2000/svg">
<path d="M23.954 4.569a10 10 0 01-2.825.775 4.958 4.958 0 002.163-2.723c-.951.555-2.005.959-3.127 1.184a4.92 4.92 0 00-8.384 4.482C7.691 8.094 4.066 6.13 1.64 3.161a4.822 4.822 0 00-.666 2.475c0 1.71.87 3.213 2.188 4.096a4.904 4.904 0 01-2.228-.616v.061a4.923 4.923 0 003.946 4.827 4.996 4.996 0 01-2.212.085 4.937 4.937 0 004.604 3.417 9.868 9.868 0 01-6.102 2.105c-.39 0-.779-.023-1.17-.067a13.995 13.995 0 007.557 2.209c9.054 0 13.999-7.496 13.999-13.986 0-.209 0-.42-.015-.63a9.936 9.936 0 002.46-2.548l-.047-.02z" /></svg>
</a>
<a class="block flex items-center text-gray-300 hover:text-white no-underline" href="http://github.com/bugheist/website" target="_new">
<svg viewBox="0 0 24 24" class="fill-current w-10 h-10" xmlns="http://www.w3.org/2000/svg">
<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" /></svg>
</a>
<a class="w-10 h-10 block flex ml-5 rounded-[50px] p-[3px] items-center bg-white text-gray-300 hover:text-white no-underline" href="https://steemit.com/@bugheist" target="_new">
<img
src="{% static 'img/blog.svg' %}"
alt="steemit" />
</a>
</div>
</div>
</div>
</div>
<div class="footer-blt bg-black"> <!-- style="background: #010102; " -->
<p class="text-center">Powered by <a href="https://www.owasp.org/index.php/OWASP_Bug_Logging_Tool" target="_new">
OWASP Bug Logging Tool
</a></p>
<div class="pt-4 mt-4 pt-6 text-gray-600 border-t border-gray-800 text-center flex w-full justify-center flex-wrap">
<p>
Powered by
<a class="text-[#327BB7]" href="https://owasp.org/www-project-bug-logging-tool/">
OWASP Bug Logging Tool
</a>
</p>
<form id="footerForm" class="flex items-center ml-4" action="{% url 'set_language' %}" method="post">
{% csrf_token %}
<input name="next" type="hidden" value="{{ redirect_to }}" />
<input name="language" id="footerLanguage" type="hidden" value=""/>
<li class="dropup list-none">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}

<a class="dropdown-toggle flex gap-1" data-toggle="dropdown" href="#">
<div class="flag-{{ LANGUAGE_CODE }} w-8 rounded h-6"></div>
<i class="fa fa-caret-down"></i>
</a>
<ul class="bg-gray-900 dropdown-menu">
{% for lang in LANGUAGES %}
{% if lang.0 != LANGUAGE_CODE %}
<li> <a onclick='{
$("#footerLanguage").val("{{ lang.0 }}");
$("#footerForm").submit();}'>
<div class="flag-{{ lang.0 }} w-8 rounded h-6"></div>
</a> </li>
{% endif %}
{% endfor %}
</ul>
</li>
</form>
</div>

</footer>
9 changes: 7 additions & 2 deletions website/templates/report.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@
font-weight: 700;
font-size: 3rem;
}
.captcha-form input{
border: 1px solid rgb(64, 64, 64);
}

</style>
{% endblock %}

{% block content %}
<script src="{% static "js/jquery.validate.js" %}"></script>
<script src="{% static 'js/jquery.validate.js' %}"></script>
<script src="{% static 'js/activity.js' %}"></script>

<form action="/issue/" method="post" enctype="multipart/form-data">
Expand Down Expand Up @@ -108,7 +111,9 @@ <h1 class="title">REPORT A BUG</h1>
{% endif %}
</div>
{% csrf_token %}
{{ captcha_form.captcha }}
<div class="captcha-form">
{{ captcha_form.captcha }}
</div>
<button type="submit" name="reportbug_button" id="btn" class="btn btn-default btn-block"
data-intro="Click here to report the bug to BugHeist." data-step="5">
Report Bug <i class="fa fa-trophy" aria-hidden="true">+3</i>
Expand Down

0 comments on commit cb27b08

Please sign in to comment.