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

Jump to bottom

Release new version #128

Merged
merged 4 commits into from
Sep 19, 2024
Merged

Release new version #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04acb03
update
imhson Sep 11, 2024
0ca6a85
update
imhson Sep 11, 2024
3a8642b
update artist artwork
imhson Sep 17, 2024
aa1056f
update
imhson Sep 18, 2024
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
30 changes: 15 additions & 15 deletions public/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{
"REDIRECT_URL": "https://punkga.me",
"CHAIN_ID": "aura_6322-2",
"REDIRECT_URL": "https://staging.punkga.me",
"CHAIN_ID": "aura_6321-3",
"CHAIN_INFO": {
"chainId": "aura_6322-2",
"chainName": "Aura Mainnet",
"evmChainId": 6322,
"rpc": ["https://rpc.aura.network", "https://jsonrpc.aura.network"],
"indexerV2": "https://horoscope.aura.network/api/v2/graphql",
"chainId": "aura_6321-3",
"evmChainId": 6321,
"chainName": "Aura Euphoria TestNet",
"rpc": ["https://rpc.euphoria.aura.network", "https://jsonrpc.euphoria.aura.network"],
"indexerV2": "https://indexer-v2.staging.aurascan.io/api/v2/graphql",
"nativeCurrency": {
"name": "Aura",
"symbol": "AURA",
"symbol": "EAURA",
"decimals": 18
},
"explorer": "https://aurascan.io/"
"explorer": "https://euphoria.aurascan.io"
},
"API_URL": "https://hasura.punkga.me",
"AUTHORIZER_URL": "https://auth.punkga.me",
"API_URL": "https://hasura.staging.punkga.me",
"AUTHORIZER_URL": "https://auth.staging.punkga.me",
"AUTHORIZER_CLIENT_ID": "06c9c437-15cd-4240-b435-5d16206b46c6",
"ADMIN_URL": "https://admin.punkga.me",
"REST_API_URL": "https://api.punkga.me",
"ADMIN_URL": "https://admin.staging.punkga.me",
"REST_API_URL": "https://api.staging.punkga.me",
"IN_MAINTENANCE_MODE": false,
"GTM_ID": "GTM-5N2X4HSN",
"SEEKHYPE_URL": "https://seekhype.io/",
"GTM_ID": "GTM-MMT4K22K",
"SEEKHYPE_URL": "https://staging.seekhype.io/",
"WALLET_CONNECT_PROJECT_ID": "ec40291093ad80fa0def54b1fb44c8ef"
}
200 changes: 128 additions & 72 deletions src/components/pages/artist/Artworks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Modal from 'components/Modal'
import Image from 'next/image'
import { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { getArtistArtworks } from 'src/services'
import { getArtistArtworkAlbums, getArtistArtworks, getArtworkAlbums } from 'src/services'
import useSWR from 'swr'

import 'swiper/css'
Expand All @@ -13,30 +13,16 @@ import 'swiper/css/navigation'
import 'swiper/css/pagination'
export default function ArtworkList({ id }) {
const [page, setPage] = useState(1)
const [open, setOpen] = useState(false)
const [selectedArtwork, setSelectedArtwork] = useState<any>(null)
const [selectedAlbum, setSelectedAlbum] = useState('')
const { data, isLoading } = useSWR(
{
key: 'fetch-artist-artworks',
key: 'fetch-artist-albums',
id,
},
({ id }) => (id ? getArtistArtworks(id) : null)
({ id }) => (id ? getArtistArtworkAlbums(id) : null)
)

const { t } = useTranslation()

const prevHandler = () => {
const idx = data?.artworks?.findIndex((artwork) => artwork.url == selectedArtwork.url)
if (data?.artworks[idx - 1]) {
setSelectedArtwork(data?.artworks[idx - 1])
}
}
const nextHandler = () => {
const idx = data?.artworks?.findIndex((artwork) => artwork.url == selectedArtwork.url)
if (data?.artworks[idx + 1]) {
setSelectedArtwork(data?.artworks[idx + 1])
}
}
useEffect(() => {
window.addEventListener('keydown', (e) => {
if (e.key == 'ArrowRight') {
Expand All @@ -60,70 +46,27 @@ export default function ArtworkList({ id }) {
</div>
)
}
if (selectedAlbum) return <Album id={selectedAlbum} setSelectedAlbum={setSelectedAlbum} />
return (
<div>
{data?.artworks?.length ? (
{data?.albums?.length ? (
<>
<Modal
open={open}
setOpen={setOpen}
preventClickOutsideToClose={false}
className='[&_.static]:!overflow-visible'>
<div className='relative'>
<Image
width={300}
height={300}
src={selectedArtwork?.url}
alt=''
className='w-auto h-full max-h-[80vh] rounded-md object-cover'
/>
<div>
<div
onClick={prevHandler}
id='prev'
className='absolute -bottom-14 lg:top-1/2 -scale-x-100 left-[calc(50%-20px)] lg:-left-[98px] -translate-x-1/2 lg:translate-x-0 -translate-y-1/2 cursor-pointer bg-[#FFFFFF] rounded-full text-[#B0B0B0] hover:text-border-brand-hover active:text-border-brand-focus w-8 lg:w-16 h-8 lg:h-16 grid place-items-center shadow-[0px_4px_4px_rgba(0,0,0,0.25)]'>
<svg xmlns='http://www.w3.org/2000/svg' width='7' height='12' viewBox='0 0 7 12' fill='none'>
<path
d='M1 1L6 6L1 11'
stroke='currentColor'
strokeWidth='2'
strokeLinecap='round'
strokeLinejoin='round'
/>
</svg>
</div>
<div
onClick={nextHandler}
id='next'
className='absolute -bottom-14 lg:top-1/2 right-[calc(50%-20px)] lg:-right-[98px] translate-x-1/2 lg:translate-x-0 -translate-y-1/2 cursor-pointer bg-[#FFFFFF] rounded-full text-[#B0B0B0] hover:text-border-brand-hover active:text-border-brand-focus w-8 lg:w-16 h-8 lg:h-16 grid place-items-center shadow-[0px_4px_4px_rgba(0,0,0,0.25)]'>
<svg xmlns='http://www.w3.org/2000/svg' width='7' height='12' viewBox='0 0 7 12' fill='none'>
<path
d='M1 1L6 6L1 11'
stroke='currentColor'
strokeWidth='2'
strokeLinecap='round'
strokeLinejoin='round'
/>
</svg>
</div>
</div>
</div>
</Modal>
<div className='grid grid-cols-[repeat(auto-fill,minmax(160px,1fr))] lg:grid-cols-[repeat(auto-fill,minmax(240px,1fr))] gap-4'>
{data?.artworks?.slice((page - 1) * 12, page * 12)?.map((artwork, index) => (
<div className='grid grid-cols-[repeat(auto-fill,minmax(330px,1fr))] lg:grid-cols-[repeat(auto-fill,minmax(380px,1fr))] gap-4 lg:gap-8'>
{data?.albums?.slice((page - 1) * 12, page * 12)?.map((album, index) => (
<div
key={index}
className='p-4 rounded-mlg space-y-4 border border-border-secondary cursor-pointer'
onClick={() => {
setSelectedArtwork(artwork)
setOpen(true)
setSelectedAlbum(album.id)
}}>
<Image
width={300}
height={300}
src={artwork.url}
src={album.thumbnail_url}
alt=''
className='w-full aspect-square rounded-md object-cover'
className='w-full aspect-[373/199] rounded-mlg object-cover'
/>
<div className='text-sm font-medium line-clamp-1'>{album.name}</div>
</div>
))}
<div></div>
Expand All @@ -135,9 +78,122 @@ export default function ArtworkList({ id }) {
) : (
<div className='flex flex-col items-center gap-4 py-8'>
<Image src={Mc} alt='' className='w-[160px] h-[160px]' />
<div className='font-medium'>{t('No artworks shared')}</div>
<div className='font-medium'>{t('No albums shared')}</div>
</div>
)}
{!!data?.albums_aggregate?.aggregate?.count && (
<div className='w-full flex justify-center'>
<Pagination
shape='rounded'
count={Math.ceil(data?.albums_aggregate?.aggregate?.count / 12)}
page={page}
onChange={(event: React.ChangeEvent<unknown>, value: number) => {
setPage(value)
}}
/>
</div>
)}
</div>
)
}
const Album = ({ id, setSelectedAlbum }) => {
const [page, setPage] = useState(1)
const [open, setOpen] = useState(false)
const { data: albums, isLoading } = useSWR(
{
key: 'fetch-albums',
id,
},
({ id }) => (id ? getArtworkAlbums(id) : null)
)
const { t } = useTranslation()
const [selectedArtwork, setSelectedArtwork] = useState<any>(null)
const prevHandler = () => {
const idx = data?.artworks?.findIndex((artwork) => artwork.url == selectedArtwork.url)
if (data?.artworks[idx - 1]) {
setSelectedArtwork(data?.artworks[idx - 1])
}
}
const nextHandler = () => {
const idx = data?.artworks?.findIndex((artwork) => artwork.url == selectedArtwork.url)
if (data?.artworks[idx + 1]) {
setSelectedArtwork(data?.artworks[idx + 1])
}
}
const data = albums?.albums?.[0]
if (!data) return null
return (
<>
<Modal open={open} setOpen={setOpen} preventClickOutsideToClose={false} className='[&_.static]:!overflow-visible'>
<div className='relative'>
<Image
width={300}
height={300}
src={selectedArtwork?.url}
alt=''
className='w-auto h-full max-h-[80vh] rounded-md object-cover'
/>
<div>
<div
onClick={prevHandler}
id='prev'
className='absolute -bottom-14 lg:top-1/2 -scale-x-100 left-[calc(50%-20px)] lg:-left-[98px] -translate-x-1/2 lg:translate-x-0 -translate-y-1/2 cursor-pointer bg-[#FFFFFF] rounded-full text-[#B0B0B0] hover:text-border-brand-hover active:text-border-brand-focus w-8 lg:w-16 h-8 lg:h-16 grid place-items-center shadow-[0px_4px_4px_rgba(0,0,0,0.25)]'>
<svg xmlns='http://www.w3.org/2000/svg' width='7' height='12' viewBox='0 0 7 12' fill='none'>
<path
d='M1 1L6 6L1 11'
stroke='currentColor'
strokeWidth='2'
strokeLinecap='round'
strokeLinejoin='round'
/>
</svg>
</div>
<div
onClick={nextHandler}
id='next'
className='absolute -bottom-14 lg:top-1/2 right-[calc(50%-20px)] lg:-right-[98px] translate-x-1/2 lg:translate-x-0 -translate-y-1/2 cursor-pointer bg-[#FFFFFF] rounded-full text-[#B0B0B0] hover:text-border-brand-hover active:text-border-brand-focus w-8 lg:w-16 h-8 lg:h-16 grid place-items-center shadow-[0px_4px_4px_rgba(0,0,0,0.25)]'>
<svg xmlns='http://www.w3.org/2000/svg' width='7' height='12' viewBox='0 0 7 12' fill='none'>
<path
d='M1 1L6 6L1 11'
stroke='currentColor'
strokeWidth='2'
strokeLinecap='round'
strokeLinejoin='round'
/>
</svg>
</div>
</div>
</div>
</Modal>
<div className='flex items-center gap-1 mb-[18px] lg:mb-8 cursor-pointer' onClick={() => setSelectedAlbum('')}>
<svg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'>
<path d='M15 17L10 12L15 7' stroke='#454545' strokeWidth='1.5' strokeLinecap='round' strokeLinejoin='round' />
</svg>
<div className='text-sm font-semibold'>{data.name}</div>
</div>
<div className='grid grid-cols-[repeat(auto-fill,minmax(160px,1fr))] lg:grid-cols-[repeat(auto-fill,minmax(240px,1fr))] gap-4'>
{data?.artworks?.slice((page - 1) * 12, page * 12)?.map((artwork, index) => (
<div
key={index}
className='cursor-pointer'
onClick={() => {
setSelectedArtwork(artwork)
setOpen(true)
}}>
<Image
width={300}
height={300}
src={artwork.url}
alt=''
className='w-full aspect-square rounded-md object-cover'
/>
</div>
))}
<div></div>
<div></div>
<div></div>
<div></div>
</div>
{!!data?.artworks_aggregate?.aggregate?.count && (
<div className='w-full flex justify-center'>
<Pagination
Expand All @@ -150,6 +206,6 @@ export default function ArtworkList({ id }) {
/>
</div>
)}
</div>
</>
)
}
Loading
Loading