Merge pull request #4 from taedonn/feature/alert

3.0.1

README.md

@@ -25,11 +25,11 @@
 
 ## 사용 스택
 
-- nextjs v14.0.4
+- nextjs v14.1.0
 - typescript v5.3.3
-- tailwindcss v3.3.2
-- prisma/client v5.7.0
-- aws-sdk v3.391.0
+- tailwindcss v3.4.1
+- prisma/client v5.8.1
+- aws-sdk v3.496.0
 - react-query v3.39.3
 - next-auth v4.24.5
 - framer-motion v10.18.0

package.json

@@ -1,6 +1,6 @@
 {
     "name": "fonts-archive",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "private": true,
     "homepage": "https://fonts.taedonn.com",
     "postinstall": "prisma generate --no-engine",
@@ -11,16 +11,16 @@
         "lint": "next lint"
     },
     "dependencies": {
-        "@aws-sdk/client-s3": "^3.391.0",
-        "@aws-sdk/s3-request-presigner": "^3.391.0",
+        "@aws-sdk/client-s3": "^3.496.0",
+        "@aws-sdk/s3-request-presigner": "^3.496.0",
         "@emotion/react": "^11.11.0",
         "@emotion/styled": "^11.11.0",
-        "@mui/material": "^5.13.3",
-        "@prisma/client": "^5.7.0",
+        "@mui/material": "^5.15.5",
+        "@prisma/client": "^5.8.1",
         "@prisma/extension-accelerate": "^0.6.2",
         "@types/jsonwebtoken": "^9.0.5",
         "@types/kakao-js-sdk": "^1.39.4",
-        "@types/lodash": "^4.14.194",
+        "@types/lodash": "^4.14.202",
         "@types/node": "20.1.0",
         "@types/react": "18.2.6",
         "@types/react-dom": "18.2.4",
@@ -33,24 +33,24 @@
         "fontfaceobserver": "^2.3.0",
         "framer-motion": "^10.18.0",
         "lodash": "^4.17.21",
-        "next": "^14.0.4",
+        "next": "^14.1.0",
         "next-auth": "^4.24.5",
-        "next-seo": "^6.0.0",
+        "next-seo": "^6.4.0",
         "nextjs-progressbar": "^0.0.16",
-        "nodemailer": "^6.9.3",
+        "nodemailer": "^6.9.8",
         "postcss": "8.4.23",
         "react": "18.2.0",
         "react-color-palette": "^7.1.0",
-        "react-cookie": "^4.1.1",
+        "react-cookie": "^7.0.1",
         "react-dom": "18.2.0",
-        "react-intersection-observer": "^9.4.3",
+        "react-intersection-observer": "^9.5.3",
         "react-query": "^3.39.3",
-        "styled-components": "^5.3.11",
+        "styled-components": "^6.1.8",
         "tailwind-scrollbar-hide": "^1.1.7",
-        "tailwindcss": "3.3.2",
+        "tailwindcss": "^3.4.1",
         "typescript": "^5.3.3"
     },
     "devDependencies": {
-        "prisma": "^5.7.0"
+        "prisma": "^5.8.1"
     }
 }

prisma/migrations/20240122144439_add_privacy_protection/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE `fontsUser` ADD COLUMN `protected` BOOLEAN NOT NULL DEFAULT true,
+    ADD COLUMN `public_img` VARCHAR(191) NOT NULL DEFAULT '';

prisma/migrations/20240123005904_add_privacy_to_comment/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE `fontsComment` ADD COLUMN `user_privacy` BOOLEAN NOT NULL DEFAULT true,
+    ADD COLUMN `user_public_img` VARCHAR(191) NOT NULL DEFAULT '';

prisma/migrations/20240123023018_create_alert_model/migration.sql

