Skip to content

Commit

Permalink
Merge pull request #31 from SweetmanTech/test
Browse files Browse the repository at this point in the history
Test
  • Loading branch information
sweetmantech authored Jan 11, 2024
2 parents 7e31406 + f139e10 commit 45dde1e
Show file tree
Hide file tree
Showing 27 changed files with 443 additions and 228 deletions.
65 changes: 65 additions & 0 deletions components/Core/DraggableModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import Draggable from "react-draggable"
import { useRouter } from "next/router"
import { motion } from "framer-motion"
import Icon from "./Icon"

const DraggableModal = ({ children, href, handleClose, isVisible }) => {
const router = useRouter()

const handleExpand = () => {
handleClose()
router.push(href)
}

return (
<div
className="fixed z-[9999] flex justify-center items-center
left-0 top-0 w-screen h-screen"
>
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
<div
className="w-full h-full
absolute left-0 top-0 z-[1]"
onClick={handleClose}
/>
<Draggable scale={1} bounds="parent">
<div className="w-[90%] md:w-[50%] h-[50%] relative z-[1000]">
<motion.div
className="flex flex-col bg-black
h-full w-full
px-[20px] pt-[5px] pb-[20px]"
animate={{
opacity: isVisible ? 1 : 0,
scale: isVisible ? 1 : 0.5,
}}
initial={{
opacity: 0,
scale: 0.5,
}}
transition={{
duration: 0.2,
}}
>
<div className="flex justify-start py-[5px] gap-x-[20px]">
<div className="flex items-center gap-x-[5px]">
<button type="button" onClick={handleClose} onTouchStart={handleClose}>
<Icon name="close" className="text-gray_1" size={20} />
</button>
<button type="button" onClick={handleExpand} onTouchStart={handleExpand}>
<Icon name="expand" className="text-gray_1" size={20} />
</button>
</div>
<div className="flex-grow flex flex-col gap-y-[8px] justify-center">
<div className="w-full h-[1.5px] bg-gray" />
<div className="w-full h-[1.5px] bg-gray" />
</div>
</div>
<div className="h-[calc(100%-35px)]">{children}</div>
</motion.div>
</div>
</Draggable>
</div>
)
}

export default DraggableModal
4 changes: 4 additions & 0 deletions components/Core/Icon/resolver.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { IoWifi } from "react-icons/io5"
import { SiTidal } from "react-icons/si"
import { FaSpotify, FaApple, FaYoutube, FaFacebookF, FaInstagram, FaTwitter } from "react-icons/fa"
import { SlSocialSoundcloud } from "react-icons/sl"
import { VscExpandAll } from "react-icons/vsc"
import { IoMdClose } from "react-icons/io"

