Skip to content

Commit a2626a8

Browse files
AngelaChaejungAngelaChaejung
authored
Merge pull request #176 from gnims-project/dev
Upload/Main Merge #100
2 parents e6eb4fa + 69df441 commit a2626a8

26 files changed

+98
-99
lines changed

‎src/components/Schedule/ScheduleDetail.jsx

+9-11
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,26 @@ const ScheduleDetail = () => {
4848
</div>
4949
{modalOpen && <KebabModal setModalOpen={setModalOpen} id={id} />}
5050
<div
51-
className={`h-[212px] bg-${schedule.cardColor} pl-[18px] w-[375px] pt-[23px] pr-[21px] text-white
51+
className={`h-[202px] bg-${schedule.cardColor} pl-[18px] w-[375px] pt-[23px] pr-[21px] text-white align-
5252
`}
5353
>
54-
<div className="flex flex-row-reverse ">
54+
<div className="flex space-x-3 text-[18px] font-extralight ">
55+
<div>{schedule.date}</div> <div> {time}</div>
5556
<div
56-
className="w-[40px] mr-[-30px] right-0"
57+
className="w-[160px] flex pl-[155px]"
5758
onClick={showModalHandler}
5859
>
5960
<img
60-
className={`h-[20px] ${isHidden} row cursor-pointer`}
61+
className={`h-[20px] ${isHidden} row cursor-pointer `}
6162
src={kebab}
6263
alt="케밥메뉴"
6364
/>
6465
</div>
6566
</div>
66-
<div className="flex space-x-3 text-[18px] font-light ">
67-
<div>{schedule.date}</div> <div> {time}</div>
68-
</div>
6967
<div className="mt-[28px] font-semibold text-[24px]">
7068
{schedule.subject}
71-
</div>{" "}
72-
<div className="place-content-end font-light flex text-[18px] mt-[45px]">
69+
</div>
70+
<div className="place-content-end font-extralight flex text-[18px] mt-[66px]">
7371
D-
7472
{schedule.dday === 0 ? <div>DAY</div> : <div>{schedule.dday}</div>}
7573
</div>
@@ -80,7 +78,7 @@ const ScheduleDetail = () => {
8078
{numberOfJoiner !== 1 ? (
8179
<div className="mt-[30px] ml-[20px] h-[98px]">
8280
참여자
83-
<div className="bg-white h-[50px] w-[335px] mt-[20px] p-[15px] drop-shadow-lg flex rounded-lg">
81+
<div className="bg-white h-[50px] border-solid border-[1px] border-[#E2E2E2] w-[335px] mt-[20px] p-[15px] lg flex rounded-lg">
8482
{joiner &&
8583
joiner.map((a) => {
8684
return (
@@ -97,7 +95,7 @@ const ScheduleDetail = () => {
9795
{schedule.content ? (
9896
<div className="h-[234px] ml-[20px] mt-[30px] mb-[8px] ">
9997
일정내용{" "}
100-
<div className="bg-white word-wrap break-words whitespace-normal shadow-lg h-[186px] w-[335px] mt-[20px] p-[20px] flex rounded-lg">
98+
<div className="bg-white border-solid border-[1px] border-[#E2E2E2] word-wrap break-words whitespace-normal h-[186px] w-[335px] mt-[20px] p-[20px] flex rounded-lg">
10199
<div className="w-[295px] ">{schedule.content}</div>
102100
</div>
103101
</div>

‎src/components/layout/BottomNavi.jsx

+9-5
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ const BottomNavi = () => {
1616
return (
1717
<div className="relative">
1818
<div className="min-w-[375px] h-[50px] bg-white items-center justify-center flex">
19-
<div className="flex gap-[77px] pt-[13px] justify-center">
19+
<div className="flex gap-[77px] pt-[7px] justify-center">
2020
<div
2121
onClick={() => {
2222
// setOnicon([true,false,false])
2323
handleIconClick("follow");
2424
navigate("/follow");
2525
}}
26-
className="w-[24px] cursor-pointer h-[24px]"
26+
className="px-[4px] py-[4px] w-[30px] h-[30px] cursor-pointer "
2727
>
2828
<img
2929
src={onIcon === "follow" ? onFollow : offFollow}
@@ -37,7 +37,7 @@ const BottomNavi = () => {
3737
handleIconClick("home");
3838
navigate("/main");
3939
}}
40-
className="w-[24px] h-[24px] cursor-pointer"
40+
className="px-[4px] py-[2px] w-[30px] h-[30px] cursor-pointer "
4141
>
4242
<img src={onIcon === "home" ? onHome : offHome} alt="홈" />
4343
{/* <img src={onIcon[1]? onHome : offHome} alt="홈" /> */}
@@ -48,9 +48,13 @@ const BottomNavi = () => {
4848
handleIconClick("My");
4949
navigate("/profile");
5050
}}
51-
className="cursor-pointer px-[3.5px] c py-[5.5px] w-[24px] h-[24px]"
51+
className="cursor-pointer px-[4px] py-[4px] w-[30px] h-[30px]"
5252
>
53-
<img src={onIcon === "My" ? onMy : offMy} alt="마이" />
53+
<img
54+
src={onIcon === "My" ? onMy : offMy}
55+
alt="마이"
56+
className="w-[24px]"
57+
/>
5458
{/* <img src={onIcon[2] ? onMy : offMy} alt="마이" /> */}
5559
</div>
5660
</div>

‎src/components/layout/TopNavBar.jsx

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useState } from "react";
2-
import searchIcon from "../../img/searchIcon.png";
3-
import plusIcon from "../../img/plusIcon.png";
4-
import notifyIcon from "../../img/notifyIcon.png";
2+
import searchIcon from "../../img/searchIcon.svg";
3+
import plusIcon from "../../img/plusIcon.svg";
4+
import notifyIcon from "../../img/notifyIcon.svg";
55
import { useNavigate } from "react-router-dom";
66
import gnimsLogo from "../../img/gnimsLogo.png";
77
import { instance } from "../../shared/AxiosInstance";
@@ -105,18 +105,17 @@ const TopNavBar = () => {
105105
}}
106106
/>
107107
</div>
108-
<div className="flex flex-row gap-[19px]">
108+
<div className="flex flex-row gap-[23px]">
109109
<img
110-
className="h-[24px] w-[24px] flex left-[255px] cursor-pointer mt-[13px]"
110+
className="h-[19px] w-[19px] flex cursor-pointer mt-[18px]"
111111
src={searchIcon}
112112
alt="검색버튼"
113-
//navigate 경로는 검색페이지루트가 정해지면 변경하면됩니다
114113
onClick={() => {
115114
navigate("/userSearch");
116115
}}
117116
/>
118117
<img
119-
className="h-[24px] cursor-pointer w-[24px] flex left-[293px] mt-[13px]"
118+
className="h-[14px] cursor-pointer w-[14px] flex mt-[19px]"
120119
src={plusIcon}
121120
alt="추가버튼"
122121
onClick={() => {
@@ -126,7 +125,7 @@ const TopNavBar = () => {
126125
/>
127126
<div className={`w-[30px] bg-${allchecked}`}>
128127
<img
129-
className="h-[24px] w-[24px] cursor-pointer flex left-[331px] mt-[13px]"
128+
className="h-[21px] w-[18px] cursor-pointer flex mt-[15px]"
130129
src={notifyIcon}
131130
alt="알림버튼"
132131
onClick={() => {

‎src/components/layout/input/LoginSignupInputBox.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React, { forwardRef } from "react";
22

33
const LoginSignupInputBox = forwardRef((props, ref) => {
4-
const { type, placeholder, onChange, id, bgColor, shadow, maxLength } = props;
4+
const { type, placeholder, onChange, id, bgColor, maxLength } = props;
55
return (
66
<>
77
<div>
88
<input
99
// className={`w-full px-3 h-[50px] ${bgColor} focus:bg-inputBoxFocus placeholder-inputText `}
10-
className={`w-full px-3 h-[50px] ${bgColor} ${shadow} placeholder-inputPlaceHoldText`}
10+
className={`w-full px-3 h-[50px] ${bgColor} placeholder-inputPlaceHoldText`}
1111
type={type}
1212
id={id}
1313
ref={ref}

‎src/components/login/EmailLogin.jsx

+8-16
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ const EmailLogin = () => {
2424
const [style, setStyle] = useState({
2525
bgColorEmail: "bg-inputBox",
2626
bgColorPassword: "bg-inputBox",
27-
shadowEmail: "",
28-
shadowPassword: "",
2927
});
3028

3129
//서버에 전달하기 위한 input Ref 생성
@@ -50,13 +48,11 @@ const EmailLogin = () => {
5048
setStyle(() => ({
5149
...style,
5250
bgColorEmail: "bg-inputBoxFocus",
53-
shadowEmail: "drop-shadow-inputBoxShadow",
5451
}));
5552
if (value.trim() === "") {
5653
setStyle(() => ({
5754
...style,
5855
bgColorEmail: "bg-inputBox",
59-
shadowEmail: "",
6056
}));
6157
}
6258
if (!emailRegulationExp.test(value)) {
@@ -68,13 +64,11 @@ const EmailLogin = () => {
6864
setStyle(() => ({
6965
...style,
7066
bgColorPassword: "bg-inputBoxFocus",
71-
shadowPassword: "drop-shadow-inputBoxShadow",
7267
}));
7368
if (value.trim() === "") {
7469
setStyle(() => ({
7570
...style,
7671
bgColorPassword: "bg-inputBox",
77-
shadowPassword: "",
7872
}));
7973
}
8074
if (!passwordRegulationExp.test(value)) {
@@ -136,11 +130,11 @@ const EmailLogin = () => {
136130
};
137131

138132
return (
139-
<div className="container h-full md ">
133+
<div className="container h-full">
140134
<div className="ml-[20px] mr-[20px] ">
141-
<div className="grid grid-rows mt-[100px]">
135+
<div className="grid grid-rows pt-[100px]">
142136
<div className="h-[150px]">
143-
<div className="mx-auto w-[150px] h-[64px] overflow-hidden gap-[10px] ">
137+
<div className="mx-auto w-[150px] h-[64px] overflow-hidden gap-[10px] ">
144138
<img
145139
src={gnimsLogo}
146140
alt="곰캐릭터가 우쭐거리며 왠지 잘될 것 같은 기분포즈 중"
@@ -194,7 +188,6 @@ const EmailLogin = () => {
194188
</p>
195189
</div>
196190
</div>
197-
198191
<button
199192
onClick={onSubmit}
200193
className="h-[50px] rounded w-full bg-[#002C51] font-[700] text-[#ffff] mt-[24px]"
@@ -203,18 +196,18 @@ const EmailLogin = () => {
203196
</button>
204197
</div>
205198
</form>
206-
<div className="mt-[26px] grid grid-cols-2 text-center">
207-
<div className="border-4 border-indigo-600">
199+
<div className="my-[40px] flex text-center">
200+
<div className="border-black border-solid border-r-[1px]">
208201
<button
209-
className="text-textBlack text-[16px] font-[400] px-[30px] py-[10px]"
202+
className="text-textBlack text-[16px] font-[400] px-[30px] pr-[37px]"
210203
onClick={() => navigate("/developing")}
211204
>
212205
비밀번호 재설정
213206
</button>
214207
</div>
215-
<div>
208+
<div className="pl-[15px]">
216209
<button
217-
className="text-textBlack text-[16px] font-[400] px-[30px] py-[10px] "
210+
className="text-textBlack text-[16px] font-[400] px-[30px] pl-[40px] "
218211
onClick={() => navigate(`/signup`)}
219212
>
220213
회원가입
@@ -247,5 +240,4 @@ const EmailLogin = () => {
247240
</div>
248241
);
249242
};
250-
251243
export default EmailLogin;

‎src/components/login/InputEmail.jsx

+1-8
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ const InputEmail = () => {
1515

1616
const [style, setStyle] = useState({
1717
bgColorEmail: "bg-inputBox",
18-
shadowEmail: "",
1918
bgColorAuthenticationNumber: "bg-inputBox",
20-
shadowAuthenticationNumber: "",
2119
});
2220
const [regulation, SetRegulation] = useState({
2321
emailError: "",
@@ -49,13 +47,11 @@ const InputEmail = () => {
4947
setStyle(() => ({
5048
...style,
5149
bgColorEmail: "bg-inputBoxFocus",
52-
shadowEmail: "drop-shadow-inputBoxShadow",
5350
}));
5451
if (emailRefCurrent.value.trim() === "") {
5552
setStyle(() => ({
5653
...style,
5754
bgColorEmail: "bg-inputBox",
58-
shadowEmail: "",
5955
}));
6056
}
6157
if (emailRegulationExp.test(emailRefCurrent.value)) {
@@ -76,13 +72,11 @@ const InputEmail = () => {
7672
setStyle(() => ({
7773
...style,
7874
bgColorAuthenticationNumber: "bg-inputBoxFocus",
79-
shadowAuthenticationNumber: "drop-shadow-inputBoxShadow",
8075
}));
8176
if (authenticationNumberRefCurrent.value.trim() === "") {
8277
setStyle(() => ({
8378
...style,
8479
bgColorAuthenticationNumber: "bg-inputBox",
85-
shadowAuthenticationNumber: "",
8680
}));
8781
}
8882
}
@@ -217,7 +211,7 @@ const InputEmail = () => {
217211
onChange={onInputColor}
218212
autoComplete="off"
219213
placeholder="아이디(이메일) 입니다."
220-
className={`w-[234px] px-3 h-[50px] ${style.bgColorEmail} ${style.shadowEmail} placeholder-inputPlaceHoldText`}
214+
className={`w-[234px] px-3 h-[50px] ${style.bgColorEmail} placeholder-inputPlaceHoldText`}
221215
/>
222216
<div
223217
onClick={onSendEmail}
@@ -238,7 +232,6 @@ const InputEmail = () => {
238232
placeholder="인증번호 입력"
239233
onChange={onInputColor}
240234
bgColor={style.bgColorAuthenticationNumber}
241-
shadow={style.shadowAuthenticationNumber}
242235
ref={authenticationNumberRef}
243236
/>
244237
</div>

‎src/components/schedule/ScheduleDetail.jsx

+9-11
Original file line numberDiff line numberDiff line change
@@ -48,28 +48,26 @@ const ScheduleDetail = () => {
4848
</div>
4949
{modalOpen && <KebabModal setModalOpen={setModalOpen} id={id} />}
5050
<div
51-
className={`h-[212px] bg-${schedule.cardColor} pl-[18px] w-[375px] pt-[23px] pr-[21px] text-white
51+
className={`h-[202px] bg-${schedule.cardColor} pl-[18px] w-[375px] pt-[23px] pr-[21px] text-white align-
5252
`}
5353
>
54-
<div className="flex flex-row-reverse ">
54+
<div className="flex space-x-3 text-[18px] font-extralight ">
55+
<div>{schedule.date}</div> <div> {time}</div>
5556
<div
56-
className="w-[40px] mr-[-30px] right-0"
57+
className="w-[160px] flex pl-[155px]"
5758
onClick={showModalHandler}
5859
>
5960
<img
60-
className={`h-[20px] ${isHidden} row cursor-pointer`}
61+
className={`h-[20px] ${isHidden} row cursor-pointer `}
6162
src={kebab}
6263
alt="케밥메뉴"
6364
/>
6465
</div>
6566
</div>
66-
<div className="flex space-x-3 text-[18px] font-light ">
67-
<div>{schedule.date}</div> <div> {time}</div>
68-
</div>
6967
<div className="mt-[28px] font-semibold text-[24px]">
7068
{schedule.subject}
71-
</div>{" "}
72-
<div className="place-content-end font-light flex text-[18px] mt-[45px]">
69+
</div>
70+
<div className="place-content-end font-extralight flex text-[18px] mt-[66px]">
7371
D-
7472
{schedule.dday === 0 ? <div>DAY</div> : <div>{schedule.dday}</div>}
7573
</div>
@@ -80,7 +78,7 @@ const ScheduleDetail = () => {
8078
{numberOfJoiner !== 1 ? (
8179
<div className="mt-[30px] ml-[20px] h-[98px]">
8280
참여자
83-
<div className="bg-white h-[50px] w-[335px] mt-[20px] p-[15px] drop-shadow-lg flex rounded-lg">
81+
<div className="bg-white h-[50px] border-solid border-[1px] border-[#E2E2E2] w-[335px] mt-[20px] p-[15px] lg flex rounded-lg">
8482
{joiner &&
8583
joiner.map((a) => {
8684
return (
@@ -97,7 +95,7 @@ const ScheduleDetail = () => {
9795
{schedule.content ? (
9896
<div className="h-[234px] ml-[20px] mt-[30px] mb-[8px] ">
9997
일정내용{" "}
100-
<div className="bg-white word-wrap break-words whitespace-normal shadow-lg h-[186px] w-[335px] mt-[20px] p-[20px] flex rounded-lg">
98+
<div className="bg-white border-solid border-[1px] border-[#E2E2E2] word-wrap break-words whitespace-normal h-[186px] w-[335px] mt-[20px] p-[20px] flex rounded-lg">
10199
<div className="w-[295px] ">{schedule.content}</div>
102100
</div>
103101
</div>

‎src/components/signup/SetProfileName.jsx

+1-7
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ const SetProfileName = () => {
2121
const [style, setStyle] = useState({
2222
bgColorName: "bg-inputBox",
2323
bgColorNickname: "bg-inputBox",
24-
shadowName: "",
25-
shadowNickname: "",
2624
});
2725

2826
useEffect(() => {
@@ -50,12 +48,10 @@ const SetProfileName = () => {
5048
setStyle(() => ({
5149
...style,
5250
bgColorName: "bg-inputBoxFocus",
53-
shadowName: "drop-shadow-inputBoxShadow",
5451
}));
5552
if (value.trim() === "") {
5653
setStyle(() => ({
5754
bgColorName: "bg-inputBox",
58-
shadowName: "",
5955
}));
6056
}
6157
if (!nameRegulationExp.test(value)) {
@@ -73,13 +69,11 @@ const SetProfileName = () => {
7369
setStyle(() => ({
7470
...style,
7571
bgColorNickname: "bg-inputBoxFocus",
76-
shadowNickname: "drop-shadow-inputBoxShadow",
7772
}));
7873
if (value.trim() === "") {
7974
setStyle(() => ({
8075
...style,
8176
bgColorNickname: "bg-inputBox",
82-
shadowNickname: "",
8377
}));
8478
}
8579
if (nickNameReglationExp.test(value)) {
@@ -218,7 +212,7 @@ const SetProfileName = () => {
218212
placeholder="2~8자리 숫자,한글,영문을 입력해주세요."
219213
onChange={onValidity}
220214
maxLength={8}
221-
className={`${style.bgColorNickname} ${style.shadowNickname} w-full px-1 h-[50px] text-[16px] placeholder-inputPlaceHoldText`}
215+
className={`${style.bgColorNickname} w-full px-1 h-[50px] text-[16px] placeholder-inputPlaceHoldText`}
222216
disabled={nickNameDoubleCheck}
223217
autoComplete="off"
224218
></input>

0 commit comments

Comments
 (0)