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

feat: 공지 상세 보완 / GNB4 헤더 UI #58

Merged
merged 29 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b8b82b6
Merge pull request #54 from crolvlee/web_develop
crolvlee Aug 8, 2024
a687912
feat: gnb1 헤더
crolvlee Aug 10, 2024
e9eba0a
feat: gnb1 헤더 api 연결
crolvlee Aug 10, 2024
e2f27e2
chore: 유저 정보 불러오는 api주소 변경
crolvlee Aug 10, 2024
c0f5c24
feat: gnb3 헤더 레이아웃
crolvlee Aug 10, 2024
14f4333
feat: 동아리 생성 모달 레이아웃
crolvlee Aug 10, 2024
e0511f0
refactor: gnb1 유저 정보 가져오는 함수 리팩토링
crolvlee Aug 10, 2024
6809da4
feat: 동아리 생성 api 연결 (테스트)
crolvlee Aug 10, 2024
80f31b4
feat: 알림 라우팅, 알림 더미 데이터 정리
crolvlee Aug 10, 2024
a9234f2
feat: 회비입금현황 더보기 구현
crolvlee Aug 10, 2024
709147e
feat: 멤버 회비납부 여부 편집 UI
crolvlee Aug 11, 2024
dabaecc
feat: 회비편집 UI
crolvlee Aug 11, 2024
5ed1412
feat: 동아리 생성 POST 요청 보내기 (미완성)
crolvlee Aug 11, 2024
6d8c008
refactor: 회비 조건부렌더링 리팩토링
crolvlee Aug 11, 2024
68f4efa
feat: 공지, 회비 조건부렌더링 리팩토링
crolvlee Aug 11, 2024
9449f47
refactor: 공지, 회비 조건부렌더링 리팩토링
crolvlee Aug 11, 2024
4b1e382
Merge remote-tracking branch 'origin/web_develop' into web_develop
crolvlee Aug 11, 2024
51975ea
feat: global-style 색 변경사항 반영
crolvlee Aug 11, 2024
c41e579
feat: GNB3 빠진 아이콘들 추가
crolvlee Aug 11, 2024
910dfa1
Merge pull request #55 from crolvlee/web_develop
crolvlee Aug 11, 2024
1baafb3
feat: GNB4 기본 틀 잡기
crolvlee Aug 11, 2024
c788a77
fix: 플로팅버튼 z-index 수정
crolvlee Aug 11, 2024
82b0610
feat: 회비 아이콘 빠진 부분 추가
crolvlee Aug 11, 2024
c1367ce
feat: 동아리 정보 수정 페이지 연결
kdhqwe1030 Aug 13, 2024
c958f5b
Merge pull request #56 from kdhqwe1030/group/BasicInfo
kdhqwe1030 Aug 13, 2024
cce0bda
feat: api연결
kdhqwe1030 Aug 13, 2024
970d1fa
Merge pull request #57 from kdhqwe1030/group/BasicInfo
kdhqwe1030 Aug 13, 2024
0f05dc5
feat: 공지 상세 빠진 버튼들 추가
crolvlee Aug 13, 2024
cc406d1
Merge remote-tracking branch 'upstream/develop' into web_develop
crolvlee Aug 13, 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.mouseWheelZoom": true
}
5,130 changes: 3,312 additions & 1,818 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 6 additions & 8 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { ThemeProvider } from 'styled-components';
import { GlobalStyle } from './styles/global-style';
import theme from './styles/theme';
import { RouterProvider } from 'react-router-dom';
import { router } from './routes/router';
import React from "react";
import { ThemeProvider } from "styled-components";
import { GlobalStyle } from "./styles/global-style";
import theme from "./styles/theme";
import { RouterProvider } from "react-router-dom";
import { router } from "./routes/router";

function App() {
console.log("App 실행");
Expand All @@ -16,6 +16,4 @@ function App() {
);
}



export default App;
3 changes: 3 additions & 0 deletions src/assets/group/AlarmIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/group/DownIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/group/ModiInfoIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/group/UpIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/group/arrow_down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/icons/group/heart-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/group/heart-stroke.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/group/more_grey.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading