Updated registration form

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e2fba4f529af2bb5a3847ba160eacb885021c22..cc51bf2161e7e6c3c3540f1b1212f499c31c1e98 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e00b4877-6392-4152-a4a7-f9ffd3e1faca" name="Default Changelist" comment="">
-      <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/auth/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/auth/login.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/static/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/static/style.css" 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/auth/register.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/auth/register.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/flaskr/templates/contact_us.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/contact_us.html" 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/templates/testimonials.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/testimonials.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$/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" />
@@ -20,8 +23,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="160">
-              <caret line="125" lean-forward="true" selection-start-line="125" selection-end-line="125" />
+            <state relative-caret-position="420">
+              <caret line="21" column="12" lean-forward="true" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
               <folding>
                 <element signature="e#0#90#0" expanded="true" />
               </folding>
@@ -30,82 +33,85 @@
         </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/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="380">
-              <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
+            <state relative-caret-position="100">
+              <caret line="5" column="46" lean-forward="true" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/about.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="160">
-              <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="22" />
+            <state>
+              <caret column="19" selection-start-column="19" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="280">
-              <caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+            <state relative-caret-position="200">
+              <caret line="10" column="62" selection-start-line="10" selection-start-column="62" selection-end-line="10" selection-end-column="62" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/testimonials.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
           <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 relative-caret-position="600">
+              <caret line="33" column="28" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/contact_us.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="12" column="15" lean-forward="true" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
+            <state relative-caret-position="460">
+              <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/login.html">
+        <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="7" selection-end-column="22" />
+            <state relative-caret-position="240">
+              <caret line="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/login.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="260">
+              <caret line="13" column="40" lean-forward="true" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="180">
-              <caret line="9" column="4" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+            <state relative-caret-position="360">
+              <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="220">
-              <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
+            <state relative-caret-position="340">
+              <caret line="17" column="32" lean-forward="true" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
+              <folding>
+                <element signature="e#0#99#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -170,25 +176,25 @@
         <option value="$PROJECT_DIR$/flaskr/faq.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/update.html" />
         <option value="$PROJECT_DIR$/flaskr/user_edit.py" />
-        <option value="$PROJECT_DIR$/flaskr/auth.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" />
-        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_list.html" />
-        <option value="$PROJECT_DIR$/flaskr/admin.py" />
         <option value="$PROJECT_DIR$/flaskr/__init__.py" />
         <option value="$PROJECT_DIR$/flaskr/schema.sql" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/view_post.html" />
-        <option value="$PROJECT_DIR$/flaskr/templates/blog/index.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/blog/create.html" />
-        <option value="$PROJECT_DIR$/flaskr/blog.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/base.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/home.html" />
-        <option value="$PROJECT_DIR$/flaskr/static/style.css" />
         <option value="$PROJECT_DIR$/flaskr/templates/about.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/services.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/testimonials.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/contact_us.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/auth/login.html" />
+        <option value="$PROJECT_DIR$/flaskr/static/style.css" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/user_list.html" />
+        <option value="$PROJECT_DIR$/flaskr/admin.py" />
+        <option value="$PROJECT_DIR$/flaskr/blog.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/blog/index.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/auth/register.html" />
+        <option value="$PROJECT_DIR$/flaskr/auth.py" />
       </list>
     </option>
   </component>
@@ -350,7 +356,7 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Version Control" order="7" />
       <window_info anchor="bottom" id="Terminal" order="8" weight="0.3298279" />
-      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.3298279" />
       <window_info anchor="bottom" id="Python Console" order="10" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -598,13 +604,6 @@
         </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="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/user_edit.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="140">
