Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fe/#106 add channel UI merge #173

Merged
merged 28 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
941ae50
[FE][Feat] #16 : InputComponent κ΅¬ν˜„
leedongyull Nov 6, 2024
ef9dc8d
[FE][FEAT] νŽ˜μ΄μ§€ κ΅¬ν˜„
leedongyull Nov 7, 2024
4aea9e8
Merge branch 'main' of https://github.com/boostcampwm-2024/web28-DDar…
leedongyull Nov 7, 2024
d209411
[FE][FEAT] #106 : κΈ°λ³Έ UI κ΅¬ν˜„
leedongyull Nov 10, 2024
be8cd95
Merge branch 'feature/fe/#134-makeLayoutComponent' of https://github.…
leedongyull Nov 11, 2024
7ae36c2
Merge branch 'frontend' of https://github.com/boostcampwm-2024/web28-…
leedongyull Nov 12, 2024
69c082c
[Fe][Rename] #106 : AddChannel νŽ˜μ΄μ§€ λͺ… λ³€κ²½
leedongyull Nov 12, 2024
94f37b1
Merge branch 'feature/fe/#106-AddChannelUI' of https://github.com/boo…
leedongyull Nov 13, 2024
7297588
[FE][Fix] : Merge μž‘μ—…
leedongyull Nov 13, 2024
180eda1
Merge branch 'frontend' of https://github.com/boostcampwm-2024/web28-…
leedongyull Nov 13, 2024
9b2ced0
[FE][Style] #106 : rem λ‹¨μœ„λ‘œ λ³€κ²½ 및 κΈ°νšμ— 맞게 λ””μžμΈ μˆ˜μ •
leedongyull Nov 13, 2024
01a4683
[FE][Docs] #106 : tsDoc μ„€λͺ… μΆ”κ°€
leedongyull Nov 13, 2024
deb94fc
[FE][Style] #106 : μ‚¬μš©μž μΆ”κ°€ λ²„νŠΌ height μΆ”κ°€
leedongyull Nov 14, 2024
bc28144
[FE][Feat] #106 : μ‚¬μš©μž μ‚­μ œ UI 및 κΈ°λŠ₯ κ°„λ‹¨νžˆ κ΅¬ν˜„
leedongyull Nov 14, 2024
5a1e8b2
[FE][Feat] #106 : μ‚¬μš©μž μ‚­μ œ κΈ°λŠ₯ κ΅¬ν˜„ 및 mock데이터 μΆ”κ°€
leedongyull Nov 14, 2024
67169a6
[FE][Doc] #106 : μ‚¬μš©μž μ‚­μ œ κΈ°λŠ₯ tsDoc μΆ”κ°€
leedongyull Nov 14, 2024
5c6c96b
[FE][Feat] #106 : svg λŒ€μ‹  react-icons μ‚¬μš©
leedongyull Nov 14, 2024
31a1029
[FE][Style] #106 : 색상 λ³€κ²½ 및 λ””μžμΈ λ³€κ²½
leedongyull Nov 14, 2024
e4a8509
Delete package.json
leedongyull Nov 14, 2024
0cb24d8
Delete pnpm-lock.yaml
leedongyull Nov 14, 2024
3f948ee
Delete frontend/package.json
leedongyull Nov 14, 2024
65c9325
Delete backend/package.json
leedongyull Nov 14, 2024
0639b78
Merge branch 'frontend' of https://github.com/boostcampwm-2024/web28-…
leedongyull Nov 14, 2024
0d88c6a
Merge branch 'frontend' of https://github.com/boostcampwm-2024/web28-…
leedongyull Nov 14, 2024
5b98450
[FE][Feat] #106 : Footer 투λͺ… μΆ”κ°€
leedongyull Nov 14, 2024
f176c60
Merge branch 'feature/fe/#106-AddChannelUI' of https://github.com/boo…
leedongyull Nov 14, 2024
459b26d
[FE][Chore]#106 : json μΆ”κ°€
leedongyull Nov 14, 2024
743cfa5
[FE][Chore]#106 : λ°±μ—”λ“œ json λ³€κ²½
leedongyull Nov 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 34 additions & 33 deletions backend/package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
{
"name": "ddara-backend",
"private": true,
"workspaces": [
"frontend",
"backend"
],
"version": "0.0.0",
"type": "module",
"description": "λ”°λΌλ”°λΌμ˜ 선따라길따라 BackEnd μ½”λ“œ",
"main": "index.js",
"scripts": {
"dev": "node src/index.js",
"test": "vitest",
"test:watch": "vitest --watch",
"test:coverage": "vitest run --coverage",
"lint": "pnpm lint-staged"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"bcrypt": "^5.1.1",
"dotenv": "^16.4.5",
"express": "^4.21.1",
"express-validator": "^7.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.13.1",
"swagger-jsdoc": "^6.2.8",
"swagger-ui-express": "^5.0.1",
"ws": "^8.11.0"
}
}
{
"name": "ddara-backend",
"private": true,
"workspaces": [
"frontend",
"backend"
],
"version": "0.0.0",
"type": "module",
"description": "λ”°λΌλ”°λΌμ˜ 선따라길따라 BackEnd μ½”λ“œ",
"main": "index.js",
"scripts": {
"dev": "node src/index.js",
"test": "vitest",
"test:watch": "vitest --watch",
"test:coverage": "vitest run --coverage",
"lint": "pnpm lint-staged"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"bcrypt": "^5.1.1",
"dotenv": "^16.4.5",
"express": "^4.21.1",
"express-validator": "^7.2.0",
"jsonwebtoken": "^9.0.2",
"pg": "^8.13.1",
"swagger-jsdoc": "^6.2.8",
"swagger-ui-express": "^5.0.1",
"uuid": "^11.0.3",
"ws": "^8.11.0"
}
}
128 changes: 64 additions & 64 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,64 +1,64 @@
{
"name": "ddara-frontend",
"private": true,
"workspaces": [
"frontend",
"backend"
],
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"test": "vitest",
"test:watch": "vitest --watch",
"test:coverage": "vitest run --coverage",
"lint": "pnpm lint-staged",
"preview": "vite preview",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
"dependencies": {
"@fontsource/pretendard": "^5.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
"react-router-dom": "^6.28.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^3.2.2",
"@eslint/js": "^9.13.0",
"@storybook/addon-essentials": "^8.4.2",
"@storybook/addon-interactions": "^8.4.2",
"@storybook/addon-onboarding": "^8.4.2",
"@storybook/blocks": "^8.4.2",
"@storybook/react": "^8.4.2",
"@storybook/react-vite": "^8.4.2",
"@storybook/test": "^8.4.2",
"@types/navermaps": "^3.7.8",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react-swc": "^3.5.0",
"autoprefixer": "^10.4.20",
"classnames": "^2.5.1",
"eslint": "^9.13.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.14",
"eslint-plugin-storybook": "^0.11.0",
"globals": "^15.11.0",
"postcss": "^8.4.47",
"storybook": "^8.4.2",
"tailwindcss": "^3.4.14",
"typescript": "~5.6.2",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10",
"vite-tsconfig-paths": "^5.1.1"
},
"eslintConfig": {
"extends": [
"plugin:storybook/recommended"
]
}
}
{
"name": "ddara-frontend",
"private": true,
"workspaces": [
"frontend",
"backend"
],
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc -b && vite build",
"test": "vitest",
"test:watch": "vitest --watch",
"test:coverage": "vitest run --coverage",
"lint": "pnpm lint-staged",
"preview": "vite preview",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
"dependencies": {
"@fontsource/pretendard": "^5.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "^5.3.0",
"react-router-dom": "^6.28.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^3.2.2",
"@eslint/js": "^9.13.0",
"@storybook/addon-essentials": "^8.4.2",
"@storybook/addon-interactions": "^8.4.2",
"@storybook/addon-onboarding": "^8.4.2",
"@storybook/blocks": "^8.4.2",
"@storybook/react": "^8.4.2",
"@storybook/react-vite": "^8.4.2",
"@storybook/test": "^8.4.2",
"@types/navermaps": "^3.7.8",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react-swc": "^3.5.0",
"autoprefixer": "^10.4.20",
"classnames": "^2.5.1",
"eslint": "^9.13.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.14",
"eslint-plugin-storybook": "^0.11.0",
"globals": "^15.11.0",
"postcss": "^8.4.47",
"storybook": "^8.4.2",
"tailwindcss": "^3.4.14",
"typescript": "~5.6.2",
"typescript-eslint": "^8.11.0",
"vite": "^5.4.10",
"vite-tsconfig-paths": "^5.1.1"
},
"eslintConfig": {
"extends": [
"plugin:storybook/recommended"
]
}
}
28 changes: 28 additions & 0 deletions frontend/src/component/common/InputBox.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { ChangeEvent, FocusEvent } from 'react';

