got update user properties working

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8c793786dc69d097506b165643fe7c0503c40ba8..cc7ecb99895c5fa482448398bfbc7a144eaadc2f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,16 @@
   <component name="ChangeListManager">
     <list default="true" id="e00b4877-6392-4152-a4a7-f9ffd3e1faca" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/flaskr/static/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/static/style.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/admin.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/auth.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/auth.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/blog.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/blog.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/schema.sql" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/schema.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/templates/admin/user_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/admin/user_list.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/flaskr/templates/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/base.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/flaskr/templates/blog/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/blog/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/flaskr/templates/blog/update.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/blog/update.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/flaskr/templates/home.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/home.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/user_edit.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/user_edit.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/instance/flaskr.sqlite" beforeDir="false" afterPath="$PROJECT_DIR$/instance/flaskr.sqlite" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -19,67 +24,58 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/dashboard.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/user_edit.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="4" column="19" selection-start-line="4" selection-start-column="19" selection-end-line="4" selection-end-column="19" />
+            <state relative-caret-position="240">
+              <caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+              <folding>
+                <element signature="e#0#90#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="75" column="35" selection-start-line="75" selection-start-column="35" selection-end-line="75" selection-end-column="35" />
+            <state relative-caret-position="100">
+              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/resources.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+            <state relative-caret-position="320">
+              <caret line="16" column="14" lean-forward="true" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/__init__.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
-              <folding>
-                <element signature="e#0#9#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="120">
+              <caret line="6" column="2" lean-forward="true" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="840">
-              <caret line="72" column="7" lean-forward="true" selection-start-line="72" selection-start-column="7" selection-end-line="72" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="25" lean-forward="true" selection-start-column="25" selection-end-column="25" />
+            <state relative-caret-position="240">
+              <caret line="12" column="27" lean-forward="true" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="600">
-              <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
+            <state relative-caret-position="140">
+              <caret line="7" column="22" lean-forward="true" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -87,8 +83,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="74" lean-forward="true" selection-start-line="74" selection-end-line="74" />
+            <state relative-caret-position="180">
+              <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
               <folding>
                 <element signature="e#0#90#0" expanded="true" />
               </folding>
@@ -97,19 +93,13 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="260">
-              <caret line="13" column="13" lean-forward="true" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="6" column="19" lean-forward="true" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+            <state relative-caret-position="360">
+              <caret line="59" column="18" lean-forward="true" selection-start-line="59" selection-start-column="18" selection-end-line="59" selection-end-column="18" />
+              <folding>
+                <element signature="e#0#90#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -158,11 +148,9 @@
         <option value="$PROJECT_DIR$/flaskr/Readme2" />
         <option value="$PROJECT_DIR$/flaskr/templates/auth/register.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/auth/login.html" />
-        <option value="$PROJECT_DIR$/flaskr/auth.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/create.html" />
         <option value="$PROJECT_DIR$/flaskr/db2.py" />
         <option value="$PROJECT_DIR$/flaskr.py" />
-        <option value="$PROJECT_DIR$/flaskr/blog.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/admin/admin.html" />
         <option value="$PROJECT_DIR$/flaskr/about.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/about.html" />
@@ -170,11 +158,6 @@
         <option value="$PROJECT_DIR$/flaskr/templates/contact_us.html" />
         <option value="$PROJECT_DIR$/flaskr/services.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.py" />
-        <option value="$PROJECT_DIR$/flaskr/schema.sql" />
-        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_list.html" />
-        <option value="$PROJECT_DIR$/flaskr/admin.py" />
-        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" />
-        <option value="$PROJECT_DIR$/flaskr/user_edit.py" />
         <option value="$PROJECT_DIR$/flaskr/testimonials.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/services.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/testimonials.html" />
@@ -188,11 +171,18 @@
         <option value="$PROJECT_DIR$/flaskr/resources.py" />
         <option value="$PROJECT_DIR$/flaskr/__init__.py" />
         <option value="$PROJECT_DIR$/flaskr/faq.py" />
-        <option value="$PROJECT_DIR$/flaskr/templates/blog/index.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/update.html" />
-        <option value="$PROJECT_DIR$/flaskr/templates/base.html" />
         <option value="$PROJECT_DIR$/flaskr/static/style.css" />
