From f3a1c8e434a6d00e13f8700dc4564516ba4d1aee Mon Sep 17 00:00:00 2001
From: Shenyuan Jin <shenyuan.jin@ucdconnect.ie>
Date: Tue, 30 Nov 2021 21:20:13 +0800
Subject: [PATCH] display

---
 app/static/profile.css          |   2 +-
 app/templates/edit_profile.html |  57 ++++++++++++++++++++++++++------
 data-dev.sqlite                 | Bin 6885376 -> 6885376 bytes
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/app/static/profile.css b/app/static/profile.css
index 6cc231b..a07f661 100644
--- a/app/static/profile.css
+++ b/app/static/profile.css
@@ -51,7 +51,7 @@ body {
     text-decoration: none;
     text-indent: 0;
     line-height: 20px;
-    width: 178px;
+    width: 200px;
 }
 .file input {
     position: absolute;
diff --git a/app/templates/edit_profile.html b/app/templates/edit_profile.html
index 687d29e..cc4d5f0 100644
--- a/app/templates/edit_profile.html
+++ b/app/templates/edit_profile.html
@@ -39,11 +39,11 @@
                 <div class="col-sm-8" style="margin: 0px 45px ">
                     <form action="{{ url_for('.uploadPhoto') }}" method="post" enctype="multipart/form-data">
                         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
-                        <a href="javascript:;" class="file btn btn-warning" style="margin: 3px 10px">Change Avatar
+                        <a href="javascript:;" class="file btn btn-warning" style="margin-top: 3px" >Change Avatar
                             {{ form.photo(id="chooseImage") }}
                         </a>
                         <button  type="submit" class="form-control btn btn-warning"
-                                style="margin-top: 3px">Save Avatar Change
+                                style="margin-top: 3px; width: 200px">Save Avatar Change
                         </button>
                     </form>
                 </div>
@@ -55,23 +55,41 @@
                 <form class="form-horizontal" method="post">
                     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
                     <div class="form-group" style="margin-top: 15px; ">
-                        <label for="username" class="col-sm-3 control-label text-left">User name</label>
+                        <label for="username" class="col-sm-3 control-label text-left" style="font-size: 16px">
+                            <svg t="1638275834308" class="icon" viewBox="0 0 1024 1024"  width="16" height="16">
+                                <path d="M512 512c123.776 0 224-100.224 224-224S635.776 64 512 64a223.936 223.936 0 0 0-224 224C288 411.776 388.224 512 512 512z m0 64c-149.504 0-448 85.76-448 256v128h896v-128c0-170.24-298.496-256-448-256z" fill="#262626" p-id="4157">
+                                </path>
+                            </svg>
+                            &nbsp Username
+                        </label>
                         <div class="col-sm-9">
                             <input value="{{ current_user.username }}" name="username" type="text" class="form-control"
                                    id="username">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label text-left">E-mail</label>
+                        <label class="col-sm-3 control-label text-left" style="font-size: 16px">
+                            <svg t="1638276469792" class="icon" viewBox="0 0 1024 1024"  width="16" height="16">
+                                <path d="M513.92 537.216L99.968 278.592v96.96L513.92 637.44v-0.32l412.48-265.664V277.12L513.92 537.216zM0 128h1024v768H0V128z" fill="#262626" p-id="4289">
+                                </path>
+                            </svg>
+                            &nbsp E-mail
+                        </label>
                         <div class="col-sm-9" style="margin-top: 5px;">
                             <p>{{ current_user.email }}</p>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="grade" class="col-sm-3 control-label text-left">Grade</label>
+                        <label for="grade" class="col-sm-3 control-label text-left" style="font-size: 16px">
+                            <svg t="1638276824932" class="icon" viewBox="0 0 1024 1024" width="16" height="16">
+                                <path d="M186.181818 679.563636c27.927273-18.618182 46.545455-46.545455 46.545455-74.472727 0-37.236364-18.618182-65.163636-55.854546-83.781818V409.6L512 558.545455 1024 325.818182 512 93.090909 0 325.818182l111.709091 46.545454v148.945455c-37.236364 18.618182-55.854545 46.545455-55.854546 83.781818 0 27.927273 18.618182 55.854545 46.545455 74.472727L55.854545 837.818182c-27.927273 93.090909 46.545455 93.090909 46.545455 93.090909h93.090909s74.472727 0 46.545455-93.090909L186.181818 679.563636z" p-id="6799"></path><path d="M325.818182 577.163636v27.927273c0 37.236364-18.618182 74.472727-37.236364 102.4 18.618182 37.236364 37.236364 74.472727 37.236364 130.327273v55.854545c46.545455 18.618182 111.709091 37.236364 186.181818 37.236364C744.727273 930.909091 837.818182 791.272727 837.818182 791.272727v-279.272727L512 660.945455l-186.181818-83.781819z" p-id="6800">
+
+                            </path></svg>
+                            &nbsp Grade
+                        </label>
                         <div class="col-sm-9">
                             <select name="grade" class="form-control" id="grade">
-                                <option selected="selected" value="{{ current_user.grade }}"></option>
+                                <option selected="selected" value="{{ current_user.grade }}">{{ current_user.grade }}</option>
                                 <option>Freshman</option>
                                 <option>Sophomore</option>
                                 <option>Junior</option>
@@ -82,10 +100,16 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="collage" class="col-sm-3 control-label text-left">Collage</label>
+                        <label for="collage" class="col-sm-3 control-label text-left" style="font-size: 16px">
+                            <svg t="1638277114233" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9061" width="16" height="16">
+                                <path d="M254.8746 854.5444 254.8746 498.187264l39.131136 0 0-44.130304L94.164992 454.05696l0 40.17152 39.12704 0 0 360.31488L254.874624 854.54336zM31.7174 414.9268c0 0 966.1348 0 967.5919 0 23.3165-10.2031 22.2751-32.0625 0.4157-46.6319C977.8668 353.7203 514.6655 19.3475 514.6655 19.3475S55.0339 353.7203 31.7174 368.2949C8.4019 382.8644 6.9448 404.7237 31.7174 414.9268zM514.6655 184.4603c38.6304 0 69.9484 31.3139 69.9484 69.9484 0 38.6304-31.317 69.9484-69.9484 69.9484-38.6345 0-69.9515-31.317-69.9515-69.9484C444.713 215.7742 476.031 184.4603 514.6655 184.4603zM55.8346 934.4993 975.188992 934.4993 975.188992 895.368192 55.834624 895.368192 55.834624 934.499328zM15.9068 1014.4543l999.213056 0 0-36.625408L15.906816 977.828892 15.906816 1014.454272zM576.3072 854.5444 576.3072 495.685632l39.12704 0 0-39.131136L415.593472 456.554496l0 37.673984 39.12704 0 0 360.31488L576.3072 854.54336zM895.234 854.5444 895.234 495.685632l39.131136 0 0-39.131136L734.52032 456.554496l0 37.673984 39.131136 0 0 360.31488L895.234048 854.54336z" p-id="9062">
+
+                            </path></svg>
+                            &nbsp Collage
+                        </label>
                         <div class="col-sm-9">
                             <select name="collage" class="form-control" id="collage">
-                                <option selected="selected" value="{{ current_user.college }}"></option>
+                                <option selected="selected" value="{{ current_user.college }}">{{ current_user.college }}</option>
                                 <option>Beijing-Dublin International Collage</option>
                                 <option>Fan Gongxiu Honor Collage</option>
                                 <option>Environmental and Energy Engineering Collage</option>
@@ -102,7 +126,12 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="introduction" class="col-sm-3 control-label text-left">What's Up</label>
+                        <label for="introduction" class="col-sm-3 control-label text-left" style="font-size: 16px">
+                            <svg t="1638277192477" class="icon" viewBox="0 0 1026 1024" width="16" height="16">
+                                <path d="M53.499987 931.671898c-14.326775 0-27.061685-9.551183-35.021005-23.877958-38.204732-127.349107-20.69423-372.496137 85.960647-437.762554 38.204732-23.877958 62.08269-50.939643 65.266417-82.77692 6.367455-38.204732-23.877958-76.409464-41.388459-97.103694-60.490826-63.674553-74.8176-154.410792-36.612868-219.677209C133.093178 5.207146 215.870098-15.487084 314.565655 11.574601c30.245413 9.551183 58.898962 20.69423 79.593192 30.245413 58.898962 27.061685 89.144375 41.38846 168.737567-17.510502 14.326775-9.551183 38.204732-6.367455 47.755915 6.367455 9.551183 14.326775 6.367455 38.204732-6.367456 47.755915-113.022332 82.776919-175.105022 55.715234-240.371439 23.877958-20.69423-9.551183-44.572187-20.69423-68.450145-27.061685-65.266417-17.510502-120.981651-6.367455-144.859609 30.245412s-9.551183 92.328102 30.245413 136.90029c44.572187 47.755915 65.266417 103.471149 58.898962 151.227064-6.367455 50.939643-38.204732 92.328102-97.103694 130.532835-68.450145 49.347779-89.144375 251.514486-54.12337 366.128682 6.367455 17.510502-3.183728 38.204732-23.877958 44.572187-4.775592-3.183728-7.959319-3.183728-11.143046-3.183727z m93.919966 92.328102c-6.367455 0-17.510502-3.183728-23.877958-9.551183-14.326775-14.326775-14.326775-35.021004-3.183727-47.755915 92.328102-100.287422 183.064341-133.716562 269.024988-100.287422 14.326775 6.367455 27.061685 9.551183 41.388459 17.510503 97.103694 41.38846 157.59452 65.266417 213.309754 17.510502 30.245413-27.061685 35.021004-50.939643 35.021005-103.47115 3.183728-47.755915 3.183728-106.654877 47.755915-168.737566 82.776919-124.165379 175.105022-154.410792 278.576171-89.144375 17.510502 9.551183 20.69423 30.245413 9.551183 47.755915-9.551183 17.510502-30.245413 20.69423-47.755915 9.551183-47.755915-30.245413-103.471149-47.755915-183.064341 68.450145-30.245413 47.755915-35.021004 89.144375-38.204732 133.716562-3.183728 47.755915-3.183728 106.654877-62.08269 151.227065-89.144375 76.409464-189.431796 35.021004-284.943626-6.367456-14.326775-6.367455-27.061685-9.551183-41.38846-17.510502-47.755915-20.69423-113.022332 6.367455-186.248069 82.776919-7.959319 7.959319-17.510502 14.326775-23.877957 14.326775z" fill="#2c2c2c" p-id="10836"></path><path d="M900.371547 401.581241c71.633873-79.593192 127.349107-171.921294 79.593191-254.698214-55.715234-89.144375-192.615524-65.266417-289.719218-31.837277-30.245413 55.715234-127.349107 198.982979-130.532834 198.98298-6.367455 0 20.69423-109.838605 27.061685-154.410792-47.755915 27.061685-136.90029 100.287422-210.126026 178.288749-6.367455 41.38846-27.061685 113.022332-30.245413 113.022333-6.367455 0-6.367455-41.38846-6.367455-71.633873-20.69423 27.061685-41.38846 55.715234-55.715234 82.776919-41.38846 89.144375-79.593192 224.452801-92.328103 302.454129-25.469821 31.837277-82.776919 111.430468-93.919966 138.492154-9.551183 30.245413 17.510502 41.38846 35.021004 23.877957 14.326775-14.326775 50.939643-65.266417 82.77692-100.287422 47.755915-23.877958 171.921294-85.960647 292.902945-151.227064-23.877958 0-50.939643-3.183728-50.939642-9.551183s71.633873-20.69423 117.797923-27.061685c97.103694-50.939643 178.288749-103.471149 213.309754-133.716562 9.551183-6.367455 20.69423-17.510502 30.245413-27.061685-38.204732 0-92.328102 3.183728-92.328102-3.183728 1.591864-4.775592 125.757243-55.715234 173.513158-73.225736z m-412.292734 106.654877C384.607664 608.523539 177.665366 839.343795 168.114183 860.038025c-14.326775 17.510502-17.510502 17.510502-9.551183 0 14.326775-30.245413 224.452801-313.597175 310.413447-399.557822 79.593192-79.593192 224.452801-162.370111 310.413448-168.737567 47.755915-3.183728 41.38846 3.183728 0 20.69423-85.960647 27.061685-192.615524 98.695558-291.311082 195.799252z" fill="#2c2c2c" p-id="10837">
+                                </path>
+                            </svg>
+                            &nbsp What's Up</label>
                         <div class="col-sm-9">
                         <textarea name="aboutme" class="form-control" rows="3" id="about_me"
                                   placeholder="You can only enter 50 characters"
@@ -112,8 +141,14 @@
                             document.getElementById("about_me").value = "{{ current_user.about_me }}";
                         </script>
                     </div>
-                    <div class="col-sm-offset-1 col-sm-5 submit">
-                        <button type="submit" class="form-control btn btn-warning">Submit</button>
+                    <div class="col-sm-offset-1 col-sm-11 submit" align="center" >
+{#                        <button type="submit" class="form-control btn btn-warning">#}
+                        <a type="submit" style="font-size: 16px" >
+                            <svg t="1638275490644" class="icon" viewBox="0 0 1024 1024" width="16" height="16">
+                                <path d="M652.4 156.6125a112.5 112.5 0 1 1 155.925 161.15625L731.375 394.71875 572.3 235.5875l79.5375-79.5375 0.5625 0.5625zM333.63125 792.40625v0.1125H174.5v-159.1875l358.03125-357.975 159.075 159.13125-357.975 357.91875zM62 849.5h900v112.5H62v-112.5z" fill="#262626" p-id="4025">
+
+                                </path></svg> &nbspSubmit</a>
+{#                        </button>#}
                     </div>
                 </form>
             </div>
diff --git a/data-dev.sqlite b/data-dev.sqlite
index a6dc15328c1166ecf3d40b77e2228d8582155672..5bdf19cc9544c7fb11b862c41b6d4b56ee73b6da 100644
GIT binary patch
delta 495
zcmWm7M^eI20Dxf$iX9a@0%FG&lNVkjv4AKx?7i1mj)4oug)<CJ);cb{g2QRta0_?-
zF241b`~33ePzWlS{97pP%jC<{Y~jgyc0AvX@~im`TeEB_R4J{5WxA>NSkcv$uqR+>
zQC--&W(!?4r6sMn`}z@mDG3E$l%oPZRH6#is6j32P!B&E(1<1k(2N$eq7CinKqrFe
zLI`0*(2f7Q2fgS+KL#*}A;d6@5sYFC<4`dH4LSr2#35l~5(!waF@<T&U=~TFFo!he
zv49K~v4mx;U=>-cVI3RT#1^)(gI(-l9|t(Z5sq<!Q=H)(7r4X~u5p7~IJm<-9*QOL
H82R}FGVs%V

delta 494
zcmWm7M^eII0Dw^miXFu+0>+LlCVv{l0up;~*t@YD0~d}nu5_~2ap4slPUD7Kxbt)I
z*01pS6)fO2D!KW$ST5w|%M?R?^q#!Hw<rCoVd1F4(Nl`0nzp6;+4p48*Q9tLBGR&^
zJDTCBrlMN5q5Cf%J<lZ}A&7ERAcRU(p&B))MIGu9MgtlVK@*zMf>yMl9UbUI6kUiR
zjs&_P<NxnPANnzXK@1^@VT@oDV;F~m38>H@pu>O(3pP?n!@(q`FpU{xki{%=a50B@
zEMO5!SjGxgv4(YQU=v%|#twF|hdlOifI}SN7$-Qz8P0KmOI+a^H}G(aJKPsb;vw<#
E2hm2-IRF3v