Feature/43 jwt

.prettierrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+  semi: false,
+  singleQuote: true,
+  trailingComma: 'all',
+}

package.json

@@ -13,24 +13,31 @@
     "@ckeditor/ckeditor5-react": "^6.1.0",
     "@types/bcrypt": "^5.0.1",
     "@types/date-fns": "^2.6.0",
+    "@types/formidable": "^3.4.5",
+    "@types/multer": "^1.4.10",
     "@types/react-datepicker": "^4.19.3",
     "axios": "^1.6.1",
     "bcrypt": "^5.1.1",
     "date-fns": "^2.30.0",
     "dotenv": "^16.3.1",
+    "formidable": "^3.5.1",
     "gsap": "^3.12.2",
     "jsonwebtoken": "^9.0.2",
     "moment": "^2.29.4",
+    "multer": "^1.4.5-lts.1",
     "mysql": "^2.18.1",
     "mysql2": "^3.6.3",
     "next": "14.0.1",
     "next-auth": "^4.24.4",
+    "next-connect": "^1.0.0",
     "next-themes": "^0.2.1",
+    "prettier": "^3.1.0",
     "react": "^18",
     "react-calendar": "^4.6.1",
     "react-datepicker": "^4.21.0",
     "react-dom": "^18",
-    "react-modal": "^3.16.1"
+    "react-modal": "^3.16.1",
+    "recoil": "^0.7.7"
   },
   "devDependencies": {
     "@types/jsonwebtoken": "^9.0.4",

src/app/api/advice/route.ts

@@ -0,0 +1,31 @@
+import axios from 'axios';
+import { NextResponse } from 'next/server';
+import { verifyJwt } from '@/app/lib/jwt';
+
+interface reqBody {
+    text: string;
+}
+type resBody = {
+    result: string;
+}
+
+export const POST = async(req: Request) => {
+    const body: reqBody = await req.json();
+    const accessToken = req.headers.get('Authorization')?.split('mlru ')[1] as string;
+
+    // 헤더에 토큰이 없거나, 토큰 복호화 실패하면 리턴.
+    if(!accessToken || !verifyJwt(accessToken)) {
+        return new Response(JSON.stringify({"result":"No Authorization"}))
+    }
+    try {
+        const res = await axios.post(`${process.env.MODEL_URL}/advice/`,{
+            text: body.text
+        });
+        const result = res.data
+        return NextResponse.json(result.result)
+    } catch (err) {
+        console.log(err)
+        return NextResponse.json(err)
+    }
+
+};

src/app/api/auth/[...nextauth]/route.ts

@@ -29,7 +29,7 @@ const handler = NextAuth({
                 if(result.user_id) {
                     return result;
                 }
-                throw new Error(result);
+                throw new Error(result.result);
             }
         }),
         KakaoProvider({
@@ -53,6 +53,7 @@ const handler = NextAuth({
                 account.refresh_token = result.refreshToken
                 return true;
             } else {
+                // 로컬 로그인 처리 쪽인데 어떻게 할까.
                 return true;
             }
         },

src/app/api/diary/route.ts

@@ -0,0 +1,174 @@
+import { NextRequest, NextResponse } from "next/server";
+import axios from 'axios';
+import queryPromise from "@/app/lib/db";
+export const api = {
+    bodyParse: false
+};
+
+// POST 작성
+// PATCH 수정
+// DELETE 삭제
+
+export async function POST( req: NextRequest, res: NextResponse ) {
+    const data = await req.formData();
+    const accessToken = req.headers.get('Authorization')?.split('mlru ')[1] as string;
+    const title = data.get('title') as string;
+    const content = data.get('content') as string;
+    const weather = data.get('weather') as string;
+    const id = data.get('id') as string;
+    const name = data.get('name') as string;
+    const imgTit = data.get('imgTit') as string;
+
+
+    const predictEmo = await axios.post(
+        `${process.env.BASE_URL}/api/emotion`,
+        {text: content},
+        {
+            headers: {
+                'Authorization': `mlru ${accessToken}`
+            }
+        }
+    );
+    console.log(predictEmo.data);  // 감정 숫자.
+
+    const maxEmotion = Object.entries(predictEmo.data).reduce((max: any, [key, value]: any) => {
+        return value > max[1] ? [key, value] : max;
+      }, ['', -Infinity]);
+
+    const predictSumm = await axios.post(
+        `${process.env.BASE_URL}/api/summary`,
+        {text: content},
+        {
+            headers: {
+                'Authorization': `mlru ${accessToken}`
+            }
+        }
+    );
+
+    console.log(predictSumm.data); // 내용 요약.
+
+    const predictAdvice = await axios.post(
+        `${process.env.BASE_URL}/api/advice`,
+        {text:predictSumm.data},
+        {
+            headers: {
+                'Authorization': `mlru ${accessToken}`
+            }
+        }
+    );
+    console.log(predictAdvice.data); // 조언
+
+    const weatherQuery: { [key: string]: string } = {
+        "맑음": "sunny",
+        "흐림":"cloudy",
+        "비":"rainy",
+        "바람":"windy",
+        "눈":"snowy"
+    };
+    const emotionQuery: { [key: string]: string } = {
+        "중립": "normal",
+        "슬픔": "sadness",
+        "분노": "angry",
+        "놀람": "amazing",
+        "행복": "happiness",
+        "불안": "unhappiness"
+    };
+    const query = 'weather is ' + weatherQuery[weather] + `, feel ${emotionQuery[maxEmotion[0]]} in the picture`;
+    let imgSrc = [];
+    const predictImg = await axios.post(
+        `${process.env.BASE_URL}/api/img`,
+        {text: query},
+        {
+            headers: {
+                'Authorization': `mlru ${accessToken}`
+            }
+        }
+    );
+    imgSrc.push(predictImg.data.result);
+    const img = data.get('img') as File;
+    if(img) {
+        const fb = new FormData();
+        fb.append('image', img);
+        const result = await axios.post(
+            'https://api.imgur.com/3/upload',
+            fb,
+            {
+                headers: {
+                    'Authorization': `Client-ID ${process.env.IMGUR_KEY}`,
+                    'Accept': 'application/json'
+                }
+            }
+        );
+        imgSrc.push(result.data.data.link);
+    }
+
+    try {
+        let sql = 'INSERT INTO tb_diary VALUES(?,?,?,?,?,?,?,?,?,?,?,?)';
+        let values = [
+            null,
+            id,
+            name,
+            title,
+            content,
+            predictEmo.data,
+            weather,
+            'pretendard',
+            null,
+            predictAdvice.data,
+            new Date(),
+            new Date()
+        ];
+        const result = await queryPromise(sql, values);
+        if(img) {
+            sql = 'INSERT INTO tb_image VALUES(?,?,?,?,?,?)';
+            values = [null, result.insertId, imgTit, imgSrc, 'user', new Date()];
+            const done = await queryPromise(sql, values);
+        }
+        return NextResponse.json({result:'done'});
+    } catch (err) {
+        console.log(err);
+        return NextResponse.json({result:'error'})
+    }
+};
+
+export const PUT = async(req: Request) => {
+    const data = await req.formData();
+    const images: any[] = [];
+    data.forEach((v, k) => {
+        images.push(v);
+    })
+    const imgs: any[] = [];
+
+const uploadImages = async () => {
+  for (const v of images) {
+    const fb = new FormData();
+    fb.append('image', v);
+
+    try {
+      const result = await axios.post(
+        'https://api.imgur.com/3/upload',
+        fb,
+        {
+          headers: {
+            'Authorization': `Client-ID ${process.env.IMGUR_KEY}`,
+            'Accept': 'application/json'
+          }
+        }
+      );
+      imgs.push(result.data.data.link);
+    } catch (error) {
+      console.log(error);
+      return 0;
+    }
+  }
+  return imgs;
+};
+
+const result = await uploadImages();
+if(result === 0) {
+    return NextResponse.json({result:'error'});
+}
+console.log(result);
+
+    return NextResponse.json({result:imgs})
+}

src/app/api/emotion/route.ts

@@ -4,7 +4,7 @@ import { verifyJwt } from '@/app/lib/jwt';
 
 
 type reqBody = {
-    text: string;
+    text: string[];
 }
 type resBody = {
     result: string;
@@ -19,7 +19,7 @@ export async function POST (req: Request) {
         return new Response(JSON.stringify({"result":"No Authorization"}))
     }
     try {
-        const res = await axios.post(`http://127.0.0.1:8000/predict/emotion/`,{
+        const res = await axios.post(`${process.env.MODEL_URL}/emotion/`,{
             text: body.text
         });
         const result: resBody = res.data

src/app/api/login/route.ts

@@ -1,5 +1,6 @@
 import { signJwtAccessToken, signJwtRefreshToken } from '@/app/lib/jwt'
 import queryPromise from '@/app/lib/db'
+import { NextResponse } from 'next/server';
 const crypto = require('crypto');
 
 interface reqBody {
@@ -10,9 +11,8 @@ interface reqBody {
 export const POST = async(req: Request) => {
     const body: reqBody = await req.json();
     let sql = 'SELECT user_id, user_password, user_name, user_salt FROM tb_user WHERE user_id = ?';
-    let values = [body.username];
-    let result = await queryPromise(sql, values);
-    if(result.length < 1) return new Response(JSON.stringify({"result":"no user"}));
+    let result = await queryPromise(sql, [body.username]);
+    if(result.length < 1) return NextResponse.json({result:'아이디가 없습니다.'})
     const hashPassword = crypto.createHash('sha512').update(body.password + result[0].user_salt).digest('hex');
     const chk = hashPassword === result[0].user_password;
     if(chk) {
@@ -28,5 +28,5 @@ export const POST = async(req: Request) => {
             refreshToken
         };
         return new Response(JSON.stringify(rst))
-    } else return new Response("Wrong Password");
+    } else return NextResponse.json({result:'비밀번호가 일치하지 않습니다.'})
 }

src/app/api/summary/route.ts

@@ -18,7 +18,7 @@ export async function POST (req: Request) {
         return new Response(JSON.stringify({"result":"No Authorization"}))
     }
     try {
-        const res = await axios.post(`http://127.0.0.1:8000/predict/summary/`,{
+        const res = await axios.post(`${process.env.MODEL_URL}/summary/`,{
             text: body.text
         });
         const result: resBody = res.data

src/app/api/test/route.ts

@@ -24,10 +24,10 @@ export async function POST(req: Request) {
     `;
 
     // 쿼리 실행
-    await queryPromise(sql, [user_id, emotion_img, user_pw, user_name, provider]);
-
+    const result = await queryPromise(sql, [user_id, emotion_img, user_pw, user_name, provider]);
+    console.log('test------------------------')
     // 성공적인 응답 반환
-    const result = { emotion_img };
+    console.log(result);
 
     // NextResponse 생성자를 사용하여 응답 반환
     return new NextResponse(JSON.stringify(result), {

src/app/api/trans/route.ts

@@ -18,7 +18,7 @@ export async function POST (req: Request) {
         return new Response(JSON.stringify({"result":"No Authorization"}))
     }
     try {
-        const res = await axios.post(`http://127.0.0.1:8000/predict/trans/`,{
+        const res = await axios.post(`${process.env.MODEL_URL}/trans/`,{
             text: body.text
         });
         const result: resBody = res.data