+        <option value="$PROJECT_DIR$/flaskr/templates/base.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/home.html" />
+        <option value="$PROJECT_DIR$/flaskr/user_edit.py" />
+        <option value="$PROJECT_DIR$/flaskr/auth.py" />
+        <option value="$PROJECT_DIR$/flaskr/schema.sql" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/blog/index.html" />
+        <option value="$PROJECT_DIR$/flaskr/blog.py" />
+        <option value="$PROJECT_DIR$/flaskr/admin.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_list.html" />
       </list>
     </option>
   </component>
@@ -376,23 +366,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/db.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/dashboard.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -454,13 +427,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="5" column="16" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/pcparts_list.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="200">
@@ -475,20 +441,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/contact_us.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="7" selection-start-line="7" selection-end-line="17" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="12" lean-forward="true" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/pcparts_addBuild.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="840">
@@ -510,16 +462,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="23" column="24" lean-forward="true" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#99#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/pcparts_addPart.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
@@ -530,30 +472,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="42" lean-forward="true" selection-start-line="8" selection-start-column="42" selection-end-line="8" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/user_edit.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="18" column="34" lean-forward="true" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#90#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/pcparts/updatePart.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -582,13 +500,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/home.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/about.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="280">
@@ -596,20 +507,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/create.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -673,72 +570,168 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/__init__.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/resources.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
-          <caret line="8" column="26" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
+          <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="3" column="58" selection-start-line="3" selection-start-column="58" selection-end-line="3" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/create.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="5" column="19" lean-forward="true" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/db.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
           <folding>
-            <element signature="e#0#9#0" expanded="true" />
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="280">
+          <caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/login.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/home.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/contact_us.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" selection-start-line="7" selection-end-line="17" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
-          <caret line="6" column="19" lean-forward="true" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/resources.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
+        <state relative-caret-position="400">
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#9#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="25" lean-forward="true" selection-start-column="25" selection-end-column="25" />
+        <state relative-caret-position="180">
+          <caret line="63" column="22" lean-forward="true" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#99#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="13" column="13" lean-forward="true" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="120">
+          <caret line="15" column="15" lean-forward="true" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/user_edit.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#90#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="100">
+          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="74" lean-forward="true" selection-start-line="74" selection-end-line="74" />
+        <state relative-caret-position="180">
+          <caret line="63" lean-forward="true" selection-start-line="63" selection-end-line="63" />
           <folding>
             <element signature="e#0#90#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="75" column="35" selection-start-line="75" selection-start-column="35" selection-end-line="75" selection-end-column="35" />
+        <state relative-caret-position="120">
+          <caret line="6" column="2" lean-forward="true" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="30" lean-forward="true" selection-start-line="30" selection-end-line="30" />
+        <state relative-caret-position="320">
+          <caret line="16" column="14" lean-forward="true" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="840">
-          <caret line="72" column="7" lean-forward="true" selection-start-line="72" selection-start-column="7" selection-end-line="72" selection-end-column="7" />
+        <state relative-caret-position="360">
+          <caret line="59" column="18" lean-forward="true" selection-start-line="59" selection-start-column="18" selection-end-line="59" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#90#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" column="22" lean-forward="true" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="12" column="27" lean-forward="true" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
         </state>
       </provider>
     </entry>

diff --git a/flaskr/__pycache__/admin.cpython-37.pyc b/flaskr/__pycache__/admin.cpython-37.pyc
index 12c1115174f48ed3fd525debfff3251667b06113..8927978187645b9c647c26a1d83faf43eabbdaac 100644 (file)
Binary files a/flaskr/__pycache__/admin.cpython-37.pyc and b/flaskr/__pycache__/admin.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/auth.cpython-37.pyc b/flaskr/__pycache__/auth.cpython-37.pyc
index 084dce94c99556b9cf877cd4488f6838bcaefec0..5632a2f729af3dae0c3e9b7de9b7e15ffa4e95b8 100644 (file)
Binary files a/flaskr/__pycache__/auth.cpython-37.pyc and b/flaskr/__pycache__/auth.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/blog.cpython-37.pyc b/flaskr/__pycache__/blog.cpython-37.pyc
index 836a39e32dfaef0205e98ad65db799aa1731d980..b01dbcb51aa3c3910de84b3a0e4524a9b0186729 100644 (file)
Binary files a/flaskr/__pycache__/blog.cpython-37.pyc and b/flaskr/__pycache__/blog.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/user_edit.cpython-37.pyc b/flaskr/__pycache__/user_edit.cpython-37.pyc
index 0297d8d92c48fdb8248486cd5f5efdcf32655e41..403bcd4472d8c95844d6c84befeecbba677bd1e5 100644 (file)
Binary files a/flaskr/__pycache__/user_edit.cpython-37.pyc and b/flaskr/__pycache__/user_edit.cpython-37.pyc differ

