Got Update User working in the admin panel

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f07a4acc81026c8d6c314c5c5a02d7d3ddfd4812..69a40973682301f9766dafdf4a2aaa92850381d7 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,22 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e00b4877-6392-4152-a4a7-f9ffd3e1faca" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/flaskr/about.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/contact_us.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/services.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/templates/about.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/templates/contact_us.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/templates/services.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/flaskr/user_edit.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/admin.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_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/dashboard.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/dashboard.html" 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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -13,103 +28,107 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/dashboard.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="9" column="12" lean-forward="true" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+            <state relative-caret-position="220">
+              <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
+              <folding>
+                <element signature="e#1520#1526#0" expanded="true" />
+                <element signature="e#1533#1539#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/dashboard.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/admin.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="6" column="21" lean-forward="true" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+            <state relative-caret-position="60">
+              <caret line="3" column="9" lean-forward="true" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/admin.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="3" column="9" lean-forward="true" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
+            <state relative-caret-position="140">
+              <caret line="7" column="16" lean-forward="true" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
+        <entry file="file://$PROJECT_DIR$/templates/pcparts/updatePart.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" />
-              <folding>
-                <element signature="e#1#91#0" expanded="true" />
-              </folding>
+              <caret line="5" column="22" lean-forward="true" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="160">
-              <caret line="8" column="26" lean-forward="true" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
+              <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+              <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/__init__.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/user_edit.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="420">
-              <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
+            <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#9#0" expanded="true" />
+                <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$/templates/pcparts_list.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="12" column="55" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
+            <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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/create.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="80">
-              <caret line="4" column="14" lean-forward="true" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
+            <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>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="52" column="10" lean-forward="true" selection-start-line="52" selection-start-column="10" selection-end-line="52" selection-end-column="10" />
+            <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#1520#1526#0" expanded="true" />
-                <element signature="e#1533#1539#0" expanded="true" />
-                <element signature="e#1546#1552#0" expanded="true" />
-                <element signature="e#1559#1565#0" expanded="true" />
+                <element signature="e#0#99#0" expanded="true" />
               </folding>
             </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$/templates/pcparts_addPart.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="40">
-              <caret line="2" column="43" lean-forward="true" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+            <state relative-caret-position="340">
+              <caret line="17" column="34" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
+              <folding>
+                <element signature="n#style#0;n#input#0;n#dd#0;n#dl#0;n#form#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -164,7 +183,6 @@
         <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/schema.sql" />
         <option value="$PROJECT_DIR$/flaskr/auth.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/create.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/update.html" />
@@ -173,13 +191,23 @@
         <option value="$PROJECT_DIR$/flaskr/templates/blog/index.html" />
         <option value="$PROJECT_DIR$/flaskr/dashboard.py" />
         <option value="$PROJECT_DIR$/flaskr/blog.py" />
-        <option value="$PROJECT_DIR$/flaskr/__init__.py" />
-        <option value="$PROJECT_DIR$/flaskr/templates/dashboard.html" />
         <option value="$PROJECT_DIR$/flaskr/static/style.css" />
         <option value="$PROJECT_DIR$/flaskr/templates/admin/admin.html" />
+        <option value="$PROJECT_DIR$/flaskr/about.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/about.html" />
+        <option value="$PROJECT_DIR$/flaskr/contact_us.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/contact_us.html" />
+        <option value="$PROJECT_DIR$/flaskr/services.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/base.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/services.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/dashboard.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.py" />
+        <option value="$PROJECT_DIR$/flaskr/__init__.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/base.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" />
+        <option value="$PROJECT_DIR$/flaskr/user_edit.py" />
       </list>
     </option>
   </component>
@@ -249,6 +277,12 @@
               <item name="openhouseparty.online" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="openhouseparty.online" type="b2602c69:ProjectViewProjectNode" />
+              <item name="openhouseparty.online" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="pcparts" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -266,8 +300,8 @@
       <recent name="C:\Users\Joseph\Documents\GitHub\flaskr_mediaserver\templates\pcparts" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\Joseph\Documents\GitHub\openhouseparty.online\flaskr\static" />
       <recent name="C:\Users\Joseph\Documents\GitHub\openhouseparty.online\flaskr" />
+      <recent name="C:\Users\Joseph\Documents\GitHub\openhouseparty.online\flaskr\static" />
       <recent name="C:\Users\Joseph\Documents\GitHub\flaskr_mediaserver\templates" />
     </key>
   </component>
