Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
8677435
make quick offer on mp
bz-hashtag-0780 Jan 15, 2023
1773f75
Update .env.production
bz-hashtag-0780 Jan 17, 2023
34b7fa6
marketplace stuff
bz-hashtag-0780 Jan 19, 2023
d3e2758
offers cleanup
bz-hashtag-0780 Jan 19, 2023
ea21a99
stuff fix search bar and any input field
bz-hashtag-0780 Jan 20, 2023
1702704
Update FUSDClaimModal.tsx
bz-hashtag-0780 Jan 20, 2023
533c853
Update FUSDClaimModal.tsx
bz-hashtag-0780 Jan 20, 2023
f084b1c
fr labs test :3
bz-hashtag-0780 Jan 21, 2023
81b77bc
Update BeastMarketFilters.tsx
bz-hashtag-0780 Jan 23, 2023
758d492
Beast Owned filter
bz-hashtag-0780 Jan 23, 2023
a0dc483
Update BeastMarketBeastList.tsx
bz-hashtag-0780 Jan 23, 2023
cb7f30d
Beast Details responsiveness at width: 420px
bz-hashtag-0780 Jan 24, 2023
02ffdd8
responsiveness done beast-details
bz-hashtag-0780 Jan 24, 2023
e63e635
update owned filter
bz-hashtag-0780 Jan 24, 2023
58ebb64
Add close button on modals
bz-hashtag-0780 Jan 24, 2023
18eb015
drop 13, q1, 2023
bz-hashtag-0780 Jan 27, 2023
5f2f0ba
Update PackStore.tsx
bz-hashtag-0780 Jan 27, 2023
d0662ec
fix name
bz-hashtag-0780 Jan 27, 2023
5ac6575
updated
bz-hashtag-0780 Jan 27, 2023
e52d2ac
Update use-beast-market.hook.ts
bz-hashtag-0780 Feb 3, 2023
240f921
Update PackStore.tsx
bz-hashtag-0780 Feb 3, 2023
848a520
Filters query url "done"
bz-hashtag-0780 Feb 6, 2023
6795990
Update BeastMarketThumbnail.tsx
bz-hashtag-0780 Feb 6, 2023
82f7c21
Egg animation
bz-hashtag-0780 Feb 6, 2023
8f7e5f7
Update BeastMarketBeastList.tsx
bz-hashtag-0780 Feb 6, 2023
f312fd0
Update BeastMarket.tsx
bz-hashtag-0780 Feb 8, 2023
b73cd36
Breeding updates
bz-hashtag-0780 Feb 8, 2023
3f9be25
remove bottle
bz-hashtag-0780 Feb 8, 2023
1bc2cde
Create basic_beasts_empy_potion_bottle.png
bz-hashtag-0780 Feb 8, 2023
6cbe092
new
bz-hashtag-0780 Feb 8, 2023
f9d584d
new
bz-hashtag-0780 Feb 8, 2023
04a6f5d
Update MakeLovePotionModal.tsx
bz-hashtag-0780 Feb 9, 2023
8a4efad
breeding
bz-hashtag-0780 Feb 9, 2023
2464936
Update use-beast-market.hook.ts
bz-hashtag-0780 Feb 10, 2023
3a21538
Create transfer.tsx
bz-hashtag-0780 Feb 21, 2023
a93a3aa
Update transfer.tsx
bz-hashtag-0780 Feb 26, 2023
86c0d5f
Update use-user-beasts.hook.ts
bz-hashtag-0780 Feb 28, 2023
76c15af
Dedicated beast pages
bz-hashtag-0780 Mar 1, 2023
4d8cb79
Update BeastTemplateContent.tsx
bz-hashtag-0780 Mar 1, 2023
076a8c9
Add beasts in search bar
bz-hashtag-0780 Mar 2, 2023
521a146
Update BeastModalView.tsx
bz-hashtag-0780 Mar 2, 2023
abcbeab
Explorer
bz-hashtag-0780 Mar 13, 2023
5ccdd45
Update BeastTemplateContent.tsx
bz-hashtag-0780 Mar 13, 2023
c3d6523
Sharing
bz-hashtag-0780 Mar 13, 2023
c6e282e
Update SocialMediaShare.tsx
bz-hashtag-0780 Mar 13, 2023
9400d4c
Beast Market Skin Overview teddies added
bz-hashtag-0780 Mar 13, 2023
95f5d30
filters overview
bz-hashtag-0780 Mar 13, 2023
26686e7
fix clear all filters and social media responsiveness
bz-hashtag-0780 Mar 13, 2023
52598c3
fixed styling for filtersoverview
bz-hashtag-0780 Mar 14, 2023
315e419
fixing mobile and desktop for filtersoverview
bz-hashtag-0780 Mar 14, 2023
40c0b39
Update BeastTemplateHero.tsx
bz-hashtag-0780 Mar 14, 2023
9d69b52
Update SelectedFiltersOverview.tsx
bz-hashtag-0780 Mar 31, 2023
de453e6
Update ProductBeastView.tsx
bz-hashtag-0780 Mar 31, 2023
6b4e8df
Update InfoMobile.tsx
bz-hashtag-0780 Mar 31, 2023
6f36bda
social share
bz-hashtag-0780 Mar 31, 2023
91b9070
Changing font when in Russian
bz-hashtag-0780 Mar 31, 2023
765d886
Minor fixes
bz-hashtag-0780 Mar 31, 2023
f6c1207
layout fix beast template pages
bz-hashtag-0780 Mar 31, 2023
dcc9e6e
minor fixes
bz-hashtag-0780 Apr 11, 2023
04e2076
minor fixes
bz-hashtag-0780 Apr 11, 2023
72d5b68
Update ProductBeastView.tsx
bz-hashtag-0780 Apr 11, 2023
feec491
Breeding stuff
bz-hashtag-0780 May 22, 2023
fc92f7e
initial hatching animation setup
bz-hashtag-0780 May 22, 2023
44813c3
Breeding animation
bz-hashtag-0780 May 23, 2023
ca80111
hide breeding in production
bz-hashtag-0780 May 23, 2023
a8a7ff3
Update hatching.tsx
bz-hashtag-0780 May 23, 2023
308cb70
Update ChangeNicknameModal.tsx
bz-hashtag-0780 Jun 15, 2023
df5c9fc
minor fix
bz-hashtag-0780 Sep 16, 2023
f6fad63
Update .gitignore
bz-hashtag-0780 Nov 23, 2023
8de2a2b
blocto update
bz-hashtag-0780 Nov 23, 2023
42fb4ee
Update package.json
bz-hashtag-0780 Nov 23, 2023
fd175ae
Update Layout.tsx
bz-hashtag-0780 Nov 23, 2023
5b7f4c2
Update Layout.tsx
bz-hashtag-0780 Nov 23, 2023
dbc532b
setup
bz-hashtag-0780 Dec 10, 2023
0bfaffc
Update setup.tsx
bz-hashtag-0780 Dec 10, 2023
37188b4
navbar update wonderland
bz-hashtag-0780 Dec 10, 2023
7769775
Update Navbar.tsx
bz-hashtag-0780 Dec 11, 2023
f31d887
Update Layout.tsx
bz-hashtag-0780 Dec 22, 2023
f81a5cf
Update Layout.tsx
bz-hashtag-0780 Jun 14, 2024
70517d9
new inbox
bz-hashtag-0780 Sep 1, 2024
1f658f0
Update index.tsx
bz-hashtag-0780 Oct 25, 2024
70a35af
Update Hero.tsx
bz-hashtag-0780 Oct 25, 2024
719f2b7
Update use-hunter-data.hook.ts
bz-hashtag-0780 Oct 25, 2024
583c651
fix scripts
bz-hashtag-0780 Oct 25, 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
12 changes: 6 additions & 6 deletions .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@ NEXT_PUBLIC_SIGN_MESSAGE="Sign this message so our backend can verify you."

