Skip to content

Commit dfb0c32

Browse files
authored
Merge pull request #1456 from scroll-tech/new-navbar
New navbar
2 parents b09595f + 5113476 commit dfb0c32

File tree

84 files changed

+1376
-1365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1376
-1365
lines changed

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
"@next/third-parties": "^15.1.5",
3131
"@rainbow-me/rainbowkit": "^2.1.2",
3232
"@sentry/nextjs": "^7.95.0",
33+
"@tailwindcss/postcss": "^4.0.6",
3334
"@tanstack/react-query": "^5.55.3",
3435
"@tanstack/react-virtual": "^3.11.2",
3536
"@types/mdx": "^2.0.13",
3637
"@typescript-eslint/parser": "^8.4.0",
38+
"clsx": "^2.1.1",
3739
"copy-to-clipboard": "^3.3.2",
3840
"dayjs": "^1.11.5",
3941
"ethers": "6.12.0",
@@ -90,11 +92,11 @@
9092
"eslint-plugin-prettier": "^5.1.3",
9193
"husky": "^8.0.2",
9294
"pino-pretty": "^10.3.1",
93-
"postcss": "^8.4.17",
95+
"postcss": "^8.5.2",
9496
"prettier": "^3.2.4",
9597
"raw-loader": "^4.0.2",
9698
"sitemap": "^7.1.1",
97-
"tailwindcss": "^3.3.0",
99+
"tailwindcss": "^4.0.6",
98100
"turbo": "^2.4.2",
99101
"typescript": "^5.1.6"
100102
},

postcss.config.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

postcss.config.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const config = {
2+
plugins: {
3+
"@tailwindcss/postcss": {},
4+
},
5+
}
6+
export default config

src/app/SCR-sSCR/page.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { promises as fs } from "fs"
2+
import { notFound } from "next/navigation"
23

3-
import { BNToAmount, genMeta } from "@/utils"
4+
import { BNToAmount, genMeta, isSepolia } from "@/utils"
45

56
import Explaination from "./Explaination"
67
import Header from "./Header"
@@ -21,6 +22,10 @@ const ScrAndsSCRPage = async () => {
2122
next: { revalidate: 3600 },
2223
}).then(res => res.json())
2324

25+
if (isSepolia) {
26+
notFound()
27+
}
28+
2429
return (
2530
<>
2631
<Header circulatingSupply={circulatingSupply} votableSupply={BNToAmount(BigInt(votable_supply))}></Header>

src/app/_canvas-and-badges/Badges/BadgeList/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import LoadingButton from "@/components/LoadingButton"
1313
import LoadingPage from "@/components/LoadingPage"
1414
import { CANVAS_AND_BADGES_PAGE_SYMBOL, CATEGORY_LIST, SORT_LIST } from "@/constants"
1515
import { isAboveScreen } from "@/utils/dom"
16+
import { scrollRequest } from "@/utils/request"
1617

1718
import BadgeCard from "./BadgeCard"
1819
// import BadgeMasonry from "./BadgeMasonry"

src/app/_canvas-and-badges/Header/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import { retrieveCanvasBadgeURL } from "@/apis/canvas-badge"
1313
import Button from "@/components/Button"
1414
import { CANVAS_AND_BADGES_PAGE_SYMBOL, CANVAS_URL, HEADER_BADGES, HEADER_STARS, ISSUE_BADGES_URL } from "@/constants"
1515
import useCheckViewport from "@/hooks/useCheckViewport"
16+
import { scrollRequest } from "@/utils/request"
1617

1718
// import Counter from "./Counter"
1819
import Statistic from "./Statistic"

src/app/_canvas/Dashboard/ReferDialog/coupon.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { useRainbowContext } from "@/contexts/RainbowProvider"
1818
import useSnackbar from "@/hooks/useSnackbar"
1919
import useCanvasStore from "@/stores/canvasStore"
2020
import { generateShareTwitterURL } from "@/utils"
21+
import { scrollRequest } from "@/utils/request"
2122

2223
const CouponBox = styled(Box)(({ theme }) => ({
2324
background: `url(${couponBackground.src}) no-repeat center center`,

src/app/_canvas/badge/[id]/BadgeDetail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const BadgeDetail = props => {
9191
pb: [0, "6rem"],
9292
minHeight: ["unset", "calc(100vh - 6.5rem)"],
9393

94-
height: [`calc(var(--vh, 1vh) * 100 - 6.2rem - ${actionHeight})`, "auto"],
94+
height: [`calc(var(--vh, 1vh) * 100 - 6.4rem - ${actionHeight})`, "auto"],
9595
display: "flex",
9696
alignItems: isOverflow ? "flex-start" : "center",
9797
overflowY: isOverflow ? "auto" : "unset",

src/app/_canvas/components/GridBg/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const Container: any = styled<any>(Box, { shouldForwardProp: prop => prop !== "g
4444
},
4545
},
4646
[theme.breakpoints.down("md")]: {
47-
marginTop: "-6.2rem",
47+
marginTop: "-6.4rem",
4848
height: "calc(var(--vh, 1vh) * 100)",
4949
},
5050
}))

src/app/_canvas/mint/flow/FirstBadgeStep.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import useSnackbar from "@/hooks/useSnackbar"
1313
import { mintBadge } from "@/services/canvasService"
1414
import useCanvasStore from "@/stores/canvasStore"
1515
import { truncateAddress } from "@/utils"
16+
import { scrollRequest } from "@/utils/request"
1617

1718
import StepWrapper from "./StepWrapper"
1819

0 commit comments

Comments
 (0)