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

2958 update badge design #2967

Closed
wants to merge 11 commits into from
Closed

2958 update badge design #2967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b6aa04
feat: parse images from contract and updates for writing
tim-schultz Oct 10, 2024
9adc43e
feat: wip rendering badge with images
tim-schultz Oct 10, 2024
cc3dc54
feat: fetch and display badge info across contracts using env vars
tim-schultz Oct 10, 2024
b3f60ca
feat: seperate out views and show earned badges before mint
tim-schultz Oct 11, 2024
eaf6fe9
feat: begin moving onMint over to ScrollCampaign
tim-schultz Oct 11, 2024
fc556ab
feat: add back the scrollStampStore for the scroll campaign
nutrina Oct 11, 2024
32ad80d
feat(scroll): fix mint on chain
larisa17 Oct 11, 2024
2d67a00
feat: adding rulsets to sample env as comment, for anyone who needs t…
nutrina Oct 11, 2024
448b5e7
fix: proper test value for NEXT_PUBLIC_SCROLL_BADGE_PROVIDER_INFO in …
nutrina Oct 11, 2024
19ed176
feat(scroll): disable tests
larisa17 Oct 11, 2024
afd07f3
feat(scroll): update tests
larisa17 Oct 11, 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
7 changes: 6 additions & 1 deletion app/.env-example.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,10 @@ NEXT_PUBLIC_ONBOARD_RESET_INDEX=1
NEXT_PUBLIC_GA_ID=id

# Env vars for the scroll campaign
NEXT_PUBLIC_SCROLL_BADGE_PROVIDER_INFO='[{"badgeContractAddress":"0x...","title":"Passport Developer","providers":[{"level":1,"name":"DeveloperList#PassportCommiterLevel1#7f421a19","image":"/assets/img1.svg"}]}]'
# The sample below applies for the following rulesets (defined in adjango admin):
# - {"name": "ContributorPassport10", "condition": {"OR": [{"repository_commit_count": {"threshold": 10, "repository": "https://github.com/passportxyz/passport-scorer"}}, {"repository_commit_count": {"threshold": 10, "repository": "https://github.com/passportxyz/passport"}}]}}
# - {"name": "ContributorPassport30", "condition": {"OR": [{"repository_commit_count": {"threshold": 30, "repository": "https://github.com/passportxyz/passport-scorer"}}, {"repository_commit_count": {"threshold": 30, "repository": "https://github.com/passportxyz/passport"}}]}}
# - {"name": "ContributorPassport20", "condition": {"OR": [{"repository_commit_count": {"threshold": 20, "repository": "https://github.com/passportxyz/passport-scorer"}}, {"repository_commit_count": {"threshold": 20, "repository": "https://github.com/passportxyz/passport"}}]}}

NEXT_PUBLIC_SCROLL_BADGE_PROVIDER_INFO='[{"badgeContractAddress":"0x71A848A38fFCcA5c7A431F2BB411Ab632Fa0c456","title":"Passport Developer","providers":[{"level":100,"name":"DeveloperList#ContributorPassport10#b1933500","image":"assets/scrollBadgeLevel1.svg"},{"level":200,"name":"DeveloperList#ContributorPassport20#a4d87d4e","image":"assets/scrollBadgeLevel2.svg"},{"level":300,"name":"DeveloperList#ContributorPassport30#4f1f3558","image":"assets/scrollDevZKRollup3.svg"}]},{"badgeContractAddress":"0x71A848A38fFCcA5c7A431F2BB411Ab632Fa0c456","title":"Passport Developer 2","providers":[{"level":100,"name":"DeveloperList#ContributorPassport10#b1933500","image":"assets/scrollBadgeLevel1.svg"},{"level":200,"name":"DeveloperList#ContributorPassport20#a4d87d4e","image":"assets/scrollBadgeLevel2.svg"},{"level":300,"name":"DeveloperList#ContributorPassport30#4f1f3558","image":"assets/scrollDevZKRollup3.svg"}]}]'
NEXT_PUBLIC_SCROLL_CAMPAIGN_CHAIN_ID=
66 changes: 33 additions & 33 deletions app/__tests__/components/ScrollCampaign.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { MemoryRouter } from "react-router-dom";
import { makeTestCeramicContext, renderWithContext } from "../../__test-fixtures__/contextTestHelpers";
import { CeramicContextState } from "../../context/ceramicContext";
import { AppRoutes } from "../../pages";
import { ScrollStepsBar } from "../../components/ScrollCampaign";
// import { ScrollStepsBar } from "../../components/ScrollCampaign";
import { useParams } from "react-router-dom";
import { CredentialResponseBody } from "@gitcoin/passport-types";
import { googleStampFixture } from "../../__test-fixtures__/databaseStorageFixtures";
Expand Down Expand Up @@ -140,47 +140,47 @@ describe("Landing page tests", () => {
});
});

