Skip to content

Commit

Permalink
Merge pull request #11 from shampsdev:dev
Browse files Browse the repository at this point in the history
Implemented fixes, added gif for mobile
  • Loading branch information
mikedegeofroy authored Oct 14, 2024
2 parents df8b286 + 7b9ff26 commit a1e1111
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 33 deletions.
Binary file added public/logo-icons/fond.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo-icons/shamps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo-icons/vkusvill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions src/components/preloader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ const Preloader: React.FC = () => {
return [0].includes(index);
} else if (progress < 18) {
return [0, 1].includes(index);
} else if (progress < 30) {
} else if (progress < 24) {
return [0, 1, 2].includes(index);
} else if (progress < 31) {
} else if (progress < 26) {
return [1, 2].includes(index);
} else if (progress < 37) {
} else if (progress < 31) {
return [1, 2, 3].includes(index);
} else if (progress < 56) {
} else if (progress < 37) {
return [1, 2, 3, 5].includes(index);
} else if (progress < 61) {
} else if (progress < 56) {
return [1, 2, 5].includes(index);
} else if (progress < 74) {
} else if (progress < 61) {
return [0, 2, 5].includes(index);
} else if (progress < 83) {
} else if (progress < 74) {
return [0, 2].includes(index);
} else if (progress < 87) {
} else if (progress < 83) {
return [0, 2, 4].includes(index);
} else if (progress < 95) {
} else if (progress < 87) {
return [4].includes(index);
}
return false;
Expand Down
52 changes: 29 additions & 23 deletions src/modules/hero.section.tsx
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
import { AnimatedLogo } from '@/components/animated-logo';
import { Icons } from '@/components/icons';
import { TextLogo } from '@/components/text-logo';

export const HeroSection = () => {
return (
<div
id='hero'
className='min-h-svh w-full flex justify-center items-center flex-col gap-y-8'
>
<AnimatedLogo />
<TextLogo char='full' className='md:hidden w-[90%] h-fit' />
<p className='text-xl text-center'>
We are the champions - Мы Шампиньоны
</p>
<p className='text-muted-foreground md:text-lg max-w-[90%] md:max-w-[70%] text-center'>
Мы команда Шампиньоны из ИТМО. От побед в хакатонах <Icons.trophey /> и
создания TravelTech <Icons.plane /> решений выросли в IT-микроагентство.{' '}
<Icons.computer /> Здесь рассказываем о наших проектах и достижениях.
Всегда открыты для новых идей и сотрудничества. <Icons.heart />
</p>
<a
href='https://t.me/m/Hl0aa0mKNDRi'
target='_blank'
rel='noopener noreferrer'
className='inline-block bg-black text-white text-lg py-3 px-10 rounded-full text-center'
<div>
<div
id='hero'
className='min-h-[80vh] w-full flex justify-center pt-20 items-center flex-col gap-y-8'
>
[ Написать шампиньонам ]
</a>
<AnimatedLogo />
<img
className='md:hidden w-[90%] h-fit'
src='/logo-icons/shamps.gif'
alt=''
/>
<p className='text-xl text-center'>
We are the champions - Мы Шампиньоны
</p>
<p className='text-muted-foreground md:text-lg max-w-[90%] md:max-w-[70%] text-center'>
Мы команда Шампиньоны из ИТМО. От побед в хакатонах <Icons.trophey />{' '}
и создания TravelTech <Icons.plane /> решений выросли в
IT-микроагентство. <Icons.computer /> Здесь рассказываем о наших
проектах и достижениях. Всегда открыты для новых идей и
сотрудничества. <Icons.heart />
</p>
<a
href='https://t.me/m/Hl0aa0mKNDRi'
target='_blank'
rel='noopener noreferrer'
className='inline-block bg-black text-white text-lg py-3 px-10 rounded-full text-center'
>
[ Написать шампиньонам ]
</a>
</div>
</div>
);
};
2 changes: 1 addition & 1 deletion src/modules/projects.section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const projects: Project[] = [

export const ProjectsSection = () => {
return (
<div id='projects' className='pt-24'>
<div id='projects' className='pt-16'>
<p className='text-center text-xl pb-16'>А вот наши проекты</p>
<div className='w-[90%] mx-auto flex flex-col gap-y-10 md:gap-y-40'>
{projects.map((project, index) => (
Expand Down

0 comments on commit a1e1111

Please sign in to comment.