@@ -343,74 +377,6 @@
     </layout>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/sql/select_all_items.sql">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/pcparts_addPart.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/select_build.sql">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/select_mediaserver_file_list.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="18" selection-start-column="18" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/select_fileToDelete.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="44" selection-start-column="44" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/select_fileToDownload.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="36" selection-start-column="36" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/insert_fan.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="12" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/delete_part.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="1" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/insert_settings.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="5" column="9" selection-start-line="5" selection-start-column="9" selection-end-line="5" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/insert_case.sql">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/sql/select_settings.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="22" selection-start-column="22" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/templates/pcparts_addBuild.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7">
-          <caret line="25" column="19" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/item_list.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -435,13 +401,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/templates/add_item.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="600">
-          <caret line="30" column="28" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/layout.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -507,20 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="13" column="27" lean-forward="true" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
-        </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="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>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -545,16 +490,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1440">
-          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
-          <folding>
-            <element signature="e#0#99#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -596,13 +531,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr - Copy.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="621">
-          <caret line="733" column="48" lean-forward="true" selection-start-line="733" selection-start-column="14" selection-end-line="733" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/static/houseparty.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -616,84 +544,210 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/about.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="9" column="12" lean-forward="true" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
+        <state relative-caret-position="100">
+          <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="2" column="43" lean-forward="true" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
+        <state relative-caret-position="60">
+          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/admin.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/create.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="3" column="9" lean-forward="true" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
+        <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">
+    <entry file="file://$PROJECT_DIR$/templates/add_item.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="600">
+          <caret line="30" column="28" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/about.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+        </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" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-          <folding>
-            <element signature="e#1#91#0" expanded="true" />
-          </folding>
+          <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$/flaskr/templates/blog/create.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="4" column="14" lean-forward="true" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
+        <state relative-caret-position="40">
+          <caret line="2" selection-start-line="2" selection-end-line="4" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/templates/pcparts_list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="12" column="55" selection-start-line="12" selection-start-column="55" selection-end-line="12" selection-end-column="55" />
+        <state relative-caret-position="200">
+          <caret line="10" column="43" selection-start-line="10" selection-start-column="43" selection-end-line="10" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/dashboard.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/services.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
+        </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$/flaskr/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
+        <state relative-caret-position="840">
+          <caret line="60" column="36" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="36" />
           <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$/templates/pcparts_addBuild.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="26" lean-forward="true" selection-start-line="8" selection-start-column="26" selection-end-line="8" selection-end-column="26" />
+        <state relative-caret-position="840">
+          <caret line="42" column="28" lean-forward="true" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/dashboard.html">
+    <entry file="file://$PROJECT_DIR$/flaskr - Copy.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="6" column="21" lean-forward="true" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="21" />
+        <state relative-caret-position="281">
+          <caret line="683" column="18" lean-forward="true" selection-start-line="683" selection-start-column="18" selection-end-line="683" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/templates/pcparts/updatePart_details.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="11" column="29" lean-forward="true" selection-start-line="11" selection-start-column="29" selection-end-line="11" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="52" column="10" lean-forward="true" selection-start-line="52" selection-start-column="10" selection-end-line="52" selection-end-column="10" />
+        <state relative-caret-position="220">
+          <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
           <folding>
             <element signature="e#1520#1526#0" expanded="true" />
             <element signature="e#1533#1539#0" expanded="true" />
-            <element signature="e#1546#1552#0" expanded="true" />
-            <element signature="e#1559#1565#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/admin.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="3" column="9" lean-forward="true" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
+        </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$/flaskr/templates/admin/user_list.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="7" column="16" lean-forward="true" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
+        </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">
+          <caret line="17" column="34" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
+          <folding>
+            <element signature="n#style#0;n#input#0;n#dd#0;n#dl#0;n#form#0;n#!!top" expanded="true" />
+          </folding>
+        </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">
+          <caret line="5" column="22" lean-forward="true" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="160">
+          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+          <folding>
+            <element signature="e#0#90#0" expanded="true" />
           </folding>
         </state>
       </provider>

