Skip to content

Commit

Permalink
fix: adding classname and remove div
Browse files Browse the repository at this point in the history
  • Loading branch information
IloveNooodles committed Aug 19, 2022
1 parent 2b76077 commit 6892754
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 30 deletions.
56 changes: 27 additions & 29 deletions src/pages/Catalogue/Catalogue.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,35 +23,33 @@ const Catalogue: React.FC<{}> = () => {
document.title = 'Catalogue - DEVA: Blog OSKM ITB 2022';

return (
<div>
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown min-h-screen relative z-10">
<VistockHome />
<div className="container max-w-[92.5vw] xl:max-w-screen-xl mx-auto">
<p className="text-4xl md:text-h3 font-Heading font-bold mb-2 text-center pt-10">
{CATALOGUE_TITLE}
</p>
<div className="py-10">
<div className="container max-w-max xl:max-w-screen-xl mx-auto">
<div className="flex justify-center relative pt-9">
<div className="bg-LightBrown absolute top-0 right-[10%] lg:right-[14%] rounded-md flex flex-row justify-between items-center self-center w-44 h-10">
<Pagination
pagination={{
pages: Math.ceil(
data.length / LIMIT_CATALOGUE
),
page: 0,
limit: 0,
prev: 0,
next: 0,
total: 0,
}}
page={currentPage}
setPage={setCurrentPage}
/>
</div>
<div className="grid place-items-stretch xl:grid-cols-3 lg:grid-cols-2 md:grid-cols-2 sm:grid-cols-1 gap-6 bg-LightBrown py-6 px-6 rounded-lg">
{merchs}
</div>
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown min-h-screen relative z-10">
<VistockHome />
<div className="container max-w-[92.5vw] xl:max-w-screen-xl mx-auto">
<p className="text-4xl md:text-h3 font-Heading font-bold mb-2 text-center pt-10">
{CATALOGUE_TITLE}
</p>
<div className="py-10">
<div className="container max-w-max xl:max-w-screen-xl mx-auto">
<div className="flex justify-center relative pt-9">
<div className="bg-LightBrown absolute top-0 right-[10%] lg:right-[14%] rounded-md flex flex-row justify-between items-center self-center w-44 h-10">
<Pagination
pagination={{
pages: Math.ceil(
data.length / LIMIT_CATALOGUE
),
page: 0,
limit: 0,
prev: 0,
next: 0,
total: 0,
}}
page={currentPage}
setPage={setCurrentPage}
/>
</div>
<div className="grid place-items-stretch xl:grid-cols-3 lg:grid-cols-2 md:grid-cols-2 sm:grid-cols-1 gap-6 bg-LightBrown py-6 px-6 rounded-lg">
{merchs}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Homepage/Homepage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const Homepage: React.FC<{}> = () => {
}

return (
<div>
<div className="min-h-content">
<div className="bg-[#FF8952]">
<img
src={VistockAnnoucement}
Expand Down

0 comments on commit 6892754

Please sign in to comment.