export const Icons = {
wifi: IoWifi,
Expand All @@ -13,4 +15,6 @@ export const Icons = {
facebook: FaFacebookF,
instagram: FaInstagram,
twitter: FaTwitter,
expand: VscExpandAll,
close: IoMdClose,
}
2 changes: 1 addition & 1 deletion components/LandingCard/LandingCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Icon from "../Core/Icon"

const LandingCard = ({ title, img = "/images/Landing/web3.jpg", href }) => (
<Link href={href}>
<div className="p-[5px] md:p-2 border-[2px] border-[#d2d2d2] cursor-pointer font-dresden">
<div className="p-[5px] md:p-2 border-[2px] border-gray_1 cursor-pointer font-dresden">
<div className="relative p-[10px] md:p-4 flex flex-col items-center justify-center border-darkgray border h-full">
<div className="absolute inset-0 z-0">
<Image
Expand Down
4 changes: 2 additions & 2 deletions components/Layout/BaseLayout/BaseLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ const BaseLayout = ({ children }: ILayout) => {
<div className="flex-grow w-[calc(100vw-490px)]">{children}</div>
{entered && (
<div className="w-[370px] flex flex-col gap-y-[20px]">
<div className="border-[#d2d2d2] border-[2px] h-[calc(100%-280px)] py-[10px] overflow-y-auto">
<div className="border-gray_1 border-[2px] h-[calc(100%-280px)] py-[10px] overflow-y-auto">
<CameraFeedProvider>
<CameraFeed />
</CameraFeedProvider>
</div>
<div className="border-[#d2d2d2] border-[2px]">
<div className="border-gray_1 border-[2px]">
<DateSelectProvider>
<DateSelect />
</DateSelectProvider>
Expand Down
4 changes: 2 additions & 2 deletions components/Layout/MobileLayout/MobileLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import Navbar from "../../Navbar"

const MobileLayout = ({ children }: ILayout) => (
<div className="w-screen h-screen p-[15px]">
<div className="flex flex-col gap-y-[15px]">
<div className="flex flex-col gap-y-[5px]">
<Navbar />
<div className="flex-grow h-[calc(100vh-70px)]">{children}</div>
<div className="flex-grow h-[calc(100vh-60px)]">{children}</div>
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion components/LoadingPage/LoadingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const LoadingPage = () => {
layout="fill"
objectFit="cover"
objectPosition="center center"
src={isMobile ? "/images/Loading/m_loading.svg" : "/images/Loading/loading.png"}
src={isMobile ? "/images/Loading/m_loading.png" : "/images/Loading/loading.png"}
/>
</div>
)
Expand Down
68 changes: 37 additions & 31 deletions components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import Link from "next/link"
import { useRouter } from "next/router"
import Link from "next/link"
import { usePopupWidget } from "../../providers/PopupWidgetProvider"
import PopUpWindows from "../PopUpWindows/PopUpWindows"

const Navbar = () => {
const { pathname } = useRouter()
const { setIsOpenAbout, setIsOpenMusic, setIsOpenWeb3, setIsOpenPress } = usePopupWidget()

const navClasses = `md:min-w-[80px] px-0 md:px-[10px] md:h-[40px]
text-[11px] md:text-[16px] md:py-[5px] py-[2px] h-fit uppercase md:capitalize
md:border-none bg-darkgray flex items-center justify-center text-[#d2d2d2] font-dresden cursor-pointer`
md:border-none bg-darkgray flex items-center justify-center text-gray_1 font-dresden cursor-pointer`

const isHomePage = pathname === "/"
const isAboutPage = pathname.includes("/about")
Expand All @@ -15,51 +18,54 @@ const Navbar = () => {
const isPressPage = pathname.includes("/press")

return (
<div className="w-full grid grid-cols-6 md:flex gap-x-[5px] md:gap-x-[10px]">
<Link href="/">
<div
className={`${navClasses}
${isHomePage ? "border-b-[2px] border-b-[#347fdb] md:!bg-[#347fdb]" : ""}`}
>
Home
</div>
</Link>
<Link href="/about">
<div
<>
<div className="w-full grid grid-cols-6 md:flex gap-x-[5px] md:gap-x-[10px]">
<Link href="/">
<div
className={`${navClasses}
${isHomePage ? "border-b-[2px] border-b-[#347fdb] md:!bg-[#347fdb]" : ""}`}
>
Home
</div>
</Link>
<button
className={`${navClasses}
${isAboutPage ? "border-b-[2px] border-b-[#347fdb] md:!bg-[#347fdb]" : ""}`}
type="button"
onClick={() => setIsOpenAbout(true)}
>
About
</div>
</Link>
<Link href="/music">
<div
</button>
<button
onClick={() => setIsOpenMusic(true)}
type="button"
className={`${navClasses}
${isMusicPage ? "border-b-[2px] border-b-[#347fdb] md:!bg-[#347fdb]" : ""}`}
>
Music
</div>
</Link>
<Link href="/mint">
<div
</button>
<button
type="button"
className={`${navClasses}
${isMintPage ? "border-b-[2px] border-b-[#347fdb] md:!bg-[#347fdb]" : ""}`}
onClick={() => setIsOpenWeb3(true)}
>
Web3
</div>
</Link>
<Link href="/press">
<div
</button>
<button
type="button"
onClick={() => setIsOpenPress(true)}
className={`${navClasses}
${isPressPage ? "border-b-[2px] border-b-[#347fdb] md:!bg-[#347fdb]" : ""}`}
>
Press
</div>
</Link>
<a href="https://play.mynameisheno.com" target="_blank" rel="noreferrer">
<div className={navClasses}>Play</div>
</a>
</div>
</button>
<a href="https://play.mynameisheno.com" target="_blank" rel="noreferrer">
<div className={navClasses}>Play</div>
</a>
</div>
<PopUpWindows />
</>
)
}

Expand Down
89 changes: 89 additions & 0 deletions components/Pages/AboutPage/AboutContent.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import RecBar from "../../RecBar"
import Icon from "../../Core/Icon"

const AboutContent = () => (
<div className="p-[5px] md:p-[10px] border-[2px] border-gray_1 h-full">
<div
className="border-[1px] border-darkgray text-gray_1 font-dresden
py-[25px] text-center
flex items-center justify-center text-[16px] relative h-full
text-[12px] md:text-[16px]"
>
<div
className="h-fit max-h-full overflow-y-auto text-[12px] md:text-[16px]
px-[15px] md:px-[20px] flex flex-col gap-y-[5px] md:gap-y-[20px]"
>
<p>
{` Heno. is a true trailblazer of the music industry, boasting a plethora of talents as an
artist, producer, engineer, community organizer, and Web3 builder. Notably, Heno. has been
recognized as an "early innovator" in Web3 by Fortune Mag, while COLORS have praised his
"hard-hitting and powerful aesthetic." Heno. has carved a unique and hybrid role in the
music industry, simultaneously disrupting both the Web3 space and traditional music world.`}
</p>
<p>
{`Hailing from Takoma Park, Maryland, as a first-generation Ethiopian-Eritrean artist, Heno.
uses his art and music to tell intentional and impactful stories, finding comfort within
uncomfortable conversations. With an impressive roster of collaborators including Mick
Jenkins, JPEGMAFIA, Chaz Bear (Toro Y Moi) just to name a few, Heno. has proven his
versatility as an artist. Heno.'s recently released the anticipated video for his track
"Neybors" that has gained popularity, hitting over 3 million streams & continuing to grow.
The track has been well-received by audiences in 2023 & had earned Heno. top ten spots on
Spotify's Mellow Bars & Alternative Hip Hop playlists - not to mention performing the
record at Coachella this year & being the first music artist to ever mint Coachella
footage onchain.`}
</p>
<p>
{`"Neybors" is the first single from Heno.'s forthcoming concept album "I'm Tired of Being
Hypersurveilled" set to release in January 2024. Heno. speaks to his exhaustion with the
oppressive & all encompassing nature of surveillance by using personal experience & world
building to have universal conversations. This record is a part of a multi-hyphenate media
experience that includes a pixel arcade game, a VR world built in Unreal Engine, a short
film, + full length music album with features like Mick Jenkins, Elujay, Felix! & more.
"Neybors" is on the lighter side of surveillance however the music further explores how
surveillance affects all of us in a myriad of ways & why Heno. is tired of it.`}
</p>
<div className="w-full flex items-center justify-center gap-x-[5px] pt-[10px] md:hidden">
<a
href="https://open.spotify.com/artist/3mr6jeVpPIXBp8IMMb60aD"
target="_blank"
rel="noreferrer"
>
<Icon name="spotify" color="white" raw size={16} />
</a>
<a href="https://tidal.com/browse/artist/9582021" target="_blank" rel="noreferrer">
<Icon name="tidal" color="white" raw size={16} />
</a>
<a
href="https://music.apple.com/us/artist/heno/1352075132"
target="_blank"
rel="noreferrer"
>
<Icon name="apple" color="white" raw size={16} />
</a>
<a href="https://soundcloud.com/mynameisheno" target="_blank" rel="noreferrer">
<Icon name="soundcloud" color="white" raw size={16} />
</a>
<a
href="https://www.youtube.com/channel/UC3cM8JX39gmiNi7vSQX9KXQ"
target="_blank"
rel="noreferrer"
>
<Icon name="youtube" color="white" raw size={16} />
</a>
<a href="https://www.facebook.com/mynameisheno/" target="_blank" rel="noreferrer">
<Icon name="facebook" color="white" raw size={16} />
</a>
<a href="https://www.instagram.com/mynameisheno/?hl=en" target="_blank" rel="noreferrer">
<Icon name="instagram" color="white" raw size={16} />
</a>
<a href="https://twitter.com/mynameisheno?lang=en" target="_blank" rel="noreferrer">
<Icon name="twitter" color="white" raw size={16} />
</a>
</div>
</div>
<RecBar />
</div>
</div>
)

export default AboutContent
Loading

0 comments on commit 45dde1e

Please sign in to comment.