Merge branch 'main' of https://github.com/joffreyzhang/msdocs-python-flask-webapp-quickstart

Author: joffreyzhang

.DS_Store

@@ -0,0 +1,46 @@
+name: Azure Static Web Apps CI/CD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+    branches:
+      - main
+
+jobs:
+  build_and_deploy_job:
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    runs-on: ubuntu-latest
+    name: Build and Deploy Job
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+          lfs: false
+      - name: Build And Deploy
+        id: builddeploy
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ASHY_BUSH_008B90A10 }}
+          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
+          action: "upload"
+          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
+          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
+          app_location: "/src" # App source code path
+          api_location: "api" # Api source code path - optional
+          output_location: "build" # Built app content directory - optional
+          ###### End of Repository/Build Configurations ######
+
+  close_pull_request_job:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    runs-on: ubuntu-latest
+    name: Close Pull Request Job
+    steps:
+      - name: Close Pull Request
+        id: closepullrequest
+        uses: Azure/static-web-apps-deploy@v1
+        with:
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_ASHY_BUSH_008B90A10 }}
+          action: "close"

.github/workflows/azure-static-web-apps-ashy-bush-008b90a10.yml

@@ -0,0 +1,5 @@
+{
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "main"
+    ]
+}

.vscode/settings.json

@@ -1,19 +1,27 @@
 import os, uuid
 import pandas as pd
 
+<<<<<<< HEAD
 import pymssql
 from azure.identity import DefaultAzureCredential
 from azure.storage.blob import BlobServiceClient, BlobClient, ContainerClient
 import datetime
+=======
+from azure.identity import DefaultAzureCredential
+from azure.storage.blob import BlobServiceClient, BlobClient, ContainerClient
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
 
 from flask import (Flask, redirect, render_template, request,
                    send_from_directory, url_for, session)
 
 app = Flask(__name__)
 app.secret_key = os.urandom(24)
 
+<<<<<<< HEAD
 conn = pymssql.connect(host='sinong.database.windows.net' ,user='sinong' ,password = 'Wang1997h',database='cse6332')
 cur = conn.cursor()
+=======
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
 #================================================================================================
 # # Create a blob client using the local simulator
 # try:
@@ -36,6 +44,7 @@ def index():
    return render_template('index.html')
 
 
