Added Messages

Messages are created with the Contact Us form

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc51bf2161e7e6c3c3540f1b1212f499c31c1e98..0d128affc12f18660db594d0fad3a8df780c9ee8 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e00b4877-6392-4152-a4a7-f9ffd3e1faca" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/flaskr/templates/admin/messages.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/blog/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/blog/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/flaskr/contact_us.py" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/contact_us.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/admin.html" beforeDir="false" afterPath="$PROJECT_DIR$/flaskr/templates/admin/admin.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" />
@@ -23,8 +21,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="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" />
+            <state relative-caret-position="200">
+              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
               <folding>
                 <element signature="e#0#90#0" expanded="true" />
               </folding>
@@ -33,19 +31,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
+        <entry file="file://$PROJECT_DIR$/flaskr/admin.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="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 relative-caret-position="780">
+              <caret line="95" column="17" lean-forward="true" selection-start-line="95" selection-start-column="17" selection-end-line="95" selection-end-column="17" />
+              <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/admin.py">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/messages.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="19" selection-start-column="19" selection-end-column="19" />
+            <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>
           </provider>
         </entry>
@@ -53,62 +54,65 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/user_list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state 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 relative-caret-position="160">
+              <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
+        <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/admin.html">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="100">
+              <caret line="5" column="54" lean-forward="true" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
+        <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
           <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="540">
+              <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
+              <folding>
+                <element signature="e#1#91#0" expanded="true" />
+              </folding>
             </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/home.py">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="200">
+              <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="39" />
             </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="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 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="false">
-        <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <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 relative-caret-position="340">
+              <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="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" />
+            <state relative-caret-position="220">
+              <caret line="23" column="21" lean-forward="true" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
               <folding>
                 <element signature="e#0#99#0" expanded="true" />
               </folding>
@@ -144,7 +148,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/templates/layout.html" />
         <option value="$PROJECT_DIR$/sql/upload_file.sql" />
         <option value="$PROJECT_DIR$/schema.sql" />
         <option value="$PROJECT_DIR$/templates/mediaserver_file_list.html" />
@@ -159,9 +162,7 @@
         <option value="$PROJECT_DIR$/flaskr/Readme2" />
         <option value="$PROJECT_DIR$/flaskr/db2.py" />
         <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/contact_us.py" />
         <option value="$PROJECT_DIR$/flaskr/services.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.py" />
         <option value="$PROJECT_DIR$/flaskr/testimonials.py" />
@@ -178,7 +179,6 @@
         <option value="$PROJECT_DIR$/flaskr/user_edit.py" />
         <option value="$PROJECT_DIR$/flaskr/templates/admin/user_edit.html" />
         <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/create.html" />
         <option value="$PROJECT_DIR$/flaskr/templates/base.html" />
@@ -190,11 +190,15 @@
         <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" />
+        <option value="$PROJECT_DIR$/flaskr/contact_us.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/admin.html" />
+        <option value="$PROJECT_DIR$/flaskr/admin.py" />
+        <option value="$PROJECT_DIR$/flaskr/templates/admin/messages.html" />
+        <option value="$PROJECT_DIR$/flaskr/schema.sql" />
       </list>
     </option>
   </component>
@@ -383,13 +387,6 @@
     </layout-to-restore>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/flaskr/Readme2">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="12" column="7" lean-forward="true" selection-start-line="12" selection-start-column="7" selection-end-line="12" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/templates/dashboard.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -510,13 +507,6 @@
         </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="40">
-          <caret line="2" column="24" lean-forward="true" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/dashboard.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -624,13 +614,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/home.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="10" column="39" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/view_post.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="80">
@@ -673,13 +656,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/templates/testimonials.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="220">
@@ -687,81 +663,115 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/templates/contact_us.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/static/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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/static/style.css">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/login.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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/admin/user_list.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/auth/register.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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/admin.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/blog/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="19" selection-start-column="19" selection-end-column="19" />
+        <state relative-caret-position="180">
+          <caret line="9" column="19" lean-forward="true" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
+    <entry file="file://$PROJECT_DIR$/flaskr/home.py">
       <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="200">
+          <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/flaskr/blog.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="200">
+          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
           <folding>
             <element signature="e#0#90#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <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="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 relative-caret-position="220">
