Skip to content

Commit

Permalink
ver 0.0.2 (#55)
Browse files Browse the repository at this point in the history
* feat: add svgr

* chore: move constants folder location

* fix: change compiler options

* fix: delete common/index.ts

* style: modify type of textStyles

* feat: add storybook settings for react-router-dom and global style

* fix: fix eslint, vscode config & update `yarn.lock` (#4)

* feat: add common components(2) (#6)

Squashed commit of the following:

commit 1a905ca
Author: [email protected] <[email protected]>
Date:   Thu Jul 13 15:22:25 2023 +0900

    fix: fix profile component finally

commit 6efb15c
Author: [email protected] <[email protected]>
Date:   Wed Jul 12 19:11:32 2023 +0900

    fix: fix build error finally finally

commit ad9521e
Author: [email protected] <[email protected]>
Date:   Wed Jul 12 18:56:51 2023 +0900

    fix: fix profile component finally

commit 1b278d6
Author: [email protected] <[email protected]>
Date:   Wed Jul 12 18:55:41 2023 +0900

    fix: modify user image sample url

commit 80f08fc
Author: [email protected] <[email protected]>
Date:   Wed Jul 12 18:45:03 2023 +0900

    fix: fix build error about type

commit 220878b
Author: [email protected] <[email protected]>
Date:   Wed Jul 12 18:32:15 2023 +0900

    fix: fix build error about type

commit 2d2368e
Author: [email protected] <[email protected]>
Date:   Wed Jul 12 00:46:05 2023 +0900

    fix: fix build errors

commit d20c41c
Author: [email protected] <[email protected]>
Date:   Tue Jul 11 23:35:06 2023 +0900

    style: add borderStyle to textButton

commit 2a3dc3b
Author: [email protected] <[email protected]>
Date:   Tue Jul 11 23:34:46 2023 +0900

    fix: fix ProfileProps type

commit 8598116
Author: [email protected] <[email protected]>
Date:   Tue Jul 11 23:34:18 2023 +0900

    style: modify style to className

commit 7682210
Author: [email protected] <[email protected]>
Date:   Tue Jul 11 20:33:26 2023 +0900

    feat: add dateUtils

commit 22c2c37
Author: [email protected] <[email protected]>
Date:   Tue Jul 11 20:30:01 2023 +0900

    chore: modify icon svg files name

commit 3407723
Author: [email protected] <[email protected]>
Date:   Tue Jul 11 20:29:43 2023 +0900

    fix: remove caret in yarn.lock

commit 9b3ef08
Author: ballsona <[email protected]>
Date:   Sat Jul 8 22:48:01 2023 +0900

    style: fix how to deal styling props

commit 0e0cbf4
Author: ballsona <[email protected]>
Date:   Sat Jul 8 20:08:51 2023 +0900

    chore: change `Promise` to `Hangout`

commit b670296
Author: ballsona <[email protected]>
Date:   Sat Jul 8 20:06:44 2023 +0900

    feat: add style prop in components

commit f40b11d
Author: ballsona <[email protected]>
Date:   Sat Jul 8 20:04:35 2023 +0900

    feat: add time utils in PromiseBox

commit 2547bb8
Author: ballsona <[email protected]>
Date:   Sat Jul 8 20:04:13 2023 +0900

    style: modify PromiseBox design

commit ccf149f
Author: ballsona <[email protected]>
Date:   Sat Jul 8 18:51:13 2023 +0900

    feat: add UserImage component

commit a06feca
Author: ballsona <[email protected]>
Date:   Sat Jul 8 18:51:01 2023 +0900

    feat: add TextButton component

commit 958a4ef
Author: ballsona <[email protected]>
Date:   Sat Jul 8 18:50:51 2023 +0900

    feat: add PromiseBox component

commit 094879c
Author: ballsona <[email protected]>
Date:   Sat Jul 8 18:50:35 2023 +0900

    feat: add Profile component

commit d86c501
Author: ballsona <[email protected]>
Date:   Sat Jul 8 18:50:25 2023 +0900

    feat: add icon svg files

commit 1a9849b
Author: ballsona <[email protected]>
Date:   Sat Jul 8 18:50:10 2023 +0900

    feat: install vanilla-extract packages

* feat: add skeleton calendar components (#7)

* feat: add calendar common components

* feat: add stories

* feat: add `isInCurrentMonth` in `renderWeek`

* feat: add calendar state util

* fix: resolve wrong path

* style: correct comments

* style: modify comments

* fix: handle when action is not a function

* style: fix comments

* feat: add common components (#5)

* feat: add NavgitationBar common component

* feat: add ContentBox common component

* feat: add FloatingButton common component

* feat: add CheckBox common component

* fix: change style name

* fix: change variable name from promise to hangout

* fix: change variable name from promise to hangout

* refactor: rename props type

* refactor: change variable case type

* refactor: separate constant

* feat: add className to component's props

* fix: change storybook props value

* feat: add api utils (#11)

* feat: install react query

* feat: add api utils

* feat: add `useAuth`, `useGlobalAlert`

* chore: update eslint rules & fix

* chore: update eslint rules

* feat: add test endpoint

* feat: add api custom hooks

* chore: update eslint rules & fix

* feat: add test page

* refactor: modify `Api` type

* feat: add `getQueryKeysToInvalidate`

* fix: remove wrong props

* feat: add Friend tab UI (#13)

* feat: add Hangout tab UI  (#16)

* feat: add BasicLayout Component

* feat: add HangoutListTemplate Component

* fix: delete TextButton default props

* feat: modify HangoutBox type and style

* feat: modify navigationBar style and props

* feat: update navigate structure

* feat: add Date utils for hangout box

* feat: add dummydata and modify eslint

* feat: add api utils (#11)

* feat: install react query

* feat: add api utils

* feat: add `useAuth`, `useGlobalAlert`

* chore: update eslint rules & fix

* chore: update eslint rules

* feat: add test endpoint

* feat: add api custom hooks

* chore: update eslint rules & fix

* feat: add test page

* refactor: modify `Api` type

* feat: add `getQueryKeysToInvalidate`

* fix: remove wrong props

* feat: add Friend tab UI (#13)

* fix: delete TextButton default props

* fix: fix rebase conflicts

* feat: modify about navigation states

* feat: apply MainHeader to Hangout Tab

* feat: modify isNotAccpted to isAccpted

* fix: remove memoization from NavigationBar

* fix: fix date utils error and add annnotations

* chore: undo eslintrc modify

* feat: apply date util updates in components

---------

Co-authored-by: Gwangseo Go <[email protected]>
Co-authored-by: Kanghyun Lee <[email protected]>

* feat: add StyledCalendar based on skeleton component (#17)

* feat: add StyledCalendar component

* fix: fix error in isToday()

* feat: modify dayText styling

* feat: change Calendar component structures

* feat: update date utils reflected on develop

* feat: add useCallbacks in render functions

* fix: delete isToday function

* feat: add Home Tab UI (#18)

* feat: add CalendarHeader Component

* feat: add GroupProfileImage component

* feat: add NewRequestNotification component

* feat: add FavoriteGroup component

* feat: add ScheduleList component

* feat: add HomeContent component

* feat: add HomeTab

* style: add zIndex in navigationBar

* feat: move GroupProfileImage component to common

* fix: update groupProfileImage path

* style: add className in CalendarHeader prop

* feat: modify profile selecting method

* style: remove inline styling

* feat: add EmptyContent in home tab

* feat: add friend tab to page and solve other style problems (#21)

* fix: change eslint options for solving onClick error

* feat: move dummy data

* feat: add friendTab to page

* feat: add padding to common layout and remove from other content

* fix: change floating button icon size

* fix: solve Home header style problem

* feat: 약속 상세 정보 및 요청 탭 UI (#24)

* feat: add Main and Sub layout

* feat: add useKakaoMap

* feat: add WeeklyScheduleList component

* feat: add HangoutDetailContent component

* feat: add Footer in HangoutDetailContent

* feat: add HangoutInfoList component

* feat: add hangout Detail and Request Tab

* fix: fix rerendering error in navigation state

* feat: update gitignore

* fix: delete .env

* feat: add newHangout tab (#27)

* feat: add id to user dummy data

* feat: add SelectFriend step

* feat: add NewHangoutStepInfo constant

* feat: add SelectDate and SelectLocation step on skeleton component

* feat: add validation check logic

* feat: add CheckStep skeleton component

* feat: add CompleteStep skeleton component

* feat: add NewHangoutContent component

* feat: add step key constant

* feat: add NewHangoutFooter component

* feat: add style for footer

* feat: add sub header text

* feat: add header component

* feat: add newHangout page

* feat: remove padding bottom at layout

* fix: move type declaration location

* fix: improves like functional programming

* feat: add friend schedule tab  (#26)

* feat: add FriendScheduleContent component

* feat: add ScheduleList component

* feat: add friend schedule tab

* fix: change new Date() location in component

* feat: update url paths

* chore: rename file name

* fix: fix component path error

* refactor: update files for useKakaoMap hook (#29)

* refactor: update files for useKakaoMap hook

* fix: remove unnecessary code

* feat: add common components (3) (#31)

* feat: add TextInput common component

* feat: add InputBar common component

* feat: add PageHeader common component

* feat: change to PageHeader common component

* feat: add PageSubHeader common component

* fix: remove unnecessary svg and whitespace

* feat: add arrow for moving before page

* feat: add `getAvailableSchedules` (#34)

* feat: add `getAvailableSchedules`

* fix: treat `start` before `from`

* refactor: reduce unnecessary logic to get result

* refactor: use `.reduce` instead of `for` loop

* style: update comment

* feat: add NewFriendTab and NewGroupTab (#38)

* feat: add FooterButton common component

* fix: solve ui error

* feat: add SelectUserList common component

* feat: replace existing component with SelectUserList

* feat: add NewFriendContent component for new-friend tab

* fix: change type of selectId from number to array

* feat: add NewGroupContent component for new-group tab

* fix: add padding-bottom size

* feat: add newFriend and newGroup tab

* fix: change wrong file name

* feat: replace existing component with FooterButton

* feat: add LoginTab (#39)

* feat: add logo svg files for login tab

* feat: add login tab

* feat: add todo comments

* feat: add date select step in newHangoutTab (#35)

* feat: add selectedDay handler function

* feat: add date format function for datetime input

* feat: add SelectDateStep in hangout creation

* feat: add `useMontlyCalendar` for montly calendar

* feat: add comments in `useMontlyCalendar`

* feat: apply `useMontlyCalendar` in ScheduleList

* fix: remove day in currentDate object

* refactor: modify conditional statements

* refactor: add comments in util function

* feat: add location select step in newHangoutTab (#40)

* feat: add className prop to FooterButton component

* feat: add className prop to InputBar component and change style

* fix: export margin in PageSubHeader style

* feat: add SelectLocationInfo component

* feat: add SelectLocationMap component

* feat: add SelectLocationTab component

* feat: add SelectLocationStep

* feat: change subtitle text in new hangout

* feat: add routing (#42)

* feat: add routing to FloatingButton

* feat: add routing to HomePage

* feat: add routing to FriendPage

* feat: add routing to HangoutPage

* fix: solve useKakaoMap hook error

* fix: solve layout issue

* feat: add routing to hangout request

* fix: solve style error in hangout detail

* feat: add routing to EmptyContent component

* fix: add id prop to HangoutBox component

* feat: add routing to new group and friend tab

* fix: add id to hangout dummy data

* feat: add type and state about schedule (#43)

* feat: add `onSelectDay` function in WeeklyCalendar

* feat: add Hangout Type

* feat: add Schedule Type

* feat: add Schedule state and handler

* fix: handle UI errors (#44)

* feat: update activeNavType in NavBar

* fix: fix bug in dateSelectBox

* feat: connect api related to friend (#46)

* feat: add apis related to friend

* feat: connect apis to friend tab

* feat: add `friendInfo` and `groupInfo` type

* feat: add onClick function in EmptyContent

* feat: connect api and work about related jobs (#45)

* feat: add hangoutInfo state and change logics

* feat: add data preprocessing for api

* feat: connect api to new-hangout page

* fix: change content about EmptyContent component

* fix: change label

* fix: solve error

* feat: add social login & hangout apis (#47)

* feat: add social login handler

* feat: add safe area inset

* feat: send background color to RN

* feat: add login api

* feat: add hangout apis

* feat: add home apis (#49)

* feat: add group create api (#48)

* feat: add create-new group api

* feat: add comments and labels in friend search tab

* feat: add mypage tab (#52)

* fix: change variable about friend api data (#53)

---------

Co-authored-by: ballsona <[email protected]>
Co-authored-by: Gwangseo Go <[email protected]>
  • Loading branch information
3 people authored Sep 2, 2023
1 parent 5839bb6 commit 1bbb4d4
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 10 deletions.
4 changes: 4 additions & 0 deletions src/assets/icons/SettingIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const SelectFriendStep = ({ onNextStep }: SelectFriendStepProps) => {
const groupList = clubList?.map((club: any) => ({
id: club.id,
name: club.clubName,
profileImg: club.clubMemberList.map(
profileImg: club.members.map(
(member: FriendInfo) => member.profileImg ?? '',
),
}));
Expand Down
2 changes: 1 addition & 1 deletion src/pages/friend/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const FriendTab = () => {
const groupList = clubList?.map((club: any) => ({
id: club.id,
name: club.clubName,
profileImg: club.clubMemberList.map(
profileImg: club.members.map(
(member: FriendInfo) => member.profileImg ?? '',
),
}));
Expand Down
35 changes: 27 additions & 8 deletions src/pages/mypage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,36 @@
import MainHeader from '@/components/common/MainHeader';
import { ReactComponent as SettingIcon } from '@/assets/icons/SettingIcon.svg';
import { useLogout } from '@/hooks/useAuth';
import ContentBox from '@/components/common/ContentBox';
import TextButton from '@/components/common/TextButton';
import { COLORS } from '@/constants/styles';

import * as styles from './mypage.css';

const MyPage = () => {
const logout = useLogout();

return (
<button
type="button"
onClick={() => {
logout();
}}
>
Logout
</button>
<>
<MainHeader title="내 정보">
<div className={styles.settingIcon}>
<SettingIcon />
</div>
</MainHeader>

<ContentBox title="내 정보">
<div className={styles.mypageText}>준비중이에요... 했다 생각해줘 🥹</div>
</ContentBox>

<TextButton
label="로그아웃"
backgroundColor={COLORS.primary.yellow}
className={styles.logoutButton}
onClick={() => {
logout();
}}
/>
</>
);
};

Expand Down
16 changes: 16 additions & 0 deletions src/pages/mypage/mypage.css.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { style } from '@vanilla-extract/css';

export const settingIcon = style({
width: '22px',
height: '22px',
cursor: 'pointer',
});

export const mypageText = style({
width: 'fit-content',
margin: '5px auto',
});

export const logoutButton = style({
marginTop: '20px',
});

0 comments on commit 1bbb4d4

Please sign in to comment.