@@ -632,128 +631,135 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/view_post.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="460">
-          <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
+        <state relative-caret-position="80">
+          <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/create.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="4" column="28" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+        <state relative-caret-position="20">
+          <caret line="1" selection-start-line="1" selection-end-line="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
-          <folding>
-            <element signature="e#0#99#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="320">
+          <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/view_post.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/home.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
+        <state relative-caret-position="180">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/create.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/about.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="20">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
+        <state relative-caret-position="160">
+          <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/base.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
+        <state relative-caret-position="280">
+          <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
+        <state relative-caret-position="120">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/testimonials.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="125" lean-forward="true" selection-start-line="125" selection-end-line="125" />
-          <folding>
-            <element signature="e#0#90#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="220">
+          <caret line="11" column="5" 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/templates/home.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/contact_us.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="9" column="4" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+        <state relative-caret-position="240">
+          <caret line="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="380">
-          <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
+        <state relative-caret-position="600">
+          <caret line="33" column="28" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/about.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="22" />
+        <state relative-caret-position="200">
+          <caret line="10" column="62" selection-start-line="10" selection-start-column="62" selection-end-line="10" selection-end-column="62" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/services.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
+        <state>
+          <caret column="19" selection-start-column="19" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
       <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="460">
+          <caret line="23" column="26" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/testimonials.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
       <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 relative-caret-position="420">
+          <caret line="21" column="12" lean-forward="true" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#90#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/contact_us.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="15" lean-forward="true" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
+        <state relative-caret-position="100">
+          <caret line="5" column="46" lean-forward="true" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
         </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="140">
-          <caret line="7" selection-start-line="7" selection-end-line="7" selection-end-column="22" />
+        <state relative-caret-position="260">
+          <caret line="13" column="40" lean-forward="true" selection-start-line="13" selection-start-column="40" selection-end-line="13" selection-end-column="40" />
         </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="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="360">
+          <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="17" column="32" lean-forward="true" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
+          <folding>
+            <element signature="e#0#99#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

diff --git a/flaskr/__pycache__/admin.cpython-37.pyc b/flaskr/__pycache__/admin.cpython-37.pyc
index eab560c7f71c94fc88cfbabd0e0f8bc10fe6daff..d3003e3690b8674b476c850417e01209a883e3ef 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 2501818e374ae3cd010b4b74f8f5a7f041374fdb..c68f75af4456592588b120e03fa840a0bcf81af5 100644 (file)
Binary files a/flaskr/__pycache__/blog.cpython-37.pyc and b/flaskr/__pycache__/blog.cpython-37.pyc differ

diff --git a/flaskr/admin.py b/flaskr/admin.py
index ace01fbe57eb15ed51c7ede33f16408cd9a2dd4f..3bbcedb0d2b2f4a108c13e7a02932b7710766742 100644 (file)
--- a/flaskr/admin.py
+++ b/flaskr/admin.py
@@ -31,7 +31,7 @@ def delete_user():
         'DELETE FROM xuser WHERE xuser_id = ?', [request.form['user_to_delete']]
     )
     db.commit()
-    return redirect(url_for('admin.index'))
+    return redirect(url_for('admin.get_users'))
 
 def get_user(user_id):
     user = get_db().execute(

diff --git a/flaskr/auth.py b/flaskr/auth.py
index cfe6af917c0dfde677cd913f587db8d3a5c47149..69ae9f9c1f57d85c5588c64da8925a36a3e928b2 100644 (file)
--- a/flaskr/auth.py
+++ b/flaskr/auth.py
@@ -18,6 +18,9 @@ def register():
     if request.method == 'POST':
         username = request.form['username']
         password = request.form['password']
+        firstname = request.form['firstname']
+        lastname = request.form['lastname']
+        email = request.form['email']
         db = get_db()
         error = None
 
@@ -29,8 +32,8 @@ def register():
         if error is None:
             try:
                 db.execute(
-                    "INSERT INTO xuser (xuser_username, xuser_password) VALUES (?, ?)",
-                    (username, generate_password_hash(password)),
+                    "INSERT INTO xuser (xuser_username, xuser_password, xuser_firstname, xuser_lastname, xuser_email) VALUES (?, ?, ?, ?, ?)",
+                    (username, generate_password_hash(password), firstname, lastname, email),
                 )
                 db.commit()
             except db.IntegrityError:

diff --git a/flaskr/blog.py b/flaskr/blog.py
index 1759e5ae60a4d7d909391cb5ac92665f5f3db317..365173052e192a7c36a66996814b8fa1ba5eb415 100644 (file)
--- a/flaskr/blog.py
+++ b/flaskr/blog.py
@@ -18,6 +18,10 @@ def index():
         ' FROM post p JOIN xuser u ON p.post_author_id = u.xuser_id'
         ' ORDER BY post_created DESC'
     ).fetchall()