@@ -0,0 +1,26 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `user_public_img` on the `fontsComment` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE `fontsComment` DROP COLUMN `user_public_img`;
+
+-- CreateTable
+CREATE TABLE `fontsAlert` (
+    `alert_id` INTEGER NOT NULL AUTO_INCREMENT,
+    `alert_type` VARCHAR(191) NOT NULL DEFAULT '',
+    `alert_read` BOOLEAN NOT NULL DEFAULT false,
+    `alert_page` VARCHAR(191) NOT NULL DEFAULT '',
+    `alert_link` VARCHAR(191) NOT NULL DEFAULT '',
+    `sender_name` VARCHAR(191) NOT NULL DEFAULT '',
+    `sender_img` VARCHAR(191) NOT NULL DEFAULT '',
+    `sender_content` VARCHAR(191) NOT NULL DEFAULT '',
+    `recipent_email` VARCHAR(191) NOT NULL DEFAULT '',
+    `recipent_auth` VARCHAR(191) NOT NULL DEFAULT '',
+    `created_at` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+
+    INDEX `fontsAlert_alert_id_idx`(`alert_id`),
+    PRIMARY KEY (`alert_id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

prisma/migrations/20240123054512_edit_alert_model/migration.sql

@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE `fontsAlert` ADD COLUMN `bundle_id` INTEGER NOT NULL DEFAULT 0,
+    ADD COLUMN `bundle_order` INTEGER NOT NULL DEFAULT 0,
+    ADD COLUMN `font_id` INTEGER NOT NULL DEFAULT 0,
+    ADD COLUMN `sender_auth` VARCHAR(191) NOT NULL DEFAULT '',
+    ADD COLUMN `sender_email` VARCHAR(191) NOT NULL DEFAULT '';

prisma/migrations/20240124060324_add_relation_to_alert_model/migration.sql

@@ -0,0 +1,30 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `like` on the `fonts` table. All the data in the column will be lost.
+  - You are about to drop the column `bundle_id` on the `fontsAlert` table. All the data in the column will be lost.
+  - You are about to drop the column `bundle_order` on the `fontsAlert` table. All the data in the column will be lost.
+  - You are about to drop the column `font_id` on the `fontsAlert` table. All the data in the column will be lost.
+  - You are about to drop the column `sender_auth` on the `fontsAlert` table. All the data in the column will be lost.
+  - You are about to drop the column `sender_email` on the `fontsAlert` table. All the data in the column will be lost.
+  - Added the required column `comment_id` to the `fontsAlert` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `user_no` to the `fontsAlert` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE `fonts` DROP COLUMN `like`;
+
+-- AlterTable
+ALTER TABLE `fontsAlert` DROP COLUMN `bundle_id`,
+    DROP COLUMN `bundle_order`,
+    DROP COLUMN `font_id`,
+    DROP COLUMN `sender_auth`,
+    DROP COLUMN `sender_email`,
+    ADD COLUMN `comment_id` INTEGER NOT NULL,
+    ADD COLUMN `user_no` INTEGER NOT NULL;
+
+-- CreateIndex
+CREATE INDEX `fontsAlert_comment_id_idx` ON `fontsAlert`(`comment_id`);
+
+-- CreateIndex
+CREATE INDEX `fontsAlert_user_no_idx` ON `fontsAlert`(`user_no`);

prisma/migrations/20240124112440_add_like/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE `fonts` ADD COLUMN `like` INTEGER NOT NULL DEFAULT 0;

prisma/migrations/20240124154840_edit_report_model/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `report_user_auth` on the `fontsUserReport` table. All the data in the column will be lost.
+  - You are about to drop the column `report_user_email` on the `fontsUserReport` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE `fontsUserReport` DROP COLUMN `report_user_auth`,
+    DROP COLUMN `report_user_email`,
+    ADD COLUMN `reported_user_id` INTEGER NOT NULL DEFAULT 0;

prisma/schema.prisma

@@ -55,12 +55,15 @@ model fontsUser {
   user_email_token   String
   user_email_confirm Boolean
   profile_img        String         @db.Text
+  public_img         String         @default("")
+  protected          Boolean        @default(true)
   nickname_reported  Int            @default(0)
   created_at         DateTime       @default(now())
   updated_at         DateTime       @default(now()) @updatedAt
   liked_fonts        fontsLiked[]
   comments           fontsComment[]
   reports            fontsUserReport[]
+  alerts             fontsAlert[]
 
   @@index([user_no])
   @@index([user_id])
@@ -88,6 +91,7 @@ model fontsComment {
   user_email            String    @default("")
   user_auth             String    @default("")
   user_image            String    @default("")
+  user_privacy          Boolean   @default(true)
   comment               String    @db.Text
   depth                 Int
   bundle_id             Int
@@ -105,6 +109,7 @@ model fontsComment {
   font                  fonts     @relation(fields: [font_id], references: [code])
   user                  fontsUser @relation(fields: [user_id], references: [user_no])
   reports               fontsUserReport[]
+  alerts                fontsAlert[]
 
   @@index([font_id])
   @@index([user_id])
@@ -115,8 +120,7 @@ model fontsUserReport {
   report_id         Int          @id @default(autoincrement())
   report_font_code  Int          @default(0)
   report_user_id    Int
-  report_user_email String       @default("")
-  report_user_auth  String       @default("")
+  reported_user_id  Int          @default(0)
   comment_id        Int
   report_nickname   Boolean      @default(false)
   report_politics   Boolean      @default(false)
@@ -164,4 +168,26 @@ model fontsNotice {
   notice_updated_at DateTime @default(now()) @updatedAt
 
   @@index([notice_id])
+}
+
+model fontsAlert {
+  alert_id       Int          @id @default(autoincrement())
+  alert_type     String       @default("")
+  alert_read     Boolean      @default(false)
+  alert_page     String       @default("")
+  alert_link     String       @default("")
+  sender_name    String       @default("")
+  sender_img     String       @default("")
+  sender_content String       @default("")
+  recipent_email String       @default("")
+  recipent_auth  String       @default("")
+  created_at     DateTime     @default(now())
+  comment_id     Int
+  user_no        Int
+  comments       fontsComment @relation(fields: [comment_id], references: [comment_id])
+  user           fontsUser    @relation(fields: [user_no], references: [user_no])
+
+  @@index([alert_id])
+  @@index([comment_id])
+  @@index([user_no])
 }