reformatted the arrangement of the codes to reduces the SLOC

Otumian-empire · Jan 16, 2020 · ba312d1 · ba312d1
1 parent 48ef62b
commit ba312d1
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 52 deletions.
diff --git a/app.py b/app.py
@@ -2,112 +2,119 @@
 
 from flask import Flask, flash, jsonify, render_template, request
 
-
 app = Flask(__name__)
 app.secret_key = '#$%1RTY2^&3FGh4%^&*{"5)(iukVT^ioIo_\{\:DFDFHJHkjn})'
 
 DATABASE_NAME = "flask_ajax_db"
 
 
-@app.route('/read', methods=['GET', 'POST'])
-def read():
+@app.route('/', methods=['GET', 'POST'])
+def index():
+    return render_template('app.html')
+
+
+@app.route('/insert', methods=['POST'])
+def insert():
+
+    message = "Task not inserted"
+    result = "Provide first or last name"
     status = 0
-    result = []
-    message = ''
+
+    first_name = request.form.get('firstName', '')
+    last_name = request.form.get('lastName', '')
 
     try:
         conn = sqlite3.connect(DATABASE_NAME)
         cur = conn.cursor()
         result = cur.execute(
-            "SELECT * FROM `info` ORDER BY `id` DESC").fetchall()
+            "INSERT INTO `info`(`firstname`, `lastname`) VALUES(?, ?)", (first_name, last_name)).rowcount
 
         conn.commit()
         cur.close()
         conn.close()
+
     except Exception as e:
         print(e)
 
-    if result:
+    if first_name or last_name:
+
+        message = first_name if first_name else last_name
+        message += " added"
+        result = f"{first_name} {last_name}"
         status = 1
 
     response_object = {
-        'status': status,
-        'result': result
+        'result': result,
+        'status': status
     }
 
-    # flash(message, 'info')
+    flash(message, 'info')
     return jsonify(response_object=response_object)
 
 
-@app.route('/delete/<id>', methods=['DELETE'])
-def delete(id):
+@app.route('/read', methods=['GET', 'POST'])
+def read():
+
+    message = 'No data'
+    result = []
     status = 0
-    result = ''
-    message = "Task not deleted"
 
     try:
         conn = sqlite3.connect(DATABASE_NAME)
         cur = conn.cursor()
         result = cur.execute(
-            "DELETE FROM `info` WHERE `id` = ?", (id, )).rowcount
+            "SELECT * FROM `info` ORDER BY `id` DESC").fetchall()
 
         conn.commit()
         cur.close()
         conn.close()
     except Exception as e:
         print(e)
 
-    if result > 0:
+    if result:
+        message = ""
         status = 1
-        message = "Task deleted"
 
     response_object = {
-        'status': status,
-        'result': result
+        'result': result,
+        'status': status
     }
 
     flash(message, 'info')
     return jsonify(response_object=response_object)
 
 
-@app.route('/insert', methods=['POST'])
-def insert():
+@app.route('/delete/<id>', methods=['DELETE'])
+def delete(id):
 
+    message = "Task not deleted"
     status = 0
-    result = "Provide first or last name"
-
-    first_name = request.form.get('firstName', '')
-    last_name = request.form.get('lastName', '')
+    result = ''
 
     try:
         conn = sqlite3.connect(DATABASE_NAME)
         cur = conn.cursor()
         result = cur.execute(
-            "INSERT INTO `info`(`firstname`, `lastname`) VALUES(?, ?)", (first_name, last_name)).rowcount
+            "DELETE FROM `info` WHERE `id` = ?", (id, )).rowcount
 
         conn.commit()
         cur.close()
         conn.close()
-
     except Exception as e:
         print(e)
 
-    if first_name or last_name:
+    if result > 0:
+        message = f"Task with id {id} deleted"
         status = 1
-        result = f"{first_name} {last_name}"
 
     response_object = {
-        'status': status,
-        'result': result
+        'result': result,
+        'status': status
     }
 
+    flash(message, 'info')
     return jsonify(response_object=response_object)
 
 
-@app.route('/', methods=['GET', 'POST'])
-def index():
-    return render_template('app.html')
-
-
 if __name__ == "__main__":
     app.run(debug=True)
diff --git a/static/app.js b/static/app.js
@@ -8,15 +8,15 @@ $(function () {
         success: function (response) {
 
             tasks = response.response_object['result']
-            console.log(tasks)
 
             var task_size = tasks.length
 
             for (i = 0; i < task_size; i++) {
                 id = tasks[i][0]
-                item = tasks[i][1] + "" + tasks[i][2]
+                item = tasks[i][1] + " " + tasks[i][2]
                 add_item(id, item)
             }
+
         },
         error: function (error) {
             $('#msg').text(error.response_object['result']);
@@ -75,7 +75,6 @@ $(function () {
 
         $('.close-btn').on('click', function () {
 
-            // /DELETE
             // make request to remove item from the database
             $.ajax({
                 url: '/delete/' + id,

diff --git a/templates/app.html b/templates/app.html
@@ -48,21 +48,10 @@ <h1>jQuery Example</h1>
     <!-- load the data from the database here -->
     <div>
         <h1>Names</h1>
-        <ul id="list">
-            {% if results %}
-                {% for data in results %}
-                    <li>
-                        <span>{{ data[1] }} {{ data[2] }}</span>
-                        <button class="close-btn">close</button>
-                        <div class="clr"></div>
-                    </li>
-                {% endfor %}
-
-            {% endif %}
-
-        </ul>
+        <ul id="list"></ul>
     </div>
 
+    <!-- jquery and apps javascript -->
     <script src="{{url_for('static', filename='jquery-3.4.1.js')}}"></script>
     <script src="{{url_for('static', filename='app.js')}}"></script>
 </body>