+
+    #print("AAAAAAAAAAAAAA")
+    #print(posts[0][4])
+    #print("AAAAAAAAAAAAAA")
     return render_template('blog/index.html', posts=posts)
 
 
@@ -48,31 +52,51 @@ def create():
         #if "file1" not in request.files:
         #    return "there is no file1 in form!"
         file1 = request.files["file1"]
-        path = os.path.join(upload_folder, file1.filename)
-        file1.save(path)
-
-
+        if file1.filename != '':
+            path = os.path.join(upload_folder, file1.filename)
+            file1.save(path)
+
+            title = request.form['title']
+            body = request.form['body']
+            error = None
+            short_body = body[0:100]
+
+            if not title:
+                error = 'Title is required.'
+
+            if error is not None:
+                flash(error)
+            else:
+                db = get_db()
+                db.execute(
+                    'INSERT INTO post (post_title, post_body, post_shortbody, post_images, post_author_id)'
+                    ' VALUES (?, ?, ?, ?, ?)',
+                    (title, body, short_body, file1.filename, g.user['xuser_id'])
+                )
+                db.commit()
+                return redirect(url_for('blog.index'))
 
-
-        title = request.form['title']
-        body = request.form['body']
-        error = None
-        short_body = body[0:100]
-
-        if not title:
-            error = 'Title is required.'
-
-        if error is not None:
-            flash(error)
         else:
-            db = get_db()
-            db.execute(
-                'INSERT INTO post (post_title, post_body, post_shortbody, post_images, post_author_id)'
-                ' VALUES (?, ?, ?, ?, ?)',
-                (title, body, short_body, file1.filename, g.user['xuser_id'])
-            )
-            db.commit()
-            return redirect(url_for('blog.index'))
+            title = request.form['title']
+            body = request.form['body']
+            error = None
+            short_body = body[0:100]
+
+            if not title:
+                error = 'Title is required.'
+
+            if error is not None:
+                flash(error)
+            else:
+                db = get_db()
+                db.execute(
+                    'INSERT INTO post (post_title, post_body, post_shortbody, post_author_id)'
+                    ' VALUES (?, ?, ?, ?)',
+                    (title, body, short_body, g.user['xuser_id'])
+                )
+                db.commit()
+                return redirect(url_for('blog.index'))
+
 
     return render_template('blog/create.html')
 
@@ -123,6 +147,7 @@ def update(id):
         title = request.form['title']
         body = request.form['body']
         error = None
+        short_body = body[0:100]
 
         if not title:
             error = 'Title is required.'
@@ -132,9 +157,9 @@ def update(id):
         else:
             db = get_db()
             db.execute(
-                'UPDATE post SET post_title = ?, post_body = ?'
+                'UPDATE post SET post_title = ?, post_shortbody = ?, post_body = ?'
                 ' WHERE post_id = ?',
-                (title, body, id)
+                (title, body, short_body, id)
             )
             db.commit()
             return redirect(url_for('blog.index'))

