Skip to content

Merge master into @metamaps/alpha - #298

Merged
dysbulic merged 64 commits into
@metamaps/alphafrom
@metamaps/fix/merge-master
Jan 25, 2021
Merged

Merge master into @metamaps/alpha#298
dysbulic merged 64 commits into
@metamaps/alphafrom
@metamaps/fix/merge-master

Conversation

@dysbulic

@dysbulic dysbulic commented Jan 24, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

This is a third attempt at merging the master branch into @metamaps/alpha so it can eventually be deployed.

The first endeavor (#225) had merge conflicts in the Hasura tables metadata. The second's (#292) failing the Vercel build with no error log. Since it contains some changes to variable names that I am uncertain about the veracity of, this is a more minimal attempt generated by running git merge master and as little else as possible.

The only other commands run were:

  • git checkout master hasura/metadata/tables.yaml
  • watch the Map table in the Hasura console
  • adjust permissions on the Map table to allow writing
  • yarn codegen

dependabot Bot and others added 30 commits December 9, 2020 10:24
@dependabot
Bump next-images from 1.6.0 to 1.6.2 (#192)
22a484b 
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>
@dependabot
Bump typescript from 4.0.2 to 4.1.2 (#193)
f055b6e 
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>
@TheLoneRonin
BackEnd Guide (#195)
e5b7c78
@dependabot
Bump graphql-request from 3.2.0 to 3.3.0 (#210)
d045fbe 
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>
@dependabot
Bump typescript from 4.1.2 to 4.1.3 (#209)
b0a0723 
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>
@dependabot
Bump lint-staged from 10.4.1 to 10.5.2 (#200)
bafc0ea 
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>
@dependabot
Bump eslint from 6.8.0 to 7.14.0 (#197)
9a96e05 
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>
@dependabot
Bump jest from 24.9.0 to 26.6.3 (#198)
be07108 
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>
@dependabot
Bump @testing-library/user-event from 7.2.1 to 12.1.8 (#164)
9ffdd80 
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>
@dependabot
Bump @graphql-codegen/cli from 1.17.10 to 1.19.4 (#199)
09e3b55 
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 (#206)
8ff226f 
* 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
@dependabot
Bump @storybook/react from 5.3.21 to 6.1.11 (#211)
9bad4b5 
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>
@dan13ram
color coded player skills (#212)
12da46d
@META-DREAMER
Remove deprecated app-react package (#219)
a1c9aea
@META-DREAMER
Add build workflow to CI so errors can be shown in GitHub instead of …
731a56e 
…Vercel (#217)
@dan13ram
updated backend to read 3box collectiblesFavorite (#221)
566be91 
* updated backend to read 3box collectiblesFavorite

* removed unneccesary '?'
@dan13ram
updated frontend to display nft gallery from 3box/opensea (#222)
aa0a532 
* 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
@dependabot
Bump sourcecred from 0.7.0-beta-14 to 0.7.4 (#226)
153654d 
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>
@META-DREAMER
Fix yarn command in Backend Guide (#229)
384f93c
@mikeki
Simple fix of a command (#232)
b9e5403
Alec LaLonde
Feature/add timezone backend (#230)
63a357c 
* Added tz column

* Updated hasura permissions on new table
@TheLoneRonin
SEED ticker using CoinGecko (#223)
c8b3d29
@META-DREAMER
Create Player Guilds Table
8f4db81
@META-DREAMER
Setup Guilds table
2b61060
@pacwoodson @META-DREAMER
Added some relationships:
0b45267 
- GuildType => Guilds
- guild_account > AccountType, Guild
@META-DREAMER
Squash Migrations for updating guild table
6c44896
@META-DREAMER
Add guildname field to uniquely identify guilds with friendly id
7cefb64 
basically guild version of username
@META-DREAMER
Add permissions to select guilds
9bf127b
@META-DREAMER
Refactor PlayerPage and remove mock components
74c154e 
renamed / cleaned up a bunch of stuff and removed things that dont work in the profile
@META-DREAMER
Add LoadingState and fix empty state for player page
cd14649
dan13ram and others added 23 commits December 24, 2020 23:33
@dan13ram
sleek scroll bar for nft gallery (#251)
528d72c
@TheLoneRonin
Drawer Updates (#257)
e5739d8
Alec LaLonde
Renamed table names to be consistent snake_case (#255)
c4a2b38
Alec LaLonde
Added backdropFilter workaround and custom scrollbar for non-webkit b…
1027f01 
…rowsers (#256)
Alec LaLonde
Renamed player columns to be consistent snake_case (#262)
5534ff1
@peth-eth @TheLoneRonin
Create C4 (#270)
1e2120b 
* Create C4

* Rename C4 to C4.md

* Added a link to C4 in the README

Co-authored-by: The Lone Ronin <log2n@protonmail.com>
Alec LaLonde
Drawer Images + Other Improvements (#276)
42918a6 
* Replaced drawer images with higher-res versions, mobile/desktop button improvements

* On drawer footer, don't show outline when clicking buttons
Alec LaLonde
Fixed migration handler (#274)
cf2c143
Alec LaLonde
Fixed a couple react warnings (#273)
d2cba7a
@dependabot
Bump graphql from 15.3.0 to 15.4.0 (#259)
4fc2f73 
Bumps [graphql](https://github.com/graphql/graphql-js) from 15.3.0 to 15.4.0.
- [Release notes](https://github.com/graphql/graphql-js/releases)
- [Commits](graphql/graphql-js@v15.3.0...v15.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump ts-node-dev from 1.0.0-pre.62 to 1.1.1 (#252)
f7ab809 
Bumps [ts-node-dev](https://github.com/whitecolor/ts-node-dev) from 1.0.0-pre.62 to 1.1.1.
- [Release notes](https://github.com/whitecolor/ts-node-dev/releases)
- [Changelog](https://github.com/whitecolor/ts-node-dev/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitecolor/ts-node-dev/commits/v1.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump eslint-plugin-jest from 23.20.0 to 24.1.3 (#258)
f92ce87 
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.20.0 to 24.1.3.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](jest-community/eslint-plugin-jest@v23.20.0...v24.1.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump styled-components from 5.2.0 to 5.2.1 (#265)
59b6a03 
Bumps [styled-components](https://github.com/styled-components/styled-components) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/styled-components/styled-components/releases)
- [Changelog](https://github.com/styled-components/styled-components/blob/v5.2.1/CHANGELOG.md)
- [Commits](styled-components/styled-components@v5.2.0...v5.2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Alec LaLonde
Force minimum row height, narrower column max width (#275)
ceaae6d
@META-DREAMER
Update chakra/core to chakra/react and cleanup theme setup (#281)
78dd5bb
@META-DREAMER
Remove NextJS Build from Render config (#283)
2e15ea2 
Using Vercel now for the NextJS app
@META-DREAMER
Move SEED Ticker to left side (#282)
5a8a803 
MetaGame logo was redundant and SEED ticker often gets covered by the App Drawer
@META-DREAMER
Add step to remove duplicate players in migrateSourceCredAccounts han…
83417ab 
…dler (#280)

Some accounts in SourceCred get merged after they had already been added in the database (e.g. merging
a discord and discourse identity) which causes conflicts in the database when we try to set an
ETH address for the new merged account that conflicts with the old unmerged account.
Add tokenlog.json (#291)
c5f494d
Update FRONTEND.md (#288)
7298a3c
@META-DREAMER
Remove unused pages / components and fix usage of Wrap with WrapItem (#…
7492ae5 
…284)

* Remove unused pages / components

* Add WrapItem around components inside Wrap component

New version of Chakra requires WrapItem around any components that have Wrap

* Update LoginButton to link to own profile and show Avatar (#285)

* Update LoginButton to link to own profile and show Avatar

* Change SetupUsername to explicitly mention "username"
@META-DREAMER
Add case in SC migration script where user doesnt already have a SC i…
0dabebb 
…dentityID (#296)
@dysbulic
Merge branch 'master' into @metamaps/alpha
ff54865
@vercel

vercel Bot commented Jan 24, 2021

Copy link
Copy Markdown

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/metafam/the-game/hgam2mg3s
✅ Preview: https://the-game-git-metamaps-fixmerge-master.metafam.vercel.app

@dysbulic dysbulic mentioned this pull request Jan 24, 2021
Closed
@dysbulic
dysbulic requested a review from TheLoneRonin January 24, 2021 17:20
@dysbulic dysbulic self-assigned this Jan 24, 2021
@dysbulic
dysbulic merged commit d34717f into @metamaps/alpha Jan 25, 2021
@dysbulic
dysbulic deleted the @metamaps/fix/merge-master branch January 25, 2021 05:57
vidvidvid pushed a commit that referenced this pull request Feb 8, 2022
@peth-eth
Adding Gamification & some tl:dr changes (#298)
aa8e87d 
* new category

adding new category for "what we actually do"

* adding gamification + a few changes

* Update why-gamification-works.md

* Update metasys.md

* Update how-to-house.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TheLoneRonin TheLoneRonin Awaiting requested review from TheLoneRonin

Assignees

@dysbulic dysbulic

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@dysbulic @TheLoneRonin @dan13ram @META-DREAMER @mikeki @pacwoodson @peth-eth