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

Minor UI updates #184

Merged
merged 1 commit into from
Oct 20, 2024
Merged

Minor UI updates #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/app/events/page.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use client';
import { EventsContainer, Heading3 } from './page.style';
import { EventsContainer, Heading3, Heading4 } from './page.style';
import MainCarousel from '@/components/EventsPage/index';
import {
FE_previewItems,
Expand All @@ -19,12 +19,14 @@ export default function Page() {
<EventsContainer>
<Heading3>FLAGSHIP EVENTS</Heading3>
<MainCarousel previewItems={FE_previewItems} descriptionItems={FE_descriptionItems} />
{/* <Heading3>GUEST LECTURES</Heading3>
<MainCarousel previewItems={GL_previewItems} descriptionItems={GL_descriptionItems} /> */}
<Heading3>MAIN EVENTS</Heading3>
<MainCarousel previewItems={ME_previewItems} descriptionItems={ME_descriptionItems} />
{/* <Heading3>SHOWS AT DTS</Heading3>
<MainCarousel previewItems={DTS_previewItems} descriptionItems={DTS_descriptionItems} /> */}
<Heading3>GUEST LECTURES</Heading3>
{/* <MainCarousel previewItems={GL_previewItems} descriptionItems={GL_descriptionItems} /> */}
<Heading4>Coming Soon...</Heading4>
<Heading3>SHOWS AT DTS</Heading3>
{/* <MainCarousel previewItems={DTS_previewItems} descriptionItems={DTS_descriptionItems} /> */}
<Heading4>Coming Soon...</Heading4>
<Heading3>EXHIBITION</Heading3>
<MainCarousel
previewItems={Exhibition_previewItems}
Expand Down
4 changes: 4 additions & 0 deletions src/app/events/page.style.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ export const EventsContainer = styled.div`
export const Heading3 = styled(Heading2)`
${tw`text-white/50 text-2xl mb-32 xsm:text-4xl md:text-6xl font-normal font-spaceX text-center`}
`;

export const Heading4 = styled(Heading2)`
${tw`text-white text-xl mb-32 xsm:text-2xl md:text-4xl font-normal font-spaceX text-center`}
`;
2 changes: 1 addition & 1 deletion src/components/EventsPage/CardComponents/DetailsCard/DetailsCard.style.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const DescriptionCardContent = styled(SmallParagraph)`
}
`;
export const DescriptionCardBottom = styled.div`
${tw`flex gap-10 justify-between h-auto xsm:h-[100px] bg-white/[0.05] items-center p-5 xsm:p-10 text-xs xxxs:text-base xsm:text-2xl rounded-2xl border-[1px] border-white/[0.4]`};
${tw`flex gap-10 justify-between h-auto xsm:h-[85px] bg-white/[0.05] items-center p-5 xsm:p-10 text-xs xxxs:text-base xsm:text-2xl rounded-2xl border-[1px] border-white/[0.4]`};

backdrop-filter: blur(30px);
background-color: rgba(255, 255, 255, 0.05);
Expand Down
3 changes: 1 addition & 2 deletions src/components/EventsPage/CardComponents/PreviewCard/PreviewCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ function PreviewCard({ ImageURL, PreviewDescription = '' }) {
className='rounded-[17.82px] h-[170px] xxs:h-[180px] 2xs:h-[190px] xsm:h-[199px] ssm:h-[214px] sm:h-[235px] md:h-[260px] w-full md:w-[305px] lg:w-[338px] lg:h-[240px] '
/>
<PreviewCardContent>{truncatedDescription}</PreviewCardContent>
<div className='flex justify-center gap-4 mt-4'>
{' '}
<div className='flex justify-center gap-24 mt-4'>
{/* Reduced gap for symmetry */}
<PreviewMoreInfoButton2>Rulebook</PreviewMoreInfoButton2>
<PreviewMoreInfoButton>Register</PreviewMoreInfoButton>
Expand Down
2 changes: 1 addition & 1 deletion src/components/EventsPage/CardComponents/PreviewCard/PreviewCard.style.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const PreviewMoreInfoButton = styled(HeroPrimaryButton)`
`;

export const PreviewMoreInfoButton2 = styled(HeroGreenPrimaryButton)`
${tw`flex justify-center items-center w-auto h-auto p-4 `}
${tw`flex justify-center items-center w-auto h-auto p-3 `}

box-shadow: 0 0 5px #ffffff0d, 0 0 3px #ffffff0d, 0 0 5px #ffffff0d;

Expand Down
4 changes: 2 additions & 2 deletions src/components/EventsSection/Header.jsx/SubHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ export const SubHeader = () => {
}, 23);

const daysInterval = setInterval(() => {
if (daysStart < 43) {
if (daysStart < 3) {
daysStart += 1;
setDaysCount(daysStart);
} else {
clearInterval(daysInterval);
}
}, 40);
}, 1);

return () => {
clearInterval(eventsInterval);
Expand Down
2 changes: 1 addition & 1 deletion src/components/EventsSection/wrapperComponents/CardWrapper.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ export const CardWrapper = ({ items }) => {
);
};

const item = ['FLAGSHIP', 'GUEST LECTURE', 'MAIN EVENTS'];
const item = ['FLAGSHIP', 'GUEST LECTURE', 'MAIN EVENTS', 'SHOWS AT DTS', 'EXHIBITION'];
2 changes: 1 addition & 1 deletion src/components/Statistics/wrapper/Body.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const Body = () => {
<div className='flex justify-center items-center'>
<Card />
</div>
<GraphMain />
{/* <GraphMain /> */}
</div>
</>
);
Expand Down
Loading