Fixed Blog with other authors not showing up

Also fixed static images across the app

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc7ecb99895c5fa482448398bfbc7a144eaadc2f..831cf3c2620340275f234dd0b7c89ba1c456c1d7 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,16 +3,17 @@
   <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/__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/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/about.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/about.html" 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/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$/flaskr/templates/services.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/services.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/user_edit.py" beforeDir="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" />
@@ -24,10 +25,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/user_edit.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/blog.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" />
+            <state relative-caret-position="320">
+              <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
               <folding>
                 <element signature="e#0#90#0" expanded="true" />
               </folding>
@@ -35,20 +36,35 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="300">
+              <caret line="15" column="39" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/admin.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" />
+            <state relative-caret-position="980">
+              <caret line="49" column="28" lean-forward="true" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" />
+              <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/blog/index.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="340">
+              <caret line="47" column="12" lean-forward="true" selection-start-line="47" selection-start-column="12" selection-end-line="47" selection-end-column="12" />
+              <folding>
+                <element signature="e#0#99#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -56,50 +72,56 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="420">
+              <caret line="21" column="17" lean-forward="true" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/flaskr/__init__.py">
           <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 relative-caret-position="80">
+              <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
+              <folding>
+                <element signature="e#0#9#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/base.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 relative-caret-position="-1120">
+              <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="680">
+              <caret line="53" column="8" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="8" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/about.html">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="340">
+              <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="200">
+              <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
             </state>
           </provider>
         </entry>
@@ -153,13 +175,11 @@
         <option value="$PROJECT_DIR$/flaskr.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" />
         <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/admin/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" />
         <option value="$PROJECT_DIR$/flaskr/templates/dashboard.html" />
         <option value="$PROJECT_DIR$/flaskr/home.py" />
@@ -169,20 +189,22 @@
         <option value="$PROJECT_DIR$/flaskr/templates/faq.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/resources.html" />
         <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/update.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" />
+        <option value="$PROJECT_DIR$/flaskr/__init__.py" />
+        <option value="$PROJECT_DIR$/flaskr/admin.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/base.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/home.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/about.html" />
+        <option value="$PROJECT_DIR$/flaskr/templates/services.html" />
+        <option value="$PROJECT_DIR$/flaskr/blog.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/blog/index.html" />
       </list>
     </option>
   </component>
@@ -479,13 +501,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="11" column="5" lean-forward="true" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/testimonials.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -500,13 +515,6 @@
         </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">
-          <caret line="14" selection-start-line="14" selection-end-line="14" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -591,13 +599,6 @@
         </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">
@@ -608,10 +609,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/home.py">
       <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 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" lean-forward="true" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
@@ -622,116 +637,123 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/home.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
       <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 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/contact_us.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="10" column="42" lean-forward="true" selection-start-line="10" selection-start-column="42" selection-end-line="10" selection-end-column="42" />
+        </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" selection-start-line="7" selection-end-line="17" selection-end-column="9" />
+          <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/contact_us.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
+        <state relative-caret-position="260">
+          <caret line="13" column="63" selection-start-line="13" selection-start-column="63" selection-end-line="13" selection-end-column="63" />
         </state>
       </provider>
     </entry>
-    <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="400">
-          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
+        <state relative-caret-position="140">
+          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
           <folding>
-            <element signature="e#0#9#0" expanded="true" />
+            <element signature="e#0#90#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="80">
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
           <folding>
-            <element signature="e#0#99#0" expanded="true" />
+            <element signature="e#0#9#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="-1120">
+          <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/user_edit.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
       <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 relative-caret-position="680">
+          <caret line="53" column="8" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_edit.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/about.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 relative-caret-position="340">
+          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="200">
+          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
+    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="340">
+          <caret line="47" column="12" lean-forward="true" selection-start-line="47" selection-start-column="12" selection-end-line="47" selection-end-column="12" />
+          <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/admin.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="980">
+          <caret line="49" column="28" lean-forward="true" selection-start-line="49" selection-start-column="28" selection-end-line="49" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#90#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="320">
+          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
           <folding>
             <element signature="e#0#90#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/update.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
       <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 relative-caret-position="420">