# ---- Packstore ----
# 1 random Normal skin 1-Star Beast
NEXT_PUBLIC_ADDRESS_RESERVABLE_NORMAL_SKIN="0x6ec745e460cc646c"
NEXT_PUBLIC_ADDRESS_REFUNDABLE_NORMAL_SKIN="0xdca2fbd53ec45907"
NEXT_PUBLIC_ADDRESS_RESERVABLE_NORMAL_SKIN="0xfe20e2699d201976"
NEXT_PUBLIC_ADDRESS_REFUNDABLE_NORMAL_SKIN="0xfe20e2699d201976"

# 1 random Cursed Black 1-Star Beast
NEXT_PUBLIC_ADDRESS_RESERVABLE_CURSED_BLACK="0xaba9241acafae206"
NEXT_PUBLIC_ADDRESS_REFUNDABLE_CURSED_BLACK="0x470d62928ea8efd7"
NEXT_PUBLIC_ADDRESS_RESERVABLE_CURSED_BLACK="0x24992fb21ce6969c"
NEXT_PUBLIC_ADDRESS_REFUNDABLE_CURSED_BLACK="0x24992fb21ce6969c"

# 1 random Shiny Gold 1-Star Beast
NEXT_PUBLIC_ADDRESS_RESERVABLE_GOLD_STAR="0x5c0fe1b8a445ba22"
NEXT_PUBLIC_ADDRESS_REFUNDABLE_GOLD_STAR="0x6391a3fdd3253bf8"
NEXT_PUBLIC_ADDRESS_RESERVABLE_GOLD_STAR="0xb5b6a4baa475f86f"
NEXT_PUBLIC_ADDRESS_REFUNDABLE_GOLD_STAR="0xb5b6a4baa475f86f"
# -------------------