+          <caret line="23" column="21" lean-forward="true" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#99#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <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="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 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/templates/auth/register.html">
+    <entry file="file://$PROJECT_DIR$/flaskr/contact_us.py">
       <provider selected="true" editor-type-id="text-editor">
-        <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 relative-caret-position="540">
+          <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
+          <folding>
+            <element signature="e#1#91#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/flaskr/auth.py">
+    <entry file="file://$PROJECT_DIR$/flaskr/admin.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" />
+        <state relative-caret-position="780">
+          <caret line="95" column="17" lean-forward="true" selection-start-line="95" selection-start-column="17" selection-end-line="95" selection-end-column="17" />
           <folding>
-            <element signature="e#0#99#0" expanded="true" />
+            <element signature="e#0#90#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="160">
+          <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+        </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="100">
+          <caret line="5" column="54" lean-forward="true" selection-start-line="5" selection-start-column="54" selection-end-line="5" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/templates/admin/messages.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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/flaskr/schema.sql">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

diff --git a/flaskr/__pycache__/admin.cpython-37.pyc b/flaskr/__pycache__/admin.cpython-37.pyc
index d3003e3690b8674b476c850417e01209a883e3ef..9df37b58b993b0147c6bc4d6cff61155db0aef72 100644 (file)
Binary files a/flaskr/__pycache__/admin.cpython-37.pyc and b/flaskr/__pycache__/admin.cpython-37.pyc differ

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

diff --git a/flaskr/__pycache__/contact_us.cpython-37.pyc b/flaskr/__pycache__/contact_us.cpython-37.pyc
index 779a8531b3aec8a7027dd77ed55fbf9ff59861fe..7d88ef8752cd4a0297e620b0bf8e8a6c4c5dbd69 100644 (file)
Binary files a/flaskr/__pycache__/contact_us.cpython-37.pyc and b/flaskr/__pycache__/contact_us.cpython-37.pyc differ

diff --git a/flaskr/admin.py b/flaskr/admin.py
index 3bbcedb0d2b2f4a108c13e7a02932b7710766742..48ad0e163c225c54fe2a18ae9d887b0ccba26e1d 100644 (file)
--- a/flaskr/admin.py
+++ b/flaskr/admin.py
@@ -77,4 +77,25 @@ def update_user(user_id):
             db.commit()
             return redirect(url_for('admin.index'))
 
-    return render_template('admin/user_edit.html', user=user)
\ No newline at end of file
+    return render_template('admin/user_edit.html', user=user)
+
+
+@bp.route('/messages')
+@login_required
+def get_messages():
+    db = get_db()
+    messages = db.execute(
+        'SELECT message_id, message_name, message_email, message_subject, message_body'
+        ' FROM message'
+    ).fetchall()
+
+    return render_template('admin/messages.html', messages=messages)
+
+@bp.route('/message_delete', methods=['POST'])
+def delete_message():
+    db = get_db()
+    db.execute(
+        'DELETE FROM message WHERE message_id = ?', [request.form['message_to_delete']]
+    )
+    db.commit()
+    return redirect(url_for('admin.get_messages'))
\ No newline at end of file

diff --git a/flaskr/contact_us.py b/flaskr/contact_us.py
index f5589083b2d5a6394fab6e5f6e538890e33e95ed..8f3b8f0ef4a74ba8b036f6b4fb3687a7bafb74a3 100644 (file)
--- a/flaskr/contact_us.py
+++ b/flaskr/contact_us.py
@@ -2,10 +2,55 @@
 from flask import (
     Blueprint, flash, g, redirect, render_template, request, url_for
 )
+# import smtplib
+from flaskr.db import get_db
 
 bp = Blueprint('contact_us', __name__)
 
 #Display Data - About
-@bp.route('/contact_us')
+@bp.route('/contact_us', methods=['GET', 'POST'])
 def index():
