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.

Sign up for GitHub

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

Ver 2.0 4차 수정(지도 리스트 데이터 0, 1개일 때 UI 대응) #196

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Ver 2.0 4차 수정(지도 리스트 데이터 0, 1개일 때 UI 대응) #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d07435
🐛 fix: 데이터 0, 1개일 때 지도 리스트 css 수정
han-kimm Mar 18, 2024
2e46a0a
Merge pull request #195 from han-kimm/fix/artistpage
han-kimm Mar 18, 2024
362f919
Merge branch 'main' into develop
han-kimm Mar 18, 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
6 changes: 3 additions & 3 deletions app/(route)/artist/[artistId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const ArtistIdPage = () => {
<Image src="/icon/arrow-left.svg" width={20} height={20} alt="화살표" className={`${mapVar.toggleTab || "scale-x-[-1]"}`} />
</button>
{mapVar.toggleTab && (
<div className="absolute bottom-0 flex max-h-344 min-h-84 w-full flex-col gap-16 rounded-t-lg bg-white-black pt-28 shadow-2xl tablet:top-0 tablet:max-h-full tablet:w-360 tablet:rounded-none tablet:border tablet:border-gray-100 tablet:border-t-transparent tablet:pt-20 tablet:shadow-none pc:top-0 pc:h-[84rem] pc:w-400 pc:rounded-l-lg pc:border-t-gray-100 pc:py-20">
<div className="absolute bottom-0 flex max-h-352 min-h-84 w-full flex-col gap-16 rounded-t-lg bg-white-black pt-28 shadow-2xl tablet:top-0 tablet:max-h-full tablet:w-360 tablet:rounded-none tablet:border tablet:border-gray-100 tablet:border-t-transparent tablet:pt-20 tablet:shadow-none pc:top-0 pc:h-[84rem] pc:w-400 pc:rounded-l-lg pc:border-t-gray-100 pc:py-20">
<div className="absolute left-[calc((100%-64px)/2)] top-12 h-4 w-64 rounded-sm bg-gray-700 tablet:hidden" />
<div className="flex flex-row items-center justify-start gap-12 px-20 pc:w-full">
<div className="relative h-36 w-36 pc:h-64 pc:w-64">
Expand All @@ -109,9 +109,9 @@ const ArtistIdPage = () => {
인기순
</SortButton>
</div>
<div className="overflow-scroll scrollbar-none pc:h-[65rem]">
<div className="min-h-200 overflow-scroll scrollbar-none pc:h-[65rem]">
{isEmpty ? (
<p className="flex-center h-[20rem] w-full pt-20 text-14 font-500">행사가 없습니다.</p>
<p className="flex-center w-full pt-20 text-14 font-500">행사가 없습니다.</p>
) : (
<div className="px-20">
{artistData.pages.map((page) =>
Expand Down
16 changes: 8 additions & 8 deletions app/(route)/mypage/_components/tab/MyLocationTab/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
"use client";

import EventCard from "@/(route)/artist/[artistId]/_components/EventCard";
import { instance } from "@/api/api";
import { useQuery } from "@tanstack/react-query";
import Image from "next/image";
import { useState } from "react";
import KakaoMap from "@/components/KakaoMap";
import TimeFilter from "@/components/TimeFilter";
import { STATUS } from "@/constants/eventStatus";
import { instance } from "@/api/api";
import useCustomMap from "@/hooks/useCustomMap";
import { EventCardType } from "@/types/index";
import { useQuery } from "@tanstack/react-query";
import Image from "next/image";
import { useState } from "react";
import { STATUS } from "@/constants/eventStatus";

interface Props {
userId: string;
Expand Down Expand Up @@ -45,12 +45,12 @@ const MyLocationTab = ({ userId }: Props) => {
<Image src="/icon/arrow-left.svg" width={20} height={20} alt="화살표" className={`${mapVar.toggleTab || "scale-x-[-1]"}`} />
</button>
{mapVar.toggleTab && (
<div className="absolute bottom-0 flex max-h-344 min-h-84 w-full flex-col gap-16 rounded-t-lg bg-white-black pt-28 shadow-2xl tablet:w-full pc:top-0 pc:h-[84rem] pc:max-h-full pc:w-400 pc:rounded-none pc:rounded-l-lg pc:border pc:border-gray-100 pc:border-t-gray-100 pc:border-t-transparent pc:py-20 pc:shadow-none">
<div className="absolute bottom-0 flex max-h-352 min-h-84 w-full flex-col gap-16 rounded-t-lg bg-white-black pt-28 shadow-2xl tablet:w-full pc:top-0 pc:h-[84rem] pc:max-h-full pc:w-400 pc:rounded-none pc:rounded-l-lg pc:border pc:border-gray-100 pc:border-t-gray-100 pc:border-t-transparent pc:py-20 pc:shadow-none">
<div className="absolute left-[calc((100%-64px)/2)] top-12 h-4 w-64 rounded-sm bg-gray-700 pc:hidden" />
<TimeFilter setStatus={setStatus} status={status} />
<div className="overflow-scroll scrollbar-none pc:h-[72rem]">
<div className="min-h-320 overflow-scroll scrollbar-none pc:h-[72rem]">
{isEmpty ? (
<p className="flex-center h-[50rem] w-full pt-20 text-14 font-500">행사가 없습니다.</p>
<p className="flex-center w-full pt-20 text-14 font-500">행사가 없습니다.</p>
) : (
<div className="px-20">
{myEventsData?.map((event) => (
Expand Down
Loading