From deb505d740fe42ac4ff005f7a06ca8c14f5a2582 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Thu, 8 Feb 2018 22:29:10 +0100 Subject: [PATCH] restructure --- .idea/workspace.xml | 192 +++++++++++++++++++++---------------- cookbook/urls.py | 12 +-- cookbook/views/__init__.py | 1 + cookbook/views/edit.py | 32 +++++++ cookbook/views/new.py | 59 ++++++++++++ cookbook/views/views.py | 79 --------------- 6 files changed, 209 insertions(+), 166 deletions(-) create mode 100644 cookbook/views/new.py diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1868d7a1..9e9433fb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,15 +2,11 @@ - - + - - - - + @@ -264,7 +287,7 @@ - + @@ -340,10 +363,11 @@ + - + @@ -351,7 +375,6 @@ - @@ -419,13 +442,6 @@ - - - - - - - @@ -643,50 +659,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -703,18 +675,76 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + diff --git a/cookbook/urls.py b/cookbook/urls.py index 028bb4f4..9ebaca66 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -5,13 +5,13 @@ from cookbook.views import api urlpatterns = [ path('', views.index, name='index'), - path('new/recipe', views.new_recipe, name='new_recipe'), - path('new/category', views.new_category, name='new_category'), - path('new/keyword', views.new_keyword, name='new_keyword'), + path('new/recipe', new.recipe, name='new_recipe'), + path('new/category', new.category, name='new_category'), + path('new/keyword', new.keyword, name='new_keyword'), - path('edit/recipe//', views.edit_recipe, name='edit_recipe'), - path('edit/category//', views.edit_category, name='edit_category'), - path('edit/keyword//', views.new_keyword, name='edit_keyword'), + path('edit/recipe//', edit.recipe, name='edit_recipe'), + path('edit/category//', edit.category, name='edit_category'), + path('edit/keyword//', edit.keyword, name='edit_keyword'), path('batch/import', batch.batch_import, name='batch_import'), path('batch/category', batch.batch_edit, name='batch_edit'), diff --git a/cookbook/views/__init__.py b/cookbook/views/__init__.py index 54b4ff0e..9b99fbd0 100644 --- a/cookbook/views/__init__.py +++ b/cookbook/views/__init__.py @@ -2,3 +2,4 @@ from cookbook.views.views import * from cookbook.views.api import * from cookbook.views.batch import * from cookbook.views.edit import * +from cookbook.views.new import * diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py index e69de29b..a655287d 100644 --- a/cookbook/views/edit.py +++ b/cookbook/views/edit.py @@ -0,0 +1,32 @@ +from django.contrib.auth.decorators import login_required +from django.shortcuts import redirect, render + +from cookbook.forms import RecipeForm, EditRecipeForm +from cookbook.models import Recipe + + +@login_required +def recipe(request, recipe_id): + if request.method == "POST": + form = RecipeForm(request.POST) + if form.is_valid(): + recipe_obj = form.save(commit=False) + recipe_obj.created_by = request.user.id + recipe_obj.save() + form.save_m2m() + return redirect('edit_recipe/' + recipe_id) + else: + recipe_obj = Recipe.objects.get(id=recipe_id) + form = EditRecipeForm(instance=recipe_obj) + + return render(request, 'new_recipe.html', {'from': form}) + + +@login_required +def category(request, category_id): + return render(request, 'index.html') + + +@login_required +def keyword(request, keyword_id): + return render(request, 'index.html') diff --git a/cookbook/views/new.py b/cookbook/views/new.py new file mode 100644 index 00000000..d289b829 --- /dev/null +++ b/cookbook/views/new.py @@ -0,0 +1,59 @@ +from django.contrib.auth.decorators import login_required +from django.shortcuts import redirect, render +from django_tables2 import RequestConfig + +from cookbook.forms import CategoryForm, KeywordForm, RecipeForm +from cookbook.models import Category, Keyword +from cookbook.tables import CategoryTable, KeywordTable + + +@login_required +def recipe(request): + if request.method == "POST": + form = RecipeForm(request.POST) + if form.is_valid(): + recipe_obj = form.save(commit=False) + recipe_obj.created_by = request.user.id + recipe_obj.save() + form.save_m2m() + return redirect('index') + else: + form = RecipeForm() + + return render(request, 'new_recipe.html', {'form': form}) + + +@login_required +def category(request): + if request.method == "POST": + form = CategoryForm(request.POST) + if form.is_valid(): + category_obj = form.save(commit=False) + category_obj.created_by = request.user.id + category_obj.save() + return redirect('new_category') + else: + form = CategoryForm() + + table = CategoryTable(Category.objects.all()) + RequestConfig(request, paginate={'per_page': 25}).configure(table) + + return render(request, 'new_category.html', {'form': form, 'table': table}) + + +@login_required +def keyword(request): + if request.method == "POST": + form = KeywordForm(request.POST) + if form.is_valid(): + keyword_obj = form.save(commit=False) + keyword_obj.created_by = request.user.id + keyword_obj.save() + return redirect('new_keyword') + else: + form = KeywordForm() + + table = KeywordTable(Keyword.objects.all()) + RequestConfig(request, paginate={'per_page': 25}).configure(table) + + return render(request, 'new_keyword.html', {'form': form, 'table': table}) diff --git a/cookbook/views/views.py b/cookbook/views/views.py index 7774cc84..8ed03500 100644 --- a/cookbook/views/views.py +++ b/cookbook/views/views.py @@ -18,82 +18,3 @@ def index(request): return render(request, 'index.html', {'recipes': table, 'filter': f}) else: return render(request, 'index.html') - - -@login_required -def edit_recipe(request, recipe_id): - if request.method == "POST": - form = RecipeForm(request.POST) - if form.is_valid(): - recipe = form.save(commit=False) - recipe.created_by = request.user.id - recipe.save() - form.save_m2m() - return redirect('edit_recipe/' + recipe_id) - else: - recipe = Recipe.objects.get(id=recipe_id) - form = EditRecipeForm(instance=recipe) - - return render(request, 'new_recipe.html', {'from': form}) - - -@login_required -def edit_category(request, category_id): - return render(request, 'index.html') - - -@login_required -def edit_keyword(request, keyword_id): - return render(request, 'index.html') - - -@login_required -def new_recipe(request): - if request.method == "POST": - form = RecipeForm(request.POST) - if form.is_valid(): - recipe = form.save(commit=False) - recipe.created_by = request.user.id - recipe.save() - form.save_m2m() - return redirect('index') - else: - form = RecipeForm() - - return render(request, 'new_recipe.html', {'form': form}) - - -@login_required -def new_category(request): - if request.method == "POST": - form = CategoryForm(request.POST) - if form.is_valid(): - category = form.save(commit=False) - category.created_by = request.user.id - category.save() - return redirect('new_category') - else: - form = CategoryForm() - - table = CategoryTable(Category.objects.all()) - RequestConfig(request, paginate={'per_page': 25}).configure(table) - - return render(request, 'new_category.html', {'form': form, 'table': table}) - - -@login_required -def new_keyword(request): - if request.method == "POST": - form = KeywordForm(request.POST) - if form.is_valid(): - keyword = form.save(commit=False) - keyword.created_by = request.user.id - keyword.save() - return redirect('new_keyword') - else: - form = KeywordForm() - - table = KeywordTable(Keyword.objects.all()) - RequestConfig(request, paginate={'per_page': 25}).configure(table) - - return render(request, 'new_keyword.html', {'form': form, 'table': table})