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

Fe #13

Merged
merged 52 commits into from
Apr 7, 2024
Merged

Fe #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
a9bf4ff
feat: vite 설치
kanghaeun Mar 14, 2024
766b2a9
feat: fullcalendar 설치
kanghaeun Mar 14, 2024
9697d8f
Merge pull request #12 from JNU-econovation/feat/4/initialSettings
mlnwns Mar 14, 2024
46c051f
chore: 불필요한 파일 삭제
kanghaeun Mar 26, 2024
a5b293f
feat: fullcalendar 및 styled-components 설치
kanghaeun Mar 26, 2024
9866e43
feat: import fullcalendar
kanghaeun Mar 26, 2024
b1fbfc4
style: 달력 크기 및 배치
kanghaeun Mar 26, 2024
987ea2d
feat: index.css 삭제
kanghaeun Mar 27, 2024
c40f094
style: 전체적인 틀 수정
kanghaeun Mar 27, 2024
dba1501
style: css 초기화
kanghaeun Mar 29, 2024
ba57085
style: pretendard 폰트 추가
kanghaeun Mar 29, 2024
645cc04
style: SideBar 및 LineBox 추가
kanghaeun Mar 29, 2024
738c154
style: 달력 크기 수정
kanghaeun Mar 29, 2024
bd87cdd
feat: 폰트 전역 적용
kanghaeun Mar 29, 2024
259ed31
Merge pull request #18 from JNU-econovation/feat/15/fullcalendar-Css
mlnwns Mar 30, 2024
d099558
feat: react-modal 라이브러리 설치
mlnwns Mar 30, 2024
6f1d129
style: today 날짜 색상 수정
kanghaeun Mar 30, 2024
dcc370a
feat: 생성 모달 구현
mlnwns Apr 1, 2024
618f0fb
feat: react-day-picker 라이브러리 설치
mlnwns Apr 2, 2024
3e5f5e0
chore: DayPicker 라이브러리 관련 내용 삭제
mlnwns Apr 3, 2024
8f6bc9f
feat: react-select 라이브러리 설치
mlnwns Apr 3, 2024
59d0c78
feat: 날짜 선택 기능 구현
mlnwns Apr 4, 2024
a3cd70f
style: 생성 모달 내 타이틀, 버튼 디자인 추가
mlnwns Apr 4, 2024
a437b7f
feat: react-select 라이브러리 설치
mlnwns Apr 4, 2024
d7adb9d
feat: 시간 선택 기능 추가
mlnwns Apr 4, 2024
eaffc1b
feat: 생성 기능 백엔드 연결
mlnwns Apr 4, 2024
e3947af
feat: axios, react-modal 설치
kanghaeun Apr 4, 2024
21e2763
feat: .env gitignore에 추가
kanghaeun Apr 4, 2024
481a1cc
feat: Modal import
kanghaeun Apr 4, 2024
264e0be
feat: vite 초기설정
kanghaeun Apr 4, 2024
cde8703
feat: TipTap 라이브러리 설치
mlnwns Apr 4, 2024
8a9ed46
feat addEvent 기능 추가
kanghaeun Apr 4, 2024
e6a674b
feat: eventClick시 Modal 기능 추가
kanghaeun Apr 4, 2024
910a7ad
feat: React-quill 라이브러리 설치
mlnwns Apr 4, 2024
7b1ca16
feat: react-icon 설치
kanghaeun Apr 4, 2024
c2a2dee
feat: event 시간 삭제
kanghaeun Apr 4, 2024
4470939
feat: 모달창으로 eventID props
kanghaeun Apr 4, 2024
946c2ce
feat: 모달 내부 content 추가
kanghaeun Apr 4, 2024
19de10d
style: Bold font 추가
kanghaeun Apr 4, 2024
af6276c
feat: React-quill 라이브러리 적용
mlnwns Apr 5, 2024
94dd3e1
chore: 주석 제거
mlnwns Apr 6, 2024
e6b489c
Merge pull request #37 from JNU-econovation/feat/19/schedule-create-m…
mlnwns Apr 6, 2024
78745a9
feat: 일정 조회 모달 props로 데이터 추가
kanghaeun Apr 6, 2024
ffb6719
feat: 일정 조회 모달 생성
kanghaeun Apr 6, 2024
4f72089
style: 일정 조회 모달 스타일 추가
kanghaeun Apr 6, 2024
00bcd77
feat: 일정 삭제 기능 추가
kanghaeun Apr 6, 2024
c5e6f08
chore: 불필요한 파일 삭제
kanghaeun Apr 6, 2024
eb71db7
Merge branch 'FE' into feat/21/schedule-inquiry
kanghaeun Apr 6, 2024
040fe45
Merge pull request #38 from JNU-econovation/feat/21/schedule-inquiry
kanghaeun Apr 6, 2024
148c09d
feat: 동일 모달 충돌 해결
kanghaeun Apr 6, 2024
5687032
feat: 일정 생성시 자동 reload
kanghaeun Apr 6, 2024
9f07630
style: Modal className 변경
kanghaeun Apr 6, 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
Empty file removed FE/README.md
Empty file.
1 change: 1 addition & 0 deletions FE/error/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_ERROR_API = 'http://43.202.32.52:8080'
21 changes: 21 additions & 0 deletions FE/error/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
rules: {
'react/jsx-no-target-blank': 'off',
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
}
27 changes: 27 additions & 0 deletions FE/error/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

.env

node_modules
dist
dist-ssr
*.local
.env

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
3 changes: 3 additions & 0 deletions FE/error/.vite/deps_temp_1b71c091/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "module"
}
8 changes: 8 additions & 0 deletions FE/error/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
17 changes: 17 additions & 0 deletions FE/error/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
<link
rel="stylesheet"
href="https://unpkg.com/[email protected]/dist/quill.snow.css"
/>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
Loading
Loading