Головна сторінка Огляд Довідка
Увійти
control
/
matcsh
2
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

ui and functionality done, site is silver

control 4 роки тому
батько
9f1c6c338b
коміт
3491b75a30
10 змінених файлів з 113 додано та 42 видалено
Розділений вигляд Показати статистику Diff
  1. BIN
      app/database.db
  2. 1 1
      app/logic.py
  3. 68 4
      app/static/css/custom.css
  4. BIN
      app/static/uploads/ljqeDhr9dbs7ThAI.jpeg
  5. 2 1
      app/templates/base.html
  6. 3 2
      app/templates/login.html
  7. 3 2
      app/templates/matchbook.html
  8. 30 26
      app/templates/messaging.html
  9. 4 4
      app/templates/profile.html
  10. 2 2
      app/templates/register.html

BIN
app/database.db
Переглянути файл


+ 1 - 1
app/logic.py
Переглянути файл 

@@ -78,7 +78,7 @@ def messaging():
 
         new_msg_dbcall = Message(sender=current_user.id, recipient=recipient.id, message=message)
 
         db.session.add(new_msg_dbcall)
 
         db.session.commit()
 
-
 
+        return redirect(url_for('logic.messaging'))
 
     return render_template("messaging.html", user=current_user, recipient=recipient, msg_hist=joint_history)

+ 68 - 4
app/static/css/custom.css
Переглянути файл 

