Merge pull request #14 from TheTrustyPwo/lastminutechanges

Lastminutechanges

Author: TheTrustyPwo

app/auth/auth_service.py

@@ -1,4 +1,3 @@
-import requests
 from flask_login import login_user, logout_user
 from passlib.hash import bcrypt
 
@@ -34,8 +33,6 @@ def log_in_user(email, password):
     :rtype: bool
     """
     user = User.get_by_email(email.lower())
-    if not user or user.password is None:
-        return False
     if user and bcrypt.verify(password, user.password):
         login_user(user)
         return True
@@ -47,7 +44,3 @@ def log_out_user():
     Logs the current user out.
     """
     logout_user()
-
-
-def get_google_provider_cfg():
-    return requests.get('https://accounts.google.com/.well-known/openid-configuration').json()

app/auth/routes.py

@@ -1,12 +1,8 @@
-from flask import flash, redirect, render_template, request, url_for, current_app
-from flask_login import current_user, login_required, login_user
-import json
-import requests
+from flask import flash, redirect, render_template, request, url_for
+from flask_login import current_user, login_required
 
-from app import oauth_client
 from app.auth import auth_blueprint, auth_service
 from app.auth.forms import RegisterForm, LoginForm
-from app.models import User
 
 
 @auth_blueprint.route("/register", methods=["GET", "POST"])
@@ -70,64 +66,6 @@ def login():
     return render_template("login.html", form=form)
 
 
-@auth_blueprint.route("/login/google")
-def login_google():
-    google_provider_cfg = auth_service.get_google_provider_cfg()
-    authorization_endpoint = google_provider_cfg["authorization_endpoint"]
-
-    request_uri = oauth_client.prepare_request_uri(
-        authorization_endpoint,
-        redirect_uri=request.base_url + "/callback",
-        scope=["openid", "email", "profile"],
-    )
-    return redirect(request_uri)
-
-
-@auth_blueprint.route("/login/google/callback")
-def login_google_callback():
-    code = request.args.get("code")
-
-    google_provider_cfg = auth_service.get_google_provider_cfg()
-    token_endpoint = google_provider_cfg["token_endpoint"]
-
-    token_url, headers, body = oauth_client.prepare_token_request(
-        token_endpoint,
-        authorization_response=request.url,
-        redirect_url=request.base_url,
-        code=code
-    )
-
-    token_response = requests.post(
-        token_url,
-        headers=headers,
-        data=body,
-        auth=(current_app.config['GOOGLE_CLIENT_ID'], current_app.config['GOOGLE_CLIENT_SECRET']),
-    )
-
-    oauth_client.parse_request_body_response(json.dumps(token_response.json()))
-
-    userinfo_endpoint = google_provider_cfg["userinfo_endpoint"]
-    uri, headers, body = oauth_client.add_token(userinfo_endpoint)
-    userinfo_response = requests.get(uri, headers=headers, data=body)
-
-    if not userinfo_response.json().get("email_verified"):
-        flash("Login Failed: Email not verified", "danger")
-        return redirect(url_for("auth.login"))
-
-    email = userinfo_response.json()["email"]
-    picture = userinfo_response.json()["picture"]
-    username = userinfo_response.json()["given_name"]
-
-    user = User.get_by_email(email)
-    if not user:
-        user = User(email=email, username=username, password=None)
-        user.save()
-
-    login_user(user)
-
-    return redirect(url_for('feed.home'))
-
-
 @auth_blueprint.route("/logout", methods=["POST"])
 @login_required
 def logout():

app/static/css/style.css

