Skip to content

Commit 4cd342b

Browse files
kiJu2kiJu2
authored
Merge pull request #111 from SanginJeong/React-정상인-sprint6
[정상인] sprint6
2 parents 211b281 + 2083dda commit 4cd342b

File tree

47 files changed

+839
-204
lines changed

Some content is hidden

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

47 files changed

+839
-204
lines changed

‎vite-project/eslint.config.js‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
1-
import js from '@eslint/js'
2-
import globals from 'globals'
3-
import reactHooks from 'eslint-plugin-react-hooks'
4-
import reactRefresh from 'eslint-plugin-react-refresh'
1+
import js from "@eslint/js";
2+
import globals from "globals";
3+
import reactHooks from "eslint-plugin-react-hooks";
4+
import reactRefresh from "eslint-plugin-react-refresh";
55

66
export default [
7-
{ ignores: ['dist'] },
7+
{ ignores: ["dist"] },
88
{
9-
files: ['**/*.{js,jsx}'],
9+
files: ["**/*.{js,jsx}"],
1010
languageOptions: {
1111
ecmaVersion: 2020,
1212
globals: globals.browser,
1313
parserOptions: {
14-
ecmaVersion: 'latest',
14+
ecmaVersion: "latest",
1515
ecmaFeatures: { jsx: true },
16-
sourceType: 'module',
16+
sourceType: "module",
1717
},
1818
},
1919
plugins: {
20-
'react-hooks': reactHooks,
21-
'react-refresh': reactRefresh,
20+
"react-hooks": reactHooks,
21+
"react-refresh": reactRefresh,
2222
},
2323
rules: {
2424
...js.configs.recommended.rules,
2525
...reactHooks.configs.recommended.rules,
26-
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
27-
'react-refresh/only-export-components': [
28-
'warn',
26+
"no-unused-vars": ["warn", { varsIgnorePattern: "^[A-Z_]" }],
27+
"react-refresh/only-export-components": [
28+
"warn",
2929
{ allowConstantExport: true },
3030
],
31+
"no-console": ["warn", { allow: ["warn", "error"] }],
3132
},
3233
},
33-
]
34+
];

‎vite-project/package-lock.json‎

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

‎vite-project/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13+
"@tanstack/react-query": "^5.85.5",
1314
"axios": "^1.11.0",
1415
"dotenv": "^17.2.1",
1516
"react": "^19.1.0",
1617
"react-dom": "^19.1.0",
1718
"react-responsive": "^10.0.1",
18-
"react-router": "^7.7.0"
19+
"react-router": "^7.7.0",
20+
"zustand": "^5.0.8"
1921
},
2022
"devDependencies": {
2123
"@eslint/js": "^9.25.0",

‎vite-project/public/images/ic_plus.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎vite-project/public/images/ic_x.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎vite-project/src/App.css‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
:root {
22
--primary100: #3692ff;
3+
--primary200: #1967d6;
4+
--primary300: #1251aa;
5+
6+
--gray50: #f9fafb;
7+
--gray100: #f3f4f6;
8+
--gray200: #e5e7eb;
9+
--gray400: #9ca3af;
10+
--gray500: #6b7280;
11+
--gray600: #4b5563;
12+
--gray700: #374151;
13+
--gray800: #1f2937;
14+
--gray900: #111827;
315
}
416

517
* {
@@ -45,12 +57,69 @@ p {
4557

4658
.wrap {
4759
padding: 0 240px;
60+
}
61+
62+
.btn-large {
63+
height: 56px;
64+
padding: 16px 124px;
65+
border-radius: 40px;
66+
border: none;
67+
font-weight: 600;
68+
font-size: 20px;
69+
color: var(--gray100);
70+
}
71+
72+
.btn-medium {
73+
height: 48px;
74+
padding: 12px 71px;
75+
border-radius: 40px;
76+
border: none;
77+
font-weight: 600;
78+
font-size: 18px;
79+
color: var(--gray100);
80+
}
81+
82+
.btn-small-40 {
83+
height: 42px;
84+
padding: 12px 23px;
85+
border-radius: 8px;
86+
border: none;
87+
font-weight: 600;
88+
font-size: 16px;
89+
color: var(--gray100);
90+
}
91+
92+
.btn-small-48 {
93+
height: 48px;
94+
padding: 12px 23px;
95+
border-radius: 8px;
96+
border: none;
97+
font-weight: 600;
98+
font-size: 16px;
99+
color: var(--gray100);
100+
}
101+
102+
.btn-large:disabled,
103+
.btn-medium:disabled,
104+
.btn-small-40:disabled,
105+
.btn-small-48:disabled {
106+
background-color: #9ca3af;
107+
}
108+
109+
.ic-x-btn {
110+
background-color: var(--gray400);
111+
color: #f9fafb;
112+
width: 20px;
113+
height: 20px;
114+
border-radius: 100%;
48115
display: flex;
49116
justify-content: center;
117+
align-items: center;
50118
}
51119

52120
.container {
53121
max-width: 1200px;
122+
margin: 0 auto;
54123
}
55124

56125
@media screen and (max-width: 1199px) {

‎vite-project/src/App.jsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { useState } from "react";
21
import "./App.css";
32
import { Route, Routes, Navigate } from "react-router";
4-
import ItemsPage from "./pages/Items-Page/ItemsPage";
5-
import AddItemPage from "./pages/AddItem-Page/AddItemPage";
3+
import ItemsPage from "./pages/ItemsPage";
4+
import AddItemPage from "./pages/AddItemPage";
65
import Layout from "./layout/Layout";
7-
import FreeBoard from "./pages/FreeBoard-Page/FreeBoard";
6+
import FreeBoard from "./pages/FreeBoardPage";
87

98
function App() {
109
return (

‎vite-project/src/utils/api.js‎ renamed to ‎vite-project/src/api/axiosInstance.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ import axios from "axios";
22

33
const VITE_BACKEND_URL = import.meta.env.VITE_BACKEND_URL;
44

5-
export const instance = axios.create({
5+
const instance = axios.create({
66
baseURL: VITE_BACKEND_URL,
77
headers: {
88
"Content-Type": "application/json",
99
},
1010
});
11+
12+
export default instance;

‎vite-project/src/common/Dropdown/DropDown.jsx‎ renamed to ‎vite-project/src/common/Dropdown/index.jsx‎

File renamed without changes.

‎vite-project/src/common/ErrorMessage/ErrorMessage.style.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.error-message {
2+
color: #f74747;
3+
padding: 6px 8px;
4+
}

0 commit comments

Comments
 (0)