ADDED settings.json to gitignore

jeffreymew · jeffreymew · commit b2b057799839 · 2018-11-06T14:44:06.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 node_modules/
 __pycache__/
 dist/
-settings.py
+settings.py
+settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/README.md b/README.md
@@ -4,6 +4,12 @@ Code based on https://github.com/dternyak/React-Redux-Flask
 
 This is starter code.
 
+## Running The Code
+
+1. Clone the reponsitory
+2. Import the project into your favorite editor (thats Visual Studio Code for us!)
+3. [TODO] Set y
+
 ## Contributing
 
 If you are interested in fixing issues and contributing directly to the code base,
@@ -29,6 +35,11 @@ Please also see our [Code of Conduct](CODE_OF_CONDUCT.md).
 
 The code ships with a set of recommended Visual Studio Code extensions that will empower the developement process of your Flask + React web application. These extensions include rich language support (code completion, go to definition) for both Python and JavaScript, as well as quick deploy to Azure from within VS Code. When the project is imported into VS Code, a notifcation will appear giving you the option to install these extensions. 
 
+List of bundled extensions:
+
+* Python Extension for Visual Studio Code
+* Azure App Service Extension
+
 ## License
 
 Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/app/models/models.py b/app/models/models.py
@@ -75,8 +75,13 @@ def add_task(incoming):
             user_id=incoming["user_id"],
             status=incoming["status"]
         )
-        db.session.add(task)
-        db.session.commit()
+
+        try:
+            db.session.add(task)
+            db.session.commit()
+            return True
+        except IntegrityError:
+            return False
     
     @staticmethod
     def get_latest_tasks():
diff --git a/app/routes.py b/app/routes.py
@@ -67,9 +67,8 @@ def is_token_valid():
 def submit_task():
     incoming = request.get_json()
 
-    try:
-        Task.add_task(incoming)
-    except IntegrityError:
+    success = Task.add_task(incoming)
+    if not success:
         return jsonify(message="Error submitting task"), 409
 
     return jsonify(success=True)
diff --git a/static/public/index.html b/static/public/index.html
@@ -1,19 +1,16 @@
 <html>
+    <head>
+        <meta charset="utf-8">
+        <title>Flask + React Starter Kit</title>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="shortcut icon" type="image/x-icon" href="%PUBLIC_URL%/favicon.ico?"/>
+        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='bundle.css') }}"/>
+        <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500' rel='stylesheet' type='text/css'>
 
-<head>
-    <meta charset="utf-8">
-    <title>PVSC Standup</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="shortcut icon" type="image/x-icon" href="%PUBLIC_URL%/favicon.ico?"/>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='bundle.css') }}"/>
-    <link href='https://fonts.googleapis.com/css?family=Roboto:400,300,500' rel='stylesheet' type='text/css'>
-
-</head>
-
-<body>
-<div id="root"></div>
-</body>
-<script src="{{ url_for('static', filename='bundle.js') }}"></script>
-
+    </head>
+    <body>
+        <div id="root"></div>
+    </body>
+    <script src="{{ url_for('static', filename='bundle.js') }}"></script>
 </html>
