mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

lots of things working

Browse Source
This commit is contained in:
vabene1111
2018-02-01 12:16:39 +01:00
parent 572e0b5fc9
commit 901ae9053a
13 changed files with 333 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

360
.idea/workspace.xml generated
View File

@@ -2,8 +2,17 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f314243c-cf5d-48a7-b986-5e05ee924c9f" name="Default" comment=""> <list default="true" id="f314243c-cf5d-48a7-b986-5e05ee924c9f" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/cookbook/filters.py" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/Recipies/settings.py" afterPath="$PROJECT_DIR$/Recipies/settings.py" />
<change beforePath="$PROJECT_DIR$/Recipies/urls.py" afterPath="$PROJECT_DIR$/Recipies/urls.py" />
<change beforePath="$PROJECT_DIR$/cookbook/forms.py" afterPath="$PROJECT_DIR$/cookbook/forms.py" />
<change beforePath="$PROJECT_DIR$/cookbook/tables.py" afterPath="$PROJECT_DIR$/cookbook/tables.py" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/index.html" afterPath="$PROJECT_DIR$/cookbook/templates/index.html" /> <change beforePath="$PROJECT_DIR$/cookbook/templates/index.html" afterPath="$PROJECT_DIR$/cookbook/templates/index.html" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/registration/login.html" afterPath="$PROJECT_DIR$/cookbook/templates/registration/login.html" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" afterPath="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" />
<change beforePath="$PROJECT_DIR$/cookbook/views.py" afterPath="$PROJECT_DIR$/cookbook/views.py" />
<change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@@ -24,7 +33,7 @@
<expand> <expand>
<path> <path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
<item name="Test DB" type="feb32156:DbDataSourceImpl" /> <item name="Django default" type="feb32156:DbDataSourceImpl" />
</path> </path>
</expand> </expand>
<select /> <select />
@@ -37,8 +46,8 @@
<file leaf-file-name="views.py" pinned="false" current-in-tab="false"> <file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/views.py"> <entry file="file://$PROJECT_DIR$/cookbook/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="300">
<caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" /> <caret line="14" column="38" lean-forward="false" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
<folding> <folding>
<element signature="e#0#49#0" expanded="true" /> <element signature="e#0#49#0" expanded="true" />
</folding> </folding>
@@ -46,63 +55,43 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="tables.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="25" column="29" lean-forward="false" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="filters.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding>
<element signature="e#0#21#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false"> <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Recipies/settings.py"> <entry file="file://$PROJECT_DIR$/Recipies/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1725"> <state relative-caret-position="501">
<caret line="69" column="10" lean-forward="false" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" /> <caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="8" column="41" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="base.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1325">
<caret line="53" column="23" lean-forward="false" selection-start-line="53" selection-start-column="23" selection-end-line="53" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="new_category.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
<caret line="34" column="22" lean-forward="false" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@@ -113,8 +102,8 @@
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Python Script" />
<option value="HTML File" /> <option value="HTML File" />
<option value="Python Script" />
</list> </list>
</option> </option>
</component> </component>
@@ -124,6 +113,7 @@
<find>LOGIN_REDIRECT_URL</find> <find>LOGIN_REDIRECT_URL</find>
<find>'django.template.context_processors.request'</find> <find>'django.template.context_processors.request'</find>
<find>of</find> <find>of</find>
<find>trans</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@@ -134,20 +124,22 @@
<list> <list>
<option value="$PROJECT_DIR$/cookbook/admin.py" /> <option value="$PROJECT_DIR$/cookbook/admin.py" />
<option value="$PROJECT_DIR$/cookbook/templates/registration.html" /> <option value="$PROJECT_DIR$/cookbook/templates/registration.html" />
<option value="$PROJECT_DIR$/cookbook/templates/registration/login.html" />
<option value="$PROJECT_DIR$/Recipies/urls.py" />
<option value="$PROJECT_DIR$/cookbook/templates/registration/new_keyword.html" /> <option value="$PROJECT_DIR$/cookbook/templates/registration/new_keyword.html" />
<option value="$PROJECT_DIR$/cookbook/templates/new_recipe.html" /> <option value="$PROJECT_DIR$/cookbook/templates/new_recipe.html" />
<option value="$PROJECT_DIR$/cookbook/urls.py" /> <option value="$PROJECT_DIR$/cookbook/urls.py" />
<option value="$PROJECT_DIR$/cookbook/templates/base.html" />
<option value="$PROJECT_DIR$/cookbook/models.py" />
<option value="$PROJECT_DIR$/cookbook/templates/new_category.html" />
<option value="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" />
<option value="$PROJECT_DIR$/cookbook/locale/de/LC_MESSAGES/django.po" />
<option value="$PROJECT_DIR$/Recipies/urls.py" />
<option value="$PROJECT_DIR$/cookbook/templates/registration/login.html" />
<option value="$PROJECT_DIR$/cookbook/forms.py" /> <option value="$PROJECT_DIR$/cookbook/forms.py" />
<option value="$PROJECT_DIR$/Recipies/settings.py" /> <option value="$PROJECT_DIR$/Recipies/settings.py" />
<option value="$PROJECT_DIR$/cookbook/templates/base.html" /> <option value="$PROJECT_DIR$/cookbook/filters.py" />
<option value="$PROJECT_DIR$/cookbook/tables.py" />
<option value="$PROJECT_DIR$/cookbook/models.py" />
<option value="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" />
<option value="$PROJECT_DIR$/cookbook/templates/new_category.html" />
<option value="$PROJECT_DIR$/cookbook/views.py" />
<option value="$PROJECT_DIR$/cookbook/templates/index.html" /> <option value="$PROJECT_DIR$/cookbook/templates/index.html" />
<option value="$PROJECT_DIR$/cookbook/views.py" />
<option value="$PROJECT_DIR$/cookbook/tables.py" />
</list> </list>
</option> </option>
</component> </component>
@@ -182,6 +174,7 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@@ -194,6 +187,42 @@
<item name="Recipies" type="462c0819:PsiDirectoryNode" /> <item name="Recipies" type="462c0819:PsiDirectoryNode" />
<item name="cookbook" type="462c0819:PsiDirectoryNode" /> <item name="cookbook" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="Recipies" type="b2602c69:ProjectViewProjectNode" />
<item name="Recipies" type="462c0819:PsiDirectoryNode" />
<item name="cookbook" type="462c0819:PsiDirectoryNode" />
<item name="locale" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Recipies" type="b2602c69:ProjectViewProjectNode" />
<item name="Recipies" type="462c0819:PsiDirectoryNode" />
<item name="cookbook" type="462c0819:PsiDirectoryNode" />
<item name="locale" type="462c0819:PsiDirectoryNode" />
<item name="de" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Recipies" type="b2602c69:ProjectViewProjectNode" />
<item name="Recipies" type="462c0819:PsiDirectoryNode" />
<item name="cookbook" type="462c0819:PsiDirectoryNode" />
<item name="locale" type="462c0819:PsiDirectoryNode" />
<item name="de" type="462c0819:PsiDirectoryNode" />
<item name="LC_MESSAGES" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Recipies" type="b2602c69:ProjectViewProjectNode" />
<item name="Recipies" type="462c0819:PsiDirectoryNode" />
<item name="cookbook" type="462c0819:PsiDirectoryNode" />
<item name="locale" type="462c0819:PsiDirectoryNode" />
<item name="en" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Recipies" type="b2602c69:ProjectViewProjectNode" />
<item name="Recipies" type="462c0819:PsiDirectoryNode" />
<item name="cookbook" type="462c0819:PsiDirectoryNode" />
<item name="locale" type="462c0819:PsiDirectoryNode" />
<item name="en" type="462c0819:PsiDirectoryNode" />
<item name="LC_MESSAGES" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="Recipies" type="b2602c69:ProjectViewProjectNode" /> <item name="Recipies" type="b2602c69:ProjectViewProjectNode" />
<item name="Recipies" type="462c0819:PsiDirectoryNode" /> <item name="Recipies" type="462c0819:PsiDirectoryNode" />
@@ -223,7 +252,6 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@@ -232,7 +260,7 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="DefaultHtmlFileTemplate" value="HTML File" /> <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="com.intellij.database.dataSource.DataSourceTemplate" value="Sqlite (Xerial)" /> <property name="com.intellij.database.dataSource.DataSourceTemplate" value="Sqlite (Xerial)" />
<property name="SearchEverywhereHistoryKey" value="settings&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py&#10;base&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/templates/base.html&#10;mode&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;model&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settin&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py" /> <property name="SearchEverywhereHistoryKey" value="model&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settings&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py&#10;forms&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/forms.py&#10;base&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/templates/base.html&#10;mode&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settin&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
@@ -300,9 +328,9 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26030254" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2597809" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968178" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20265251" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20450929" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23952255" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23952255" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="SciView" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -330,22 +358,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
<caret line="34" column="22" lean-forward="false" selection-start-line="34" selection-start-column="22" selection-end-line="34" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html"> <entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50"> <state relative-caret-position="50">
@@ -419,7 +431,7 @@
<state relative-caret-position="575"> <state relative-caret-position="575">
<caret line="23" column="1" lean-forward="true" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" /> <caret line="23" column="1" lean-forward="true" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
<folding> <folding>
<element signature="e#632#669#0" expanded="false" /> <element signature="e#632#676#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -437,7 +449,7 @@
<state relative-caret-position="200"> <state relative-caret-position="200">
<caret line="8" column="41" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> <caret line="8" column="41" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#28#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -586,32 +598,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/registration/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="15" lean-forward="true" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Recipies/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="23" column="1" lean-forward="true" selection-start-line="23" selection-start-column="1" selection-end-line="23" selection-end-column="1" />
<folding>
<element signature="e#632#669#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/forms.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575"> <state relative-caret-position="575">
@@ -619,14 +605,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1325">
<caret line="53" column="23" lean-forward="false" selection-start-line="53" selection-start-column="23" selection-end-line="53" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="das://table:/76de5693/85add68a-b15d-441c-9865-ed9a59ea29b9/main.cookbook_recipe"> <entry file="das://table:/76de5693/85add68a-b15d-441c-9865-ed9a59ea29b9/main.cookbook_recipe">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider"> <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state> <state>
@@ -648,6 +626,74 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/tables/table_template.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="662">
<caret line="70" column="0" lean-forward="false" selection-start-line="70" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/registration/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="25" column="47" lean-forward="true" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Recipies/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="41" lean-forward="true" selection-start-line="12" selection-start-column="41" selection-end-line="12" selection-end-column="41" />
<folding>
<element signature="e#632#676#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/locale/de/LC_MESSAGES/django.po">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="28" lean-forward="true" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding>
<element signature="e#0#28#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="14" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3">
<caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="501">
<caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="41" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/models.py"> <entry file="file://$PROJECT_DIR$/cookbook/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850"> <state relative-caret-position="850">
@@ -656,60 +702,46 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/tables/table_template.html"> <entry file="file://$PROJECT_DIR$/cookbook/forms.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1075"> <state relative-caret-position="1178">
<caret line="67" column="72" lean-forward="false" selection-start-line="67" selection-start-column="72" selection-end-line="67" selection-end-column="72" /> <caret line="57" column="0" lean-forward="false" selection-start-line="57" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cookbook/urls.py"> <entry file="file://$PROJECT_DIR$/cookbook/filters.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="275">
<caret line="8" column="41" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" /> <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#28#0" expanded="true" /> <element signature="e#0#21#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1725">
<caret line="69" column="10" lean-forward="false" selection-start-line="69" selection-start-column="10" selection-end-line="69" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="21" column="27" lean-forward="false" selection-start-line="21" selection-start-column="27" selection-end-line="21" selection-end-column="27" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html"> <entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500"> <state relative-caret-position="625">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> <caret line="25" column="29" lean-forward="false" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="14" column="38" lean-forward="false" selection-start-line="14" selection-start-column="38" selection-end-line="14" selection-end-column="38" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>

