diff --git a/cocktail/__pycache__/settings.cpython-37.pyc b/cocktail/__pycache__/settings.cpython-37.pyc index 835cc4a..619f373 100644 Binary files a/cocktail/__pycache__/settings.cpython-37.pyc and b/cocktail/__pycache__/settings.cpython-37.pyc differ diff --git a/cocktail/cocktail_img/cocktail_img/Adam_Kadmon_Complotti.jpg b/cocktail/cocktail_img/cocktail_img/Adam_Kadmon_Complotti.jpg new file mode 100644 index 0000000..3adc9cc Binary files /dev/null and b/cocktail/cocktail_img/cocktail_img/Adam_Kadmon_Complotti.jpg differ diff --git a/cocktail/cocktail_img/cocktail_img/dark-and-stormy-720x720-recipe-95f288ed6697444ab3301f8670b4564e.jpg b/cocktail/cocktail_img/cocktail_img/dark-and-stormy-720x720-recipe-95f288ed6697444ab3301f8670b4564e.jpg new file mode 100644 index 0000000..ba515e9 Binary files /dev/null and b/cocktail/cocktail_img/cocktail_img/dark-and-stormy-720x720-recipe-95f288ed6697444ab3301f8670b4564e.jpg differ diff --git a/cocktail/cocktail_img/cocktail_img/french_connection.jpg b/cocktail/cocktail_img/cocktail_img/french_connection.jpg new file mode 100644 index 0000000..6e948fa Binary files /dev/null and b/cocktail/cocktail_img/cocktail_img/french_connection.jpg differ diff --git a/cocktail/settings.py b/cocktail/settings.py index d94a2d6..1212b15 100644 --- a/cocktail/settings.py +++ b/cocktail/settings.py @@ -37,7 +37,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'cocktail_list' + 'cocktail_list', + 'crispy_forms' ] MIDDLEWARE = [ @@ -82,6 +83,8 @@ DATABASES = { } } +CRISPY_TEMPLATE_PACK = 'bootstrap4' + # Password validation # https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators diff --git a/cocktail/templates/base.html b/cocktail/templates/base.html index bae39fe..abaecbe 100644 --- a/cocktail/templates/base.html +++ b/cocktail/templates/base.html @@ -19,6 +19,9 @@ Strumenti Bicchieri Random Cocktail + {% if request.user.is_staff %} + Crea Cocktail + {% endif %}
diff --git a/cocktail_list/__pycache__/forms.cpython-37.pyc b/cocktail_list/__pycache__/forms.cpython-37.pyc new file mode 100644 index 0000000..8cc583a Binary files /dev/null and b/cocktail_list/__pycache__/forms.cpython-37.pyc differ diff --git a/cocktail_list/__pycache__/urls.cpython-37.pyc b/cocktail_list/__pycache__/urls.cpython-37.pyc index 913fc11..819a32d 100644 Binary files a/cocktail_list/__pycache__/urls.cpython-37.pyc and b/cocktail_list/__pycache__/urls.cpython-37.pyc differ diff --git a/cocktail_list/__pycache__/views.cpython-37.pyc b/cocktail_list/__pycache__/views.cpython-37.pyc index 497a0a1..bcfabae 100644 Binary files a/cocktail_list/__pycache__/views.cpython-37.pyc and b/cocktail_list/__pycache__/views.cpython-37.pyc differ diff --git a/cocktail_list/forms.py b/cocktail_list/forms.py new file mode 100644 index 0000000..fcdd2a6 --- /dev/null +++ b/cocktail_list/forms.py @@ -0,0 +1,9 @@ +from django.forms import ModelForm +from .models import Cocktail + +class CocktailForm(ModelForm): + + + class Meta: + model = Cocktail + fields = '__all__' \ No newline at end of file diff --git a/cocktail_list/templates/crea_cocktail.html b/cocktail_list/templates/crea_cocktail.html new file mode 100644 index 0000000..dc20f78 --- /dev/null +++ b/cocktail_list/templates/crea_cocktail.html @@ -0,0 +1,16 @@ +{% extends 'base.html' %} +{% load static %} +{% load crispy_forms_tags %} + +{% block css %} + +{% endblock css %} + + +{% block content %} + + {% csrf_token %} + {{ form|crispy }} +
+
+{% endblock content %} \ No newline at end of file diff --git a/cocktail_list/urls.py b/cocktail_list/urls.py index de9f2c3..a8a8fbc 100644 --- a/cocktail_list/urls.py +++ b/cocktail_list/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from .views import homepage,cocktail,cerca,random_cocktail,strumenti_cocktail,bicchieri_cocktail +from .views import homepage,cocktail,cerca,random_cocktail,strumenti_cocktail,bicchieri_cocktail,createCocktail urlpatterns = [ path("",homepage,name="Homepage"), @@ -7,6 +7,7 @@ urlpatterns = [ path("cerca/",cerca,name="cerca"), path("random_cocktail/",random_cocktail,name="random_cocktail"), path("strumenti/",strumenti_cocktail,name="strumenti-list"), - path("bicchieri/",bicchieri_cocktail,name="bicchieri-list") + path("bicchieri/",bicchieri_cocktail,name="bicchieri-list"), + path("crea-cocktail/",createCocktail,name="crea-cocktail") ] \ No newline at end of file diff --git a/cocktail_list/views.py b/cocktail_list/views.py index da15fde..abc5669 100644 --- a/cocktail_list/views.py +++ b/cocktail_list/views.py @@ -1,6 +1,8 @@ from django.shortcuts import render,get_object_or_404,redirect from .models import Cocktail,Ingredienti,Strumenti,Bicchieri +from .forms import CocktailForm import random + # Create your views here. @@ -73,4 +75,16 @@ def cerca(request): context = {"querystring":querystring,"cocktail":cocktail,"ingrediente":searching_ingred} return render(request,"cerca.html",context) else: - return render(request,"cerca.html") \ No newline at end of file + return render(request,"cerca.html") + +def createCocktail(request): + if request.method == "POST": + form = CocktailForm(request.POST,request.FILES) + if form.is_valid(): + cocktail = form.save() + return redirect("cocktail", nome_cocktail=cocktail.nome_cocktail) + else: + form = CocktailForm() + context = {"form":form} + return render(request,"crea_cocktail.html",context) + diff --git a/db.sqlite3 b/db.sqlite3 index aadd947..31a3a73 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