diff --git a/flaskr/admin.py b/flaskr/admin.py
index 8972998da0cd37c48c09c1e816a15b6c332b5214..a19e56a90e29d42c42665b522adad44ab17352a1 100644 (file)
--- a/flaskr/admin.py
+++ b/flaskr/admin.py
@@ -18,8 +18,8 @@ def index():
 def get_users():
     db = get_db()
     users = db.execute(
-        'SELECT user_id, user_name'
-        ' FROM user'
+        'SELECT xuser_id, xuser_username, xuser_firstname, xuser_lastname, xuser_email'
+        ' FROM xuser'
     ).fetchall()
 
     return render_template('admin/user_list.html', users=users)
@@ -28,13 +28,60 @@ def get_users():
 def delete_user():
     db = get_db()
     db.execute(
-        'DELETE FROM user WHERE user_id = ?', [request.form['user_to_delete']]
+        'DELETE FROM xuser WHERE xuser_id = ?', [request.form['user_to_delete']]
     )
     db.commit()
     return redirect(url_for('admin.index'))
 
 #@bp.route('/user_update/<int:user_id>', methods=['POST'])
-@bp.route('/user_update', methods=['POST'])
-def update_user():
+#@bp.route('/<int:user_id>/user_update', methods=('GET', 'POST'))
+#def update_user(user_id):
 
-    return render_template('admin/user_edit.html', user_id=request.form['user_to_edit'])
\ No newline at end of file
+#    return render_template('admin/user_edit.html', user_id=request.form['user_to_edit'])
+
+
+def get_user(user_id):
+    user = get_db().execute(
+        'SELECT xuser_id, xuser_username, xuser_firstname, xuser_lastname, xuser_email'
+        ' FROM xuser'
+        ' WHERE xuser_id = ?',
+        (user_id,)
+    ).fetchone()
+
+    return user
+
+
+@bp.route('/<int:user_id>/user_update', methods=['GET', 'POST'])
+@login_required
+def update_userInfo(user_id):
+    #user_id = request.form['user_to_edit']
+    print("AAAAA")
+    print(user_id)
+    print("AAAAA")
+    user = get_user(user_id)
+    if request.method == 'POST':
+        username = request.form['username']
+        firstname = request.form['firstname']
+        lastname = request.form['lastname']
+        email = request.form['email']
+        error = None
+
+        if not username:
+            error = 'Username is required.'
+
+        if error is not None:
+            flash(error)
+        else:
+            db = get_db()
+            db.execute(
+                'UPDATE xuser SET xuser_username = ?, xuser_firstname = ?, xuser_lastname = ?, xuser_email = ? WHERE xuser_id = ?',
+                [username,
+                 firstname,
+                 lastname,
+                 email,
+                 user_id]
+            )
+            db.commit()
+            return redirect(url_for('admin.index'))
+
+    return render_template('admin/user_edit.html', user=user)
\ No newline at end of file

diff --git a/flaskr/auth.py b/flaskr/auth.py
index a0818bde6da759fdc09e3473749ab92e9df26a1a..cfe6af917c0dfde677cd913f587db8d3a5c47149 100644 (file)
--- a/flaskr/auth.py
+++ b/flaskr/auth.py
@@ -29,7 +29,7 @@ def register():
         if error is None:
             try:
                 db.execute(
-                    "INSERT INTO user (user_name, user_password) VALUES (?, ?)",
+                    "INSERT INTO xuser (xuser_username, xuser_password) VALUES (?, ?)",
                     (username, generate_password_hash(password)),
                 )
                 db.commit()
