diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..93559cf Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index e33bdf1..f1fb9ae 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ env ACMAS/package-lock.json ACMAS/package.json ACMAS/app/db.sqlite3 -ACMAS/node_modules \ No newline at end of file +ACMAS/node_modules +**/.DS_Store \ No newline at end of file diff --git a/ACMAS/app/ACMAS_Web/components/dropdown_profile/dropdown_profile.html b/ACMAS/app/ACMAS_Web/components/dropdown_profile/dropdown_profile.html new file mode 100644 index 0000000..cf0c621 --- /dev/null +++ b/ACMAS/app/ACMAS_Web/components/dropdown_profile/dropdown_profile.html @@ -0,0 +1,188 @@ +{% load component_tags %} + + + +
+ + + \ No newline at end of file diff --git a/ACMAS/app/ACMAS_Web/components/dropdown_profile/dropdown_profile.py b/ACMAS/app/ACMAS_Web/components/dropdown_profile/dropdown_profile.py new file mode 100644 index 0000000..250604e --- /dev/null +++ b/ACMAS/app/ACMAS_Web/components/dropdown_profile/dropdown_profile.py @@ -0,0 +1,9 @@ +from django_components import component + + +@component.register("dropdown_profile") +class dropdown_profile(component.Component): + template_name = "dropdown_profile/dropdown_profile.html" + + +# {% component "dropdown_profile" %} diff --git a/ACMAS/app/ACMAS_Web/components/icon/icon.py b/ACMAS/app/ACMAS_Web/components/icon/icon.py index 84efff7..e080c3a 100644 --- a/ACMAS/app/ACMAS_Web/components/icon/icon.py +++ b/ACMAS/app/ACMAS_Web/components/icon/icon.py @@ -16,7 +16,8 @@ def get_context_data(self, icon, icon_type, icon_class): # {% component "icon" icon="" icon_type="" icon_class="" %} # icon: "information-circle", ... (same naming as the website: https://heroicons.com/) # icon_type: "outline", "solid", "mini" -# icon_class: defaults with "w-5 h-5", you can add other classes for tailwind "..." +# icon_class: defaults with "w-5 h-5", to change fill color "fill-gray-100" (svg fill in tailwind), +# you can add other classes from tailwind "..." # NOTE need to load following line at the top of component's html to do nested components # {% load component_tags %} diff --git a/ACMAS/app/ACMAS_Web/templates/_base.html b/ACMAS/app/ACMAS_Web/templates/_base.html index 670cebf..e7ff74a 100644 --- a/ACMAS/app/ACMAS_Web/templates/_base.html +++ b/ACMAS/app/ACMAS_Web/templates/_base.html @@ -84,7 +84,7 @@ } } - + @@ -92,21 +92,21 @@ {% comment %} - {% endcomment %} + {% endcomment %} @@ -161,19 +179,22 @@ {% block content %} {% endblock content %}
+ + + - + {% endblock body %}