describe("Component tests", () => {
beforeEach(() => {
jest.restoreAllMocks();
jest.clearAllMocks();
});
it("shows step 0 correctly", () => {
(useParams as jest.Mock).mockReturnValue({ campaignId: "scroll-developer", step: "0" });
// describe("Component tests", () => {
// beforeEach(() => {
// jest.restoreAllMocks();
// jest.clearAllMocks();
// });
// it("shows step 0 correctly", () => {
// (useParams as jest.Mock).mockReturnValue({ campaignId: "scroll-developer", step: "0" });

render(<ScrollStepsBar />);
// render(<ScrollStepsBar />);

const connectWalletStep = screen.getByText("Connect Wallet");
expect(connectWalletStep).toBeInTheDocument();
expect(connectWalletStep).not.toHaveClass("brightness-50");
// const connectWalletStep = screen.getByText("Connect Wallet");
// expect(connectWalletStep).toBeInTheDocument();
// expect(connectWalletStep).not.toHaveClass("brightness-50");

const githubStep = screen.getByText("Connect to Github");
expect(githubStep).toBeInTheDocument();
expect(githubStep).toHaveClass("brightness-50");
// const githubStep = screen.getByText("Connect to Github");
// expect(githubStep).toBeInTheDocument();
// expect(githubStep).toHaveClass("brightness-50");

const mintStep = screen.getByText("Mint Badge");
expect(mintStep).toBeInTheDocument();
expect(mintStep).toHaveClass("brightness-50");
});
// const mintStep = screen.getByText("Mint Badge");
// expect(mintStep).toBeInTheDocument();
// expect(mintStep).toHaveClass("brightness-50");
// });

it("shows step 1 correctly", () => {
(useParams as jest.Mock).mockReturnValue({ campaignId: "scroll-developer", step: "1" });
// it("shows step 1 correctly", () => {
// (useParams as jest.Mock).mockReturnValue({ campaignId: "scroll-developer", step: "1" });

render(<ScrollStepsBar />);
// render(<ScrollStepsBar />);

const connectWalletStep = screen.getByText("Connect Wallet");
expect(connectWalletStep).toBeInTheDocument();
expect(connectWalletStep).toHaveClass("brightness-50");
// const connectWalletStep = screen.getByText("Connect Wallet");
// expect(connectWalletStep).toBeInTheDocument();
// expect(connectWalletStep).toHaveClass("brightness-50");

const githubStep = screen.getByText("Connect to Github");
expect(githubStep).toBeInTheDocument();
expect(githubStep).not.toHaveClass("brightness-50");
// const githubStep = screen.getByText("Connect to Github");
// expect(githubStep).toBeInTheDocument();
// expect(githubStep).not.toHaveClass("brightness-50");

const mintStep = screen.getByText("Mint Badge");
expect(mintStep).toBeInTheDocument();
expect(mintStep).toHaveClass("brightness-50");
});
});
// const mintStep = screen.getByText("Mint Badge");
// expect(mintStep).toBeInTheDocument();
// expect(mintStep).toHaveClass("brightness-50");
// });
// });

describe("Github Connect page tests", () => {
beforeEach(async () => {
Expand Down
Loading
Loading