diff --git a/flaskr/__init__.py b/flaskr/__init__.py
index dead69abdfe429c0d6fb7802752c6e428bb6afdd..48b2126f0e5196f5ca411e9f24f556f816e2ca4a 100644 (file)
--- a/flaskr/__init__.py
+++ b/flaskr/__init__.py
@@ -48,4 +48,17 @@ def create_app(test_config=None):
     from . import admin
     app.register_blueprint(admin.bp)
 
+    from . import about
+    app.register_blueprint(about.bp)
+
+    from . import contact_us
+    app.register_blueprint(contact_us.bp)
+
+    from . import services
+    app.register_blueprint(services.bp)
+
+    from . import user_edit
+    app.register_blueprint(user_edit.bp)
+
+
     return app
\ No newline at end of file

diff --git a/flaskr/__pycache__/__init__.cpython-37.pyc b/flaskr/__pycache__/__init__.cpython-37.pyc
index 8f6062e690038ef5c46ec661f3707408eaf7e0ae..3c6fad59aa0fbe435fec3ae49ca139a26f28a930 100644 (file)
Binary files a/flaskr/__pycache__/__init__.cpython-37.pyc and b/flaskr/__pycache__/__init__.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/about.cpython-37.pyc b/flaskr/__pycache__/about.cpython-37.pyc
new file mode 100644 (file)
index 0000000..86c1593
Binary files /dev/null and b/flaskr/__pycache__/about.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/admin.cpython-37.pyc b/flaskr/__pycache__/admin.cpython-37.pyc
index 9b20c956d45c5b161ae19d89585332f71973c9c5..12c1115174f48ed3fd525debfff3251667b06113 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__/contact_us.cpython-37.pyc b/flaskr/__pycache__/contact_us.cpython-37.pyc
new file mode 100644 (file)
index 0000000..779a853
Binary files /dev/null and b/flaskr/__pycache__/contact_us.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/services.cpython-37.pyc b/flaskr/__pycache__/services.cpython-37.pyc
new file mode 100644 (file)
index 0000000..b6104af
Binary files /dev/null and b/flaskr/__pycache__/services.cpython-37.pyc differ

diff --git a/flaskr/__pycache__/user_edit.cpython-37.pyc b/flaskr/__pycache__/user_edit.cpython-37.pyc
new file mode 100644 (file)
index 0000000..0297d8d
Binary files /dev/null and b/flaskr/__pycache__/user_edit.cpython-37.pyc differ

diff --git a/flaskr/about.py b/flaskr/about.py
new file mode 100644 (file)
index 0000000..748c293
--- /dev/null
+++ b/flaskr/about.py
@@ -0,0 +1,11 @@
+
+from flask import (
+    Blueprint, flash, g, redirect, render_template, request, url_for
+)
+
+bp = Blueprint('about', __name__)
+
+#Display Data - About
+@bp.route('/about')
+def index():
+    return render_template('about.html')
\ No newline at end of file

diff --git a/flaskr/admin.py b/flaskr/admin.py
index 03f29bdeec4be1455abd82e2e726fc7310bd0d2f..8972998da0cd37c48c09c1e816a15b6c332b5214 100644 (file)
--- a/flaskr/admin.py
+++ b/flaskr/admin.py
@@ -22,13 +22,19 @@ def get_users():
         ' FROM user'
     ).fetchall()
 
-    return  render_template('admin/user_list.html', users=users)
+    return render_template('admin/user_list.html', users=users)
 
 @bp.route('/user_delete', methods=['POST'])
 def delete_user():
     db = get_db()
     db.execute(
-        'DELETE FROM user WHERE user_id = ?',[request.form['user_to_delete']]
+        'DELETE FROM user WHERE user_id = ?', [request.form['user_to_delete']]
     )
     db.commit()
-    return redirect(url_for('admin.index'))
\ No newline at end of file
+    return redirect(url_for('admin.index'))
+
+#@bp.route('/user_update/<int:user_id>', methods=['POST'])
+@bp.route('/user_update', methods=['POST'])
+def update_user():
+
+    return render_template('admin/user_edit.html', user_id=request.form['user_to_edit'])
\ No newline at end of file

diff --git a/flaskr/contact_us.py b/flaskr/contact_us.py
new file mode 100644 (file)
index 0000000..f558908
--- /dev/null
+++ b/flaskr/contact_us.py
@@ -0,0 +1,11 @@
+
+from flask import (
+    Blueprint, flash, g, redirect, render_template, request, url_for
+)
+
+bp = Blueprint('contact_us', __name__)
+
+#Display Data - About
+@bp.route('/contact_us')
+def index():
+    return render_template('contact_us.html')
\ No newline at end of file

