From 2f703a4a1b1f56c5dc286b38fd8003a183139b9c Mon Sep 17 00:00:00 2001
From: Hwang Taehwan <107744534+stakbucks@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:37:50 +0900
Subject: [PATCH 1/2] fix(bottle): remove header and add margin top at sents
tab (#73)
* fix(bottle): remove header and add margin top at sents tab
* chore(e2e): upgrade playwright to latest v
---
apps/bottle/src/app/bottles/sents/Sents.tsx | 6 ++++--
apps/bottle/src/app/bottles/sents/page.tsx | 2 --
packages/e2e/package.json | 2 +-
pnpm-lock.yaml | 20 ++++++++++----------
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/apps/bottle/src/app/bottles/sents/Sents.tsx b/apps/bottle/src/app/bottles/sents/Sents.tsx
index 159854d..46821c3 100644
--- a/apps/bottle/src/app/bottles/sents/Sents.tsx
+++ b/apps/bottle/src/app/bottles/sents/Sents.tsx
@@ -22,7 +22,9 @@ export function Sents() {
<>
{sentBottles.length > 0 ? (
<>
- {`${currentUser.name}님을 마음에\n들어한 분들이에요`}
+ {`${currentUser.name}님을 마음에\n들어한 분들이에요`}
시간 내에 보틀을 열지 않으면 사라져요
@@ -49,7 +51,7 @@ export function Sents() {
>
) : (
-
+
조금만 기다려 볼까요?
나를 마음에 들어할 상대는 누굴까요 👀
diff --git a/apps/bottle/src/app/bottles/sents/page.tsx b/apps/bottle/src/app/bottles/sents/page.tsx
index 41db611..6bbf364 100644
--- a/apps/bottle/src/app/bottles/sents/page.tsx
+++ b/apps/bottle/src/app/bottles/sents/page.tsx
@@ -1,4 +1,3 @@
-import { Header } from '@/components/common/header';
import { ProfileLayout } from '@/components/profile/layout';
import { getServerSideTokens } from '@/features/server/serverSideTokens';
import { ServerFetchBoundary } from '@/store/query/ServerFetchBoundary';
@@ -13,7 +12,6 @@ export default function SentBottlesPage() {
return (
-
diff --git a/packages/e2e/package.json b/packages/e2e/package.json
index e591b15..4e00189 100644
--- a/packages/e2e/package.json
+++ b/packages/e2e/package.json
@@ -16,7 +16,7 @@
"@bottlesteam/typescript-config": "workspace:*",
"@bottlesteam/bottle": "workspace:*",
"start-server-and-test": "^2.0.5",
- "@playwright/test": "^1.47.1",
+ "@playwright/test": "^1.48.0",
"dotenv": "^16.4.5",
"eslint": "^8"
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d2ed1c8..3f24873 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -259,8 +259,8 @@ importers:
specifier: workspace:*
version: link:../typescript-config
'@playwright/test':
- specifier: ^1.47.1
- version: 1.47.1
+ specifier: ^1.48.0
+ version: 1.48.0
dotenv:
specifier: ^16.4.5
version: 16.4.5
@@ -2436,12 +2436,12 @@ packages:
engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
dev: true
- /@playwright/test@1.47.1:
- resolution: {integrity: sha512-dbWpcNQZ5nj16m+A5UNScYx7HX5trIy7g4phrcitn+Nk83S32EBX/CLU4hiF4RGKX/yRc93AAqtfaXB7JWBd4Q==}
+ /@playwright/test@1.48.0:
+ resolution: {integrity: sha512-W5lhqPUVPqhtc/ySvZI5Q8X2ztBOUgZ8LbAFy0JQgrXZs2xaILrUcNO3rQjwbLPfGK13+rZsDa1FpG+tqYkT5w==}
engines: {node: '>=18'}
hasBin: true
dependencies:
- playwright: 1.47.1
+ playwright: 1.48.0
dev: false
/@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.3)(react@18.3.1):
@@ -7058,18 +7058,18 @@ packages:
pathe: 1.1.2
dev: true
- /playwright-core@1.47.1:
- resolution: {integrity: sha512-i1iyJdLftqtt51mEk6AhYFaAJCDx0xQ/O5NU8EKaWFgMjItPVma542Nh/Aq8aLCjIJSzjaiEQGW/nyqLkGF1OQ==}
+ /playwright-core@1.48.0:
+ resolution: {integrity: sha512-RBvzjM9rdpP7UUFrQzRwR8L/xR4HyC1QXMzGYTbf1vjw25/ya9NRAVnXi/0fvFopjebvyPzsmoK58xxeEOaVvA==}
engines: {node: '>=18'}
hasBin: true
dev: false
- /playwright@1.47.1:
- resolution: {integrity: sha512-SUEKi6947IqYbKxRiqnbUobVZY4bF1uu+ZnZNJX9DfU1tlf2UhWfvVjLf01pQx9URsOr18bFVUKXmanYWhbfkw==}
+ /playwright@1.48.0:
+ resolution: {integrity: sha512-qPqFaMEHuY/ug8o0uteYJSRfMGFikhUysk8ZvAtfKmUK3kc/6oNl/y3EczF8OFGYIi/Ex2HspMfzYArk6+XQSA==}
engines: {node: '>=18'}
hasBin: true
dependencies:
- playwright-core: 1.47.1
+ playwright-core: 1.48.0
optionalDependencies:
fsevents: 2.3.2
dev: false
From 2b1bf11545e95a86e7dce60241b92b302a1341b0 Mon Sep 17 00:00:00 2001
From: Hwang Taehwan <107744534+stakbucks@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:56:22 +0900
Subject: [PATCH 2/2] fix(bottle): introduction area width (#74)
---
.../src/components/common/bottle-card/bottleCardstyle.css.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/bottle/src/components/common/bottle-card/bottleCardstyle.css.ts b/apps/bottle/src/components/common/bottle-card/bottleCardstyle.css.ts
index dfd1612..b7ec6be 100644
--- a/apps/bottle/src/components/common/bottle-card/bottleCardstyle.css.ts
+++ b/apps/bottle/src/components/common/bottle-card/bottleCardstyle.css.ts
@@ -19,7 +19,7 @@ export const timeTagStyle = style({
});
export const introductionBoxStyle = style({
- width: '296px',
+ width: '100%',
height: '95px',
backgroundColor: colors.neutral100,
padding: spacings.md,