@@ -52,17 +52,17 @@ def login():
         db = get_db()
         error = None
         user = db.execute(
-            'SELECT * FROM user WHERE user_name = ?', (username,)
+            'SELECT * FROM xuser WHERE xuser_username = ?', (username,)
         ).fetchone()
 
         if user is None:
             error = 'Incorrect username.'
-        elif not check_password_hash(user['user_password'], password):
+        elif not check_password_hash(user['xuser_password'], password):
             error = 'Incorrect password.'
 
         if error is None:
             session.clear()
-            session['user_id'] = user['user_id']
+            session['xuser_id'] = user['xuser_id']
             return redirect(url_for('index'))
 
         flash(error)
@@ -73,13 +73,13 @@ def login():
 
 @bp.before_app_request
 def load_logged_in_user():
-    user_id = session.get('user_id')
+    user_id = session.get('xuser_id')
 
     if user_id is None:
         g.user = None
     else:
         g.user = get_db().execute(
-            'SELECT * FROM user WHERE user_id = ?', (user_id,)
+            'SELECT * FROM xuser WHERE xuser_id = ?', (user_id,)
         ).fetchone()
 
 

diff --git a/flaskr/blog.py b/flaskr/blog.py
index 4c25a3e924967ab2f4eb9a33af7ac5ca05069c7e..a3fe86fc0fa37b445de3e0a430a6ae10a7a4a9b4 100644 (file)
--- a/flaskr/blog.py
+++ b/flaskr/blog.py
@@ -38,7 +38,7 @@ def create():
             db.execute(
                 'INSERT INTO post (post_title, post_body, post_author_id)'
                 ' VALUES (?, ?, ?)',
-                (title, body, g.user['user_id'])
+                (title, body, g.user['xuser_id'])
             )
             db.commit()
             return redirect(url_for('blog.index'))
@@ -57,7 +57,7 @@ def get_post(id, check_author=True):
     if post is None:
         abort(404, f"Post id {id} doesn't exist.")
 
-    if check_author and post['post_author_id'] != g.user['user_id']:
+    if check_author and post['post_author_id'] != g.user['xuser_id']:
         abort(403)
 
     return post

diff --git a/flaskr/schema.sql b/flaskr/schema.sql
index 99610f91d79d7afac06d977e916f1aa89d1af2a8..746c2c08d099207edf7f604f70c28f6232b64d49 100644 (file)
--- a/flaskr/schema.sql
+++ b/flaskr/schema.sql
@@ -3,10 +3,17 @@ drop table if exists user;
 create table user (
   user_id integer primary key autoincrement,
   user_name text unique not null,
-  user_password text not null,
-  user_firstname,
-  user_lastname,
-  user_email
+  user_password text not null
+);
+
+drop table if exists xuser;
+create table xuser (
+  xuser_id integer primary key autoincrement,
+  xuser_username text unique not null,
+  xuser_password text not null,
+  xuser_firstname,
+  xuser_lastname,
+  xuser_email
 );
 
 drop table if exists post;

diff --git a/flaskr/templates/admin/user_edit.html b/flaskr/templates/admin/user_edit.html
index d28ae1ce4bae82e46c0224dd3bd5cc57b7c9b323..f30dcbc1415a5bd6c2f2fdfe9e1893b728c99a1c 100644 (file)
--- a/flaskr/templates/admin/user_edit.html
+++ b/flaskr/templates/admin/user_edit.html
@@ -1,19 +1,19 @@
 {% extends "base.html" %}
 
 {% block header %}
-  <h1>{% block title %}Edit User {{ user_id }}{% endblock %}</h1>
+  <h1>{% block title %}Edit User {{ user['xuser_id'] }}{% endblock %}</h1>
 {% endblock %}
 
 {% block content %}
-  <form action="{{ url_for('user_edit.edit_user2', user_id = user_id) }} "method="post">
+  <form method="post">
     <label for="username">Username</label>
-    <input name="username" id="username" value="{{ request.form['username'] }}" required>
+    <input name="username" id="username" value="{{ request.form['username'] or user['xuser_username'] }}" required>
     <label for="email">Email</label>