+          <caret line="21" column="17" lean-forward="true" selection-start-line="21" selection-start-column="17" selection-end-line="21" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.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 relative-caret-position="300">
+          <caret line="15" column="39" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
         </state>
       </provider>
     </entry>

diff --git a/flaskr/__init__.py b/flaskr/__init__.py
index dd499b5a8e93c1bbea417ee15e253dee57655f4c..3efd5c490be08e450a8a04dec15319e7ff89f5c4 100644 (file)
--- a/flaskr/__init__.py
+++ b/flaskr/__init__.py
@@ -57,9 +57,6 @@ def create_app(test_config=None):
     from . import services
     app.register_blueprint(services.bp)
 
-    from . import user_edit
-    app.register_blueprint(user_edit.bp)
-
     from . import testimonials
     app.register_blueprint(testimonials.bp)
 

diff --git a/flaskr/__pycache__/__init__.cpython-37.pyc b/flaskr/__pycache__/__init__.cpython-37.pyc
index bb82a48e8cc9ab58e17728db74866cdd177e7801..2dbb7881801889c41d1545f66ef69b707c846b2e 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__/admin.cpython-37.pyc b/flaskr/__pycache__/admin.cpython-37.pyc
index 8927978187645b9c647c26a1d83faf43eabbdaac..eab560c7f71c94fc88cfbabd0e0f8bc10fe6daff 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__/blog.cpython-37.pyc b/flaskr/__pycache__/blog.cpython-37.pyc
index b01dbcb51aa3c3910de84b3a0e4524a9b0186729..02c59dbc7298c9126fdedb7967428b8a0b5893a3 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
deleted file mode 100644 (file)
index 403bcd4..0000000
Binary files a/flaskr/__pycache__/user_edit.cpython-37.pyc and /dev/null differ

diff --git a/flaskr/admin.py b/flaskr/admin.py
index a19e56a90e29d42c42665b522adad44ab17352a1..ace01fbe57eb15ed51c7ede33f16408cd9a2dd4f 100644 (file)
--- a/flaskr/admin.py
+++ b/flaskr/admin.py
@@ -3,7 +3,7 @@ from flask import (
 )
 from flaskr.auth import login_required
 from flaskr.db import get_db
-
+from werkzeug.security import generate_password_hash, check_password_hash
 
 bp = Blueprint('admin', __name__)
 
@@ -33,16 +33,9 @@ def delete_user():
     db.commit()
     return redirect(url_for('admin.index'))
 
