ereuse/devicehub-django
8
0
Fork 0
Code Issues 6 Pull requests 6 Packages Projects Releases Wiki Activity

Serving files locally: issue #30 #33

Open
rskthomas wants to merge 4 commits from issue_30 into main
pull from: issue_30
merge into: ereuse:main
Conversation 0 Commits 4 Files changed 7 +15 -8
7 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dashboard/static/css/bootstrap-icons.min.css vendored Normal file
View file

File diff suppressed because one or more lines are too long

BIN
dashboard/static/fonts/bootstrap-icons.woff Normal file
View file

Binary file not shown.

BIN
dashboard/static/fonts/bootstrap-icons.woff2 Normal file
View file

Binary file not shown.

4
dashboard/templates/base.html
View file

@ -15,9 +15,9 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
{% block style %} {% block style %}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css"> <script src="{% static 'fontawesomefree/js/all.min.js' %}"></script>
<link rel="stylesheet" href= "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
<link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet"> <link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "/css/bootstrap-icons.min.css" %}" rel="stylesheet">
<style> <style>
.bd-placeholder-img { .bd-placeholder-img {

1
dhub/settings.py
View file

@ -76,6 +76,7 @@ INSTALLED_APPS = [
"django.contrib.staticfiles", "django.contrib.staticfiles",
'django_extensions', 'django_extensions',
'django_bootstrap5', 'django_bootstrap5',
'fontawesomefree',
'django_tables2', 'django_tables2',
"rest_framework", "rest_framework",
"login", "login",

12
login/templates/login_base.html
View file

@ -13,11 +13,11 @@
{% endblock %} {% endblock %}
<title>{% block title %}{% if title %}{{ title }} – {% endif %}DeviceHub{% endblock %}</title> <title>{% block title %}{% if title %}{{ title }} – {% endif %}DeviceHub{% endblock %}</title>
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
{% block style %} {% block style %}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css"> <script src="{% static 'fontawesomefree/js/all.min.js' %}"></script>
<link rel="stylesheet" href= "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css">
<link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet"> <link href="{% static "/css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "/css/bootstrap-icons.min.css" %}" rel="stylesheet">
<style> <style>
.bd-placeholder-img { .bd-placeholder-img {
@ -107,9 +107,9 @@
</div> </div>
</footer> </footer>
<script src="/static/js/bootstrap.bundle.min.js"></script> <script src="{% static "js/jquery-3.3.1.slim.min.js" %}"></script>
<script src="https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity="sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" crossorigin="anonymous"></script> <script src="{% static "js/popper.min.js" %}"></script>
<script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.4/dist/Chart.min.js" integrity="sha384-zNy6FEbO50N+Cg5wap8IKA4M/ZnLJgzc6w2NqACZaK0u0FXfOWRRJOnQtpZun8ha" crossorigin="anonymous"></script> <script src="{% static "js/bootstrap.min.js" %}"></script>
<script> <script>
const togglePassword = document.querySelector('#togglePassword'); const togglePassword = document.querySelector('#togglePassword');
const password = document.querySelector('#id_password'); const password = document.querySelector('#id_password');

1
requirements.txt
View file

@ -4,6 +4,7 @@ django-bootstrap5==24.2
django-extensions==3.2.3 django-extensions==3.2.3
djangorestframework==3.15.1 djangorestframework==3.15.1
django-tables2==2.6.0 django-tables2==2.6.0
fontawesomefree==6.4.2
python-decouple==3.3 python-decouple==3.3
py-dmidecode==0.1.3 py-dmidecode==0.1.3
pandas==2.2.2 pandas==2.2.2