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.

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

Merge FLIP Fest PRs #195

Merged
merged 23 commits into from
Jan 19, 2022
Merged

Merge FLIP Fest PRs #195

merged 23 commits into from
Jan 19, 2022

Conversation

MaxStalker
Copy link
Contributor

This PR shall resolve all merge conflicts and bring Playground back into stable form.

@MaxStalker MaxStalker requested a review from 10thfloor as a code owner January 12, 2022 15:40
@vercel
Copy link

vercel bot commented Jan 12, 2022

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/onflow/flow-playground/7QEXJuWNbBhYEZ9pC99qJMDNPcdM
✅ Preview: https://flow-playground-git-max-another-merge-onflow.vercel.app

@MaxStalker
Copy link
Contributor Author

@10thfloor can you tell what was the problem with our tutorials so I can check if this was fixed?

Copy link
Contributor

@psiemens psiemens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good @MaxStalker!

I have a comment about the URL structure, but don't let it block this PR.

navigate(`/${this.projectId}`, { replace: true});

navigate(`/${this.projectId}?type=readme&id=0`, { replace: true });
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the README should just be the default view when loading a project. Is ?type=readme required?

src/util/url.ts Outdated
@@ -11,6 +11,6 @@ export const getParams = (url: string): any => {
},{})
}

export const scriptTypes = ["account", "tx", "script"]
export const scriptTypes = ["account", "tx", "script", "readme"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be pageTypes instead of scripts?

@vercel vercel bot temporarily deployed to Preview January 18, 2022 15:47 Inactive
@10thfloor 10thfloor merged commit a1d47f2 into master Jan 19, 2022
@bthaile bthaile deleted the max/another-merge branch May 16, 2023 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants