diff --git a/config/settings/base.py b/config/settings/base.py index 764ac2e..c713143 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -35,7 +35,6 @@ INSTALLED_APPS = [ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "django_bootstrap5", "flangr.posts", "flangr.circles", ] @@ -115,5 +114,3 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" MEDIA_URL = "media/" AUTH_USER_MODEL = "auth.User" - -STATICFILES_DIRS = ["flangr/static"] diff --git a/flangr/circles/urls.py b/flangr/circles/urls.py index d911ce4..54d0d59 100644 --- a/flangr/circles/urls.py +++ b/flangr/circles/urls.py @@ -6,5 +6,5 @@ app_name = "circles" urlpatterns = [ path("", views.CircleListView.as_view(), name="circle_list"), path("circle/", views.CircleUpdateView.as_view(), name="circle_update"), - path("circle/new", views.CircleCreateView.as_view(), name="circle_create"), + path("add", views.CircleCreateView.as_view(), name="circle_create"), ] diff --git a/flangr/circles/views.py b/flangr/circles/views.py index 3a77d30..590f5ed 100644 --- a/flangr/circles/views.py +++ b/flangr/circles/views.py @@ -34,7 +34,6 @@ class CircleCreateView(LoginRequiredMixin, CreateView): circle = form.save(commit=False) circle.owner = self.request.user circle.save() - form.save_m2m() return HttpResponseRedirect(self.get_success_url()) diff --git a/flangr/posts/urls.py b/flangr/posts/urls.py index fe472ee..7dc96a0 100644 --- a/flangr/posts/urls.py +++ b/flangr/posts/urls.py @@ -5,11 +5,5 @@ from . import views app_name = "posts" urlpatterns = [ path("post/", views.PostDetailView.as_view(), name="post_detail"), - path( - "post//fullscreen", - views.PostDetailView.as_view(template_name_suffix="_fullscreen"), - name="post_fullscreen", - ), path("post/new", views.PostCreateView.as_view(), name="post_create"), - path("posts", views.PostListView.as_view(), name="post_list"), ] diff --git a/flangr/posts/views.py b/flangr/posts/views.py index ffbd1ba..f3685e3 100644 --- a/flangr/posts/views.py +++ b/flangr/posts/views.py @@ -4,7 +4,6 @@ from django.http import HttpResponseRedirect from django.urls import reverse from django.views.generic import CreateView from django.views.generic import DetailView -from django.views.generic import ListView from django.views.generic.edit import ModelFormMixin from .models import Comment @@ -49,11 +48,5 @@ class PostCreateView(LoginRequiredMixin, CreateView): self.object = form.save(commit=False) self.object.user = self.request.user self.object.save() - form.save_m2m() return HttpResponseRedirect(self.get_success_url()) - - -class PostListView(LoginRequiredMixin, ListView): - def get_queryset(self): - return Post.objects.filter(circles__members=self.request.user) diff --git a/flangr/static/css/base.css b/flangr/static/css/base.css deleted file mode 100644 index c37ca54..0000000 --- a/flangr/static/css/base.css +++ /dev/null @@ -1,3 +0,0 @@ -.img-full { - object-fit: contain; -} diff --git a/flangr/templates/base.html b/flangr/templates/base.html index 302257b..0f1d64b 100644 --- a/flangr/templates/base.html +++ b/flangr/templates/base.html @@ -1,49 +1,6 @@ -{% load django_bootstrap5 %} -{% load static %} - Flangr - - {% bootstrap_css %} - {% block extracss %}{% endblock extracss %} - - {% block nav %} - - {% endblock nav %} - {% bootstrap_messages %} - {% block content %}{% endblock content %} - + {% block content %}{% endblock content %} diff --git a/flangr/templates/circles/circle_form.html b/flangr/templates/circles/circle_form.html index 622f6ac..1ccb008 100644 --- a/flangr/templates/circles/circle_form.html +++ b/flangr/templates/circles/circle_form.html @@ -1,17 +1,9 @@ {% extends "base.html" %} -{% load django_bootstrap5 %} - {% block content %} -
-
-
-

Create a new circle

-
- {% csrf_token %} - {% bootstrap_form form %} - {% bootstrap_button button_type="submit" content="OK" %} -
-
-
-
+

Circle {{ object.name }}

+
+ {% csrf_token %} + {{ form }} + +
{% endblock content %} diff --git a/flangr/templates/circles/circle_list.html b/flangr/templates/circles/circle_list.html index 899e1ca..e608e86 100644 --- a/flangr/templates/circles/circle_list.html +++ b/flangr/templates/circles/circle_list.html @@ -1,22 +1,9 @@ {% extends "base.html" %} {% block content %} -
-
-
-

