Merge pull request #1 from ljensen505/main

Main

.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

.idea/PortfolioProject.iml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.10" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,13 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="object.is_tombstone" />
+          <option value="object.key" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>

.idea/misc.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/PortfolioProject.iml" filepath="$PROJECT_DIR$/.idea/PortfolioProject.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

Procfile

@@ -0,0 +1 @@
+web: gunicorn main:app

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)

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

recipes/recipes.json

@@ -1,26 +1,15 @@
 {
-    "3": {
+    "0": {
         "quantity": "2",
         "name": "Sourdough",
         "ingredients": {
-            "AP Flour": 800,
+            "AP Flour": 500,
-            "WW Flour": 200,
-            "Water": 700,
-            "Salt": 20,
-            "Yeast": 0,
-            "Starter": 50
-        }
-    },
-    "7": {
-        "quantity": "5",
-        "name": "Sourdough * 2.5",
-        "ingredients": {
-            "AP Flour": 2000,
             "WW Flour": 500,
-            "Water": 1750,
+            "Rye Flour": 0,
-            "Salt": 50,
+            "Water": 0,
+            "Salt": 0,
             "Yeast": 0,
-            "Starter": 125
+            "Starter": 0
         }
     }
 }

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

runtime.txt

@@ -0,0 +1 @@
+python-3.10.0