diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..a4ec3f4 Binary files /dev/null and b/.DS_Store differ diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/PortfolioProject.iml b/.idea/PortfolioProject.iml new file mode 100644 index 0000000..9a323b0 --- /dev/null +++ b/.idea/PortfolioProject.iml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7a2bd3b --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..dc9ea49 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e6b36c4 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..dc46f1b --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn main:app \ No newline at end of file diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc new file mode 100644 index 0000000..f860590 Binary files /dev/null and b/__pycache__/main.cpython-310.pyc differ diff --git a/__pycache__/recipe.cpython-310.pyc b/__pycache__/recipe.cpython-310.pyc new file mode 100644 index 0000000..247d2b9 Binary files /dev/null and b/__pycache__/recipe.cpython-310.pyc differ diff --git a/main.py b/main.py index 004b1e5..d54e8b5 100644 --- a/main.py +++ b/main.py @@ -1,13 +1,13 @@ """ Portfolio Project for CS361 Spring 2022 Written by Lucas Jensen -Last updated 3/29/22 for Assignment 1 +Last updated 5/12 for Assignment 1 """ from flask import Flask, redirect, render_template, request from recipe import Recipe, RecipeBook app = Flask(__name__) - +book = RecipeBook() @app.route("/") def home(): @@ -57,5 +57,4 @@ def add_recipe(): if __name__ == "__main__": - book = RecipeBook() app.run(debug=False) diff --git a/recipe.py b/recipe.py index 531f4f8..cc800df 100644 --- a/recipe.py +++ b/recipe.py @@ -2,6 +2,7 @@ Written by Lucas Jensen Portfolio Project for CS361 The main logic behind a recipe +Last updated 5/12 """ import json diff --git a/recipes/recipes.json b/recipes/recipes.json index cfb3eb8..a68bee6 100644 --- a/recipes/recipes.json +++ b/recipes/recipes.json @@ -1,26 +1,15 @@ { - "3": { + "0": { "quantity": "2", "name": "Sourdough", "ingredients": { - "AP Flour": 800, - "WW Flour": 200, - "Water": 700, - "Salt": 20, - "Yeast": 0, - "Starter": 50 - } - }, - "7": { - "quantity": "5", - "name": "Sourdough * 2.5", - "ingredients": { - "AP Flour": 2000, + "AP Flour": 500, "WW Flour": 500, - "Water": 1750, - "Salt": 50, + "Rye Flour": 0, + "Water": 0, + "Salt": 0, "Yeast": 0, - "Starter": 125 + "Starter": 0 } } } \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..3017968 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +click==8.1.3 +Flask==2.1.2 +gunicorn==20.1.0 +itsdangerous==2.1.2 +Jinja2==3.1.2 +MarkupSafe==2.1.1 +Werkzeug==2.1.2 diff --git a/runtime.txt b/runtime.txt new file mode 100644 index 0000000..333d904 --- /dev/null +++ b/runtime.txt @@ -0,0 +1 @@ +python-3.10.0 \ No newline at end of file