Your Circles

- - - - - - {% for circle in object_list %} - - - - - {% endfor %} -
NameMembers
{{ circle.name }}{{ circle.members.all }}
-
-
-
+

Your Circles

+ {% endblock content %} diff --git a/flangr/templates/posts/post_detail.html b/flangr/templates/posts/post_detail.html index 726e5c2..57d573c 100644 --- a/flangr/templates/posts/post_detail.html +++ b/flangr/templates/posts/post_detail.html @@ -1,30 +1,20 @@ {% extends "base.html" %} -{% load django_bootstrap5 %} - {% block content %} -
-
-
- {% if object.title %} -

{{ object.title }}

- {% else %} -

{{ object.user.username }}

- {% endif %} - -
-
-

Comments

-
    - {% for comment in object.comments.all %} -
  • {{ comment.user }} - {{ comment.comment }}
    • - {% endfor %} -
-
- {% csrf_token %} - {% bootstrap_form form %} - {% bootstrap_button button_type="submit" content="OK" %} -
-
-
-
+ {% if object.title %} +

{{ object.title }}

+ {% else %} +

{{ object.user.username }}

+ {% endif %} + +

Comments

+
    + {% for comment in object.comments.all %} +
  • {{ comment.user }} - {{ comment.comment }}
    • + {% endfor %} +
+
+ {% csrf_token %} + {{ form }} + +
{% endblock content %} diff --git a/flangr/templates/posts/post_form.html b/flangr/templates/posts/post_form.html index 09ae82c..66bfaba 100644 --- a/flangr/templates/posts/post_form.html +++ b/flangr/templates/posts/post_form.html @@ -1,19 +1,10 @@ {% extends "base.html" %} -{% load django_bootstrap5 %} {% block content %} -
-
-
-

Upload a new picture

-
- {% csrf_token %} - {% bootstrap_form form %} - {% bootstrap_button button_type="submit" content="OK" %} - -
-
-
-
- +

Upload a new picture

+
+ {% csrf_token %} + {{ form }} + +
{% endblock content %} diff --git a/flangr/templates/posts/post_fullscreen.html b/flangr/templates/posts/post_fullscreen.html deleted file mode 100644 index 9200f39..0000000 --- a/flangr/templates/posts/post_fullscreen.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "base.html" %} -{% load django_bootstrap5 %} - -{% block nav %}{% endblock nav %} - -{% block content %} -
-
-

{{ object.title }}

- X -
-
- -
-
-{% endblock content %} diff --git a/flangr/templates/posts/post_list.html b/flangr/templates/posts/post_list.html deleted file mode 100644 index 5bc3c66..0000000 --- a/flangr/templates/posts/post_list.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "base.html" %} -{% block content %} -
-
-
-

Posts Shared with you

- -
-
-
-{% endblock content %} diff --git a/flangr/templates/registration/login.html b/flangr/templates/registration/login.html index fda684b..21dad4a 100644 --- a/flangr/templates/registration/login.html +++ b/flangr/templates/registration/login.html @@ -1,19 +1,10 @@ {% extends "base.html" %} -{% load django_bootstrap5 %} {% block content %} -
-
-
-

Login

-
- {% csrf_token %} - {% bootstrap_form form %} - {% bootstrap_button button_type="submit" content="OK" %} -
-
-
-
- - +

Login

+
+ {% csrf_token %} + {{ form }} + +
{% endblock content %} diff --git a/flangr/urls.py b/flangr/urls.py index 3485708..19577ed 100644 --- a/flangr/urls.py +++ b/flangr/urls.py @@ -16,20 +16,15 @@ Including another URLconf from django.conf import settings from django.conf.urls.static import static from django.contrib import admin -from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.urls import include from django.urls import path -from .posts.views import PostListView - urlpatterns = [ path("admin/", admin.site.urls), path("accounts/", include("django.contrib.auth.urls")), path("posts/", include("flangr.posts.urls")), path("circles/", include("flangr.circles.urls")), - path("", PostListView.as_view(), name="home"), ] if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) - urlpatterns += staticfiles_urlpatterns() diff --git a/requirements/base.txt b/requirements/base.txt index 9cf60c8..c49991b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,3 @@ pillow django coverage -django-bootstrap5 diff --git a/requirements/development.txt b/requirements/development.txt index 373944e..3290807 100644 --- a/requirements/development.txt +++ b/requirements/development.txt @@ -1,3 +1,2 @@ --r base.txt pre-commit flake8