Skip to content

Commit

Permalink
fixed merge conflicts after adding promotions
Browse files Browse the repository at this point in the history
  • Loading branch information
@RedFox360
RedFox360 committed Dec 12, 2023
1 parent 59af6c4 commit ce5af44
Showing 1 changed file with 15 additions and 207 deletions.
222 changes: 15 additions & 207 deletions pages/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,11 @@ import {
} from 'firebase/auth'
import { AvatarCreator } from '@readyplayerme/rpm-react-sdk'
import { Avatar } from '@readyplayerme/visage'
import promotion1 from '../public/promotions/fen-naloxone-400x840.webp'
import promotion2 from '../public/promotions/imm-alex-belonging-400x840.webp'
import promotion3 from '../public/promotions/luv-love-lives-on-eng-400x840.webp'

export default function Home(props: any) {
let [searchTerm, setSearchTerm] = useState<string>('')
let [searchTags, setSearchTags] = useState<string[]>([])
let [avatarCreated, setAvatarCreated] = useState<string>(
'https://readyplayerme.github.io/visage/male.glb'
)
let [user, setUser] = useState<any>()

useMemo(async () => {
onAuthStateChanged(getAuth(), (user) => {
if (user) {
setUser(user)
if (user.photoURL) {
setAvatarCreated(user.photoURL)
}
}
})
}, [])

return (
<>
<div className='home'>
Expand Down Expand Up @@ -69,179 +54,8 @@ export default function Home(props: any) {
.games
</span>
</h1>
{/* </Link> */}
<h2
className='navLinks'
style={{
paddingRight: '20px',
verticalAlign: 'middle',
color: 'var(--text)',
}}
>
<a
href={'#'}
onClick={() => {
let accountModal = document.querySelector(
'.accountModal'
) as HTMLDialogElement
accountModal.showModal()
}}
>
<span className='material-symbols-outlined'>account_circle</span>
</a>

{/* <a href={'#'}>
<span className='material-symbols-outlined'>code</span>
</a> */}
</h2>
</nav>
<dialog className='accountModal modal'>
<span
className='material-symbols-outlined modalCloseButton'
onClick={() => {
let accountModal = document.querySelector(
'.accountModal'
) as HTMLDialogElement
accountModal.close()
}}
>
close
</span>
{!user && <p>Loading...</p>}
{user && (
<>
<Avatar
style={{ height: '300px' }}
modelSrc={avatarCreated}
animationSrc={'/male-idle.glb'}
/>
<h1 style={{ fontSize: '2.0em' }}>
{user.displayName ||
user.email ||
user.phoneNumber ||
'Anonymous Parakeet'}
</h1>
{user.isAnonymous && (
<Link
href={'#'}
onClick={async (e) => {
e.preventDefault()
let user = await signInWithPopup(
getAuth(),
new GoogleAuthProvider()
)
setUser(user.user)
}}
>
<span
style={{
color: 'var(--text)',
textDecoration: 'underline',
fontSize: '1.5rem',
}}
>
Sign in with Google
</span>
<br />
<br />
<i>
By signing in, you agree to our Privacy Policy and Terms of
Service.
</i>
</Link>
)}
{!user.isAnonymous && (
<>
<Link
href={`#`}
onClick={(e) => {
e.preventDefault()
updateProfile(user, {
displayName: prompt('Enter your new display name:'),
})
}}
>
<span
style={{
color: 'var(--text)',
textDecoration: 'underline',
padding: '20px',
}}
>
Change Name
</span>
</Link>
<Link
href={`#`}
onClick={(e) => {
e.preventDefault()
let accountModal = document.querySelector(
'.accountModal'
) as HTMLDialogElement
accountModal.close()
let avatarModal = document.querySelector(
'.avatarModal'
) as HTMLDialogElement
avatarModal.showModal()
}}
>
<span
style={{
color: 'var(--text)',
textDecoration: 'underline',
padding: '20px',
}}
>
Change Avatar
</span>
</Link>
<Link
href={`#`}
onClick={(e) => {
e.preventDefault()
signOut(getAuth())
setUser(null)
}}
>
<span
style={{
color: 'var(--text)',
textDecoration: 'underline',
padding: '20px',
}}
>
Log Out
</span>
</Link>
</>
)}
</>
)}
</dialog>
<dialog className='avatarModal modal'>
{!user && <p>Loading...</p>}
{user && (
<div className='avatarBuilder'>
<AvatarCreator
subdomain='parakeet'
onAvatarExported={(url) => {
setAvatarCreated(url)
updateProfile(user, {
photoURL: url,
})
let avatarModal = document.querySelector(
'.avatarModal'
) as HTMLDialogElement
avatarModal.close()
let accountModal = document.querySelector(
'.accountModal'
) as HTMLDialogElement
accountModal.showModal()
}}
/>
</div>
)}
</dialog>

<Carousel
showStatus={false}
showArrows={true}
Expand Down Expand Up @@ -300,24 +114,18 @@ export default function Home(props: any) {
)
}
if (
(game.name
.replace(/\s+/g, '')
.toLowerCase()
.includes(searchTerm) ||
searchTerm == '') &&
(searchTags.some((tag) => game.tags.includes(tag)) ||
searchTags.length === 0)
// (game.name
// .replace(/\s+/g, '')
// .toLowerCase()
// .includes(searchTerm) ||
// searchTerm == '') &&
// (searchTags.some((tag) => game.tags.includes(tag)) ||
// searchTags.length === 0)
true
)
return (
<Link key={game.id} href={`/play/${game.id}`}>
<Atropos
key={game.id}
className='game'
highlight={false}
shadow={false}
rotateTouch={false}
rotate={false}
>
<Atropos key={game.id} className='game' rotate={true}>
<img
className='game-bgart'
src={game.art.background}
Expand All @@ -327,14 +135,14 @@ export default function Home(props: any) {
<img
className='game-emblemart'
src={game.art.emblem}
data-atropos-offset='5'
data-atropos-offset='1'
alt=''
/>
)}
{game.art.logo && (
<img
className='game-logoart'
data-atropos-offset='10'
data-atropos-offset='2'
src={game.art.logo}
alt={game.name}
/>
Expand Down

0 comments on commit ce5af44

Please sign in to comment.