Skip to content

Commit

Permalink
Merge pull request #45 from Mallang-Trip/develop
Browse files Browse the repository at this point in the history
V0.0.35
  • Loading branch information
DaeHee99 authored Jan 26, 2024
2 parents b496e59 + b5a8950 commit e80be1b
Show file tree
Hide file tree
Showing 76 changed files with 133 additions and 124 deletions.
6 changes: 3 additions & 3 deletions src/components/ArticleList/ArticleItem/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function ArticleItem({

return (
<div
className="py-5 border-b border-[#D9D9D9] cursor-pointer"
className="py-5 border-b border-mediumgray cursor-pointer"
onClick={() => navigation(`/community/${articleId}`)}
>
<div className="flex gap-2.5 mb-3">
Expand All @@ -29,14 +29,14 @@ function ArticleItem({
/>
<div className="h-10 flex flex-col justify-center">
<p className="text-sm text-black font-bold">{nickname}</p>
<p className="text-sm text-[#3E3E3E] font-medium">{introduction}</p>
<p className="text-sm text-boldgray font-medium">{introduction}</p>
</div>
</div>

<div className="flex flex-col-reverse sm:flex-row justify-between gap-4">
<div className="w-full">
<p className="text-lg text-black font-bold">{title}</p>
<p className="w-full text-sm text-[#3E3E3E] font-medium whitespace-pre-wrap mt-3 mb-4">
<p className="w-full text-sm text-boldgray font-medium whitespace-pre-wrap mt-3 mb-4">
{content}
</p>
<p className="text-xs text-darkgray font-medium">
Expand Down
2 changes: 1 addition & 1 deletion src/components/BottomNav/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function BottomNav() {
};

return (
<div className="fixed bottom-0 left-0 z-40 w-full h-16 bg-white border-t border-x border-[#D9D9D9] rounded-t-2xl md:hidden">
<div className="fixed bottom-0 left-0 z-40 w-full h-16 bg-white border-t border-x border-mediumgray rounded-t-2xl md:hidden">
<div className="grid h-full max-w-lg grid-cols-5 mx-auto font-medium">
<button
type="button"
Expand Down
2 changes: 1 addition & 1 deletion src/components/CheckModal/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function CheckModal({
</div>
<div className="flex">
<button
className="w-full h-16 text-lg text-center text-darkgray rounded-bl-xl bg-[#F4F4F4]"
className="w-full h-16 text-lg text-center text-darkgray rounded-bl-xl bg-lightgray"
onClick={closeModal}
>
{noText}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Header/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function Header() {
onClick={() => navigation("/login")}
className={`${
user.auth ? "hidden" : "flex"
} flex-row text-[#000000] font-medium rounded-lg text-sm px-5 py-2 text-center mr-3`}
} flex-row text-black font-medium rounded-lg text-sm px-5 py-2 text-center mr-3`}
>
로그인
</button>
Expand All @@ -144,7 +144,7 @@ function Header() {
onClick={() => navigation("/signup")}
className={`${
user.auth ? "hidden" : "flex"
} flex-row text-[#000000] font-medium rounded-lg text-sm px-5 py-2 text-center`}
} flex-row text-black font-medium rounded-lg text-sm px-5 py-2 text-center`}
>
회원가입
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/PartyPlan/PlanBox/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function PlanBox({ index, name, time }) {
return (
<div className="relative w-full h-16 md:h-[83px] mb-6 rounded-full bg-[#EAF4FF] font-bold">
<div className="relative w-full h-16 md:h-[83px] mb-6 rounded-full bg-skyblue font-bold">
<div className="w-10 h-10 md:w-14 md:h-14 absolute left-4 top-3 rounded-full bg-primary text-white text-lg flex justify-center items-center">
{index}
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/pages/CommunityPage/ArticleDetail/ArticleBody/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function ArticleBody({

return (
<>
<div className="w-full pt-5 pb-8 border-b border-[#D9D9D9]">
<div className="w-full pt-5 pb-8 border-b border-mediumgray">
<div className="flex justify-between mb-3">
<div className="flex gap-2.5">
<img
Expand All @@ -81,7 +81,7 @@ function ArticleBody({
/>
<div className="h-10 flex flex-col justify-center">
<p className="text-sm text-black font-bold">{nickname}</p>
<p className="text-sm text-[#3E3E3E] font-medium">
<p className="text-sm text-boldgray font-medium">
{dateToGapKorean(updatedAt, true)}
</p>
</div>
Expand All @@ -106,7 +106,7 @@ function ArticleBody({
)}
<div
className={`w-[100px] absolute top-11 right-2 z-10 rounded-lg bg-white text-sm shadow-sm transition-all duration-500 overflow-hidden ${
showMore ? "max-h-[100px] border border-[#D9D9D9]" : "max-h-0"
showMore ? "max-h-[100px] border border-mediumgray" : "max-h-0"
}`}
>
<button
Expand Down Expand Up @@ -161,7 +161,7 @@ function ArticleBody({
</div>
)}
</div>
<p className="w-full text-base text-[#3E3E3E] font-medium whitespace-pre-wrap mt-3 mb-4">
<p className="w-full text-base text-boldgray font-medium whitespace-pre-wrap mt-3 mb-4">
{content}
</p>
{partyId && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function CommentForm({ reloadArticle }) {
type="text"
value={newComment}
onChange={(e) => setNewComment(e.target.value)}
className="w-full focus:outline-primary bg-[#F4F4F4] py-2.5 px-5 text-base rounded-lg"
className="w-full focus:outline-primary bg-lightgray py-2.5 px-5 text-base rounded-lg"
placeholder="댓글을 입력해주세요."
/>
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ function ReplyForm({ commentId, reloadArticle }) {
type="text"
value={newReply}
onChange={(e) => setNewReply(e.target.value)}
className="w-full focus:outline-primary bg-[#F4F4F4] py-2.5 px-5 text-base rounded-lg"
className="w-full focus:outline-primary bg-lightgray py-2.5 px-5 text-base rounded-lg"
placeholder="답글을 입력해주세요."
/>
<button
type="submit"
className="w-20 py-3 bg-[#EAF4FF] text-sm text-primary rounded-lg border border-primary"
className="w-20 py-3 bg-skyblue text-sm text-primary rounded-lg border border-primary"
>
등록
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ function ReplyItem({
/>
<div className="h-10 flex flex-col justify-center">
<p className="text-sm text-black font-bold">{nickname}</p>
<p className="text-sm text-[#3E3E3E] font-medium">
<p className="text-sm text-boldgray font-medium">
{dateToGapKorean(createdAt)}
</p>
</div>
</div>
<div className="ml-[50px]">
<div className="w-full text-base text-[#3E3E3E] font-medium whitespace-pre-wrap mt-2.5 mb-5">
<div className="w-full text-base text-boldgray font-medium whitespace-pre-wrap mt-2.5 mb-5">
{content}
</div>
<div className="flex gap-8 text-xs text-darkgray">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ function CommentItem({
/>
<div className="h-10 flex flex-col justify-center">
<p className="text-sm text-black font-bold">{nickname}</p>
<p className="text-sm text-[#3E3E3E] font-medium">
<p className="text-sm text-boldgray font-medium">
{dateToGapKorean(createdAt)}
</p>
</div>
</div>
<div className="ml-[50px]">
<div className="w-full text-base text-[#3E3E3E] font-medium whitespace-pre-wrap mt-2.5 mb-5">
<div className="w-full text-base text-boldgray font-medium whitespace-pre-wrap mt-2.5 mb-5">
{content}
</div>
<div className="flex gap-8 text-xs">
Expand All @@ -68,7 +68,7 @@ function CommentItem({
)}
</div>
<div
className={`w-full transition-all duration-500 overflow-hidden border-l-2 border-[#F4F4F4] mt-5 ${
className={`w-full transition-all duration-500 overflow-hidden border-l-2 border-lightgray mt-5 ${
showReply ? "max-h-[1000px] " : "max-h-0"
}`}
>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/CommunityPostPage/ArticleBodyForm/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ function ArticleBodyForm({
placeholder="제목을 입력해주세요"
className="w-full text-2xl text-black placeholder:text-darkgray focus:outline-none"
/>
<hr className="bg-[#D9D9D9] mt-4 mb-8 h-px border-0" />
<hr className="bg-mediumgray mt-4 mb-8 h-px border-0" />
<textarea
ref={textareaRef}
value={content}
onChange={contentHandler}
placeholder="내용을 작성해주세요."
className="w-full min-h-[320px] text-sm text-[#3E3E3E] placeholder:text-darkgray focus:outline-none resize-none noScrollBar"
className="w-full min-h-[320px] text-sm text-boldgray placeholder:text-darkgray focus:outline-none resize-none noScrollBar"
/>
<div className="flex justify-center items-center mt-[70px]">
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function ImageInput({ images, setImages, index }) {
return (
<>
<div
className="w-20 h-20 bg-[#EAF4FF] border border-dashed border-primary rounded-lg cursor-pointer flex justify-center items-center"
className="w-20 h-20 bg-skyblue border border-dashed border-primary rounded-lg cursor-pointer flex justify-center items-center"
onClick={() => imageRef.current.click()}
>
{images[index] ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function PartySelectBox({ selectedParty, setSelectedParty }) {
return (
<>
<button
className="w-[200px] h-[50px] border border-[#D9D9D9] rounded-lg py-4 px-5 text-sm text-black flex items-center"
className="w-[200px] h-[50px] border border-mediumgray rounded-lg py-4 px-5 text-sm text-black flex items-center"
onClick={() => setShowPartyModal(true)}
>
{selectedParty.name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function TypeDropBox({

return (
<div
className={`w-[200px] border border-[#D9D9D9] rounded-lg overflow-hidden transition-all duration-500 ${
className={`w-[200px] border border-mediumgray rounded-lg overflow-hidden transition-all duration-500 ${
showDropBox ? "max-h-[1000px]" : "max-h-[50px]"
}`}
>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/DriverApplyPage/Accout/HourPrice/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function HourPrice({ hour, setHour, money, setMoney, index, isShow }) {
if (!show)
return (
<div
className="w-[300px] h-14 mx-auto my-5 bg-[#EAF4FF] border border-dashed border-primary rounded-2xl cursor-pointer flex justify-center items-center"
className="w-[300px] h-14 mx-auto my-5 bg-skyblue border border-dashed border-primary rounded-2xl cursor-pointer flex justify-center items-center"
onClick={() => setShow(true)}
>
<img src={primaryPlus} alt="plus" />
Expand All @@ -31,7 +31,7 @@ function HourPrice({ hour, setHour, money, setMoney, index, isShow }) {
<input
type="text"
name="hour"
className="w-12 text-center border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block p-2.5"
className="w-12 text-center border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block p-2.5"
value={onlyNumber(hour[index])}
onChange={hourHandler}
autoComplete="off"
Expand All @@ -40,7 +40,7 @@ function HourPrice({ hour, setHour, money, setMoney, index, isShow }) {
<input
type="text"
name="money"
className="w-24 text-center border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block p-2.5"
className="w-24 text-center border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block p-2.5"
value={onlyNumber(money[index]).replace(/\B(?=(\d{3})+(?!\d))/g, ",")}
onChange={moneyHandler}
autoComplete="off"
Expand Down
6 changes: 3 additions & 3 deletions src/pages/DriverApplyPage/Accout/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function Accout({
</div>
<input
type="text"
className="border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5 caret-white cursor-pointer"
className="border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5 caret-white cursor-pointer"
placeholder="은행을 선택해주세요"
value={bank}
onChange={() => {}}
Expand All @@ -54,7 +54,7 @@ function Accout({
</div>
<input
type="text"
className="border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
className="border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
placeholder="예금주 성함(본인)을 입력해주세요"
value={name}
onChange={(e) => setName(e.target.value)}
Expand All @@ -68,7 +68,7 @@ function Accout({
</div>
<input
type="text"
className="border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
className="border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
placeholder="계좌번호를 입력해주세요"
value={onlyNumber(accoutNumber)}
onChange={(e) => setAccoutNumber(e.target.value)}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/DriverApplyPage/CarInfo/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function CarInfo({
</div>
<div className="flex justify-center w-full h-[200px] mt-4 mb-16 relative">
<div
className="w-[300px] h-[200px] bg-[#EAF4FF] border border-dashed border-primary rounded-2xl cursor-pointer"
className="w-[300px] h-[200px] bg-skyblue border border-dashed border-primary rounded-2xl cursor-pointer"
onClick={() => imageRef.current.click()}
>
{carImage && (
Expand Down Expand Up @@ -70,7 +70,7 @@ function CarInfo({
<input
type="text"
id="model_name"
className="border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
className="border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
placeholder="차량의 모델 이름"
value={modelName}
onChange={(e) => setModelName(e.target.value)}
Expand All @@ -85,7 +85,7 @@ function CarInfo({
<input
type="text"
id="max_num"
className="border border-[#D9D9D9] text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
className="border border-mediumgray text-black text-sm rounded-lg focus:outline-primary block w-full p-2.5"
placeholder="승객들의 최대 탑승 가능 정원"
value={maxNum}
onChange={(e) => setMaxNum(onlyNumber(e.target.value))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function ImageInput({ title, image, name, imageHandler }) {
</div>
<div className="flex justify-center w-full h-[200px] mt-4 mb-16 relative">
<div
className="w-[300px] h-[200px] bg-[#EAF4FF] border border-dashed border-primary rounded-2xl cursor-pointer"
className="w-[300px] h-[200px] bg-skyblue border border-dashed border-primary rounded-2xl cursor-pointer"
onClick={() => imageRef.current.click()}
>
{image && (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/DriverApplyPage/StepButton/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function StepButton({
className={`${
activeNext
? "h-10 text-white rounded-full text-sm w-28 bg-primary"
: "h-10 bg-[#F4F4F4] border rounded-full text-darkgray text-sm w-28 border-[#F4F4F4]"
: "h-10 bg-lightgray border rounded-full text-darkgray text-sm w-28 border-lightgray"
}`}
disabled={!activeNext}
onClick={nextHandler}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/DriverApplyPage/Stepper/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import CheckIcon from "./CheckIcon";

function Stepper({ step }) {
return (
<ol className="flex items-center w-full mb-20 text-sm text-[#D9D9D9]">
<ol className="flex items-center w-full mb-20 text-sm text-mediumgray">
<li
className={`flex w-full items-center after:content-[''] after:w-full after:h-1 after:border-b after:border-4 after:inline-block ${
step > 1 ? "after:border-blue-100" : "after:border-lightgray"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/HelpPage/ArticleItem/ArticleBody/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import exampleImg from "../../../../assets/images/단양.jpg";

function ArticleBody({ type }) {
return (
<div className="w-full px-6 pb-10 border-b border-[#D9D9D9]">
<div className="w-full px-6 pb-10 border-b border-mediumgray">
{type === "notice" && (
<p className="mt-4 text-xs text-darkgray font-medium">
작성일 2023.08.09
Expand Down
2 changes: 1 addition & 1 deletion src/pages/HelpPage/ArticleItem/ArticleTitle/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function ArticleTitle() {
return (
<div className="w-full px-6 py-4 text-sm text-black font-bold bg-skyblue border-t-2 border-b border-[#D9D9D9]">
<div className="w-full px-6 py-4 text-sm text-black font-bold bg-skyblue border-t-2 border-b border-mediumgray">
결제 방식에 대한 안내
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/HelpPage/FAQList/FAQ/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function FAQ({ index, faqId, title }) {
const navigation = useNavigate();

return (
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center bg-white border-b border-[#D9D9D9]">
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center bg-white border-b border-mediumgray">
<div className="w-8 flex-shrink-0">{index}</div>
<div className="w-full flex">
<button
Expand Down
2 changes: 1 addition & 1 deletion src/pages/HelpPage/FAQList/Head/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function Head() {
return (
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center font-bold bg-skyblue border-t-2 border-b border-[#D9D9D9]">
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center font-bold bg-skyblue border-t-2 border-b border-mediumgray">
<div className="w-8 flex-shrink-0">번호</div>
<div className="w-full">자주 묻는 질문</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/HelpPage/NoticeList/Head/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function Head() {
return (
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center font-bold bg-skyblue border-t-2 border-b border-[#D9D9D9]">
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center font-bold bg-skyblue border-t-2 border-b border-mediumgray">
<div className="w-8 flex-shrink-0">번호</div>
<div className="w-full">제목</div>
<div className="w-20 flex-shrink-0">작성일</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/HelpPage/NoticeList/Notice/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function Notice({ index, noticeId, title, date }) {
const navigation = useNavigate();

return (
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center bg-white border-b border-[#D9D9D9]">
<div className="w-full px-5 py-4 flex gap-12 justify-between items-center text-sm text-black text-center bg-white border-b border-mediumgray">
<div className="w-8 flex-shrink-0">{index}</div>
<div className="w-full flex">
<button
Expand Down
6 changes: 3 additions & 3 deletions src/pages/IntroPage/BottomInfo/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ function BottomInfo() {
return (
<div className="mt-14 mb-10 flex justify-center flex-col sm:flex-row gap-6 sm:gap-12 md:gap-36 mx-5 sm:mx-12 pl-14 sm:pl-0">
<div className="text-xs text-darkgray">
<p className="text-sm text-[#3E3E3E] font-bold mb-2.5">말랑트립</p>
<p className="text-sm text-boldgray font-bold mb-2.5">말랑트립</p>
<p>대표: 김제윤</p>
<p className="my-1">사업자등록번호: 399-51-00784</p>
<p>경기도 의왕시 모락로 89-15 109동 403호</p>
</div>
<div className="text-xs text-darkgray">
<p className="text-sm text-[#3E3E3E] font-bold mb-2.5">고객문의</p>
<p className="text-sm text-boldgray font-bold mb-2.5">고객문의</p>
<p>실시간 고객상담: 말랑톡</p>
<p className="my-1">유선 번호: 070-8080-2665</p>
<p>기타문의: [email protected]</p>
</div>
<div className="text-xs text-darkgray">
<p className="text-sm text-[#3E3E3E] font-bold mb-2.5">SNS</p>
<p className="text-sm text-boldgray font-bold mb-2.5">SNS</p>
<p>INSTAGRAM: @mallang_trip</p>
</div>
</div>
Expand Down
Loading

0 comments on commit e80be1b

Please sign in to comment.