NEXT_PUBLIC_GRAPHQL_ENDPOINT="https://basicbeasts-dev.graphcdn.app"
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ yarn-error.log*

# vercel
.vercel
.env.production
.env.development
13 changes: 11 additions & 2 deletions components/common/Layout/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { FC, useState } from "react"
import Navbar from "@components/common/Navbar"
import Footer from "@components/common/Footer"
import SideNavbar from "@components/common/SideNavbar"
import * as fcl from "@onflow/fcl"
import * as fcl from "@blocto/fcl"
import Head from "next/head"
import { useRouter } from "next/dist/client/router"
import { ToastContainer, toast } from "react-toastify"
Expand All @@ -11,7 +11,7 @@ import SlideOverNavbar from "../SlideOverNavbar"
import profilePictures from "data/profilePictures"
import Snowfall from "react-snowfall"

//Configure FCL
//Configure FCL.
fcl
.config()
.put("accessNode.api", process.env.NEXT_PUBLIC_ACCESS_NODE_API)
Expand All @@ -33,6 +33,7 @@ fcl
.put("0xHunterScore", process.env.NEXT_PUBLIC_HUNTER_SCORE_ADDRESS)
.put("0xPack", process.env.NEXT_PUBLIC_PACK_ADDRESS)
.put("0xInbox", process.env.NEXT_PUBLIC_INBOX_ADDRESS)
.put("0xBasicBeastsInbox", process.env.NEXT_PUBLIC_INBOX_ADDRESS)
.put("0xEvolution", process.env.NEXT_PUBLIC_EVOLUTION_ADDRESS)
.put("0xProfile", process.env.NEXT_PUBLIC_PROFILE_ADDRESS)
.put("0xFiatToken", process.env.NEXT_PUBLIC_FIAT_TOKEN_ADDRESS)
Expand Down Expand Up @@ -82,8 +83,16 @@ fcl
"0xBlackMarketplace",
process.env.NEXT_PUBLIC_NFT_DAY_TREASURE_CHEST_ADDRESS,
)
.put(
"0xBasicBeastsDrop",
process.env.NEXT_PUBLIC_NFT_DAY_TREASURE_CHEST_ADDRESS,
)
// .put("0xBeastMarket", process.env.NEXT_PUBLIC_BEAST_MARKET_ADDRESS)
// .put("0xBeastOffers", process.env.NEXT_PUBLIC_BEAST_OFFERS_ADDRESS)
// .put("0xLovePotion", process.env.NEXT_PUBLIC_BEAST_MARKET_ADDRESS)
// .put("0xLovePotionMinter", process.env.NEXT_PUBLIC_BEAST_OFFERS_ADDRESS)
// .put("0xEgg", process.env.NEXT_PUBLIC_BEAST_MARKET_ADDRESS)
// .put("0xBreeding", process.env.NEXT_PUBLIC_BEAST_OFFERS_ADDRESS)

const Layout: FC = ({ children }) => {
const [isSideNavbarOpen, setIsSideNavbarOpen] = useState(false)
Expand Down
33 changes: 18 additions & 15 deletions components/common/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Menu, Transition } from "@headlessui/react"
import { toast } from "react-toastify"
import SearchBar from "@components/ui/SearchBar"
import SearchBarMobileModal from "@components/ui/SearchBarMobileModal"
import { beastData } from "data/beastData"