@@ -4787,7 +4787,7 @@ select.sort {
 .modal-popup-body,
 .chat-wrapper,
 .chat-left {
-  height: calc(90vh - 100px);
+  height: calc(100vh - 120px);
 }
 .modal-popup-body::-webkit-scrollbar-track,
 .chat-wrapper::-webkit-scrollbar-track,
@@ -5105,17 +5105,17 @@ select.sort {
   margin: 0 5px;
   position: relative;
 }
-/*.chat-form .form-group:after {*/
-/*  background-color: var(--theme-color);*/
-/*  opacity: 0.08;*/
-/*  width: 100%;*/
-/*  height: 100%;*/
-/*  content: "";*/
-/*  position: absolute;*/
-/*  top: 0;*/
-/*  left: 0;*/
-/*  border-radius: 30px;*/
-/*}*/
+.chat-form .form-group:after {
+  background-color: var(--theme-color);
+  opacity: 0.08;
+  width: 100%;
+  height: 100%;
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  border-radius: 30px;
+}
 .chat-form input {
   width: 100%;
   border: 0;
@@ -5171,6 +5171,7 @@ select.sort {
   -moz-box-align: start;
   -ms-flex-align: start;
   align-items: flex-start;
+  padding-bottom: 70px !important;
 }
 .chat-body .messages-content .message-item.outgoing-message {
   margin-left: auto;
@@ -6081,4 +6082,4 @@ select.sort {
   border-color: #eee !important;
   pointer-events: none !important;
   animation: loading-skeleton 1s infinite alternate !important;
-}
+}

app/static/js/home.js

@@ -65,7 +65,7 @@ function createPostCard(post) {
         <h4 class="fw-bold font-xs">${post.title}</h4>
         <div class="card-body p-0 me-lg-5">
             <p class="fw-500 text-grey-500 lh-26 font-xssss w-100 mb-2">
-                ${post.body.length > 300 ? `${post.body.slice(0, 300)} <a href="/post/${post.id}" class="fw-600 text-primary ms-2">See more</a>` : post.body}
+                ${post.body.length > 150 ? `${post.body.slice(0, 150)} <a href="/post/${post.id}" class="fw-600 text-primary ms-2">See more</a>` : post.body}
             </p>
         </div>
     
@@ -89,12 +89,12 @@ function createPostCard(post) {
                 <span class="d-none-xss">${post.replyCount} Replies</span>
             </a>
     
-            <div id="share" class="pointer ms-auto d-flex align-items-center fw-600 text-grey-900 text-dark lh-26 font-xssss" id="shareDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+            <div class="pointer ms-auto d-flex align-items-center fw-600 text-grey-900 text-dark lh-26 font-xssss" id="dropdownMenu32" data-bs-toggle="dropdown" aria-expanded="false">
                 <i class="feather-share-2 text-grey-900 text-dark btn-round-sm font-lg"></i>
                 <span class="d-none-xs">Share</span>
             </div>
     
-            <div class="dropdown-menu dropdown-menu-end p-4 rounded-xxl border-0 shadow-lg right-0 " aria-labelledby="shareDropdown">
+            <div class="dropdown-menu dropdown-menu-end p-4 rounded-xxl border-0 shadow-lg right-0 " aria-labelledby="dropdownMenu32">
                 <h4 class="fw-700 font-xss text-grey-900 d-flex align-items-center">Share <i class="feather-x ms-auto font-xssss btn-round-xs bg-greylight text-grey-900 me-2"></i></h4>
                 <div class="card-body p-0 d-flex">
                     <ul class="d-flex align-items-center justify-content-between mt-2">
@@ -106,23 +106,12 @@ function createPostCard(post) {
                     </ul>
                 </div>
                 <h4 class="fw-700 font-xssss mt-4 text-grey-500 d-flex align-items-center mb-3">Copy Link</h4>
-                <i id="copy-link" class="feather-copy position-absolute right-35 mt-3 font-xs text-grey-500"></i>
-                <input id="post-link" type="text" value="https://studyhub.thepwo.com/post/${post.id}" class="bg-grey text-grey-700 border-0 lh-32 p-2 font-xssss fw-600 rounded-3 w-100 theme-dark-bg" disabled>
+                <i class="feather-copy position-absolute right-35 mt-3 font-xs text-grey-500"></i>
+                <input type="text" placeholder="https://studyhub.thepwo.com/post/${post.id}" class="bg-grey text-grey-500 font-xssss border-0 lh-32 p-2 font-xssss fw-600 rounded-3 w-100 theme-dark-bg">
             </div>
-        </div>`);
-
-    postCard.onclick = () => {
-        location.href = `/post/${post.id}`;
-    }
-
-    postCard.querySelector('#share').onclick = (event) => event.stopPropagation();
-    postCard.querySelector('#copy-link').onclick = () => {
-        const postLink = postCard.querySelector('#post-link');
-        postLink.select();
-        postLink.setSelectionRange(0, 99999);
-        navigator.clipboard.writeText(postLink.value);
-    }
+        </div>`)
 
+    postCard.onclick = () => window.location.href = `/post/${post.id}`;
     return postCard;
 }
 

app/static/js/models/conversation.js

@@ -3,7 +3,22 @@ import Message from "./message.js";
 
 // Establish a socket connection
 const socket = io.connect(`/messages/socket`, {rememberTransport: false});
-const current = await User.getCurrent()
+
+// Listen for new message events
+socket.on('new_message', async message => {
+    // Extract message properties
+    const {id, senderId, conversationId, content, timestamp, readUserIds} = message;
+
+    // Get sender and conversation objects
+    const sender = await User.getById(senderId);
+    const conversation = await Conversation.getById(conversationId);
+
+    // Get read users
+    const readUsers = await Promise.all(readUserIds.map(async userId => await User.getById(userId)));
+
+    // Create a new Message object and add it to the conversation history
+    conversation.history.push(new Message(id, sender, conversation, content, new Date(timestamp), new Set(readUsers)));
+});
 
 class Conversation {
     // Static cache map for storing Conversation objects
@@ -55,10 +70,15 @@ class Conversation {
         }
     }
 
+    /**
+     * Get all conversations
+     * @returns {Array<Conversation>} - An array of Conversation objects
+     */
     static async getAll() {
         const response = await fetch(`/api/v1/conversations/all`);
         const data = await response.json();
-        return Promise.all(data.map(async conversationData => await Conversation.fromJson(conversationData)));
+        const conversations = await Promise.all(data.map(async conversationData => await Conversation.fromJson(conversationData)));
+        return conversations.filter(convo => convo !== undefined);
     }
 
     /**
@@ -109,7 +129,6 @@ class Conversation {
             const readUsers = await Promise.all(readUserIds.map(async userId => await User.getById(userId)));
             return new Message(id, sender, this, content, moment.utc(timestamp), new Set(readUsers));
         }));
-        this.history.sort((a, b) => b.timestamp - a.timestamp);
     }
 
     /**
@@ -133,15 +152,10 @@ class Conversation {
      * Get the last message in the conversation
      * @returns {Message|undefined} - The last Message object in the conversation or undefined if no messages
      */
-     get latestMessage() {
+    getLastMessage() {
         if (this.history.length === 0) return undefined;
         return this.history[this.history.length - 1];
     }
-
-    get image() {
-         if (this.isGroup) return `/static/assets/default-group.png`;
-         else return Array.from(this.users).find(user => user.id !== current.id).pfp;
-    }
 }
 
 export default Conversation;

app/static/js/models/user.js

@@ -11,15 +11,17 @@ class User {
      * @param {string} username - The username of the user
      * @param {Date} dateCreated - The date the user was created
      * @param {string} pfp - The profile picture URL of the user
+     * @param answered
      */
-    constructor(id, email, username, dateCreated, pfp) {
+    constructor(id, email, username, dateCreated, pfp, answered) {
         if (User.#cache.has(id)) return User.#cache.get(id);
 
         this.id = id;
         this.email = email;
         this.username = username;
         this.dateCreated = dateCreated;
         this.pfp = pfp;
+        this.answered = answered;
         User.#cache.set(id, this);
     }
 
@@ -42,8 +44,8 @@ class User {
      * @returns {User} - The created User object
      */
     static fromJson(json) {
-        const { id, email, username, dateCreated, pfp } = json;
-        return new User(id, email, username, moment.utc(dateCreated), pfp);
+        const { id, email, username, dateCreated, pfp, answered } = json;
+        return new User(id, email, username, moment.utc(dateCreated), pfp, answered);
     }
 
     /**

app/static/js/users.js

@@ -26,7 +26,7 @@ $(document).ready(async function () {
         document.getElementById("message").style.visibility = "visible";
         document.getElementById("profile-picture").remove();
     }
-
+    document.getElementById("reputation").innerText = "Reputation: " + user.answered.toLocaleString();
     await fetchUserPosts();
 });
 

app/templates/user.html

@@ -48,6 +48,8 @@ <h4 class="fw-700 font-sm mt-2 mb-lg-5 mb-4 pl-15">
                             <span id="username">Loading...</span>
                             <span class="fw-500 font-xssss text-grey-500 mt-1 mb-3 d-block" id="email">Loading...</span>
                         </h4>
+                        <span class="z-index-1 position-absolute-md text-black font-xss text-uppercase fw-700 ls-3"
+                                style="right: 400px !important; transform: translateY(-300%)" id="reputation">Loading...</span>
                         <div class="d-flex align-items-center justify-content-center position-absolute-md right-15 top-0 me-2">
                             <a class="d-none d-lg-block bg-success p-3 z-index-1 rounded-3 text-white font-xsssss text-uppercase fw-700 ls-3"
                                id="message" style="visibility: hidden">Message</a>