friends added

Author: themuku

__pycache__/app.cpython-312.pyc

@@ -1,7 +1,7 @@
-from flask import request, redirect, session, render_template, url_for, flash
+from flask import request, redirect, session, render_template, url_for, flash, make_response, jsonify
 import bcrypt
 from config import db, app
-from models import Blog, User, EnumRole
+from models import Blog, User, Friend, EnumRole
 from werkzeug.exceptions import NotFound, Unauthorized, BadRequest, Conflict, InternalServerError
 import cloudinary.uploader
 from helpers import inject_user_data
@@ -205,6 +205,7 @@ def user_settings_page(username):
             user.username = request.form["username"]
             user.email = request.form["email"]
             user.profile_img = request.files["profile_img"]
+            user.bio = request.form["bio"]
             db.session.commit()
             return redirect(url_for("user_page", username=user.username))
         elif request.method == "GET":
@@ -215,18 +216,44 @@ def user_settings_page(username):
 @inject_user_data
 def user_friends_page(username):
     if "user_id" in session:
-        user = User.query.filter_by(username=username).first()
+        user = User.query.get(session["user_id"])
+        friend = User.query.filter_by(username=username).first()
     else:
         return redirect(url_for("login"))
 
     if request.method == "POST":
-        friend_username = request.form["friend_username"]
-        friend = User.query.filter_by(username=friend_username).first()
-        user.friends.append(friend)
-        db.session.commit()
+        friends = Friend.query.filter_by(user_id=user.id, friend_id=friend.id).all()
+
+        if friends:
+            return InternalServerError(description="Friendship already exists", response=redirect(url_for("user_friends_page", username=user.username)))
+        else:
+            new_friend = Friend(user_id=user.id, friend_id=friend.id)
+
+        try:
+            db.session.add(new_friend)
+            db.session.commit()
+        except Exception as e:
+            print(str(e))
+            return InternalServerError(description="Something went wrong", response=redirect(url_for("user_friends_page", username=user.username)))
         return redirect(url_for("user_friends_page", username=user.username))
     elif request.method == "GET":
-        return render_template("user_page/friends.html", user=user)
+        friends = Friend.query.filter_by(user_id=user.id).all()
+        users = [User.query.get(friend.friend_id) for friend in friends]
+        friends_list = [user.serialize() for user in users]
+        return render_template("user_page/friends.html", user=user, friends=friends_list)
+
+
+@app.route("/search/user/<string:username>", methods=["GET"])
+def search_page(username):
+    if request.method == "GET":
+        found_users = User.query.filter_by(username=username).first()  # Fetch the user, if any
+
+        if found_users:
+            return make_response(jsonify(found_users.serialize()), 200, {"Content-Type": "application/json"})
+        else:
+            return make_response(jsonify({"message": "User not found."}), 404)  # Handle not found case
+    else:
+        return redirect(url_for("home_page"))
 
 
 @app.route("/not-found")
@@ -235,6 +262,31 @@ def not_found_page():
     return render_template("not_found_page/index.html")
 
 
+@app.errorhandler(NotFound)
+def page_not_found(e):
+    return redirect(url_for("not_found_page"))
+
+
+@app.errorhandler(Unauthorized)
+def unauthorized(e):
+    return redirect(url_for("login"))
+
+
+@app.errorhandler(BadRequest)
+def bad_request(e):
+    return redirect(url_for("sign_up"))
+
+
+@app.errorhandler(Conflict)
+def conflict(e):
+    return redirect(url_for("sign_up"))
+
+
+@app.errorhandler(InternalServerError)
+def internal_server_error(e):
+    return redirect(url_for("home_page"))
+
+
 if __name__ == '__main__':
     with app.app_context():
         db.create_all()

__pycache__/models.cpython-312.pyc