diff --git a/flaskr/schema.sql b/flaskr/schema.sql
index ee656bf2150a72c03316d402e6e319138b924e16..99610f91d79d7afac06d977e916f1aa89d1af2a8 100644 (file)
--- a/flaskr/schema.sql
+++ b/flaskr/schema.sql
@@ -3,7 +3,10 @@ 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_password text not null,
+  user_firstname,
+  user_lastname,
+  user_email
 );
 
 drop table if exists post;
@@ -17,6 +20,9 @@ CREATE TABLE post (
 );
 
 
+
+
+
 --Basic info about an item
 drop table if exists item;
 create table item (

diff --git a/flaskr/services.py b/flaskr/services.py
new file mode 100644 (file)
index 0000000..a4fef33
--- /dev/null
+++ b/flaskr/services.py
@@ -0,0 +1,11 @@
+
+from flask import (
+    Blueprint, flash, g, redirect, render_template, request, url_for
+)
+
+bp = Blueprint('services', __name__)
+
+#Display Data - About
+@bp.route('/services')
+def index():
+    return render_template('services.html')
\ No newline at end of file

diff --git a/flaskr/static/chas_portrait.png b/flaskr/static/chas_portrait.png
new file mode 100644 (file)
index 0000000..74df7fd
Binary files /dev/null and b/flaskr/static/chas_portrait.png differ

diff --git a/flaskr/templates/about.html b/flaskr/templates/about.html
new file mode 100644 (file)
index 0000000..287ec84
--- /dev/null
+++ b/flaskr/templates/about.html
@@ -0,0 +1,46 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <h1>{% block title %}About{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+Charles Murillo is an Engineer by profession.
+</br>
+</br>
+He obtained his Degree at Michigan Technological University in 2017,
+and a power certificate along with a certificate in Fannuc Robotics
+which he obtained at the Northwest State Community College.
+</br>
+<img alt="Chas" src="static\chas_portrait.png" width="281" height="337">
+</br>
+Realizing that the cost of living and debt levels are putting pressure on
+many people to compete with one another for more from life,
+Chas wants to take the junk/plastic life throws at him that’s over
+produced by society and put it into developing his replicable machinery
+for creating sustainable housing to mend people’s insecurities.
+</br>
+</br>
+</br>
+</br>
+</br>
+<b>The Birth of OpenHouseParty</b>
+</br>
+</br>
+Charles Murillo was able to witness the struggles of many ordinary people in having a
+decent house to live in or paying in their monthly rent. Moreover, he is aware that today’s
+modern way life is making more families to have less time together.
+</br>
+</br>
+These observations prompted him to create OpenHouseParty to give hope to families and individuals
+who are struggling to have proper homes as well as to provide the opportunity for families to bond together.
+</br>
+</br>
+The cost of each miniature design is affordable and made available to everyone because it is open-source.
+This project also encourages everyone to contribute and share their expertise to make the project better and more useful.
+</br>
+</br>
+OpenHouseParty aims to help people have stable housing at a very affordable cost.
+</br>
+
+{% endblock %}
\ No newline at end of file

diff --git a/flaskr/templates/admin/user_edit.html b/flaskr/templates/admin/user_edit.html
new file mode 100644 (file)
index 0000000..d28ae1c
--- /dev/null
+++ b/flaskr/templates/admin/user_edit.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block header %}
+  <h1>{% block title %}Edit User {{ user_id }}{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+  <form action="{{ url_for('user_edit.edit_user2', user_id = user_id) }} "method="post">
+    <label for="username">Username</label>
+    <input name="username" id="username" value="{{ request.form['username'] }}" required>
+    <label for="email">Email</label>
+    <input name="email" id="email" value="{{ request.form['email'] }}">
+    <label for="firstname">First Name:</label>
+    <input name="firstname" id="firstname" value="{{ request.form['firstname'] }}">
+    <label for="lastname">Last Name:</label>
+    <input name="lastname" id="lastname" value="{{ request.form['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 9e73db47c89a5f168390ee723e064e9d488c5e21..046566bb4faf6903d1f1a6984511714e94d403e0 100644 (file)
--- a/flaskr/templates/admin/user_list.html
+++ b/flaskr/templates/admin/user_list.html
@@ -11,6 +11,10 @@
                         <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>
+                        <input type=submit value="Edit"></input>
+                    </form>
             </dt>
         </dl>
     {% endfor %}

diff --git a/flaskr/templates/base.html b/flaskr/templates/base.html
index 3d8d0a700212c5b02525127235bf0fd982e0840b..cc5a01c02f9e3281962fb00d1cd00fa6f1171f6c 100644 (file)
--- a/flaskr/templates/base.html
+++ b/flaskr/templates/base.html
@@ -23,9 +23,11 @@
   </head>
   <body>
   <ul>
-    <li><a href="{{ url_for('dashboard.index') }}">Visit Dashboard</a></li>
-    <li><a href="{{ url_for('dashboard.index') }}">Visit Dashboard</a></li>
-    <li><a href="{{ url_for('dashboard.index') }}">Visit Dashboard</a></li>
+    <li><a href="{{ url_for('blog.index') }}">Blog</a></li>
+    <li><a href="{{ url_for('dashboard.index') }}">Dashboard</a></li>
+    <li><a href="{{ url_for('about.index') }}">About</a></li>
+    <li><a href="{{ url_for('contact_us.index') }}">Contact Us</a></li>
+    <li><a href="{{ url_for('services.index') }}">Services</a></li>
   </ul>
   </body>
 

diff --git a/flaskr/templates/contact_us.html b/flaskr/templates/contact_us.html
new file mode 100644 (file)
index 0000000..b4e05c7
--- /dev/null
+++ b/flaskr/templates/contact_us.html
@@ -0,0 +1,19 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <h1>{% block title %}Contact Us{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+  <form method="post">
+    <label for="name">Name</label>
+    <input name="name" id="name" value="{{ request.form['name'] }}" required>
+    <label for="email">Email</label>
+    <input name="email" id="email" value="{{ request.form['email'] }}" required>
+    <label for="subject">Subject</label>
+    <input name="subject" id="subject" value="{{ request.form['subject'] }}" required>
+    <label for="body">Body</label>
+    <textarea name="body" id="body">{{ request.form['body'] }}</textarea>
+    <input type="submit" value="Submit">
+  </form>
+{% endblock %}
\ No newline at end of file

diff --git a/flaskr/templates/dashboard.html b/flaskr/templates/dashboard.html
index b370708a0ff590ddfb153d704b9870c7a0b53f82..c0f50c76e8a963a365a633f60066ead40c327814 100644 (file)
--- a/flaskr/templates/dashboard.html
+++ b/flaskr/templates/dashboard.html
@@ -1,13 +1,12 @@
 {% extends "base.html" %}
+{% block header %}
+  <h1>{% block title %}Dashboard{% endblock %}</h1>
+{% endblock %}
 {% block content %}
-
-                <h1>Dashboard</h1>
                 <b>Landing Page</b>
                 <em>Welcome to the dashboard!</em>
                 </br>
-                <em>New Stuff</em>
                 </br>
-                <a href="{{ url_for('blog.index') }}">Visit Blog</a>
                 <a href="{{ url_for('admin.index') }}">Visit Admin Panel</a>
                 </br>
                 </br>

diff --git a/flaskr/templates/services.html b/flaskr/templates/services.html
new file mode 100644 (file)
index 0000000..dfe1cbf
--- /dev/null
+++ b/flaskr/templates/services.html
@@ -0,0 +1,9 @@
+{% extends 'base.html' %}
+
+{% block header %}
+  <h1>{% block title %}Services{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+
+{% endblock %}
\ No newline at end of file

diff --git a/flaskr/user_edit.py b/flaskr/user_edit.py
new file mode 100644 (file)
index 0000000..46ca643
--- /dev/null
+++ b/flaskr/user_edit.py
@@ -0,0 +1,24 @@
+from flask import (
+    Blueprint, flash, g, redirect, render_template, request, url_for
+)
+from flaskr.auth import login_required
+from flaskr.db import get_db
+
+
+bp = Blueprint('user_edit', __name__)
+
+
+@bp.route('/user_update/<int:user_id>', 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

diff --git a/instance/flaskr.sqlite b/instance/flaskr.sqlite
index 8d4a4e2bf4f972326b991020754e208df4dbec18..2e880c89712d80261e3303ff57b64480d6a599f3 100644 (file)
Binary files a/instance/flaskr.sqlite and b/instance/flaskr.sqlite differ