diff --git a/flaskr/static/style.css b/flaskr/static/style.css
index e2cc153fb66ca8a6805710a6cd94a7c6bafa16f1..94669ddba729dadf33c4ecff1ca2ee8471852fa2 100644 (file)
--- a/flaskr/static/style.css
+++ b/flaskr/static/style.css
@@ -1,4 +1,5 @@
-html { font-family: sans-serif; background: #eee; padding: 1rem; }
+/* html { font-family: sans-serif; background: #eee; padding: 1rem; } */
+html { font-family: sans-serif; background: white; padding: 1rem; }
 /* body { max-width: 960px; margin: 0 auto; background: white; } */
 body { max-width: 90%; margin: 0 auto;  }
 /* h1 { font-family: serif; color: #377ba8; margin: 1rem 0; } */
@@ -30,7 +31,7 @@ nav ul li a, nav ul li span, header .action { display: block; padding: 0.5rem; }
 .content textarea { min-height: 12em; resize: vertical; }
 input.danger { color: #cc2f2e; }
 input[type=submit] { align-self: start; min-width: 10em; }
-.bottom { background: lightyellow; display: flex; align-items: center; padding: 0 0.5rem; }
+.bottom { background: white; display: flex; align-items: center; padding: 0 0.5rem; }
 
 .post2 { width: 25%; margin-left: 25%;}
 p2 {background-color: none; color: black; font-size: 25px; margin-left: 35%; }

diff --git a/flaskr/templates/admin/user_list.html b/flaskr/templates/admin/user_list.html
index c1c7981f736dce8553b06049ffd324cf21935090..f53f2eb70cd621cf05f9dc60043502cc2f799d0b 100644 (file)
--- a/flaskr/templates/admin/user_list.html
+++ b/flaskr/templates/admin/user_list.html
@@ -8,7 +8,7 @@
             <dt>
                 <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=hidden name=user_to_delete value="{{ user.xuser_id }}"></input>
                         <input type=submit value="Delete"></input>
                     </form>
                     <form action="{{ url_for('admin.update_user', user_id=user['xuser_id']) }}" method=get class=add-item>

diff --git a/flaskr/templates/auth/register.html b/flaskr/templates/auth/register.html
index aaa545899dafbd09b538c8ec4785cd0eddbe219e..291efab0dfd5f94f0365dd806897a61ad547f4d3 100644 (file)
--- a/flaskr/templates/auth/register.html
+++ b/flaskr/templates/auth/register.html
@@ -11,6 +11,12 @@
     <input name="username" id="username" required>
     <label for="password">Password</label>
     <input type="password" name="password" id="password" required>
+    <label for="firstname">First Name</label>
+    <input name="firstname" id="firstname">
+    <label for="lastname">Last Name</label>
+    <input name="lastname" id="lastname">
+    <label for="email">E-Mail Address</label>
+    <input name="email" id="email">
     <input type="submit" value="Register">
   </form>
 </section>

diff --git a/flaskr/templates/blog/index.html b/flaskr/templates/blog/index.html
index 5c4424336fc2e831e52bb350d4948a7a166b43f1..be89c92632eb60a92bd7273c795e991a9c5e2178 100644 (file)
--- a/flaskr/templates/blog/index.html
+++ b/flaskr/templates/blog/index.html
@@ -19,7 +19,9 @@
           <a class="action" href="{{ url_for('blog.update', id=post['post_id']) }}">Edit</a>
         {% endif %}
       </header>
-      <img src="{{url_for('blog.send_uploaded_file', filename=post['post_images']) }}" width="25%" height="25%"/>
+      {% if post['post_images'] != None %}
+        <img src="{{url_for('blog.send_uploaded_file', filename=post['post_images']) }}" width="25%" height="25%"/>
+      {% endif %}
       <p class="body">{{ post['post_shortbody'] }}</p>
     </article>
     {% if not loop.last %}

diff --git a/flaskr/upload/IMG_0524.JPG b/flaskr/upload/IMG_0524.JPG
new file mode 100644 (file)
index 0000000..d9fc9da
Binary files /dev/null and b/flaskr/upload/IMG_0524.JPG differ

diff --git a/instance/flaskr.sqlite b/instance/flaskr.sqlite
index e39bbdb3902ce854fb79244db06cc40b3ce73f41..3235b5afa3a53ac49563ad2042bd79a367258a80 100644 (file)
Binary files a/instance/flaskr.sqlite and b/instance/flaskr.sqlite differ