Skip to content

Commit 2f9aa68

Browse files
authored
Merge pull request #126 from MBTips/dev
8차 배포 Test (Dev -> Main)
2 parents 69f6838 + 8ac4d80 commit 2f9aa68

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
echo "VITE_GA_MEASUREMENT_ID=${{ secrets.VITE_GA_MEASUREMENT_ID }}" > .env
3131
3232
- name: Run build
33-
run: npm run build --verbose # 프로젝트에 맞는 빌드 명령어
33+
run: npm run build --mode production --verbose # 프로젝트에 맞는 빌드 명령어
3434

3535
- name: Docker build & push
3636
run: |

src/components/NavBar.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1+
import LoginButton from "@/components/button/LoginButton";
2+
13
const NavBar = () => {
4+
const isLoggedIn = localStorage.getItem("isLoggedIn");
5+
26
return (
3-
<div className="flex h-[56px] w-full justify-between">
7+
<div className="flex h-[62px] w-full justify-between items-center px-5">
48
<img
59
src="/public/icon/mbtipslogo.svg"
610
alt="Logo"
7-
className="ml-[20px]"
811
width={110}
912
height={31}
1013
/>
1114

12-
<img
15+
{isLoggedIn === "true" ? <LoginButton/> : <img
1316
src="/public/icon/people.svg"
1417
alt="Login Done"
1518
className="mx-auto mr-[20px]"
1619
width={24}
1720
height={24}
18-
/>
21+
/>}
1922
</div>
2023
);
2124
};

src/components/button/LoginButton.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
const LoginButton = () => {
22
return (
3-
<button className="border-[0.8px] border-gray-300 px-4 py-0.5 rounded-lg font-bold text-gray-600 text-sm">
3+
<a href="/login">
4+
<button className="w-[69px] h-[36px] border-[0.8px] border-gray-300 rounded-lg font-bold text-gray-600 text-md">
45
로그인
5-
</button>
6+
</button>
7+
</a>
68
);
79
};
810

src/pages/Content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ const Content = () => {
180180
try {
181181
trackEvent("User", "Clicked Start Chat Button", "Start Chat");
182182

183-
const response = await instance.post("api/fast-friend");
183+
const response = await instance.post("/api/fast-friend");
184184
console.log("Success!!", response.data);
185185
} catch (error) {
186186
console.error("Select Info Error", error);

vite.config.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import fs from "fs";
88
// vite.config.ts 파일에서 alias 설정을 추가해야 합니다.
99

1010
export default defineConfig(({ mode }: { mode: string }) => {
11+
console.log("mode", mode);
12+
1113
const isProduction = mode === "production";
1214
const keyPath = "./certs/key.pem";
1315
const certPath = "./certs/cert.pem";

0 commit comments

Comments
 (0)