Feed and fonts added

Author: vladnov138

Diff for: .idea/flask-retromemes-app.iml

@@ -52,23 +52,46 @@ def upload_meme():
 @app.route("/feed", methods=['GET', 'POST'])
 @app.route("/index", methods=['GET', 'POST'])
 @app.route("/main", methods=['GET', 'POST'])
-def show_feed():
-    return render_template("index.html")
+def show_feed(page=1):
+    if request.method == "GET" and request.args.get('page'):
+        page = int(request.args.get('page'))
+    dataposts = list(get_all_tabledata(create_connection('C:\\Users\\79246\\PycharmProjects\\flask-retromemes-app\\'
+                                                'database\\memes_testdata.db'), 'Post'))
+    pages = len(dataposts) // PAGES_POSTS
+    if len(dataposts) % PAGES_POSTS != 0:
+        pages += 1
+    posts = []
+    limit = page * PAGES_POSTS
+    if limit > len(dataposts):
+        limit = len(dataposts)
+    # Generate posts
+    for i in range((page - 1) * PAGES_POSTS, limit):
+        author_name = get_username_bId(dataposts[i][1], 'C:\\Users\\79246\\PycharmProjects\\flask-retromemes-app\\'
+                                                    'database\\memes_testdata.db')
+        avatar = get_user_avatar_bId(dataposts[i][1], 'C:\\Users\\79246\\PycharmProjects\\flask-retromemes-app\\'
+                                                    'database\\memes_testdata.db')
+        post = {'avatar': AVATAR_FOLDER + avatar, 'author_id': dataposts[i][1],
+                'author_name': author_name, 'date': dataposts[i][4], 'comment': dataposts[i][2],
+                'image': MEMES_FOLDER + dataposts[i][3], }
+        posts.append(post)
+    return render_template("index.html", posts=posts, pages=pages)
 
 
 @app.route('/admin', methods=['GET', 'POST'])
 @app.route('/adminpannel', methods=['GET', 'POST'])
 @app.route('/adminpanel', methods=['GET', 'POST'])
 def admin_panel():
-    try:
-        username = session['login']
-        connection = create_connection(DATABASE_PATH)
-        if is_user_admin(connection, username, 'login'):
-            return render_template('admin.html')
-        return generate_notadmin_page()
-    except:
-        return generate_notadmin_page()
-
+    if request.method == 'POST':
+        print(list(request.form))
+    # try:
+    #     username = session['login']
+    #     connection = create_connection(DATABASE_PATH)
+    #     if is_user_admin(connection, username, 'login'):
+    #         return render_template('admin.html')
+    #     return generate_notadmin_page()
+    # except:
+    #     return generate_notadmin_page()
+    return render_template('admin.html')
 
 # Handling of 404 error
 @app.errorhandler(404)
@@ -116,15 +139,17 @@ def login_user():
         login = request.form.get('login')
         password = request.form.get('password')
         con = sl.connect(DATABASE_PATH)
-        sql = f"SELECT password,id FROM users WHERE `login`='{login}'"
+        sql = f"SELECT password,id, admin FROM users WHERE `login`='{login}'"
         result = list(con.execute(sql))
         if password == result[0][0]:
             session['login'] = login
             session['id'] = result[0][1]
+            session['admin'] = result[0][2]
+        redirect('show_feed')
     return render_template('auth.html')
 
 
 # Programm run
 if __name__ == '__main__':
     #create_testdata_database(DATABASE_PATH, "C:\\Users\\Glaster\\Desktop\\memes\\")
-    app.run(host="0.0.0.0")
+    app.run(host="0.0.0.0", debug=True)

Diff for: .idea/inspectionProfiles/profiles_settings.xml

@@ -8,9 +8,11 @@
 DATABASE_PATH = os.getcwd() + '\\' + "database" + '\\' + "memes.db"
 UPLOAD_FOLDER = os.getcwd() + '\\' + "static\\images\\uploaded_memes\\"
 DEFAULT_AVATAR = os.getcwd() + "\\static\\images\\ava.png"
+AVATAR_FOLDER = 'images/avatars/'
+MEMES_FOLDER = 'images/uploaded_memes/'
 ALLOWED_EXTENSIONS = {'png', 'jpg', 'jpeg'}
 
-
+PAGES_POSTS = 10
 
 USED_TABLES = [USERS_TABLENAME, POSTS_TABLENAME, RATES_TABLENAME, HISTORY_TABLENAME]
 

Diff for: .idea/misc.xml

@@ -230,6 +230,12 @@ def get_username_bId(user_id, db_file):
     result = connection.execute(sql_querry).fetchall()[0][0]
     return result
 
+def get_user_avatar_bId(user_id, db_file):
+    connection = create_connection(db_file)
+    sql_query = f"SELECT avatar FROM users WHERE id={user_id}"
+    result = connection.execute(sql_query).fetchall()[0][0]
+    return result
+
 
 def delete_post_bID(post_id, connection, basic_path):
     """Delete post by it's id"""
@@ -278,7 +284,6 @@ def synthesize_admin(connection, admin_name, isAdmin = 1):
     add_user(connection, user)
     connection.commit()
 
-
 def synthesize_user(connection, user_name):
     """Synthesizes user"""
     synthesize_admin(connection, user_name, 0)

Diff for: .idea/modules.xml

@@ -4,9 +4,9 @@
         grid-template-columns: repeat(6, 1fr);
     }
 
