From 888d63cf1a80c46bce60c63d2cca5dbeef52c184 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Fri, 23 Aug 2024 19:01:54 +0900 Subject: [PATCH 1/9] =?UTF-8?q?feat:=20wowds-ui=20=EC=B5=9C=EC=8B=A0=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/package.json | 2 +- pnpm-lock.yaml | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/client/package.json b/apps/client/package.json index b50ac707..76b71770 100644 --- a/apps/client/package.json +++ b/apps/client/package.json @@ -16,7 +16,7 @@ "react-dom": "^18.3.1", "wowds-icons": "^0.1.3", "wowds-tokens": "^0.1.1", - "wowds-ui": "^0.1.8" + "wowds-ui": "^0.1.14" }, "devDependencies": { "@types/node": "^20", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd44ffd0..dcdc056e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -128,8 +128,8 @@ importers: specifier: ^0.1.1 version: 0.1.3 wowds-ui: - specifier: ^0.1.8 - version: 0.1.12(next@14.2.5)(react-dom@18.3.1)(react@18.3.1) + specifier: ^0.1.14 + version: 0.1.14(next@14.2.5)(react-dom@18.3.1)(react@18.3.1) devDependencies: '@types/node': specifier: ^20 @@ -13740,6 +13740,21 @@ packages: - react-dom dev: false + /wowds-ui@0.1.14(next@14.2.5)(react-dom@18.3.1)(react@18.3.1): + resolution: {integrity: sha512-pIj4lOL/sVoHU6x+YtnsUbmmTHDDjBC8dkO4W6xN7jxJDFgCivK47SUA8ltiI4OMBLsuqUBfqdRuZQbR25IJnw==} + peerDependencies: + next: ^14.1.1 + react: ^18.2.0 + dependencies: + clsx: 2.1.1 + lottie-react: 2.4.0(react-dom@18.3.1)(react@18.3.1) + next: 14.2.5(@babel/core@7.25.2)(react-dom@18.3.1)(react@18.3.1) + react: 18.3.1 + wowds-icons: 0.1.3 + transitivePeerDependencies: + - react-dom + dev: false + /wrap-ansi@6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} From e98b5feb9f435cb30546b24cd876415beaa6f508 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Fri, 23 Aug 2024 19:06:27 +0900 Subject: [PATCH 2/9] =?UTF-8?q?feat:=20client=20not-found=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/app/global.css | 1 + apps/client/app/not-found.tsx | 49 +++++++++++++++++++++++++ apps/client/public/images/not-found.svg | 34 +++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 apps/client/app/not-found.tsx create mode 100644 apps/client/public/images/not-found.svg diff --git a/apps/client/app/global.css b/apps/client/app/global.css index 82bd5a03..668ebfef 100644 --- a/apps/client/app/global.css +++ b/apps/client/app/global.css @@ -6,4 +6,5 @@ body { font-family: "SUIT" !important; display: flex; flex-direction: row; + min-height: 100vh; } diff --git a/apps/client/app/not-found.tsx b/apps/client/app/not-found.tsx new file mode 100644 index 00000000..2f4bb343 --- /dev/null +++ b/apps/client/app/not-found.tsx @@ -0,0 +1,49 @@ +import { css } from "@styled-system/css"; +import { Flex } from "@styled-system/jsx"; +import { Header, Text } from "@wow-class/ui"; +import { routePath } from "constants/routePath"; +import Image from "next/image"; +import Link from "next/link"; +import Button from "wowds-ui/Button"; + +const NotFoundPage = () => { + return ( + +
+
+ not-found + + + 오류가 발생했어요 + + + 요청하신 페이지를 찾을 수 없어요 + + + +
+ + ); +}; + +export default NotFoundPage; + +const notFoundPageContentStyle = css({ + display: "flex", + flexDirection: "column", + justifyContent: "center", + alignItems: "center", + gap: "48px", + height: "100%", +}); + +const buttonStyle = { + width: 328, +}; diff --git a/apps/client/public/images/not-found.svg b/apps/client/public/images/not-found.svg new file mode 100644 index 00000000..caf9c0f6 --- /dev/null +++ b/apps/client/public/images/not-found.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 250486a3d628d3aa6205d8ee54b06824a3e983d1 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Fri, 23 Aug 2024 19:08:35 +0900 Subject: [PATCH 3/9] =?UTF-8?q?feat:=20ui=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui/src/styles.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/ui/src/styles.css b/packages/ui/src/styles.css index 18f3f9ee..9bbe6b47 100644 --- a/packages/ui/src/styles.css +++ b/packages/ui/src/styles.css @@ -803,6 +803,9 @@ progress { .jc_center:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) { justify-content: center; } +.flex-d_column:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) { + flex-direction: column; +} .top_0:not(#\#):not(#\#):not(#\#):not(#\#):not(#\#) { top: 0; } From 2075303a7a5fcaad3897979b883c3bdf1ddf0d35 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Fri, 23 Aug 2024 19:23:50 +0900 Subject: [PATCH 4/9] =?UTF-8?q?feat:=20not-found=20=EB=B2=84=ED=8A=BC=20ar?= =?UTF-8?q?ia-label=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/app/not-found.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/client/app/not-found.tsx b/apps/client/app/not-found.tsx index 2f4bb343..21b859a2 100644 --- a/apps/client/app/not-found.tsx +++ b/apps/client/app/not-found.tsx @@ -25,7 +25,12 @@ const NotFoundPage = () => { 요청하신 페이지를 찾을 수 없어요 - From 92657e98c4d9ad43dd9049e0361a1de14dadcc65 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Sat, 24 Aug 2024 15:33:38 +0900 Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=ED=81=B4=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EC=96=B8=ED=8A=B8=20=EC=97=90=EB=9F=AC=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/app/error.tsx | 54 +++++++++++++++++++++++++++-- apps/client/public/images/error.svg | 29 ++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 apps/client/public/images/error.svg diff --git a/apps/client/app/error.tsx b/apps/client/app/error.tsx index 1344c8e2..19f472bc 100644 --- a/apps/client/app/error.tsx +++ b/apps/client/app/error.tsx @@ -1,6 +1,56 @@ "use client"; -const ErrorPage = () => { - return
error
; + +import { css } from "@styled-system/css"; +import { Flex } from "@styled-system/jsx"; +import { Header, Text } from "@wow-class/ui"; +import Image from "next/image"; +import Button from "wowds-ui/Button"; + +const ErrorPage = ({ reset }: { reset: () => void }) => { + const handleClickResetButton = () => { + reset(); + }; + + return ( + + + +
+
+ error + + 에러가 발생했어요 + + +
+ + + + ); }; export default ErrorPage; + +const errorPageContentStyle = css({ + display: "flex", + flexDirection: "column", + justifyContent: "center", + alignItems: "center", + gap: "48px", + height: "100%", +}); + +const buttonStyle = { + width: 328, +}; diff --git a/apps/client/public/images/error.svg b/apps/client/public/images/error.svg new file mode 100644 index 00000000..2b8ff63c --- /dev/null +++ b/apps/client/public/images/error.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b84cd6af3a45a5659429857d5a2f84f2ff7a10be Mon Sep 17 00:00:00 2001 From: Eugene Kim Date: Sun, 25 Aug 2024 02:36:35 +0900 Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=EC=96=B4=EB=93=9C=EB=AF=BC=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=97=90=EB=9F=AC=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/app/error.tsx | 54 ++++++++++++++++++++++++- apps/admin/app/global.css | 1 + apps/admin/app/not-found.tsx | 55 ++++++++++++++++++++++++-- apps/admin/public/images/error.svg | 29 ++++++++++++++ apps/admin/public/images/not-found.svg | 34 ++++++++++++++++ 5 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 apps/admin/public/images/error.svg create mode 100644 apps/admin/public/images/not-found.svg diff --git a/apps/admin/app/error.tsx b/apps/admin/app/error.tsx index 1344c8e2..19f472bc 100644 --- a/apps/admin/app/error.tsx +++ b/apps/admin/app/error.tsx @@ -1,6 +1,56 @@ "use client"; -const ErrorPage = () => { - return
error
; + +import { css } from "@styled-system/css"; +import { Flex } from "@styled-system/jsx"; +import { Header, Text } from "@wow-class/ui"; +import Image from "next/image"; +import Button from "wowds-ui/Button"; + +const ErrorPage = ({ reset }: { reset: () => void }) => { + const handleClickResetButton = () => { + reset(); + }; + + return ( + + + +
+
+ error + + 에러가 발생했어요 + + +
+ + + + ); }; export default ErrorPage; + +const errorPageContentStyle = css({ + display: "flex", + flexDirection: "column", + justifyContent: "center", + alignItems: "center", + gap: "48px", + height: "100%", +}); + +const buttonStyle = { + width: 328, +}; diff --git a/apps/admin/app/global.css b/apps/admin/app/global.css index 82bd5a03..668ebfef 100644 --- a/apps/admin/app/global.css +++ b/apps/admin/app/global.css @@ -6,4 +6,5 @@ body { font-family: "SUIT" !important; display: flex; flex-direction: row; + min-height: 100vh; } diff --git a/apps/admin/app/not-found.tsx b/apps/admin/app/not-found.tsx index 3ef55fd2..72365921 100644 --- a/apps/admin/app/not-found.tsx +++ b/apps/admin/app/not-found.tsx @@ -1,5 +1,54 @@ -const NotFound = () => { - return
요청하신 페이지를 찾을 수 없어요.
; +import { css } from "@styled-system/css"; +import { Flex } from "@styled-system/jsx"; +import { Header, Text } from "@wow-class/ui"; +import { routerPath } from "constants/router/routerPath"; +import Image from "next/image"; +import Link from "next/link"; +import Button from "wowds-ui/Button"; + +const NotFoundPage = () => { + return ( + +
+
+ not-found + + + 오류가 발생했어요 + + + 요청하신 페이지를 찾을 수 없어요 + + + +
+ + ); }; -export default NotFound; +export default NotFoundPage; + +const notFoundPageContentStyle = css({ + display: "flex", + flexDirection: "column", + justifyContent: "center", + alignItems: "center", + gap: "48px", + height: "100%", +}); + +const buttonStyle = { + width: 328, +}; diff --git a/apps/admin/public/images/error.svg b/apps/admin/public/images/error.svg new file mode 100644 index 00000000..2b8ff63c --- /dev/null +++ b/apps/admin/public/images/error.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/admin/public/images/not-found.svg b/apps/admin/public/images/not-found.svg new file mode 100644 index 00000000..caf9c0f6 --- /dev/null +++ b/apps/admin/public/images/not-found.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 48005f427cd645fefe1057663cf6d38127c2aa0c Mon Sep 17 00:00:00 2001 From: Eugene Kim Date: Sun, 25 Aug 2024 02:39:27 +0900 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=EC=97=90=EB=9F=AC?= =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 8caa0e99..af29f891 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,6 @@ "clsx": "^2.1.1", "wowds-icons": "^0.1.3", "wowds-tokens": "^0.1.1", - "wowds-ui": "^0.1.8" + "wowds-ui": "^0.1.14" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dcdc056e..b54ab80f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^0.1.1 version: 0.1.3 wowds-ui: - specifier: ^0.1.8 - version: 0.1.12(next@14.2.5)(react-dom@18.3.1)(react@18.3.1) + specifier: ^0.1.14 + version: 0.1.14(next@14.2.5)(react-dom@18.3.1)(react@18.3.1) devDependencies: '@pandacss/dev': specifier: ^0.44.0 @@ -13725,21 +13725,6 @@ packages: resolution: {integrity: sha512-Pej6MuUec/i6A04gWELi4bb/T2I8gf/57L9rX8G7ElVeMc7/03ELoM0nBFWKybtpYExXhhlQPp0Lg7iqATpy6Q==} dev: false - /wowds-ui@0.1.12(next@14.2.5)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-l3cTOg64IrcndZNs6B/W8bKd/z+1CNF87mJn6VCrRnB3UQhXCmWETFc22o3tSPFNkm1o59PrhhW8bMgIP2dGYw==} - peerDependencies: - next: ^14.1.1 - react: ^18.2.0 - dependencies: - clsx: 2.1.1 - lottie-react: 2.4.0(react-dom@18.3.1)(react@18.3.1) - next: 14.2.5(@babel/core@7.25.2)(react-dom@18.3.1)(react@18.3.1) - react: 18.3.1 - wowds-icons: 0.1.3 - transitivePeerDependencies: - - react-dom - dev: false - /wowds-ui@0.1.14(next@14.2.5)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-pIj4lOL/sVoHU6x+YtnsUbmmTHDDjBC8dkO4W6xN7jxJDFgCivK47SUA8ltiI4OMBLsuqUBfqdRuZQbR25IJnw==} peerDependencies: From dc6b01c188799365998ecd1c37de4953573c1903 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Tue, 27 Aug 2024 02:30:53 +0900 Subject: [PATCH 8/9] =?UTF-8?q?chore:=20error=20html,=20body=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/app/error.tsx | 41 +++++++++++++++------------------------ apps/client/app/error.tsx | 41 +++++++++++++++------------------------ 2 files changed, 32 insertions(+), 50 deletions(-) diff --git a/apps/admin/app/error.tsx b/apps/admin/app/error.tsx index 19f472bc..a97dbdbc 100644 --- a/apps/admin/app/error.tsx +++ b/apps/admin/app/error.tsx @@ -12,31 +12,22 @@ const ErrorPage = ({ reset }: { reset: () => void }) => { }; return ( - - - -
-
- error - - 에러가 발생했어요 - - -
- - - + +
+
+ error + + 에러가 발생했어요 + + +
+ ); }; diff --git a/apps/client/app/error.tsx b/apps/client/app/error.tsx index 19f472bc..a97dbdbc 100644 --- a/apps/client/app/error.tsx +++ b/apps/client/app/error.tsx @@ -12,31 +12,22 @@ const ErrorPage = ({ reset }: { reset: () => void }) => { }; return ( - - - -
-
- error - - 에러가 발생했어요 - - -
- - - + +
+
+ error + + 에러가 발생했어요 + + +
+ ); }; From 102d15101dc1f8ae471d34cad4adf14fc00112a8 Mon Sep 17 00:00:00 2001 From: ghdtjgus76 Date: Tue, 27 Aug 2024 02:34:03 +0900 Subject: [PATCH 9/9] =?UTF-8?q?feat:=20pnpm=20lock=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2b7ccd42..6964315a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,7 +71,7 @@ importers: version: 18.3.1(react@18.3.1) react-hook-form: specifier: ^7.52.2 - version: 7.52.2(react@18.3.1) + version: 7.53.0(react@18.3.1) devDependencies: '@types/node': specifier: ^20 @@ -11591,8 +11591,8 @@ packages: warning: 4.0.3 dev: false - /react-hook-form@7.52.2(react@18.3.1): - resolution: {integrity: sha512-pqfPEbERnxxiNMPd0bzmt1tuaPcVccywFDpyk2uV5xCIBphHV5T8SVnX9/o3kplPE1zzKt77+YIoq+EMwJp56A==} + /react-hook-form@7.53.0(react@18.3.1): + resolution: {integrity: sha512-M1n3HhqCww6S2hxLxciEXy2oISPnAzxY7gvwVPrtlczTM/1dDadXgUxDpHMrMTblDOcm/AXtXxHwZ3jpg1mqKQ==} engines: {node: '>=18.0.0'} peerDependencies: react: ^16.8.0 || ^17 || ^18 || ^19 @@ -13727,24 +13727,6 @@ packages: /wowds-ui@0.1.14(next@14.2.5)(react-dom@18.3.1)(react@18.3.1): resolution: {integrity: sha512-pIj4lOL/sVoHU6x+YtnsUbmmTHDDjBC8dkO4W6xN7jxJDFgCivK47SUA8ltiI4OMBLsuqUBfqdRuZQbR25IJnw==} -<<<<<<< HEAD -======= - peerDependencies: - next: ^14.1.1 - react: ^18.2.0 - dependencies: - clsx: 2.1.1 - lottie-react: 2.4.0(react-dom@18.3.1)(react@18.3.1) - next: 14.2.5(@babel/core@7.25.2)(react-dom@18.3.1)(react@18.3.1) - react: 18.3.1 - wowds-icons: 0.1.3 - transitivePeerDependencies: - - react-dom - dev: false - - /wowds-ui@0.1.14(next@14.2.5)(react-dom@18.3.1)(react@18.3.1): - resolution: {integrity: sha512-pIj4lOL/sVoHU6x+YtnsUbmmTHDDjBC8dkO4W6xN7jxJDFgCivK47SUA8ltiI4OMBLsuqUBfqdRuZQbR25IJnw==} ->>>>>>> 216c3f47bac6227d5036909c050836f4b2313530 peerDependencies: next: ^14.1.1 react: ^18.2.0