chore(fe/git): bug type shit

Author: hyuse202

spez-frontend/.gitignore

@@ -8,7 +8,7 @@
 /package-lock.json
 # testing
 /coverage
-
+.env
 # next.js
 /.next/
 /out/

spez-frontend/src/app/post/[id]/page.tsx

@@ -1,81 +1,36 @@
 "use client"
-<<<<<<< HEAD
-import svPost from "../../../utils/svPost"
-=======
 import svPost from "@/services/svPost";
 import svCmt from "@/services/svCmt";
->>>>>>> 5a06110 (chore(fe): split service)
 import Link from "next/link";
 import Comment from "@/components/Comment";
 import Parser from 'html-react-parser'
-import Image from "next/image";
-import EagleEmoji from '../../../../public/eagle_emoji.png'
 import CmtForm from "@/components/CmtForm";
 import { getRelativeTime } from "@/utils/getRelativeTime";
-import axios from "axios";
 import { GoTrash } from "react-icons/go";
-<<<<<<< HEAD
-import { useEffect } from "react";
-=======
 import { IPost, IComment } from "@/types";
 import LikeButton from "@/components/LikeButton";
 import svLike from "@/services/svLike";
->>>>>>> 5a06110 (chore(fe): split service)
 type Props = {
   params: { id: string };
 };
