diff --git a/requirements.txt b/requirements.txt index 77ced76..fc6e18e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,5 @@ Django==4.2.2 Pillow==9.5.0 fontawesomefree==6.4.0 mysqlclient==2.1.1 +django-filter==23.2 +django-tailwind==3.6.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 64c40bd..331ddfb 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,2 +1,3 @@ mypy==1.3.0 ruff==0.0.272 +django-browser-reload==1.10.0 diff --git a/src/FOSSDB/settings.py b/src/FOSSDB/settings.py index 8365263..76e80da 100644 --- a/src/FOSSDB/settings.py +++ b/src/FOSSDB/settings.py @@ -41,6 +41,7 @@ INSTALLED_APPS = [ "django_filters", "tailwind", "tokyonight_night", + "crispy_forms", "django_browser_reload", "fontawesomefree", "django.contrib.admin", diff --git a/src/apps/account/forms.py b/src/apps/account/forms.py index 149eafc..c5ac173 100644 --- a/src/apps/account/forms.py +++ b/src/apps/account/forms.py @@ -6,7 +6,7 @@ from .models import User class SignUpForm(UserCreationForm): - email = forms.EmailField(required=False) + email = forms.EmailField(required=False, help_text="Optional.") class Meta: model = User diff --git a/src/apps/account/templates/login.html b/src/apps/account/templates/login.html index e917deb..2552358 100644 --- a/src/apps/account/templates/login.html +++ b/src/apps/account/templates/login.html @@ -1,14 +1,32 @@ {% extends "base.html" %} {% load static %} {% block title %}{{ title }}{% endblock %} -{% block meta %}{% endblock %} +{% block meta %} + +{% endblock meta %} {% block content %} -
{% endblock %} diff --git a/src/apps/account/templates/signup.html b/src/apps/account/templates/signup.html index b88415b..aa76e63 100644 --- a/src/apps/account/templates/signup.html +++ b/src/apps/account/templates/signup.html @@ -1,12 +1,45 @@ {% extends "base.html" %} +{% load static %} {% block title %}{{ title }}{% endblock %} +{% block meta %} + +{% endblock meta %} {% block content %} - {% endblock %} diff --git a/src/apps/account/views.py b/src/apps/account/views.py index 4b1eca0..da3c102 100644 --- a/src/apps/account/views.py +++ b/src/apps/account/views.py @@ -22,15 +22,12 @@ def signup_view(request): if form.is_valid(): user = form.save() raw_password = form.cleaned_data.get("password1") - user = authenticate( - username=user.username, - password=raw_password, - ) + user = authenticate(username=user.username, password=raw_password) login(request, user) - return redirect("index") + return redirect("homepage") context = { - "title": "Sign Up", + "title": "FOSSDB | SignUp", "form": form, } return render(request, "signup.html", context) @@ -42,10 +39,10 @@ def login_view(request): if form.is_valid(): user = form.get_user() login(request, user) - return redirect("index") + return redirect("homepage") context = { - "title": "Login", + "title": "FOSSDB | Login", "form": form, } return render(request, "login.html", context) diff --git a/src/apps/tokyonight_night/static_src/src/styles.css b/src/apps/tokyonight_night/static_src/src/styles.css index 72ebe4e..6d3a34f 100644 --- a/src/apps/tokyonight_night/static_src/src/styles.css +++ b/src/apps/tokyonight_night/static_src/src/styles.css @@ -14,3 +14,17 @@ body { ::after { border-width: 0; } + +.border-gradient-horizontal { + position: relative; +} + +.border-gradient-horizontal::before { + content: ""; + position: absolute; + top: 0%; + width: 100%; + height: 0.25rem; + background: linear-gradient(to right, transparent, #27a1b9, transparent); + transform: translateY(-50%); +} diff --git a/src/apps/tokyonight_night/static_src/tailwind.config.js b/src/apps/tokyonight_night/static_src/tailwind.config.js index 461b690..2883ee0 100644 --- a/src/apps/tokyonight_night/static_src/tailwind.config.js +++ b/src/apps/tokyonight_night/static_src/tailwind.config.js @@ -43,21 +43,67 @@ module.exports = { ], theme: { colors: { + darkslateblue: "#3d59a1", + cornflowerblue: "#7aa2f7", gray: { - 100: "#1a1b26", - 200: "#15161e", - 300: "#16161e", + 100: "#37222c", + 200: "#1f2231", + 300: "#1a1b26", + 400: "#16161e", + 500: "#15161e", }, - indianred: "#db4b4b", - burlywood: "#e0af68", - + darkslategray: { + 100: "#2c5a66", + 200: "#414868", + 300: "#3b4261", + 400: "#283457", + 500: "#292e42", + 600: "#20303b", + }, + skyblue: { + 100: "#89ddff", + 200: "#2ac3de", + 300: "#0db9d7", + }, + paleturquoise: "#b4f9f8", + steelblue: { + 100: "#6183bb", + 200: "#536c9e", + 300: "#565f89", + 400: "#394b70", + }, + cadetblue: { + 100: "#41a6b5", + 200: "#449dab", + 300: "#27a1b9", + }, + lightskyblue: "#7dcfff", lightsteelblue: { 100: "#c0caf5", 200: "#a9b1d6", }, - skyblue: "#0db9d7", - crimson: "#f52a65", - slategray: "#737aa2", + indianred: { + 100: "#db4b4b", + 200: "#b2555b", + 300: "#914c54", + }, + sienna: "#713137", + slategray: { + 100: "#737aa2", + 200: "#545c7e", + }, + mediumturquoise: "#73daca", + lightgreen: "#9ece6a", + teal: "#266d6a", + burlywood: "#e0af68", + mediumaquamarine: "#1abc9c", + lightcoral: "#f7768e", + mediumpurple: { + 100: "#bb9af7", + 200: "#9d7cd8", + }, + sandybrown: "#ff9e64", + deeppink: "#ff007c", }, fontFamily: { rationale: [ @@ -81,9 +127,9 @@ module.exports = { base: "1rem", xl: "1.25rem", "4xl": "4rem", + xs: "0.75rem", }, extend: {}, - extend: {}, }, plugins: [ /** diff --git a/src/apps/tokyonight_night/templates/base.html b/src/apps/tokyonight_night/templates/base.html index edf3bc2..b2674ce 100644 --- a/src/apps/tokyonight_night/templates/base.html +++ b/src/apps/tokyonight_night/templates/base.html @@ -4,15 +4,25 @@ + + + + + + {% tailwind_css %} + {% block meta %}{% endblock %}