-    <input name="email" id="email" value="{{ request.form['email'] }}">
+    <input name="email" id="email" value="{{ request.form['email'] or user['xuser_email']  }}">
     <label for="firstname">First Name:</label>
-    <input name="firstname" id="firstname" value="{{ request.form['firstname'] }}">
+    <input name="firstname" id="firstname" value="{{ request.form['firstname'] or user['xuser_firstname']  }}">
     <label for="lastname">Last Name:</label>
-    <input name="lastname" id="lastname" value="{{ request.form['lastname'] }}">
+    <input name="lastname" id="lastname" value="{{ request.form['lastname'] or user['xuser_lastname']  }}">
     <input type="submit" value="Submit">
   </form>
 {% endblock %}
\ No newline at end of file

diff --git a/flaskr/templates/admin/user_list.html b/flaskr/templates/admin/user_list.html
index 046566bb4faf6903d1f1a6984511714e94d403e0..bb40ee4aab8cf12571b1704cbb8c96f2e6c74e80 100644 (file)
--- a/flaskr/templates/admin/user_list.html
+++ b/flaskr/templates/admin/user_list.html
@@ -6,13 +6,13 @@
     {% for user in users %}
         <dl>
             <dt>
-                <b>User Name:</b> {{ user.user_name }}
+                <b>User Name:</b> {{ user.xuser_username }}
                     <form action="{{ url_for('admin.delete_user') }}" method=post class=add-item>
                         <input type=hidden name=user_to_delete value="{{ user.user_id }}"></input>
                         <input type=submit value="Delete"></input>
                     </form>
-                    <form action="{{ url_for('admin.update_user') }}" method=post class=add-item>
-                        <input type=hidden name=user_to_edit value="{{ user.user_id }}"></input>
+                    <form action="{{ url_for('admin.update_userInfo', user_id=user['xuser_id']) }}" method=get class=add-item>
+                        <input type=hidden name=user_to_edit value="{{ user.xuser_id }}"></input>
                         <input type=submit value="Edit"></input>
                     </form>
             </dt>

diff --git a/flaskr/templates/base.html b/flaskr/templates/base.html
index a7ee225a7cdb8631bb57a86d97e5b568a57a06cb..2153a26cada19dc693c13c25a6d368332642344f 100644 (file)
--- a/flaskr/templates/base.html
+++ b/flaskr/templates/base.html
@@ -21,15 +21,7 @@
     }
   </style>
   </head>
-  <div class="dropdown">
-    <button class=dropbtn">More
-      <i class="fa fa-caret-down"></i>
-    </button>
-    <div class="dropdown-content">
-      <a href="{{ url_for('faq.index') }}">FAQ</a>
-      <a href="{{ url_for('resources.index') }}">Resources</a>
-    </div>
-  </div>
+
   <body>
   <ul>
     {% if g.user %}
@@ -50,12 +42,22 @@
       <li><a href="{{ url_for('testimonials.index') }}">Testimonials</a></li>
       <li><a href="{{ url_for('store.index') }}">Store</a></li>
     {% endif %}
+
   </ul>
+        <div class="dropdown">
+    <button class=dropbtn">More
+      <i class="fa fa-caret-down"></i>
+    </button>
+    <div class="dropdown-content">
+      <a href="{{ url_for('faq.index') }}">FAQ</a>
+      <a href="{{ url_for('resources.index') }}">Resources</a>
+    </div>
+  </div>
   </body>
 
   <ul>
     {% if g.user %}
-      <li><span>{{ g.user['user_name'] }}</span>
+      <li><span>{{ g.user['xuser_username'] }}</span>
       <li><a href="{{ url_for('auth.logout') }}">Log Out</a>
     {% else %}
       <li><a href="{{ url_for('auth.register') }}">Register</a>

diff --git a/flaskr/templates/blog/index.html b/flaskr/templates/blog/index.html
index 7eacab61e8768ebda84aa48e5e91c527d707a6d8..5ea7849cfbf3f57bc3639c8f06c2e75b304e1df2 100644 (file)
--- a/flaskr/templates/blog/index.html
+++ b/flaskr/templates/blog/index.html
@@ -15,7 +15,7 @@
           <h1>{{ post['post_title'] }}</h1>
           <div class="about">by {{ post['user_name'] }} on {{ post['post_created'].strftime('%Y-%m-%d') }}</div>
         </div>