-#@bp.route('/user_update/<int:user_id>', methods=['POST'])
-#@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'])
-
-
 def get_user(user_id):
     user = get_db().execute(
-        'SELECT xuser_id, xuser_username, xuser_firstname, xuser_lastname, xuser_email'
+        'SELECT xuser_id, xuser_username, xuser_password, xuser_firstname, xuser_lastname, xuser_email'
         ' FROM xuser'
         ' WHERE xuser_id = ?',
         (user_id,)
@@ -53,29 +46,29 @@ def get_user(user_id):
 
 @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")
+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']
+        password = request.form['password']
         error = None
 
         if not username:
             error = 'Username is required.'
+        elif not password:
+            error = 'Password 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 = ?',
+                'UPDATE xuser SET xuser_username = ?, xuser_password = ?, xuser_firstname = ?, xuser_lastname = ?, xuser_email = ? WHERE xuser_id = ?',
                 [username,
+                 generate_password_hash(password),
                  firstname,
                  lastname,
                  email,

diff --git a/flaskr/blog.py b/flaskr/blog.py
index a3fe86fc0fa37b445de3e0a430a6ae10a7a4a9b4..edda52a0044dd09efe5f90f8345949faaf026d6e 100644 (file)
--- a/flaskr/blog.py
+++ b/flaskr/blog.py
@@ -13,8 +13,8 @@ bp = Blueprint('blog', __name__)
 def index():
     db = get_db()
     posts = db.execute(
-        'SELECT p.post_id, post_title, post_body, post_created, post_author_id, user_name'
-        ' FROM post p JOIN user u ON p.post_author_id = u.user_id'
+        'SELECT p.post_id, post_title, post_body, post_created, post_author_id, xuser_username'
+        ' FROM post p JOIN xuser u ON p.post_author_id = u.xuser_id'
         ' ORDER BY post_created DESC'
     ).fetchall()
     return render_template('blog/index.html', posts=posts)
@@ -48,8 +48,8 @@ def create():
 
 def get_post(id, check_author=True):
     post = get_db().execute(
-        'SELECT p.post_id, post_title, post_body, post_created, post_author_id, user_name'
-        ' FROM post p JOIN user u ON p.post_author_id = u.user_id'
+        'SELECT p.post_id, post_title, post_body, post_created, post_author_id, xuser_username'
+        ' FROM post p JOIN xuser u ON p.post_author_id = u.xuser_id'
         ' WHERE p.post_id = ?',
         (id,)
     ).fetchone()

diff --git a/flaskr/templates/about.html b/flaskr/templates/about.html
index 287ec84d497c2d6d8de543e94d47c01897fd1715..40fbd0f6e4114194ccdc103762a567e61a5d9f47 100644 (file)
--- a/flaskr/templates/about.html
+++ b/flaskr/templates/about.html
@@ -12,7 +12,7 @@ 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">
+<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,

diff --git a/flaskr/templates/admin/user_edit.html b/flaskr/templates/admin/user_edit.html
index f30dcbc1415a5bd6c2f2fdfe9e1893b728c99a1c..b1340e6e806dc22be07d85adda8b2a2d359775cf 100644 (file)
--- a/flaskr/templates/admin/user_edit.html
+++ b/flaskr/templates/admin/user_edit.html
@@ -8,6 +8,8 @@
   <form method="post">
     <label for="username">Username</label>
     <input name="username" id="username" value="{{ request.form['username'] or user['xuser_username'] }}" required>
+    <label for="password">Password</label>
+    <input name="password" id="password" type="password" value="{{ request.form['password'] or user['xuser_password'] }}" required>
     <label for="email">Email</label>
     <input name="email" id="email" value="{{ request.form['email'] or user['xuser_email']  }}">
     <label for="firstname">First Name:</label>

diff --git a/flaskr/templates/admin/user_list.html b/flaskr/templates/admin/user_list.html
index bb40ee4aab8cf12571b1704cbb8c96f2e6c74e80..c1c7981f736dce8553b06049ffd324cf21935090 100644 (file)
--- a/flaskr/templates/admin/user_list.html
+++ b/flaskr/templates/admin/user_list.html
@@ -11,7 +11,7 @@
                         <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_userInfo', user_id=user['xuser_id']) }}" method=get class=add-item>
+                    <form action="{{ url_for('admin.update_user', 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>

diff --git a/flaskr/templates/base.html b/flaskr/templates/base.html
index 2153a26cada19dc693c13c25a6d368332642344f..8a9304f0bc0b13c1995071daa65cdcac48b101c1 100644 (file)
--- a/flaskr/templates/base.html
+++ b/flaskr/templates/base.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <title>{% block title %}{% endblock %}</title>
 <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
-<img src="static\houseparty.png" alt="Site Logo" width="100" height="100">
+<img src="\static\houseparty.png" alt="Site Logo" width="100" height="100">
 <nav>
   <h1>Open House Party</h1>
   <head>
@@ -90,19 +90,19 @@
       &nbsp;
       &nbsp;
       <a href="https://www.facebook.com/openhousepartybychasmurillo">
-        <img alt="Facebook" src="static\facebook_icon.png" width="50" height="50">
+        <img alt="Facebook" src="\static\facebook_icon.png" width="50" height="50">
       </a>
       <a href="https://www.twitter.com/HouseParty_Chas">
-        <img alt="Twitter" src="static\twitter_icon.png" width="50" height="50">
+        <img alt="Twitter" src="\static\twitter_icon.png" width="50" height="50">
       </a>
       <a href="https://www.youtube.com/channel/UCD1uS5BGUauOoQKWM9WqlEQ">
-        <img alt="YouTube" src="static\youtube_icon.png" width="50" height="50">
+        <img alt="YouTube" src="\static\youtube_icon.png" width="50" height="50">
       </a>
       <a href="https://www.pinterest.ph/openhousepartybychasmurillo">
-        <img alt="Pinterest" src="static\pinterest_icon.png" width="50" height="50">
+        <img alt="Pinterest" src="\static\pinterest_icon.png" width="50" height="50">
       </a>
       <a href="https://www.instagram.com/openhousepartybychasmurillo">
-        <img alt="Instagram" src="static\instagram_icon.png" width="50" height="50">
+        <img alt="Instagram" src="\static\instagram_icon.png" width="50" height="50">
       </a>
     </li>
   </ul2>

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

diff --git a/flaskr/templates/home.html b/flaskr/templates/home.html
index 4d755cbaefca2807e3b2201b859ea399ab5d413a..57933f36e147115b33306829fe4b5d418b0882fb 100644 (file)
--- a/flaskr/templates/home.html
+++ b/flaskr/templates/home.html
@@ -28,7 +28,7 @@
   <div class="mainX">
     <div class="main_left">
       <!-- original width=582 height=632 -->
-      <img alt="Winter Trees" src="static\winter_trees.png" width="523" height="568">
+      <img alt="Winter Trees" src="\static\winter_trees.png" width="523" height="568">
     </div>
     <div class="main_left2">
       <div class="fontSizeX">
@@ -49,20 +49,20 @@
     </div>
     <div class="main_left3">
       <!-- original width=574 height=634 -->
-      <img alt="Sample House 2" src="static\home_sampleHouse2.png" width="459" height="507">
+      <img alt="Sample House 2" src="\static\home_sampleHouse2.png" width="459" height="507">
     </div>
   </div>
   <!--
   <div class="mainX">
     <div class="main_left">
-      <img alt="Winter Trees" src="static\winter_trees.png" width="582" height="632" class="main_left">
+      <img alt="Winter Trees" src="\static\winter_trees.png" width="582" height="632" class="main_left">
     </div>
     <div id="text">
       HouseParty! is the home owner's starter kit for an evolving selection of cool toys and
       mods to be implemented in your own home. Our selection is affordable, appropriate, and awesome!
     </div>
     <div class="main_right">
-      <img alt="Sample House 2" src="static\home_sampleHouse2.png" width="574" height="634" class="main_right">
+      <img alt="Sample House 2" src="\static\home_sampleHouse2.png" width="574" height="634" class="main_right">
     </div>
   </div>
   -->

diff --git a/flaskr/templates/services.html b/flaskr/templates/services.html
index 302c05f8434a8cc733d5c8cf938a278629eef298..b173b72f15010589b07316c00ad335a62dd994d9 100644 (file)
--- a/flaskr/templates/services.html
+++ b/flaskr/templates/services.html
@@ -7,22 +7,22 @@
 {% block content %}
 <b>Modular Toy Construction</b>
 </br>
-<img alt="Modular Toy Construction" src="static\modular_toy_construction.png" width="162" height="116">
+<img alt="Modular Toy Construction" src="\static\modular_toy_construction.png" width="162" height="116">
 </br>
 </br>
 <b>CNC Machine Works</b>
 </br>
-<img alt="CNC Machine Works" src="static\cnc_machine_works.png" width="162" height="116">
+<img alt="CNC Machine Works" src="\static\cnc_machine_works.png" width="162" height="116">
 </br>
 </br>
 <b>Plastic Recycling</b>
 </br>
-<img alt="Plastic Recycling" src="static\plastic_recycling.png" width="162" height="116">
+<img alt="Plastic Recycling" src="\static\plastic_recycling.png" width="162" height="116">
 </br>
 </br>
 <b>Repurposing of 3D Printing</b>
 </br>
-<img alt="Repurposing of 3D Printing" src="static\repurposing_of_3d_printing.png" width="162" height="116">
+<img alt="Repurposing of 3D Printing" src="\static\repurposing_of_3d_printing.png" width="162" height="116">
 </br>
 </br>
 {% endblock %}
\ No newline at end of file

diff --git a/flaskr/user_edit.py b/flaskr/user_edit.py
deleted file mode 100644 (file)
index 11d0c11..0000000
--- a/flaskr/user_edit.py
+++ /dev/null
@@ -1,61 +0,0 @@
-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('/<int:user_id>/user_update', methods=['POST'])
-#@bp.route('/user_update2', methods=['POST'])
-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 e54b00119009cd1ab10bf59ccf3060a863793d49..3f4558b0ff34b0c12a8d28441c2716ff06c38a22 100644 (file)
Binary files a/instance/flaskr.sqlite and b/instance/flaskr.sqlite differ