@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 288edd42bc6c
+Revises: e09503250453
+Create Date: 2024-03-31 10:11:54.917785
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '288edd42bc6c'
+down_revision = 'e09503250453'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('users', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('bio', sa.Text(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('users', schema=None) as batch_op:
+        batch_op.drop_column('bio')
+
+    # ### end Alembic commands ###

app.py

@@ -1,16 +1,16 @@
 """empty message
 
-Revision ID: 0219db2fb723
+Revision ID: 558fe02535c6
 Revises: 
-Create Date: 2024-03-30 22:28:22.422436
+Create Date: 2024-03-31 10:07:58.341777
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = '0219db2fb723'
+revision = '558fe02535c6'
 down_revision = None
 branch_labels = None
 depends_on = None
@@ -41,11 +41,21 @@ def upgrade():
     sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('fk_blogs_user_id_users')),
     sa.PrimaryKeyConstraint('id')
     )
+    op.create_table('friends',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('friend_id', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.ForeignKeyConstraint(['friend_id'], ['users.id'], name=op.f('fk_friends_friend_id_users')),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], name=op.f('fk_friends_user_id_users')),
+    sa.PrimaryKeyConstraint('id')
+    )
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('friends')
     op.drop_table('blogs')
     op.drop_table('users')
     # ### end Alembic commands ###

instance/app.db

@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: e09503250453
+Revises: 558fe02535c6
+Create Date: 2024-03-31 10:09:24.272860
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e09503250453'
+down_revision = '558fe02535c6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass

migrations/__pycache__/env.cpython-312.pyc

@@ -9,6 +9,26 @@ class EnumRole:
     USER = "user"
 
 
+class Friend(db.Model):
+    __tablename__ = "friends"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    friend_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    created_at = Column(DateTime, default=datetime.utcnow)
+
+    def __repr__(self):
+        return "<Friend %r>" % self.id
+
+    def serialize(self):
+        return {
+            "id": self.id,
+            "user_id": self.user_id,
+            "friend_id": self.friend_id,
+            "created_at": self.created_at
+        }
+
+
 class User(db.Model):
     __tablename__ = "users"
 
@@ -20,11 +40,25 @@ class User(db.Model):
     created_at = Column(DateTime(timezone=True), server_default=func.now())
     role = Column(Enum(EnumRole.ADMIN, EnumRole.USER), default=EnumRole.USER)
     profile_img = Column(String(255), default="default.jpg")
-    friends = db.relationship("User", secondary="friends", primaryjoin=id == "friends.c.user_id", secondaryjoin=id == "friends.c.friend_id")
+    friends = db.relationship("Friend", backref="user", foreign_keys=[Friend.user_id])
+    bio = Column(Text, nullable=True)
 
     def __repr__(self):
         return "<User %r>" % self.id
 
+    def serialize(self):
+        return {
+            "id": self.id,
+            "username": self.username,
+            "email": self.email,
+            "profile_img": self.profile_img,
+            "role": self.role,
+            "created_at": self.created_at,
+            "bio": self.bio,
+            "friends": self.friends,
+            "blogs": self.blogs
+        }
+
 
 class Blog(db.Model):
     __tablename__ = "blogs"
@@ -40,3 +74,15 @@ class Blog(db.Model):
 
     def __repr__(self):
         return "<BlogPost %r>" % self.id
+
+    def serialize(self):
+        return {
+            "id": self.id,
+            "title": self.title,
+            "author_name": self.author_name,
+            "subtitle": self.subtitle,
+            "text": self.text,
+            "created_at": self.created_at,
+            "blog_img": self.blog_img,
+            "user_id": self.user_id
+        }

migrations/versions/288edd42bc6c_.py

@@ -0,0 +1,47 @@
+let searchInput = document.getElementById("search-friend");
+const searchResults = document.getElementById("results");
+
+document.addEventListener("keypress", async function (e) {
+  if (e.key === "Enter") {
+    const search = searchInput.value;
+    if (search.length > 0) {
+      try {
+        const response = await fetch(
+          `http://127.0.0.1:5000/search/user/${search}`,
+        );
+        const results = await response.json();
+        searchResults.innerHTML = "";
+        searchResults.innerHTML = "";
+        searchResults.innerHTML += `
+                <div class="search-result">
+                    <img src="${results.profile_img}" alt="avatar" />
+                    <p>${results.username}</p>
+                    <button class="button is-link" onclick="addFriends('${results.username}')">Add to friends</button>
+                </div>
+            `;
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  }
+});
+
+async function addFriends(username) {
+  console.log(username);
+  try {
+    const response = await fetch(
+      `http://127.0.0.1:5000/user/${username}/friends`,
+      {
+        method: "POST",
+      },
+    );
+
+    if (response.status === 200) {
+      window.location.assign("/friends");
+    } else {
+      window.location.assign("/");
+    }
+  } catch (error) {
+    console.error(error);
+  }
+}

migrations/versions/0219db2fb723_.py migrations/versions/558fe02535c6_.py

@@ -94,7 +94,6 @@
 
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="{{ url_for('static', filename='js/main.js') }}"></script>
     {% block js %} {% endblock %}
   </body>
 </html>

migrations/versions/__pycache__/0219db2fb723_.cpython-312.pyc

@@ -7,7 +7,7 @@ <h1 class="title">Friends</h1>
       <div class="column is-one-third">
         <h3 class="title is-3">Your Friends</h3>
         <ul class="friend-list">
-          {% if user.friends|length > 0 %} {% for friend in user.friends %}
+          {% if friends|length > 0 %} {% for friend in friends %}
           <li class="box">
             <figure class="image is-48x48">
               <img
@@ -16,7 +16,7 @@ <h3 class="title is-3">Your Friends</h3>
               />
             </figure>
             <div class="content">
-              <a href="/user/{{ friend.username }}">Friend Name</a>
+              <a href="/user/{{ friend.username }}">{{ friend.username }}</a>
             </div>
           </li>
           {% endfor %} {% else %}
@@ -40,11 +40,13 @@ <h3 class="title is-3">Your Friends</h3>
             </span>
           </div>
         </div>
-        <div class="results">
+        <div id="results" class="results">
           <p>No results found yet.</p>
         </div>
       </div>
     </div>
   </div>
 </section>
+{% endblock %} {% block js %}
+<script src="{{ url_for("static", filename="./js/friend.js") }}"></script>
 {% endblock %}

migrations/versions/__pycache__/288edd42bc6c_.cpython-312.pyc

@@ -40,6 +40,17 @@ <h1 class="title">Settings</h1>
           />
         </div>
       </div>
+      <div class="field">
+        <label class="label" for="bio">BIO</label>
+        <div class="control">
+          <textarea
+            name="bio"
+            id="bio"
+            class="textarea is-info"
+            placeholder="Add bio here…"
+          ></textarea>
+        </div>
+      </div>
       <hr />
       <button type="submit" class="button is-primary">Save Changes</button>
     </form>