+<<<<<<< HEAD
 @app.route('/test')
 def test():
     SQL_QUERY = """
@@ -58,6 +67,8 @@ def test():
     return render_template('test.html', data=data)
 
 
+=======
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
 @app.route('/assignment1')
 def assignment1():
     data_file_path = os.path.join(app.root_path, 'static', 'data', 'people.csv')
@@ -67,6 +78,7 @@ def assignment1():
     return render_template('assignment1.html', contain_content=False, table_content=list(data.values.tolist()), titles=data.columns.values)
 
 
+<<<<<<< HEAD
 @app.route('/assignment2')
 def assignment2():
 
@@ -76,11 +88,14 @@ def assignment2():
     return render_template('assignment2.html', contain_content=False, table_content=data, titles=headers)
 
 
+=======
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
 @app.route('/a1-upload', methods = ['POST'])   
 def upload():   
     if request.method == 'POST':   
         f = request.files['file']
         file_path = os.path.join(app.root_path, 'uploads', f.filename)
+<<<<<<< HEAD
         session['file_path'] = file_path
         f.save(file_path)
 
@@ -99,12 +114,18 @@ def upload():
             cur.execute(sql_query)
 
         conn.commit()
+=======
+        f.save(file_path)
+        
+        data = pd.read_csv(file_path)
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
         return render_template('assignment1.html', contain_content=False, table_content=list(data.values.tolist()), titles=data.columns.values)
 
 
 @app.route('/a1-searchbyname', methods = ['POST', 'GET'])
 def a1_searchbyname():
     name = request.form.get('queryName')
+<<<<<<< HEAD
     data_file_path = session.get('file_path')
     data = pd.read_csv(data_file_path)
     query_data = data.loc[data['name'] == name]
@@ -160,6 +181,15 @@ def a2_searchbymag():
     return render_template('assignment2.html', contain_content=True, table_content=data, titles=headers)
 
 
+=======
+    data_file_path = os.path.join(app.root_path, 'static', 'data', 'people.csv')
+    data = pd.read_csv(data_file_path)
+    query_data = data.loc[data['Name'] == name]
+    print(name, query_data)
+    return render_template('assignment1.html', contain_content=True, table_content=list(query_data.values.tolist()), titles=query_data.columns.values)
+
+
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
 @app.route('/favicon.ico')
 def favicon():
     return send_from_directory(os.path.join(app.root_path, 'static'),

app.py

@@ -1,3 +1,6 @@
 Flask==2.2.2
 gunicorn
 Werkzeug==2.2.2
+Pandas==2.2.2
+azure-storage-blob==12.20.2
+azure-identity==1.16.0 

requirements.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 Name,State,Salary,Grade,Room,Telnum,Picture,Keywords
 Dhruvi,TX,99099,100,550,1000010,dhru.jpg,Dhruvi is nice
 Chuck,TX,1000,98,420,,chuck.jpg,Chuck is amazing
@@ -10,3 +11,17 @@ Sue,NN, ,79,0,2723785,upset.jpg,Sue isn't Susan
 Susan,OK,255000,84,101,911, ,Susan is very smart
 Darwin,TN,25,100,,1009,dar.jpg,Darwin is very creative
 Sriya,TX,111001,100,221,,sriya.jpg,Sriya is great
+=======
+Name,State,Salary,Grade,Room,Telnum,Picture,Keywords
+Dhruvi,TX,99099,100,550,1000010,dhru.jpg,Dhruvi is nice
+Chuck,TX,1000,98,420,,chuck.jpg,Chuck is amazing
+Meena,TX,125000,99,,, ,Meena is outa here
+Dave,NN,20,40,525,0,dave.jpg,Who is this
+Tuan,CA,,80,-1,, ,Tuan is gone
+Tavo,CA,220200, ,,,tavo.jpg,Tavo works very hard
+Nora,TX,-1,80,520,808, ,
+Sue,NN, ,79,0,2723785,upset.jpg,Sue isn't Susan
+Susan,OK,255000,84,101,911, ,Susan is very smart
+Darwin,TN,25,100,,1009,dar.jpg,Darwin is very creative
+Sriya,TX,111001,100,221,,sriya.jpg,Sriya is great
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659

static/data/people.csv

@@ -1,6 +1,12 @@
 <!doctype html>
 <head>
+<<<<<<< HEAD
     <title>Assignment 1 - Sinong - cse6332</title>
+=======
+    <title>Assignment 1 - Zheng - cse6332</title>
+    <h1> Zheng Zhang 177455</h1>
+    <img src="\static\images\sinong.jpg" alt="My Picture">
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
     <link rel="stylesheet" href="{{ url_for('static', filename='bootstrap/css/bootstrap.min.css') }}">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
@@ -12,12 +18,15 @@
     <main>
        <div class="container">
         <h1 style="color: blue; font-size: 24px; text-align: center;">Assignment 1 for CSE 6332 - Sinong</h1>
+<<<<<<< HEAD
 
         <!------------------------------------------>
         <!-------------- upload module ------------->
         <!------------------------------------------>
         <!------------------------------------------>
 
+=======
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
         <div class="mb-3" style="margin-top: 20px;">
             <label for="formFile" class="form-label">Please upload your meta info file</label>
             <form action="/a1-upload" method="post" enctype="multipart/form-data">
@@ -28,21 +37,29 @@ <h1 style="color: blue; font-size: 24px; text-align: center;">Assignment 1 for C
             </form>
         </div>
 
+<<<<<<< HEAD
         <!------------------------------------------>
         <!-------------- Search by name ------------>
         <!------------------------------------------>
         <!------------------------------------------>
 
+=======
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
         <div class="mb-3" style="margin-top: 20px;">
             <label for="formFile" class="form-label">Show basic info for(person):</label>
             <form action="/a1-searchbyname" method="post" enctype="multipart/form-data">
             <div class="input-group">
+<<<<<<< HEAD
                     <input class="form-control" type="text" name="queryName" placeholder="Name (Case Sensetive)">
+=======
+                    <input type="text" name="queryName" class="form-control" id="formFile" name="file" style="border-radius: 0;">
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
                     <button type="submit" class="btn btn-primary" style="border-radius: 0;">Query</button>
                 </div>
             </form>
         </div>
 
+<<<<<<< HEAD
         <!------------------------------------------>
         <!----------- Search by cost range --------->
         <!------------------------------------------>
@@ -54,6 +71,13 @@ <h1 style="color: blue; font-size: 24px; text-align: center;">Assignment 1 for C
                 <div class="input-group">
                     <input class="form-control" type="text" name="minCost" placeholder="Min cost">
                     <input class="form-control" type="text" name="maxCost" placeholder="Max cost">
+=======
+        <div class="mb-3" style="margin-top: 20px;">
+            <label for="formFile" class="form-label">Show whose salary lower than:</label>
+            <form action="/a1-searchbys" method="post" enctype="multipart/form-data">
+                <div class="input-group">
+                    <input type="text" class="form-control" id="formFile" name="file" style="border-radius: 0;">
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
                     <button type="submit" class="btn btn-primary" style="border-radius: 0;">Query</button>
                 </div>
             </form>
@@ -114,11 +138,16 @@ <h1 style="color: blue; font-size: 24px; text-align: center;">Assignment 1 for C
             for (var i = 0; i < cells.length; i++) {
                 var cell = cells[i];
                 var span = cell.getElementsByTagName("span")[0];
+<<<<<<< HEAD
                 if (span) {
                     span.style.backgroundColor = "orange";
                     span.style.color = "red";
                     span.contentEditable = true;
                 }
+=======
+                span.style = "background-color: orange"; "color: #red";
+                span.contentEditable = true;
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
             }
         }
 
@@ -128,9 +157,14 @@ <h1 style="color: blue; font-size: 24px; text-align: center;">Assignment 1 for C
             for (var i = 0; i < cells.length - 1; i++) {
                 var cell = cells[i];
                 var span = cell.getElementsByTagName("span")[0];
+<<<<<<< HEAD
                 if (span) {
                 span.contentEditable = false;
                 span.style = "background-color: white"; "color: black";}
+=======
+                span.contentEditable = false;
+                span.style = "background-color: white"; "color: black";
+>>>>>>> 819196df4b034b220112190ae0cd93812ce6c659
             }
         }