Skip to content

Commit d5c1e42

Browse files
yummjinyummjin
authored
Merge pull request #2 from ByteCrew-Uscode/feature/1
[FEAT] : 회원가입 화면 및 홈 화면 구현
2 parents 2221ebe + a135a14 commit d5c1e42

52 files changed

Lines changed: 601 additions & 44 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.prettierrc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"singleQuote": true,
3+
"semi": true,
4+
"tabWidth": 2,
5+
"trailingComma": "all",
6+
"printWidth": 80,
7+
"bracketSpacing": true,
8+
"arrowParens": "avoid",
9+
"plugins": ["prettier-plugin-tailwindcss"]
10+
}

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite + React + TS</title>
7+
<title>농기구온</title>
88
</head>
99
<body>
1010
<div id="root"></div>

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@tanstack/react-query": "^5.81.5",
1919
"axios": "^1.10.0",
2020
"clsx": "^2.1.1",
21+
"daisyui": "^5.0.43",
2122
"prettier": "^3.6.2",
2223
"react": "^19.1.0",
2324
"react-dom": "^19.1.0",

‎pnpm-lock.yaml‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/global.css‎

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
@import url("https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.8/dist/web/variable/pretendardvariable-dynamic-subset.css");
2-
@import "tailwindcss";
1+
@import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.8/dist/web/variable/pretendardvariable-dynamic-subset.css');
2+
@import 'tailwindcss';
3+
@plugin "daisyui" {
4+
themes: light --default;
5+
}
36

47
@theme {
5-
--color-m: #377ff8;
8+
--color-m: #6a8e3f;
9+
--color-m-transparent: rgba(106, 142, 63, 0.04);
10+
--color-m-hover: #6a8e3f33;
611
--color-md: #324160;
712
--color-ml: #6da2fe;
813
--color-mxl: #ecf5fe;
914

10-
--color-s: #767676;
15+
--color-s: #191919;
1116
--color-sd: #333;
12-
--color-sl: #dadada;
13-
--color-sxl: #f5f5f5;
17+
--color-sl: #d9d9d9;
18+
--color-sxl: #dadada;
1419

1520
--color-res: #8b9aad;
1621

@@ -29,64 +34,82 @@
2934
--spacing-normal: 20px;
3035
--spacing-normal-half: 10px;
3136
--spacing-mt: 24px;
32-
37+
--spacing-dock-height: 100px;
3338
--radius-lg: 20px;
3439
--radius-md: 12px;
3540
}
3641

3742
@font-face {
38-
font-family: "Fredoka";
39-
src: url("../assets/font/fredoka-variable.ttf") format("truetype");
43+
font-family: 'Fredoka';
44+
src: url('../assets/font/fredoka-variable.ttf') format('truetype');
4045
font-weight: 600, 700;
4146
}
4247

4348
:root {
4449
font-family:
45-
"Pretendard Variable",
46-
"Pretendard",
50+
'Pretendard Variable',
51+
'Pretendard',
4752
-apple-system,
4853
BlinkMacSystemFont,
4954
system-ui,
5055
Roboto,
51-
"Helvetica Neue",
52-
"Segoe UI",
53-
"Apple SD Gothic Neo",
54-
"Noto Sans KR",
55-
"Malgun Gothic",
56-
"Apple Color Emoji",
57-
"Segoe UI Emoji",
58-
"Segoe UI Symbol",
56+
'Helvetica Neue',
57+
'Segoe UI',
58+
'Apple SD Gothic Neo',
59+
'Noto Sans KR',
60+
'Malgun Gothic',
61+
'Apple Color Emoji',
62+
'Segoe UI Emoji',
63+
'Segoe UI Symbol',
5964
sans-serif;
6065
font-size: 16px;
6166
color: #111;
6267
letter-spacing: -0.48px;
6368
}
6469

6570
/* Chrome, Safari, Edge, Opera */
66-
input[type="number"]::-webkit-outer-spin-button,
67-
input[type="number"]::-webkit-inner-spin-button {
71+
input[type='number']::-webkit-outer-spin-button,
72+
input[type='number']::-webkit-inner-spin-button {
6873
-webkit-appearance: none;
6974
margin: 0;
7075
}
7176

7277
/* Firefox */
73-
input[type="number"] {
78+
input[type='number'] {
7479
-moz-appearance: textfield;
7580
}
7681

7782
@layer utilities {
7883
.container-mobile {
79-
max-width: 402px;
84+
max-width: 390px;
8085
margin: 0 auto;
86+
overflow-x: hidden;
87+
}
88+
.scrollbar-hide {
89+
-ms-overflow-style: none; /* IE and Edge */
90+
scrollbar-width: none; /* Firefox */
8191
}
8292

8393
.scrollbar-hide::-webkit-scrollbar {
84-
display: none;
94+
display: none; /* Chrome, Safari, Opera */
95+
width: 0;
96+
height: 0;
8597
}
8698

87-
.scrollbar-hide {
88-
-ms-overflow-style: none;
89-
scrollbar-width: none;
99+
.scrollbar-hide::-webkit-scrollbar-thumb {
100+
background: transparent; /* 혹시라도 Thumb이 남아있으면 제거 */
101+
}
102+
103+
.scrollbar-hide::-webkit-scrollbar-track {
104+
background: transparent; /* 트랙도 제거 */
105+
}
106+
107+
.shadow-dock {
108+
box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.12);
109+
}
110+
111+
.shadow-homeBox {
112+
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.12);
90113
}
91114

92115
.overlay {

‎src/app/main.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { createRoot } from "react-dom/client";
2-
import "./global.css";
3-
import "@stackflow/plugin-basic-ui/index.css";
4-
import App from "./App";
5-
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
1+
import { createRoot } from 'react-dom/client';
2+
import '@stackflow/plugin-basic-ui/index.css';
3+
import './global.css';
4+
import App from './App';
5+
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
66

77
const queryClient = new QueryClient();
88

9-
createRoot(document.getElementById("root")!).render(
9+
createRoot(document.getElementById('root')!).render(
1010
<QueryClientProvider client={queryClient}>
1111
<App />
12-
</QueryClientProvider>
12+
</QueryClientProvider>,
1313
);

‎src/app/stackflow/Stack.tsx‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1-
import { basicUIPlugin } from "@stackflow/plugin-basic-ui";
2-
import { basicRendererPlugin } from "@stackflow/plugin-renderer-basic";
3-
import { stackflow } from "@stackflow/react";
1+
import { HomeScreen } from '@/screen/home/ui';
2+
import { JoinScreen } from '@/screen/join/ui';
3+
import { basicUIPlugin } from '@stackflow/plugin-basic-ui';
4+
import { basicRendererPlugin } from '@stackflow/plugin-renderer-basic';
5+
import { stackflow } from '@stackflow/react';
46

57
export const { Stack, useFlow } = stackflow({
68
transitionDuration: 350,
7-
activities: {},
9+
activities: {
10+
JoinScreen,
11+
HomeScreen,
12+
},
813
plugins: [
914
basicRendererPlugin(),
1015
basicUIPlugin({
11-
theme: "cupertino",
16+
theme: 'cupertino',
1217
}),
1318
],
19+
initialActivity: () => 'HomeScreen',
1420
});

‎src/assets/icons/icon-camera-solid.svg‎

Lines changed: 11 additions & 0 deletions
Loading

‎src/assets/icons/icon-camera.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎src/assets/icons/icon-edit.svg‎

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)