@@ -9,10 +9,24 @@ h1, h3, a, p {
 
 h1 {
 
     margin: 20px 0 20px 0;
 
 }
 
+
 
+/* Globals */
 
+.center-elem {
 
+    position: relative;
 
+    margin: auto;
 
+}
 
+.padding-top {
 
+    padding-top: 20px;
 
+}
 
+.red-border {
 
+    border-color: #ff3333 !important;
 
+}
 
+
 
 /* Major */
 
 body {
 
     padding-bottom: 50px;
 
 }
 
+
 
 /* Navbar */
 
 nav.navbar {
 
     background-color: #ff3333;
 
@@ -33,25 +47,75 @@ nav a, .navbar-text, .navbar-toggler-icon {
 
     font-size: large;
 
     padding-right: 20px;
 
 }
 
+
 
+/* Flash Alerts */
 
+.alert {
 
+    position: relative;
 
+    margin: auto;
 
+    width: 20%;
 
+}
 
+
 
 /* Images */
 
 img {
 
     max-width: 250px;
 
     max-height: 250px;
 
     margin: 20px 0 20px 0;
 
 }
 
+.mimg {
 
+    max-width: 100px;
 
+    max-height: 100px;
 
+    border-radius: 50% !important;
 
+}
 
 /* Input */
 
+input {
 
+    max-width: 200px;
 
+}
 
 .btn {
 
     background-color: #ff3333;
 
     border-color: #ff3333;
 
 }
 
-input {
 
-    max-width: 200px;
 
+.upswd {
 
+    margin-top: 20px;
 
+}
 
+.description_area {
 
+    position: relative;
 
+    margin: auto; /* centers */
 
+}
 
+.updesc {
 
+    position: relative;
 
+    margin: auto;
 
+    display: block; /* sends to newline */
 
+    margin-top: 20px;
 
 }
 
 
 /* Backgrounds */
 
 .matchbook-bg {
 
-    /*background-color:  #ffb3b3;*/
 
-    background-color: white;
 
+    background-color: #ffe6e6;
 
     width: 500px;
 
     border-radius: 25%;
 
+    border-color: #ff3333 !important;
 
+    margin: 20px 0 20px 0;
 
+    
+}
 
+
 
+/* Messaging */
 
+.message_hist {
 
+    max-width: 50%;
 
+    min-height: 20%;
 
+    max-height: 70%;
 
+    position: relative;
 
+    margin: auto;
 
+    padding: 10px;
 
+    border-color: #ffe6e6 !important;
 
+}
 
+.senderpic {
 
+    transform: translate(-100px);
 
+}
 
+.recvrpic {
 
+    transform: translate(100px);
 
+}
 
+.msging_name {
 
+    display: inline; /* removes element's newline*/
 
+    z-index: 3;
 
+    position: relative;
 
 }

BIN
app/static/uploads/ljqeDhr9dbs7ThAI.jpeg
Переглянути файл


+ 2 - 1
app/templates/base.html
Переглянути файл 

@@ -18,7 +18,8 @@
 
             rel="stylesheet"
 
             href="static/css/custom.css"
 
         />
 
-        <title>{% block title %}Home{% endblock %}</title>
 
+        <link rel = "icon" href ="static/icons/balloon-heart.svg" type = "image/x-icon" class="brand-icon">
 
+        <title>{% block title %}Matcsh.{% endblock %}</title>
 
     </head>
 
 
     <body>

+ 3 - 2
app/templates/login.html
Переглянути файл 

@@ -20,8 +20,9 @@
 
         name="passwd_login"
 
         placeholder="Enter Password"
 
     />
 
+    <br />
 
+    <button type="submit" class="btn btn-primary">Login</button>
 
 </div>
 
-<br />
 
-<button type="submit" class="btn btn-primary">Login</button>
 
+
 
 </form>
 
 {% endblock %}

+ 3 - 2
app/templates/matchbook.html
Переглянути файл 

@@ -8,9 +8,9 @@
 
         {% for user in userlist %}
 
         <li class="list-group-item matchbook-bg border rounded mx-auto">
 
             {% if user.profile_image %}
 
-                <img src="static/uploads/{{ user.profile_image }}" class="border rounded-circle">
 
+                <img src="static/uploads/{{ user.profile_image }}" class="border rounded-circle red-border">
 
             {% else %}
 
-                <img src="static/uploads/default.png" class="border rounded-circle">
 
+                <img src="static/uploads/default.png" class="border rounded-circle red-border">
 
             {% endif %}
 
             <p>{{ user.firstname }}</p>
 
             <p style="font-weight: 900;">{{ user.lastname }}</p>
 
@@ -23,4 +23,5 @@
 
         {% endfor %}
 
     </ul>
 
 </div>
 
+
 
 {% endblock %}

+ 30 - 26
app/templates/messaging.html
Переглянути файл 

@@ -1,34 +1,38 @@
 
 {% extends "base.html" %}
 
 
 {% block content %}
 
+<div class="mx-auto text-center">
 
+    <h1>Messaging</h1>
 
+    {% if user.profile_image %}
 
+    <img src="static/uploads/{{ user.profile_image }}" class="border rounded-circle red-border mimg senderpic">
 
+    {% else %}
 
+    <img src="static/uploads/default.png" class="border rounded-cirle red-border mimg senderpic">
 
+    {% endif %}
 
 
-<h1>Messaging</h1>
 
-{% if user.profile_image %}
 
-<img src="static/uploads/{{ user.profile_image }}" class="border rounded-circle">
 
-{% else %}
 
-<img src="static/uploads/default.png" class="border rounded-cirle">
 
-{% endif %}
 
-{{ user.firstname }}
 
+    {% if recipient.profile_image %}
 
+    <img src="static/uploads/{{ recipient.profile_image }}" class="border rounded-circle red-border mimg recvrpic">
 
+    {% else %}
 
+    <img src="static/uploads/default.png" class="border rounded-circle red-border mimg recvrpic">
 
+    {% endif %}
 
+    <div>
 
+        <p class="msging_name text-left">{{ user.firstname }} is talking to {{ recipient.firstname }}</p>
 
+    </div>
 
 
-{% if recipient.profile_image %}
 
-<img src="static/uploads/{{ recipient.profile_image }}" class="border rounded-circle">
 
-{% else %}
 
-<img src="static/uploads/default.png" class="border rounded-circle">
 
-{% endif %}
 
-{{ recipient.firstname }}
 
 
-<div>
 
-    {% for message in msg_hist %}
 
-        {%if message.sender == user.id %}
 
-        <p class="sender_msg">{{ message.datestamp }} :: {{ message.message }}</p>
 
-        {% else %}
 
-        <p class="rcvr_msg">{{ message.datestamp }} :: {{ message.message }}</p>
 
-        {% endif %}
 
-    {% endfor %}
 
-</div>
 
 
-<form method="POST">
 
-    <textarea name="message_box" id="message_box" cols="50" rows="3" style="resize:none;"></textarea>
 
-    <button type="submit" class="btn btn-primary">Send</button>
 
-</form>
 
+    <div class="message_hist border rounded text-left">
 
+        {% for message in msg_hist %}
 
+            {%if message.sender == user.id %}
 
+            <p class="sender_msg"><span style="font-weight: bolder;">{{ user.firstname }}</span> : {{ message.message }}</p>
 
+            {% else %}
 
+            <p class="rcvr_msg"><span style="font-weight: bolder;">{{ recipient.firstname }}</span> : {{ message.message }}</p>
 
+            {% endif %}
 
+        {% endfor %}
 
+    </div>
 
+
 
+    <form method="POST">
 
+        <textarea name="message_box" id="message_box" cols="50" rows="3" style="resize:none;" placeholder="Type your message here..."></textarea>
 
+        <button type="submit" class="btn btn-primary">Send</button>
 
+    </form>
 
+</div>
 
 {% endblock %}

+ 4 - 4
app/templates/profile.html
Переглянути файл 

@@ -17,13 +17,13 @@
 
 <p>{{ user.gender }} , {{ user.age }}</p>
 
 <form method="POST">
 
     <textarea id="description_area" name="description_area" placeholder="{{ user.description }}" style="resize:none;" rows="3" cols="40"></textarea>
 
-    <button type="submit" class="btn btn-primary">Update Description</button>
 
+    <button type="submit" class="btn btn-primary updesc">Update Description</button>
 
 </form>
 
 <form method="POST">
 
     <label for="passwd_1"></label>
 
     <input 
         type="password" 
-        class="form-control" 
+        class="form-control center-elem" 
         id="passwd_1"
 
         name="passwd_1"
 
         placeholder="Edit Password"
 
@@ -31,12 +31,12 @@
 
     <label for="passwd_2"></label>
 
     <input 
         type="password" 
-        class="form-control" 
+        class="form-control center-elem" 
         id="passwd_2"
 
         name="passwd_2"
 
         placeholder="Confirm Password"
 
     />
 
-    <button type="submit" class="btn btn-primary">Update Password</button>
 
+    <button type="submit" class="btn btn-primary upswd">Update Password</button>
 
 </form>
 
 {% endblock %}
 
 </div>

+ 2 - 2
app/templates/register.html
Переглянути файл 

@@ -54,7 +54,7 @@
 
             max="110"
 
             placeholder="Insert Your Age"
 
         />
 
-        <label for="genderm">Male</label>
 
+        <label for="genderm" class="padding-top">Male</label>
 
         <input 
             type="radio" 
             class="form-control" 
@@ -62,7 +62,7 @@
 
             name="gender"
 
             value="M"
 
         />
 
-        <label for="genderf">Female</label>
 
+        <label for="genderf" style="display: inline;">Female</label>
 
         <input 
             type="radio" 
             class="form-control"