export interface IInputBoxProps {
type?: 'text' | 'number' | 'password' | 'email' | 'tel';
placeholder?: string;
onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
onFocus?: (event: FocusEvent<HTMLInputElement>) => void;
onBlur?: (event: FocusEvent<HTMLInputElement>) => void;
className?: string;
}

export const InputBox = ({
type = 'text',
placeholder = '',
onChange,
onFocus,
onBlur,
className = '',
}: IInputBoxProps) => (
<input
type={type}
placeholder={placeholder}
onChange={onChange}
onFocus={onFocus}
onBlur={onBlur}
className={`border-grayscale-75 placeholder:text-grayscale-50 focus:border-grayscale-400 text-grayscale-400 flex h-11 w-full rounded border px-3 text-xs focus:border-2 focus:outline-none ${className}`}
/>
);
13 changes: 8 additions & 5 deletions frontend/src/component/layout/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ interface IFooterProps {
title?: string;
onClick?: () => void;
active?: boolean;
isTranperency?: boolean;
}

export const Footer = (props: IFooterProps) => {
const buttonStyle = props.active ? buttonActiveType.ACTIVE : buttonActiveType.PASSIVE;
export const Footer = ({ title, onClick, active = false, isTranperency = true }: IFooterProps) => {
const buttonStyle = active ? buttonActiveType.ACTIVE : buttonActiveType.PASSIVE;

return (
return isTranperency ? (
<footer className="absolute bottom-5 h-[6%] w-[95%]">
<button
className={classNames(
Expand All @@ -24,10 +25,12 @@ export const Footer = (props: IFooterProps) => {
buttonStyle,
)}
type="button"
onClick={props.onClick}
onClick={onClick}
>
{props.title}
{title}
</button>
</footer>
) : (
<div />
);
};
2 changes: 2 additions & 0 deletions frontend/src/component/layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ interface ILayoutProps {
footerTitle?: string;
footerActive?: boolean;
handleFooterClick?: () => void;
footerTransperency?: boolean;
}

export const Layout = (props: ILayoutProps) => {
Expand All @@ -25,6 +26,7 @@ export const Layout = (props: ILayoutProps) => {
title={props.footerTitle}
onClick={props.handleFooterClick}
active={props.footerActive}
isTranperency={props.footerTransperency}
/>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/component/layout/header/LayoutHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import { Header } from '@/component/header/Header';
import { NoticeText } from '@/component/text/NoticeText';
import { HeaderContext } from '@/component/layout/header/LayoutHeaderProvider.tsx';
import { HeaderContext } from '@/component/layout/header/LayoutHeaderProvider';

export const LayoutHeader = () => {
const { headerOption } = useContext(HeaderContext);
Expand Down
1 change: 1 addition & 0 deletions frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
border-style: solid;
font-size: 100%;
font: inherit;
vertical-align: baseline;
Expand Down
Loading
Loading