+// interface getILike{
+//   like: number
+// }
 export default async function Post({ params }: Props) {
   const id: string = params.id;
-<<<<<<< HEAD
-  const { getPost, getLike, getComment, delPost } = await svPost();
-  useEffect(aysnc () => {
-    const info: any = await getPost(id);
-    const likes: any = await getLike(id);
-    const comment: any = await getComment(id);
-    const author_url = "/user/" + info.author.id;
-
-  },[])
-  const handleLikeButton = async (e: React.FormEvent) => {
-    e.preventDefault();
-    try {
-      // Send a POST request to your FastAPI backend
-      let token: any
-      if (typeof window !== 'undefined')
-        token = localStorage.getItem('jwt')
-      await axios.post(`http://spezbe.hungnq.online/likes/?post_id=${id}`, 
-        {
-          headers: {
-            'accept': 'application/json',
-            'Authorization': `Bearer ${token}`
-          }
-        }
-      );
-      
-      // Redirect or give feedback upon success
-      // alert('Post created successfully!');
-    } catch (error) {
-      console.error('Error posting data:', error);
-      alert('Failed to create like.');
-    }
-  };
-  const handleDelPost = async (e: React.FormEvent) => {
-    let token: any
-=======
   const { getPost, delPost } = svPost();
-  const {getLike} = svLike();
-  const {getComment} = svCmt()
+  const {getComment} = svCmt();
+  const {getLike} = svLike()
   const info: IPost = await getPost(id);
   const likes: number = await getLike(id);
   console.log(likes)
   const comment: IComment[] = await getComment(id);
   const author_url = "/user/" + info.author.id;
   const handleDelPost = async () => {
     let token: string | null = null
->>>>>>> 5a06110 (chore(fe): split service)
     if (typeof window !== 'undefined')
       token = localStorage.getItem('jwt')
-    const deletePost:any = await delPost(id, token);
-    console.log(deletePost)
+     await delPost(id, token);
 
   }
   return (
@@ -93,32 +48,26 @@ export default async function Post({ params }: Props) {
           <div className="pl-2 text-2xl font-bold">{info.title}</div>
           <div className="p-2">{Parser(info.content)}</div>
           <div className="flex flex-row">
-            <button onClick={handleLikeButton} className="w-auto flex flex-row border-2 border-black rounded-full px-2">
-            <p className="pt-[0.35rem]"> Ưng</p>
-              <Image
-                src={EagleEmoji}
-                alt = "eagle_img"
-                width={30}
-                height={50} />
-              <p className="pt-[0.35rem]">: {likes} </p>
-            </button>
+              <LikeButton initialLikes={likes} post_id={id} />
             <div className="w-auto mt-[0.35rem] ml-5 border-2 rounded-full px-2 border-black">Phản hồi: {comment.length}</div>
-          </div>
+          </div> 
           <CmtForm postId={id} />
         </div>
         <div className="border-2 border-slate-950 p-2 text-black rounded shadow h-full w-1/2 space-y-5">
         <a className="font-bold text-2xl">Bình Loạn</a>
-          {comment.map((e: any) => (
+          {comment.map((element: IComment) => (
             <Comment
-                // author_id = {comment.author}
-                id = {e.id}
-                author = {e.author}
-                content= {e.content}
-                date = {e.created_at}
+              key={element.id}
+                id = {element.id}
+                author = {element.author}
+                content= {element.content}
+                created_at = {element.created_at}
+                updated_at= {element.updated_at}
+                post_id= {element.post_id}
             />
           ))}
         </div>
       </div>
     </>
   );
-}
+}

spez-frontend/src/components/CmtForm.tsx

@@ -27,23 +27,7 @@ export default function CmtForm({ postId }: Props) {
       if (typeof window !== "undefined") token = localStorage.getItem("jwt");
       if (token === undefined) router.push("/");
       // console.log(token)
-<<<<<<< HEAD
-      await axios.post(
-        `https://spezbe.hungnq.online/posts/cmt/${postId}`,
-        {
-          content: content,
-        },
-        {
-          headers: {
-            accept: "application/json",
-            Authorization: `Bearer ${token}`,
-          },
-        }
-      );
-
-=======
       await createComment(postId, token, content)
->>>>>>> 5a06110 (chore(fe): split service)
       // Redirect or give feedback upon success
       alert("Post created successfully!");
     } catch (error) {

spez-frontend/src/components/LoginForm.tsx

@@ -1,15 +1,14 @@
 "use client";
 import { useState, FormEvent } from "react";
 import LoadingSingle from "@/components/LoadingSingle";
-// import { useRouter } from "next/navigation";
-
+import svAuth from "@/services/svAuth";
 export default function LoginForm() {
-  // const router = useRouter();
   const [username, setUsername] = useState<string>("");
   const [password, setPassword] = useState<string>("");
   const [showPassword, setShowPassword] = useState<boolean | null>(false);
   const [isLoading, setIsLoading] = useState<boolean | undefined>(false);
   const [error, setError] = useState("");
+  const {authenticate} = svAuth();
   const togglePasswordVisibility = () => {
     setShowPassword((prev: boolean | null) => !prev);
   };
@@ -24,13 +23,7 @@ export default function LoginForm() {
     // console.log(body)
     // API call to authenticate using x-www-form-urlencoded
     try {
-        const res = await fetch('https://spezbe.hungnq.online/token', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-          },
-          body: body.toString(),
-        });
+        const res = await authenticate(body.toString())
 
         if (!res.ok) {
           const errorData = await res.json();

spez-frontend/src/components/PostForm.tsx

@@ -3,7 +3,6 @@ import React, { useState } from 'react';
 // import dynamic from 'next/dynamic';
 import SunEditor from 'suneditor-react';
 import 'suneditor/dist/css/suneditor.min.css';
-import axios from 'axios';
 import { useRouter } from 'next/navigation';
 import svPost from '@/services/svPost';
 // Dynamically import SunEditor to avoid SSR issues
@@ -26,24 +25,7 @@ export default function PostForm () {
         token = localStorage.getItem('jwt')
       if(token === undefined)
         router.push('/')
-<<<<<<< HEAD
-      await axios.post('https://spezbe.hungnq.online/posts/', 
-        {
-
-        title: title,
-        content: content,
-      },
-      {
-        headers: {
-          'accept': 'application/json',
-          'Authorization': `Bearer ${token}`
-        }
-      }
-    );
-
-=======
       await createPost(title, content, token)
->>>>>>> 5a06110 (chore(fe): split service)
       // Redirect or give feedback upon success
       alert('Post created successfully!');
       router.push('/');  // Redirect to the homepage or a posts page
@@ -92,4 +74,3 @@ export default function PostForm () {
     </div>
   );
 };
-

spez-frontend/src/services/svAuth.ts

@@ -0,0 +1,21 @@
+// import axios from "axios";
+import { BE_URI } from "@/utils/constants";
+
+export default function svAuth() {
+  const API = {
+    token: BE_URI + "/token",
+  };
+  async function authenticate(body: string) {
+    const data = await fetch(API.token,{
+        method: "POST",
+        headers: {
+            "Content-type": "application/x-www-form-urlencoded",
+        },
+        body: body
+      })
+    return data
+  }
+  return {
+    authenticate
+  }
+}

spez-frontend/src/services/svPost.ts

@@ -1,6 +1,5 @@
 import { BE_URI } from "@/utils/constants";
 import axios from "axios";
-import { headers } from "next/headers";
 export default function svPost() {
   const API = {
     all: BE_URI + "/posts",

spez-frontend/src/utils/constants.ts

@@ -1,5 +1 @@
-<<<<<<< HEAD
-export const BE_URI = 'https://spezbe.hungnq.online'
-=======
 export const BE_URI = process.env.NEXT_PUBLIC_SERVER_URL
->>>>>>> 5a06110 (chore(fe): split service)