1
Recipies/settings.py
View File

@@ -39,6 +39,7 @@ INSTALLED_APPS = [
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django_tables2', 'django_tables2',
'django_filters',
'cookbook.apps.CookbookConfig', 'cookbook.apps.CookbookConfig',
] ]

3
Recipies/urls.py
View File

@@ -13,11 +13,12 @@ Including another URLconf
1. Import the include() function: from django.urls import include, path 1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) 2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
""" """
from django.http import HttpResponseRedirect
from django.urls import include, path from django.urls import include, path
from django.contrib import admin from django.contrib import admin
urlpatterns = [ urlpatterns = [
path('', lambda r: HttpResponseRedirect('cookbook/')),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('cookbook/', include('cookbook.urls')), path('cookbook/', include('cookbook.urls')),
path('accounts/', include('django.contrib.auth.urls')), path('accounts/', include('django.contrib.auth.urls')),

11
cookbook/filters.py Normal file
View File

@@ -0,0 +1,11 @@
import django_filters
from cookbook.models import Recipe
class RecipeFilter(django_filters.FilterSet):
name = django_filters.CharFilter(lookup_expr='iexact')
class Meta:
model = Recipe
fields = ['name', 'category', 'keywords']

2
cookbook/forms.py
View File

@@ -54,3 +54,5 @@ class KeywordForm(forms.ModelForm):
super(KeywordForm, self).__init__(*args, **kwargs) super(KeywordForm, self).__init__(*args, **kwargs)
self.fields['name'].widget.attrs.update({'class': 'form-control'}) self.fields['name'].widget.attrs.update({'class': 'form-control'})
self.fields['description'].widget.attrs.update({'class': 'form-control'}) self.fields['description'].widget.attrs.update({'class': 'form-control'})

27
cookbook/locale/de/LC_MESSAGES/django.po Normal file
View File

@@ -0,0 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-01 11:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: .\templates\index.html:10
msgid "Cookbook"
msgstr "Kochbuch"
#: .\templates\index.html:17
msgid "Log in to view Recipies"
msgstr "Log dich ein um die Rezepte zu sehen"

27
cookbook/locale/en/LC_MESSAGES/django.po Normal file
View File

@@ -0,0 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-02-01 11:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: .\templates\index.html:10
msgid "Cookbook"
msgstr ""
#: .\templates\index.html:17
msgid "Log in to view Recipies"
msgstr ""

1
cookbook/tables.py
View File

@@ -1,4 +1,5 @@
import django_tables2 as tables import django_tables2 as tables
from .models import * from .models import *

24
cookbook/templates/index.html
View File

@@ -2,19 +2,31 @@
{% load django_tables2 %} {% load django_tables2 %}
{% load i18n %} {% load i18n %}
{% block title %}Rezepte{% endblock %} {% block title %}{% trans "Cookbook" %}{% endblock %}
{% block content %} {% block content %}
<h3> <div class="card">
{% trans "Cookbook" %} <div class="card-header">
</h3> {% trans "Search" %}
</div>
<div class="card-body">
<form action="" method="get">
{{ filter.form.as_p }}
<input type="submit"/>
</form>
{% for obj in filter.qs %}
{{ obj.name }} - ${{ obj.price }}<br/>
{% endfor %}
</div>
</div>
<br/>
{% if recipes %} {% if recipes %}
{% render_table recipes %} {% render_table table %}
{% else %} {% else %}
<div class="alert alert-danger" role="alert"> <div class="alert alert-danger" role="alert">
Log dich ein um die Rezepte zu sehen! {% trans "Log in to view Recipies" %}
</div> </div>
{% endif %} {% endif %}

65
cookbook/templates/registration/login.html
View File

@@ -1,35 +1,50 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %}
{% block content %} {% block content %}
{% if form.errors %} {% if form.errors %}
<p>Your username and password didn't match. Please try again.</p> <div class="alert alert-danger" role="alert">
{% endif %} {% trans "Your username and password didn't match. Please try again." %}
</div>
{% if next %}
{% if user.is_authenticated %}
<p>Your account doesn't have access to this page. To proceed,
please login with an account that has access.</p>
{% else %}
<p>Please login to see this page.</p>
{% endif %} {% endif %}
{% endif %}
<form method="post" action="{% url 'login' %}">
{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
</table>
<input type="submit" value="login" /> <form role="form" class="form-horizontal" method="post" action="{% url 'login' %}">
<input type="hidden" name="next" value="{{ next }}" /> {% csrf_token %}
</form> <div class="form-group">
<div class="form-group row">
<label for='{{ form.username.label_tag }}' class="col-sm-2 col-form-label">{{ form.username.label }}</label>
<div class="col-sm-10">
<input class="form-control" id="{{ form.username.id_for_label }}"
name="{{ form.username.html_name }}"/>
</div>
{% if form.username.errors %}
<div class="alert alert-danger" role="alert">
{{ form.username.errors }}
</div>
{% endif %}
</div>
<div class="form-group row">
<label for='{{ form.password.label_tag }}' class="col-sm-2 col-form-label">{{ form.password.label }}</label>
<div class="col-sm-10">
<input class="form-control" id="{{ form.password.id_for_label }}"
name="{{ form.password.html_name }}" type="password"/>
</div>
{% if form.password.errors %}
<div class="alert alert-danger" role="alert">
{{ form.password.errors }}
</div>
{% endif %}
</div>
<input type="submit" class="btn btn-primary" value="login"/>
<input type="hidden" name="next" value="{{ next }}"/>
</div>
</form>
{% endblock %} {% endblock %}

2
cookbook/templates/tables/table_template.html
View File

@@ -68,7 +68,7 @@
<ul class="pagination justify-content-center"> <ul class="pagination justify-content-center">
{% block pagination.allpages %} {% block pagination.allpages %}
<li class="page-item"> <li class="page-item">
{% blocktrans %}{% endblocktrans %}
</li> </li>
{% for page in table.paginator.page_range %} {% for page in table.paginator.page_range %}
{% with range_start=current_page|add:"-3" range_end=current_page|add:"3" page_count_minus_5=page_count|add:"-5" page_count_minus_1=page_count|add:"-1" %} {% with range_start=current_page|add:"-3" range_end=current_page|add:"3" page_count_minus_5=page_count|add:"-5" page_count_minus_1=page_count|add:"-1" %}

9
cookbook/views.py
View File

@@ -2,15 +2,20 @@ from django.utils.translation import gettext as _
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.shortcuts import render, redirect from django.shortcuts import render, redirect
from django_tables2 import RequestConfig from django_tables2 import RequestConfig
from cookbook.filters import RecipeFilter
from cookbook.forms import * from cookbook.forms import *
from cookbook.tables import RecipeTable from cookbook.tables import RecipeTable
def index(request): def index(request):
if request.user.is_authenticated: if request.user.is_authenticated:
table = RecipeTable(Recipe.objects.all()) f = RecipeFilter(request.GET, queryset=Recipe.objects.all())
table = RecipeTable(f.queryset)
RequestConfig(request, paginate={'per_page': 3}).configure(table) RequestConfig(request, paginate={'per_page': 3}).configure(table)
return render(request, 'index.html', {'recipes': table})
return render(request, 'index.html', {'recipes': table, 'filter': f})
else: else:
return render(request, 'index.html') return render(request, 'index.html')

BIN
db.sqlite3
View File

Binary file not shown.