diff --git a/LITReview/LITReview/urls.py b/LITReview/LITReview/urls.py index f6b576a..6718a3c 100644 --- a/LITReview/LITReview/urls.py +++ b/LITReview/LITReview/urls.py @@ -38,6 +38,8 @@ urlpatterns = [ path('flux/', reviews.views.flux, name='flux'), path('posts/', reviews.views.posts, name='posts'), path('subscribed/', reviews.views.subscribed, name='subscribed'), + path('ticket/add/', reviews.views.create_ticket, name='ticket-add'), + path('review/add/', reviews.views.create_review, name='review-add'), ] if settings.DEBUG: diff --git a/LITReview/media/uploads/git.jpeg b/LITReview/media/uploads/git.jpeg new file mode 100644 index 0000000..1197046 Binary files /dev/null and b/LITReview/media/uploads/git.jpeg differ diff --git a/LITReview/reviews/admin.py b/LITReview/reviews/admin.py index 8c38f3f..bce8588 100644 --- a/LITReview/reviews/admin.py +++ b/LITReview/reviews/admin.py @@ -1,3 +1,7 @@ from django.contrib import admin +from reviews.models import Ticket, Review, UserFollows -# Register your models here. + +admin.site.register(Ticket) +admin.site.register(Review) +admin.site.register(UserFollows) diff --git a/LITReview/reviews/forms.py b/LITReview/reviews/forms.py new file mode 100644 index 0000000..1bd33ef --- /dev/null +++ b/LITReview/reviews/forms.py @@ -0,0 +1,8 @@ +from django import forms +from . import models + + +class TicketForm(forms.ModelForm): + class Meta: + model = models.Ticket + fields = ['title', 'body', 'image'] diff --git a/LITReview/reviews/models.py b/LITReview/reviews/models.py index a9f5574..86d1d1b 100644 --- a/LITReview/reviews/models.py +++ b/LITReview/reviews/models.py @@ -5,9 +5,9 @@ from django.db import models class Ticket(models.Model): # Your Ticket model definition goes here - title = models.CharField(max_length=100) + title = models.CharField("Titre", max_length=100) topic = models.CharField(max_length=100) - body = models.CharField(max_length=8192) + body = models.CharField("Description", max_length=8192) user = models.ForeignKey( to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE) image = models.ImageField(upload_to="uploads/") @@ -29,10 +29,11 @@ class Review(models.Model): class UserFollows(models.Model): # Your UserFollows model definition goes here - + user = models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + class Meta: # ensures we don't get multiple UserFollows instances # for unique user-user_followed pairs pass #unique_together = ('user', 'followed_user', ) - pass + diff --git a/LITReview/reviews/templates/reviews/create_review.html b/LITReview/reviews/templates/reviews/create_review.html new file mode 100644 index 0000000..667e4cf --- /dev/null +++ b/LITReview/reviews/templates/reviews/create_review.html @@ -0,0 +1,23 @@ +{% extends 'base.html' %} + +{% block content %} + +
+
+
+

Créer une critique

+
+
+
+

Livre/Article

+
+ {% csrf_token %} + +
+
+
+

Critique

+
+
+ +{% endblock %} diff --git a/LITReview/reviews/templates/reviews/create_ticket.html b/LITReview/reviews/templates/reviews/create_ticket.html new file mode 100644 index 0000000..db989ad --- /dev/null +++ b/LITReview/reviews/templates/reviews/create_ticket.html @@ -0,0 +1,29 @@ +{% extends 'base.html' %} + +{% block content %} + +
+
+
+

Créer un ticket

+
+
+
+
+ + {% csrf_token %} + +
{{ ticket_form.title }}
+ +
{{ ticket_form.body }}
+ +
{{ ticket_form.image }}
+
+ +
+ +
+
+
+ +{% endblock %} diff --git a/LITReview/reviews/templates/reviews/home.html b/LITReview/reviews/templates/reviews/home.html index f92c699..4112106 100644 --- a/LITReview/reviews/templates/reviews/home.html +++ b/LITReview/reviews/templates/reviews/home.html @@ -1,17 +1,20 @@ {% extends 'base.html' %} -{% block nav %} - - -{% endblock %} {% block content %} -

Bienvenue {{ user.name }}

+
+
+
+

Bienvenue {{ request.user }}

+
+
+
+
+ Demander une critique +
+
+ Créer une critique +
+
+
+ {% endblock %} diff --git a/LITReview/reviews/views.py b/LITReview/reviews/views.py index 04c2d57..2080dfc 100644 --- a/LITReview/reviews/views.py +++ b/LITReview/reviews/views.py @@ -1,4 +1,6 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect +from reviews.models import Ticket +from reviews.forms import TicketForm def home(request): return render(request, 'reviews/home.html') @@ -13,3 +15,25 @@ def subscribed(request): return render(request, 'reviews/subscribed.html') +def create_ticket(request): + ticket_form = TicketForm() + if request.method == 'POST': + ticket_form = TicketForm(request.POST, request.FILES) + if ticket_form.is_valid(): + ticket = ticket_form.save(commit=False) + ticket.user = request.user + ticket.save() + + return render(request, + 'reviews/create_ticket.html', + context = {'ticket_form': ticket_form}) + +def create_review(request): + pass + +def follow_user(request): + pass + +def unfollow_user(request): + pass + diff --git a/LITReview/templates/base.html b/LITReview/templates/base.html index 2012205..e02fd31 100644 --- a/LITReview/templates/base.html +++ b/LITReview/templates/base.html @@ -1,4 +1,3 @@ - @@ -10,12 +9,31 @@
-
-
-

LITReview

+
- {% block nav %}{% endblock %} + +
{% block content %}{% endblock %}