generated from shampsdev/react-template
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from shampsdev:dev
Added a footer, news ticker, and a team section
- Loading branch information
Showing
28 changed files
with
316 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,4 +57,4 @@ export const AnimatedLogo = () => { | |
| {'>'} | ||
| </div> | ||
| ); | ||
| }; | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,38 @@ | ||
| import { Icons } from './icons'; | ||
| import { TextLogo } from './text-logo'; | ||
|
|
||
| export const Footer = () => { | ||
| return <></> | ||
| } | ||
| return ( | ||
| <> | ||
| <img className='md:max-w-[50%] mx-auto' src='/people/team.gif' alt='' /> | ||
| <div className='flex flex-col justify-between bg-black text-white w-full rounded-t-3xl min-h-[30vh] px-16 pt-14 pb-10'> | ||
| <div className='flex justify-between h-full flex-col md:flex-row'> | ||
| <div> | ||
| <TextLogo.full className='w-48 h-fit pb-2' /> | ||
| <p className='text-white/50 w-72 text-sm'> | ||
| Разработчики TravelTech, гении хакатонов и просто крутая команда | ||
| из ИТМО! | ||
| </p> | ||
| </div> | ||
| <div className='flex text-xl gap-10 h-fit flex-col md:flex-row'> | ||
| <div> | ||
| <p>Главная</p> | ||
| <p>Проекты</p> | ||
| <p>Награды</p> | ||
| </div> | ||
| <div> | ||
| <p>Команда</p> | ||
| <p>Блог</p> | ||
| </div> | ||
| <div className='flex gap-5'> | ||
| <Icons.instagram className='cursor-pointer' /> | ||
| <Icons.telegram className='cursor-pointer' /> | ||
| <Icons.youtube className='cursor-pointer' /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <p>© 2024, Шампиньоны</p> | ||
| </div> | ||
| </> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { News } from '@/types/news.interface'; | ||
| import Marquee from 'react-fast-marquee'; | ||
|
|
||
| interface NewsTickerProps { | ||
| news: News[]; | ||
| } | ||
|
|
||
| export const NewsTicker = ({ news }: NewsTickerProps) => { | ||
| console.log(news); | ||
|
|
||
| return ( | ||
| <div className='py-10'> | ||
| <hr className='w-[90%] mx-auto ' /> | ||
| <Marquee className='flex justify-around py-4 gap-2'> | ||
| {news.map((x) => ( | ||
| <div className='pr-10'> | ||
| {x.icon} <span className='text-xl'>{x.title}</span> | ||
| </div> | ||
| ))} | ||
| </Marquee> | ||
| <hr className='w-[90%] mx-auto ' /> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import { People } from '@/types/people.interface'; | ||
|
|
||
| interface SupporterCardProps { | ||
| person: People; | ||
| } | ||
|
|
||
| export const SupporterCard = ({ person }: SupporterCardProps) => { | ||
| return ( | ||
| <div className='flex h-full w-full md:w-[22rem] rounded-full border p-2 gap-5'> | ||
| <div className='h-24 w-24 bg-muted rounded-full overflow-hidden'> | ||
| <img src={person.image} alt='' /> | ||
| </div> | ||
| <div className='flex flex-col justify-around w-fit'> | ||
| <div> | ||
| <p className='text-lg'>{person.name}</p> | ||
| <p className='text-muted-foreground'>{person.role}</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import { People } from '@/types/people.interface'; | ||
|
|
||
| interface TeamCardProps { | ||
| person: People; | ||
| } | ||
|
|
||
| export const TeamCard = ({ person }: TeamCardProps) => { | ||
| return ( | ||
| <div className='flex h-full w-full rounded-2xl border p-6 gap-5'> | ||
| <div className='h-32 w-32 bg-muted rounded-full overflow-hidden'> | ||
| <img className='h-full w-full object-cover' src={person.image} alt=''/> | ||
| </div> | ||
| <div className='flex flex-col justify-around w-fit'> | ||
| <div> | ||
| <p className='text-lg'>{person.name}</p> | ||
| <p className='text-muted-foreground'>{person.role}</p> | ||
| </div> | ||
| <button className='border py-2 px-4 rounded-3xl w-fit'>{'telegram ->'}</button> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,52 @@ | ||
| import { Footer } from '@/components/footer'; | ||
| import { Icons } from '@/components/icons'; | ||
| import { NewsTicker } from '@/components/news-ticker'; | ||
| import { News } from '@/types/news.interface'; | ||
|
|
||
| const news: News[] = [ | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.dino />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.time />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.coffee />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.dino />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.time />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.coffee />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.dino />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.time />, | ||
| }, | ||
| { | ||
| title: 'пупупупупу', | ||
| icon: <Icons.coffee />, | ||
| }, | ||
| ]; | ||
|
|
||
| export const FooterSection = () => { | ||
| return <></> | ||
| } | ||
| return ( | ||
| <div className='h-fit'> | ||
| <NewsTicker news={news} /> | ||
| <Footer /> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.