-        {% if g.user['user_id'] == post['post_author_id'] %}
+        {% if g.user['xuser_id'] == post['post_author_id'] %}
           <a class="action" href="{{ url_for('blog.update', id=post['post_id']) }}">Edit</a>
         {% endif %}
       </header>

diff --git a/flaskr/templates/home.html b/flaskr/templates/home.html
index 9503d22f68057e7c53985c6d904b25e74a3a1abd..4d755cbaefca2807e3b2201b859ea399ab5d413a 100644 (file)
--- a/flaskr/templates/home.html
+++ b/flaskr/templates/home.html
@@ -5,17 +5,18 @@
 {% block content %}
 <div class="homeX">
   <div class="homeX2">
-  <!-- <b>Landing Page</b> -->
-  </br>
-  <!--<em>Welcome to OpenHouseParty!</em> -->
-  </br>
-  <p2>
+    <p2>
     Create Your Dream Home!
     </br>
     </br>
     Empowering people to create their dream home with the OpenHouseParty! kit.
     </br>
   </p2>
+  <!-- <b>Landing Page</b> -->
+  </br>
+  <!--<em>Welcome to OpenHouseParty!</em> -->
+  </br>
+
   </br>
   <!-- <img alt="Home Kit" src="static\home_party_house_kit.png" width="948" height="295" class="center"> -->
   </br>

diff --git a/flaskr/user_edit.py b/flaskr/user_edit.py
index 46ca643d3be289e014f8cb913c24559ad910a359..11d0c111ea67d4545b67f4f3ed9da7ddcc98c5bb 100644 (file)
--- a/flaskr/user_edit.py
+++ b/flaskr/user_edit.py
@@ -8,17 +8,54 @@ from flaskr.db import get_db
 bp = Blueprint('user_edit', __name__)
 
 
-@bp.route('/user_update/<int:user_id>', methods=['POST'])
+@bp.route('/<int:user_id>/user_update', methods=['POST'])
 #@bp.route('/user_update2', methods=['POST'])
-def edit_user2(user_id):
-    db = get_db()
-    db.execute(
-        'UPDATE user SET user_name = ?, user_firstname = ?, user_lastname = ?, user_email = ? WHERE user_id = ?',
-        [request.form['username'],
-         request.form['firstname'],
-         request.form['lastname'],
-         request.form['email'],
-        user_id]
-    )
-    db.commit()
-    return redirect(url_for('admin.index'))
\ No newline at end of file
+def update_user(user_id):
+    user = get_user(user_id)
+    if request.method == 'POST':
+        username = request.form['username']
+        firstname = request.form['firstname']
+        lastname = request.form['lastname']
+        email = request.form['email']
+        error = None
+
+        if not username:
+            error = 'Username is required.'
+
+        if error is not None:
+            flash(error)
+        else:
+            db = get_db()
+            db.execute(
+                'UPDATE xUser SET xUser_username = ?, xUser_firstname = ?, xUser_lastname = ?, xUser_email = ? WHERE xUser_id = ?',
+                [username,
+                 firstname,
+                 lastname,
+                 email,
+                 user_id]
+            )
+            db.commit()
+            return redirect(url_for('admin.index'))
+
+    return render_template('admin/user_edit.html', user=user)
+
+
+
+
+
+    #db = get_db()
+    #db.execute(
+    #    'UPDATE user SET user_name = ?, user_firstname = ?, user_lastname = ?, user_email = ? WHERE user_id = ?',
+    #    [request.form['username'],
+    #     request.form['firstname'],
+    #     request.form['lastname'],
+    #     request.form['email'],
+    #    user_id]
+    #)
+    #db.commit()
+    #return redirect(url_for('admin.index'))
+
+
+
+
+

diff --git a/instance/flaskr.sqlite b/instance/flaskr.sqlite
index f51efe69b34615911fcf5d3d7aba6fafe808abef..e54b00119009cd1ab10bf59ccf3060a863793d49 100644 (file)
Binary files a/instance/flaskr.sqlite and b/instance/flaskr.sqlite differ