Skip to content

Commit 64b99ce

Browse files
IloveNooodlesIloveNooodles
committed
feat: remove animation
1 parent 4bdf9b6 commit 64b99ce

7 files changed

Lines changed: 160 additions & 168 deletions

File tree

‎src/layout/BaseLayout.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const BaseLayout: React.FC<BaseProps> = (props) => {
103103
>
104104
<Link
105105
className="h-full min-w-max mr-3 flex items-center"
106-
to="/"
106+
to="https://katitb22.com/"
107107
>
108108
<img
109109
className="h-[75%] md:h-[90%]"
@@ -225,7 +225,10 @@ const BaseLayout: React.FC<BaseProps> = (props) => {
225225
py={4}
226226
>
227227
<div className="h-[80%] md:h-full flex flex-col justify-center">
228-
<Link className="h-[40%] flex justify-center" to="/">
228+
<Link
229+
className="h-[40%] flex justify-center"
230+
to="https://katitb22.com/"
231+
>
229232
<img
230233
className="w-[120px]"
231234
src={LogoTextRight}

‎src/pages/About/About.tsx‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,44 @@
11
import oskmLogo from '@/assets/images/logo/logo-oskm-itb-bawah.png';
22
import { useToggle } from '@/hooks/useToggle';
3-
import PageTransition from '@/components/PageTransition';
43
import VistockAbout from '@/components/VistockAbout';
54
import AboutDetail from './AboutDetail';
65

76
const About: React.FC<{}> = () => {
87
const [isOn, toggle] = useToggle();
98
document.title = 'About - DEVA: Blog OSKM ITB 2022';
109
return (
11-
<PageTransition>
12-
<div className="relative min-h-content">
13-
<VistockAbout />
14-
{isOn ? (
15-
<AboutDetail toggle={toggle} />
16-
) : (
17-
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown">
18-
<div className="container max-w-screen-lg min-h-screen mx-auto px-[3.75rem] py-4">
19-
<div className="relative flex flex-col items-center bg-MediumBrown bg-opacity-70 rounded-[37px] py-6 px-4 lg:bg-transparent text-center">
20-
<div className="hidden w-60 h-40 rounded-xl absolute mt-16 lg:block">
21-
&nbsp;
22-
</div>
23-
<img
24-
className="relative w-52"
25-
src={oskmLogo}
26-
alt="logo-oskm"
27-
/>
28-
<p className="text-h6 md:text-[40px] lg:text-h4">
29-
Sejak awal, OSKM ITB merupakan ajang
30-
kaderisasi terpusat yang kental dengan
31-
agenda pergerakan...
32-
</p>
33-
<button
34-
type="button"
35-
onClick={toggle}
36-
className="bg-MediumOrange px-4 py-3 mt-8 rounded-[15px] drop-shadow-lg hover:drop-shadow-xl"
37-
>
38-
See More
39-
</button>
10+
<div className="relative min-h-content">
11+
<VistockAbout />
12+
{isOn ? (
13+
<AboutDetail toggle={toggle} />
14+
) : (
15+
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown">
16+
<div className="container max-w-screen-lg min-h-screen mx-auto px-[3.75rem] py-4">
17+
<div className="relative flex flex-col items-center bg-MediumBrown bg-opacity-70 rounded-[37px] py-6 px-4 lg:bg-transparent text-center">
18+
<div className="hidden w-60 h-40 rounded-xl absolute mt-16 lg:block">
19+
&nbsp;
4020
</div>
21+
<img
22+
className="relative w-52"
23+
src={oskmLogo}
24+
alt="logo-oskm"
25+
/>
26+
<p className="text-h6 md:text-[40px] lg:text-h4">
27+
Sejak awal, OSKM ITB merupakan ajang kaderisasi
28+
terpusat yang kental dengan agenda pergerakan...
29+
</p>
30+
<button
31+
type="button"
32+
onClick={toggle}
33+
className="bg-MediumOrange px-4 py-3 mt-8 rounded-[15px] drop-shadow-lg hover:drop-shadow-xl"
34+
>
35+
See More
36+
</button>
4137
</div>
4238
</div>
43-
)}
44-
</div>
45-
</PageTransition>
39+
</div>
40+
)}
41+
</div>
4642
);
4743
};
4844

‎src/pages/Catalogue/Catalogue.tsx‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import PageTransition from '@/components/PageTransition';
21
import VistockHome from '@/components/VistockHome';
32
import React, { useEffect, useState } from 'react';
43
import MerchPost from '@/components/MerchPost';
@@ -24,44 +23,41 @@ const Catalogue: React.FC<{}> = () => {
2423
document.title = 'Catalogue - DEVA: Blog OSKM ITB 2022';
2524

2625
return (
27-
<PageTransition>
28-
<div>
29-
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown min-h-screen relative z-10">
30-
<VistockHome />
31-
<div className="container max-w-[92.5vw] xl:max-w-screen-xl mx-auto">
32-
<p className="text-4xl md:text-h3 font-Heading font-bold mb-2 text-center pt-10">
33-
{CATALOGUE_TITLE}
34-
</p>
35-
<div className="py-10">
36-
<div className="container max-w-max xl:max-w-screen-xl mx-auto">
37-
<div className="flex justify-center relative pt-9">
38-
<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">
39-
<Pagination
40-
pagination={{
41-
pages: Math.ceil(
42-
data.length /
43-
LIMIT_CATALOGUE
44-
),
45-
page: 0,
46-
limit: 0,
47-
prev: 0,
48-
next: 0,
49-
total: 0,
50-
}}
51-
page={currentPage}
52-
setPage={setCurrentPage}
53-
/>
54-
</div>
55-
<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">
56-
{merchs}
57-
</div>
26+
<div>
27+
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown min-h-screen relative z-10">
28+
<VistockHome />
29+
<div className="container max-w-[92.5vw] xl:max-w-screen-xl mx-auto">
30+
<p className="text-4xl md:text-h3 font-Heading font-bold mb-2 text-center pt-10">
31+
{CATALOGUE_TITLE}
32+
</p>
33+
<div className="py-10">
34+
<div className="container max-w-max xl:max-w-screen-xl mx-auto">
35+
<div className="flex justify-center relative pt-9">
36+
<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">
37+
<Pagination
38+
pagination={{
39+
pages: Math.ceil(
40+
data.length / LIMIT_CATALOGUE
41+
),
42+
page: 0,
43+
limit: 0,
44+
prev: 0,
45+
next: 0,
46+
total: 0,
47+
}}
48+
page={currentPage}
49+
setPage={setCurrentPage}
50+
/>
51+
</div>
52+
<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">
53+
{merchs}
5854
</div>
5955
</div>
6056
</div>
6157
</div>
6258
</div>
6359
</div>
64-
</PageTransition>
60+
</div>
6561
);
6662
};
6763
export default Catalogue;

‎src/pages/Homepage/Homepage.tsx‎

Lines changed: 56 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import Pagination from '@/components/Pagination';
66
import { SPONSOR_TITLE, MEDPAR_TITLE } from '@/types/constant';
77
import BlogPost from '@/components/BlogPost';
88
import { ErrorTypes } from '@/types/enum';
9-
import PageTransition from '@/components/PageTransition';
109
import SponsorAndPartnerContainer from '@/components/SponsorAndPartnerContainer';
1110
import VistockHome from '@/components/VistockHome';
1211
import VistockAnnoucement from '@/assets/images/home/announcement-v1.png';
@@ -60,73 +59,71 @@ const Homepage: React.FC<{}> = () => {
6059
}
6160

6261
return (
63-
<PageTransition>
64-
<div>
65-
<div className="bg-[#FF8952]">
66-
<img
67-
src={VistockAnnoucement}
68-
alt="annoucement"
69-
className="w-screen"
70-
draggable="false"
71-
/>
72-
</div>
73-
{/* <Annoucement /> */}
74-
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown min-h-screen relative z-10">
75-
<VistockHome />
76-
<div className="py-10">
77-
<div className="container max-w-[92.5vw] xl:max-w-screen-xl mx-auto">
78-
<div className="flex justify-center relative pt-9">
79-
<div className="bg-LightBrown absolute top-0 lg:right-[14%] rounded-md flex flex-row justify-between items-center self-center w-44 h-10">
80-
<Pagination
81-
pagination={posts.meta.pagination}
82-
page={page}
83-
setPage={setPage}
84-
/>
85-
</div>
86-
<div className="grid place-items-stretch lg:grid-cols-3 md:grid-cols-2 sm:grid-cols-1 gap-6 bg-LightBrown py-6 px-6 rounded-lg">
87-
{blogPostElements}
88-
</div>
62+
<div>
63+
<div className="bg-[#FF8952]">
64+
<img
65+
src={VistockAnnoucement}
66+
alt="annoucement"
67+
className="w-screen"
68+
draggable="false"
69+
/>
70+
</div>
71+
{/* <Annoucement /> */}
72+
<div className="bg-gradient-to-b from-DarkOrange to-MediumBrown min-h-screen relative z-10">
73+
<VistockHome />
74+
<div className="py-10">
75+
<div className="container max-w-[92.5vw] xl:max-w-screen-xl mx-auto">
76+
<div className="flex justify-center relative pt-9">
77+
<div className="bg-LightBrown absolute top-0 lg:right-[14%] rounded-md flex flex-row justify-between items-center self-center w-44 h-10">
78+
<Pagination
79+
pagination={posts.meta.pagination}
80+
page={page}
81+
setPage={setPage}
82+
/>
83+
</div>
84+
<div className="grid place-items-stretch lg:grid-cols-3 md:grid-cols-2 sm:grid-cols-1 gap-6 bg-LightBrown py-6 px-6 rounded-lg">
85+
{blogPostElements}
8986
</div>
90-
<div className="relative bg-LightBrown py-6 px-2 mt-16 rounded-lg flex flex-col justify-center">
91-
<div className="flex relative h-[36px] justify-center my-auto">
92-
<div className=" font-Heading text-xl sm:text-2xl text-center bg-LightBrown absolute px-[10px] py-1 bottom-10 rounded drop-shadow-lg">
93-
{SPONSOR_TITLE}
94-
</div>
87+
</div>
88+
<div className="relative bg-LightBrown py-6 px-2 mt-16 rounded-lg flex flex-col justify-center">
89+
<div className="flex relative h-[36px] justify-center my-auto">
90+
<div className=" font-Heading text-xl sm:text-2xl text-center bg-LightBrown absolute px-[10px] py-1 bottom-10 rounded drop-shadow-lg">
91+
{SPONSOR_TITLE}
9592
</div>
96-
<SponsorAndPartnerContainer
97-
listOfSponsorAndPartner={sponsorSM}
98-
/>
99-
<SponsorAndPartnerContainer
100-
listOfSponsorAndPartner={sponsorMD}
101-
/>
102-
<SponsorAndPartnerContainer
103-
listOfSponsorAndPartner={sponsorLG}
104-
/>
10593
</div>
106-
<div className="relative bg-LightBrown py-6 px-2 mt-16 rounded-lg flex justify-center flex-col">
107-
<div className="flex relative h-[36px] justify-center my-auto">
108-
<div className=" font-Heading text-xl sm:text-2xl text-center bg-LightBrown absolute px-[10px] py-1 bottom-10 rounded drop-shadow-lg">
109-
{MEDPAR_TITLE}
110-
</div>
94+
<SponsorAndPartnerContainer
95+
listOfSponsorAndPartner={sponsorSM}
96+
/>
97+
<SponsorAndPartnerContainer
98+
listOfSponsorAndPartner={sponsorMD}
99+
/>
100+
<SponsorAndPartnerContainer
101+
listOfSponsorAndPartner={sponsorLG}
102+
/>
103+
</div>
104+
<div className="relative bg-LightBrown py-6 px-2 mt-16 rounded-lg flex justify-center flex-col">
105+
<div className="flex relative h-[36px] justify-center my-auto">
106+
<div className=" font-Heading text-xl sm:text-2xl text-center bg-LightBrown absolute px-[10px] py-1 bottom-10 rounded drop-shadow-lg">
107+
{MEDPAR_TITLE}
111108
</div>
112-
<SponsorAndPartnerContainer
113-
listOfSponsorAndPartner={medparSM}
114-
/>
115-
<SponsorAndPartnerContainer
116-
listOfSponsorAndPartner={medparMD}
117-
/>
118-
<SponsorAndPartnerContainer
119-
listOfSponsorAndPartner={medparLG}
120-
/>
121-
<SponsorAndPartnerContainer
122-
listOfSponsorAndPartner={medparXL}
123-
/>
124109
</div>
110+
<SponsorAndPartnerContainer
111+
listOfSponsorAndPartner={medparSM}
112+
/>
113+
<SponsorAndPartnerContainer
114+
listOfSponsorAndPartner={medparMD}
115+
/>
116+
<SponsorAndPartnerContainer
117+
listOfSponsorAndPartner={medparLG}
118+
/>
119+
<SponsorAndPartnerContainer
120+
listOfSponsorAndPartner={medparXL}
121+
/>
125122
</div>
126123
</div>
127124
</div>
128125
</div>
129-
</PageTransition>
126+
</div>
130127
);
131128
};
132129

0 commit comments

Comments
 (0)