Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions apps/web/src/assets/add-mov.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions apps/web/src/assets/add-photo.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: 2 additions & 2 deletions apps/web/src/components/UniversityClubSidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ function UniversityClubSidebar({ university, clubCount }: UniversityClubSidebarP
const universityLabel = getUniversityLabel(university);

return (
<aside className="flex flex-col gap-6 lg:gap-10">
<section className="border-text-100 flex items-center justify-center rounded-2xl border bg-white py-8 text-center sm:rounded-[20px] sm:py-7">
<aside className="flex w-full flex-col gap-6 md:w-64.75 lg:gap-5">
<section className="border-text-100 flex items-center justify-center rounded-2xl border bg-white py-8 text-center sm:min-h-41 sm:rounded-[20px] sm:py-5.5">
<div className="flex min-w-0 flex-col items-center gap-1">
<img className="size-10 object-contain" src={university.imageUrl} alt="" />
<div className="flex max-w-full flex-col items-center">
Expand Down
16 changes: 8 additions & 8 deletions apps/web/src/pages/Home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ function Home() {
해당 학교에 등록된 동아리 정보를 확인할 수 있어요.
</p>

<label className="border-text-100 focus-within:border-primary-500 mt-12 flex h-16 w-full max-w-255 items-center rounded-[30px] border bg-white px-8 transition-[border-color,box-shadow] focus-within:shadow-[0_0_30px_0_rgba(105,191,223,0.30)] sm:mt-25 sm:h-19.5">
<label className="border-text-100 focus-within:border-primary-500 mt-12 flex h-16 w-full max-w-225 items-center rounded-[30px] border bg-white px-8 transition-[border-color,box-shadow] focus-within:shadow-[0_0_30px_0_rgba(105,191,223,0.30)] sm:mt-20 sm:h-13">
<span className="sr-only">학교명 검색</span>
<input
className="text-text-700 placeholder:text-text-300 min-w-0 flex-1 bg-transparent text-sm outline-none sm:text-[24px] sm:leading-10 sm:font-medium"
className="text-text-700 placeholder:text-text-300 min-w-0 flex-1 bg-transparent text-sm outline-none sm:text-[16px] sm:leading-10 sm:font-medium"
value={searchKeyword}
onChange={handleSearchKeywordChange}
placeholder="학교명을 검색해 보세요"
/>
<SearchIcon className="h-6 sm:h-12" />
<SearchIcon className="h-6 sm:h-8" />
</label>
</section>

Expand All @@ -132,8 +132,8 @@ function Home() {
>
<SectionTitle title="최근에 본 동아리" description="관심있게 봤던 동아리를 다시 확인해보세요." />
<RecentClubListByIds
className="mt-4 grid grid-cols-1 gap-5 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4"
emptyClassName="mt-4"
className="mt-5 grid grid-cols-1 gap-5 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4"
emptyClassName="mt-5"
recentClubIds={recentClubIds}
/>
</section>
Expand All @@ -149,7 +149,7 @@ function Home() {

return (
<button
className={`shrink-0 rounded-[26px] border px-3 font-medium transition-colors sm:px-5 ${
className={`flex shrink-0 items-center justify-center rounded-[26px] border px-3 transition-colors sm:h-7.5 sm:min-w-13 ${
isSelected
? 'border-primary-900 bg-primary-900 text-indigo-5'
: 'border-text-300 text-text-300 hover:border-primary-500 hover:text-primary-700 bg-transparent'
Expand All @@ -159,7 +159,7 @@ function Home() {
aria-pressed={isSelected}
onClick={() => handleRegionChange(region.value)}
>
<span className="leading-7 sm:text-[20px] sm:leading-10">{region.label}</span>
<span className="leading-7 sm:leading-2.5">{region.label}</span>
</button>
);
})}
Expand All @@ -169,7 +169,7 @@ function Home() {
</p>
</div>

<div className="mt-7 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-4">
<div className="mt-6 grid grid-cols-1 gap-5 sm:grid-cols-2 lg:grid-cols-4">
{universities.length > 0 ? (
universities.map((university) => <UniversityCard key={university.id} university={university} />)
) : (
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/pages/UniversityClubList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ function UniversityClubListContent({ universityId }: { universityId: number }) {
]}
/>

<div className="mt-10 grid gap-8 md:grid-cols-[279px_minmax(0,1050px)] lg:mt-15 lg:gap-5">
<div className="mt-10 grid gap-8 md:grid-cols-[259px_minmax(0,1050px)] lg:mt-15 lg:gap-5">
<UniversityClubSidebar university={university} clubCount={university.clubCount} />

<section className="flex min-w-0 flex-col items-center gap-10">
<div className="flex w-full flex-col gap-5">
<label className="border-text-100 focus-within:border-primary-500 flex items-center rounded-[30px] border bg-white px-5 transition-[border-color,box-shadow] focus-within:shadow-[0_0_30px_0_rgba(105,191,223,0.18)] sm:px-8 sm:py-2.25">
<label className="border-text-100 focus-within:border-primary-500 flex h-13 items-center rounded-[30px] border bg-white px-5 transition-[border-color,box-shadow] focus-within:shadow-[0_0_30px_0_rgba(105,191,223,0.18)] sm:px-8 sm:py-2.25">
<span className="sr-only">동아리명 검색</span>
<input
className="placeholder:text-text-300 text-text-700 min-w-0 flex-1 bg-transparent leading-10 font-medium outline-none sm:text-[20px]"
Expand Down Expand Up @@ -137,12 +137,12 @@ function UniversityClubListContent({ universityId }: { universityId: number }) {
</div>

<div className="flex w-full flex-col gap-3">
<p className="text-text-400 text-[16px] leading-7">
<p className="text-text-400 text-[16px] leading-4.75">
선택한 대학의 동아리를 확인해보세요. 관심 있는 동아리의 소개를 살펴볼 수 있어요.
</p>

{clubs.length > 0 ? (
<div className="grid w-full grid-cols-1 gap-5 sm:grid-cols-2 md:grid-cols-3">
<div className="grid w-full grid-cols-1 gap-3 sm:grid-cols-2 md:grid-cols-3">
{clubs.map((club) => (
<ClubCard key={club.id} club={club} />
))}
Expand Down
Loading