-    return render_template('contact_us.html')
\ No newline at end of file
+    if request.method == 'POST':
+
+        name = request.form['name']
+        email = request.form['email']
+        subject = request.form['subject']
+        body = request.form['body']
+
+        #message = "Thank you!"
+
+        #server = smtplib.SMTP("smtp.gmail.com", 587)
+        #server.starttls()
+        # set environmental variable here for password
+        #server.login('chas@gmail.com', 'password')
+        #send email from server to person who filled out the contact us form
+        #server.sendmail('chas@gmail.com', email, message)
+        error = None
+        db = get_db()
+        if not name:
+            error = 'Name is required.'
+        elif not email:
+            error = 'Email is required.'
+        elif not subject:
+            error = 'Subject is required.'
+        elif not body:
+            error = 'Message body is required.'
+
+        if error is None:
+                db.execute(
+                    'INSERT INTO message (message_name, message_email, message_subject, message_body) VALUES (?, ?, ?, ?)',
+                    [name, email, subject, body]
+                )
+                db.commit()
+
+                return render_template('home.html')
+        else:
+                flash(error)
+
+
+    return render_template('contact_us.html')
+
+
+#create messages within the flaskr app: messages from people filling out contact_us form
+#add a new message to the sqlite database when a user hits submit on the web form
+#this way, we don't need to send an email from chas@gmail.com to chas@gmail.com essentially
\ No newline at end of file

diff --git a/flaskr/schema.sql b/flaskr/schema.sql
index 634b8ab13e4b80a5188360f5fd8a754f5b5742fc..6a82113924090b650b53d536f5cfea78de7dec6f 100644 (file)
--- a/flaskr/schema.sql
+++ b/flaskr/schema.sql
@@ -16,6 +16,23 @@ create table xuser (
   xuser_email
 );
 
+drop table if exists item;
+create table item (
+  item_id integer primary key autoincrement,
+  item_name text not null,
+  item_price numeric not null,
+  item_description text not null
+);
+
+drop table if exists message;
+create table message (
+  message_id integer primary key autoincrement,
+  message_name text not null,
+  message_email text not null,
+  message_subject text not null,
+  message_body text not null
+);
+
 drop table if exists post;
 CREATE TABLE post (
   post_id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -33,19 +50,19 @@ CREATE TABLE post (
 
 
 --Basic info about an item
-drop table if exists item;
-create table item (
-  item_id integer primary key autoincrement,
-  item_name text,
-  item_subtitle text,
-  item_desc text,
-  item_category text,
-  item_condition text,
-  item_conditionDesc text,
-  item_cost numeric,
-  item_returnPolicyDesc text,
-  item_insertDate datetime
-);
+--drop table if exists item;
+--create table item (
+--  item_id integer primary key autoincrement,
+--  item_name text,
+--  item_subtitle text,
+--  item_desc text,
+--  item_category text,
+--  item_condition text,
+--  item_conditionDesc text,
+--  item_cost numeric,
+--  item_returnPolicyDesc text,
+--  item_insertDate datetime
+--);
 
 
 --File Upload/Download Data

diff --git a/flaskr/templates/admin/admin.html b/flaskr/templates/admin/admin.html
index 7b3a15a7a9a8b0f162745f7586e7da22ea8a6603..0c58dc67cba7ad9cc035fa2dd735c4b3e17a3ac5 100644 (file)
--- a/flaskr/templates/admin/admin.html
+++ b/flaskr/templates/admin/admin.html
@@ -3,4 +3,5 @@
     <h1>Admin Panel</h1>
     </br>
     <h1><a href="{{ url_for('admin.get_users') }}">User List</a></h1>
+    <h1><a href="{{ url_for('admin.get_messages') }}">Messages</a></h1>
 {% endblock %}
\ No newline at end of file

diff --git a/flaskr/templates/admin/messages.html b/flaskr/templates/admin/messages.html
new file mode 100644 (file)
index 0000000..74f0707
--- /dev/null
+++ b/flaskr/templates/admin/messages.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% block content %}
+    <h1><a href="{{ url_for('admin.index') }}">Admin Panel</a></h1>
+    <h1>Messages</h1>
+    </br>
+    {% for message in messages %}
+        <dl>
+            <dt>
+                <b>Person's Name:</b> {{ message.message_name }}
+                </br><b>Person's Email Address:</b> {{ message.message_email }}
+                </br><b>Message Subject:</b> {{ message.message_subject }}
+                </br><b>Message Body:</b></br> {{ message.message_body }}
+                    <form action="{{ url_for('admin.delete_message') }}" method=post class=add-item>
+                        <input type=hidden name=message_to_delete value="{{ message.message_id }}"></input>
+                        <input type=submit value="Delete"></input>
+                    </form>
+            </dt>
+        </dl>
+    {% endfor %}
+        </br>
+{% endblock %}
\ No newline at end of file

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