Merge master into @metamaps/alpha - #292
Closed
dysbulic wants to merge 50 commits into
Closed
Conversation
Bumps [next-images](https://github.com/arefaslani/next-images) from 1.6.0 to 1.6.2. - [Release notes](https://github.com/arefaslani/next-images/releases) - [Commits](https://github.com/arefaslani/next-images/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.0.2 to 4.1.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v4.0.2...v4.1.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [graphql-request](https://github.com/prisma/graphql-request) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/prisma/graphql-request/releases) - [Commits](graffle-js/graffle@3.2.0...3.3.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lint-staged](https://github.com/okonet/lint-staged) from 10.4.1 to 10.5.2. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Commits](lint-staged/lint-staged@v10.4.1...v10.5.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [eslint](https://github.com/eslint/eslint) from 6.8.0 to 7.14.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](eslint/eslint@v6.8.0...v7.14.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [jest](https://github.com/facebook/jest) from 24.9.0 to 26.6.3. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](jestjs/jest@v24.9.0...v26.6.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@testing-library/user-event](https://github.com/testing-library/user-event) from 7.2.1 to 12.1.8. - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/master/CHANGELOG.md) - [Commits](testing-library/user-event@v7.2.1...v12.1.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@graphql-codegen/cli](https://github.com/dotansimha/graphql-code-generator/tree/HEAD/packages/graphql-codegen-cli) from 1.17.10 to 1.19.4. - [Release notes](https://github.com/dotansimha/graphql-code-generator/releases) - [Changelog](https://github.com/dotansimha/graphql-code-generator/blob/master/packages/graphql-codegen-cli/CHANGELOG.md) - [Commits](https://github.com/dotansimha/graphql-code-generator/commits/@graphql-codegen/cli@1.19.4/packages/graphql-codegen-cli) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update guide to include typescript compile * add dc logs * Added line for node dependencies * Add back CMDs for running backend without docker * moving previous to guide
Bumps [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/app/react) from 5.3.21 to 6.1.11. - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v6.1.11/app/react) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* updated backend to read 3box collectiblesFavorite * removed unneccesary '?'
* updated backend to read 3box collectiblesFavorite * removed unneccesary '?' * updated frontend to display nft gallery from 3box/opensea * prettier format * using theme colors/sizes * fixed nft price string
Bumps [sourcecred](https://github.com/sourcecred/sourcecred) from 0.7.0-beta-14 to 0.7.4. - [Release notes](https://github.com/sourcecred/sourcecred/releases) - [Changelog](https://github.com/sourcecred/sourcecred/blob/master/CHANGELOG.md) - [Commits](sourcecred/sourcecred@v0.7.0-beta-14...v0.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Added tz column * Updated hasura permissions on new table
- GuildType => Guilds - guild_account > AccountType, Guild
basically guild version of username
renamed / cleaned up a bunch of stuff and removed things that dont work in the profile
Bumps [web3modal](https://github.com/web3modal/web3modal) from 1.9.1 to 1.9.2. - [Release notes](https://github.com/web3modal/web3modal/releases) - [Commits](https://github.com/web3modal/web3modal/compare/1.9.1...1.9.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@types/express](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/express) from 4.17.8 to 4.17.9. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/express) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Frontend Guide * Adding Remote URL connection Co-authored-by: Pacien Boisson <pakokrew@users.noreply.github.com>
* MyMeta - App Drawer * MyMeta - App Drawer - help (#242) * update nextjs @10.0.3 * Use next image component for main app drawer icons * change links * backdrop to close drawer * Links * typecheck * Removed py for page header Co-authored-by: The Lone Rōnin <log2n@protonmail.com> * Framer Motion Integration * Removed drawer transparency * Fix disappeared Login component * remove unnecessary pointerevent thing (thanks to display=none) * Fix ticker display * Added guilds Co-authored-by: Pacien Boisson <pakokrew@users.noreply.github.com> Co-authored-by: Pacien Boisson <pakokrew@gmail.com>
* Added tz column * Updated hasura permissions on new table * Added new dependencies for working with timezones * Added SetupTimeZone component * Bumped spacetime-informal to use their types * Extracted timezone computation into helper, added useMemo hook * Re-added spacetime types
|
@dysbulic is attempting to deploy a commit to the MetaFam Team on Vercel. A member of the Team first needs to authorize it. |
This was referenced Jan 19, 2021
Closed
|
This pull request is being automatically deployed with Vercel (learn more). 🔍 Inspect: https://vercel.com/metafam/the-game/ajkvorb58 |
Member
Author
|
Vercel is failing to build, but there is no error log. It is possible some of the variable names I changed were incorrect, so I am redoing this merge in #298. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A previous pull request to merge
masterinto@metamaps/alphafloundered because there were merge conflicts in thehasura/metadata/tables.yamlfile generated byHasura.For this changeset, I loaded Hasura with an empty
tables.yamlbecause it wouldn't start with the conflicted version. I then used thehasura consoleto rewatch the tables and set the permissions to what they had been. It was then possible to usehasura metadata exportto regeneratetables.yaml.masterrecently underwent a standardization of the names of tables and variables. There are also a couple of commits which fix names missed by that process.