-    main > div:first-child {
-        margin: 0 15px;
-        grid-column: 1/7;
+    main > div:nth-of-type(2) {
+        margin: 15px;
+        grid-column: 1/6;
         grid-template-columns: repeat(6, 1fr);
     }
 
@@ -20,19 +20,33 @@
     }
 
     .name {
-        grid-column: 3/7;
+        grid-column: 2/7;
+        grid-template-columns: repeat(6, 1fr);
+    }
+
+    .name > div:first-child {
+        grid-column: 1/7;
+        font-size: 13pt;
+    }
+
+    .name > div:last-child {
+        grid-column: 1/6;
+        width: 60px;
+        height: 20px;
+        font-size: 10pt;
     }
 
     .exit {
-        grid-column: 5/7;
+        grid-column: 6/7;
+        margin: 15px;
     }
 
     .user_avatar > img {
         width: 50px;
         height: 50px;
     }
 
-    form {
+    #adminpanel {
         grid-column: 1/7;
         margin: 15px;
     }

Diff for: app.py

@@ -1,10 +1,13 @@
+@import url("font.css");
+
 body {
     padding: 0;
     margin: 0;
     background-color: #d4d4d4;
     box-sizing: border-box;
     max-width: 100%;
     max-height: 100%;
+    
 }
 
 main {
@@ -20,7 +23,7 @@ main {
     padding-bottom: 30px;
 }
 
-main > div:first-child {
+main > div:nth-of-type(2) {
     grid-column: 1/12;
     margin: 30px;
     display: grid;
@@ -40,7 +43,7 @@ main > div:first-child {
 }
 
 .name {
-    grid-column: 4/9;
+    grid-column: 4/10;
     display: grid;
     grid-template-columns: repeat(12, 1fr);
     grid-column-gap: 20px;
@@ -65,7 +68,7 @@ main > div:first-child {
 }
 
 .exit {
-    grid-column: 12/13;
+    grid-column: 11/13;
     background-color: #ecf1f6;
     width: 80px;
     height: 20px;
@@ -74,9 +77,14 @@ main > div:first-child {
     border-color: rgba(27,31,36,0.15);
     border-radius: 4px;
     margin: 30px;
+    cursor: pointer;
+}
+
+#exitform {
+    display: none;
 }
 
-form {
+#adminpanel {
     grid-column: 1/13;
     margin: 30px;
     background-color: #d6d1d1;
@@ -87,71 +95,71 @@ form {
     grid-column-gap: 20px;
 }
 
-form > div:first-child {
+#adminpanel > div:first-child {
     font-size: 14pt;
     font-weight: 600;
     margin-top: 15px;
     text-align: center;
     grid-column: 1/13;
 }
 
-form > div:last-child {
+#adminpanel > div:last-child {
     grid-column: 1/13;
     margin-top: 15px;
 }
 
-form > .actions > input {
+#adminpanel > .actions > input {
     padding: 5px;
     border-radius: 5px;
     border: 1px;
     box-shadow:0 0 15px 4px rgba(0,0,0,0.06);
 }
 
-form > .actions > input[name="type[ban]"] {
+#adminpanel > .actions > input[name="type[ban]"] {
     background-color: #e20000;
 }
 
-form > .actions > input[name="type[ban]"]:hover {
+#adminpanel > .actions > input[name="type[ban]"]:hover {
     background-color: #cc0909;
 }
 
-form > .actions > input[name="type[unban]"] {
+#adminpanel > .actions > input[name="type[unban]"] {
     background-color: #0cb61a;
 }
 
-form > .actions > input[name="type[unban]"]:hover {
+#adminpanel > .actions > input[name="type[unban]"]:hover {
     background-color: #0e9b1a;
 }
 
-form > .actions > input[name="type[delete]"] {
+#adminpanel > .actions > input[name="type[delete]"] {
     background-color: #cf1d1d;
 }
 
-form > .actions > input[name="type[delete]"]:hover {
+#adminpanel > .actions > input[name="type[delete]"]:hover {
     background-color: #bb2e2e;
 }
 
-form > .actions > input[name="type[makeadmin]"] {
+#adminpanel > .actions > input[name="type[makeadmin]"] {
     background-color: #e20000;
 }
 
-form > .actions > input[name="type[makeadmin]"]:hover {
+#adminpanel > .actions > input[name="type[makeadmin]"]:hover {
     background-color: #cc0909;
 }
 
-form > .actions > input[name="type[makemoderator]"] {
+#adminpanel > .actions > input[name="type[makemoderator]"] {
     background-color: #0b6dc9;
 }
 
-form > .actions > input[name="type[makemoderator]"]:hover {
+#adminpanel > .actions > input[name="type[makemoderator]"]:hover {
     background-color: #0c59a1;
 }
 
-form > .actions > input[name="type[makeuser]"] {
+#adminpanel > .actions > input[name="type[makeuser]"] {
     background-color: #5ea4c5;
 }
 
-form > .actions > input[name="type[makeuser]"]:hover {
+#adminpanel > .actions > input[name="type[makeuser]"]:hover {
     background-color: #417c97;
 }
 

Diff for: database/memes.db

@@ -6,7 +6,7 @@
 
     main > div {
         grid-column: 2/6;
-        padding: 5px 10px;
+        padding: 10px;
         font-size: 10pt;
     }
 

Diff for: memes.db

@@ -1,3 +1,5 @@
+@import url("font.css");
+
 body {
     padding: 0;
     margin: 0;

Diff for: modules/constants.py

@@ -0,0 +1,18 @@
+h1, nav {
+    font-family: "Montserrat";
+}
+
+body {
+    font-family: "Roboto";
+}
+
+
+@font-face {
+    font-family: "Montserrat";
+    src: url("../fonts/Montserrat-Light.ttf");
+}
+
+@font-face {
+    font-family: "Roboto";
+    src: url("../fonts/RobotoCondensed-Regular.ttf")
+}