const Nav = styled.header<{ font: string; fontSize: string }>`
background: #111823;
Expand Down Expand Up @@ -592,7 +593,7 @@ const Navbar: FC<FuncProps> = ({
cadence: `
import Profile from 0xProfile

pub fun main(address: Address) : Profile.UserProfile? {
access(all) fun main(address: Address) : Profile.UserProfile? {
return getAccount(address)
.getCapability<&{Profile.Public}>(Profile.publicPath)
.borrow()?.asProfile()
Expand All @@ -605,31 +606,21 @@ const Navbar: FC<FuncProps> = ({
setProfile(res)

//Resolve Profile Picture
let avatar = res.avatar
let avatar = res?.avatar
for (let key in profilePictures) {
let element =
profilePictures[key as unknown as keyof typeof profilePictures]
if (avatar == element.image) {
setProfilePicture(element.image)
}
}
console.log("Navbar.ts: getCurrentUserProfile()")
// console.log("Navbar.ts: getCurrentUserProfile()")
} catch (error) {
console.log(error)
}
}

const { hunterData } = useUser()
const beastData = [
{
name: "Dappy",
imageTransparentBg: "QmUGU1LszrYGmpPp25VL6bAd5d39VW6PuDZDYSuwbj3VFS",
},
{
name: "Gecko",
imageTransparentBg: "QmVBqZGtah7sRV7YafvZuXm8nNgts8wR1ihgfvVHa7ykZQ",
},
]

return (
<>
Expand Down Expand Up @@ -668,7 +659,7 @@ const Navbar: FC<FuncProps> = ({
setOpenMobileModal={setOpenMobileSearch}
/>
<NavMenu>
<NavItem>
{/* <NavItem>
<NextLink href={"/marketplace/"}>
<A
font={
Expand All @@ -680,7 +671,7 @@ const Navbar: FC<FuncProps> = ({
Explore
</A>
</NextLink>
</NavItem>
</NavItem> */}
<NavItem>
<NextLink href={"/rankings/"}>
<A
Expand All @@ -693,6 +684,18 @@ const Navbar: FC<FuncProps> = ({
Rankings
</A>
</NextLink>
{/* <a
target="_blank"
href="https://bbwonderland.com/"
rel="noreferrer"
>
<div>
Wonderland
<div>
<ExternalLinkIcon src={externalLinkIcon.src} />
</div>
</div>
</a> */}
</NavItem>
{loggedIn && (
<NavItem>
Expand Down
2 changes: 1 addition & 1 deletion components/common/SideNavbar/SideNavbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const SideNavbar: FC<Props> = ({ isSideNavbarOpen, toggle }: Props) => {
</Icon>
<SideNavbarWrapper>
<SideNavbarMenu>
<NextLink href="/store">
<NextLink href="/drop">
<A onClick={toggle}>Store</A>
</NextLink>

Expand Down
18 changes: 16 additions & 2 deletions components/common/SlideOverNavbar/SlideOverNavbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ const SlideOverNavbar: FC<Props> = ({
</>
)}
</div>
<Link href="/store">
<Link href="/drop">
<a>
<LargeNavItem onClick={() => close()}>
Store
Drop
</LargeNavItem>
</a>
</Link>
Expand All @@ -305,6 +305,20 @@ const SlideOverNavbar: FC<Props> = ({
</LargeNavItem>
</a>
</Link>
<a
target="_blank"
href="https://bbwonderland.com/"
rel="noreferrer"
>
<SmallNavItem
style={{ display: "flex", marginTop: "5px" }}
>
Wonderland
<div>
<ExternalLinkIcon src={externalLinkIcon.src} />
</div>
</SmallNavItem>
</a>
{/* <Link href="/dexicon">
<a>
<LargeNavItem onClick={() => close()}>
Expand Down
6 changes: 6 additions & 0 deletions components/ui/AcceptOfferModal/AcceptOfferModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ const AcceptOfferModal: FC<Props> = ({ open, setOpen, beast, offer }) => {
${parseFloat(offer?.offerAmount) * 0.9} FUSD
</span>
</Title>
<div
className="text-right absolute top-0 left-0 right-3 sm:hidden"
onClick={() => setOpen(false)}
>
<div style={{ fontSize: "2em", color: "white" }}>x</div>
</div>
<div>
<Button
onClick={() => {
Expand Down
Loading