Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Develop #22

Merged
merged 52 commits into from
Jul 27, 2022
Merged

Develop #22

merged 52 commits into from
Jul 27, 2022

Conversation

forgetso
Copy link
Member

No description provided.

Lupus7 and others added 30 commits June 13, 2022 11:11
* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
* Update docs to reflect changes made

* Add link to is_human function
…d-client

# Conflicts:
#	package.json
#	src/api/DemoNFTContract.ts
#	src/api/abi.json
#	src/api/demoApi.ts
#	src/components/Modal/CheckoutModal.tsx
#	src/components/ProductCard/ProductCard.tsx
#	src/components/Prosopo/ProsopoContext.tsx
#	src/pages/index.tsx
#	src/pages/item/[nft-item-details].tsx
#	src/pages/profile/[id].tsx
* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* packages update

* abi update

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

Co-authored-by: Chris Taylor <forgetso86@gmail.com>
Lupus7 and others added 22 commits July 13, 2022 15:21
* update linting

* fix lint:fix script
* update nft urls

* update url
* Brief explanation of protection

* Add headers and more code examples

* Move text and add screenshots

* add screenshot

* Add images again

* add alt text

* Remove broken images

* Add images again

* Update screenshots

* Remove fixed width

* Remove deploy section

* Update headers

* More info

* Explain constants

* Add flow diagram
@forgetso forgetso merged commit 073b403 into main Jul 27, 2022
forgetso added a commit that referenced this pull request Jul 29, 2022
* Develop (#19)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* Integration (#6)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>

* packages update

* abi update

* Milestone2 docs (#7)

* Update docs to reflect changes made

* Add link to is_human function

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

* Psp34 and client (#9)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* packages update

* abi update

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

Co-authored-by: Chris Taylor <forgetso86@gmail.com>

* update config and env

* implement repeating captchas

* fix scroll blocking

* up pkgs

* fix ws connect and prevent errors

* ui fixes

* add loading bar on route change

* remove unused package

* fixes

* quick fix

* up pkgs

* update nft urls (#17)

* quick fix (#16)

* Linting (#15)

* update linting

* fix lint:fix script

* Nft image url update (#18)

* update nft urls

* update url

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>

* Develop (#22)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* Integration (#6)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>

* packages update

* abi update

* Milestone2 docs (#7)

* Update docs to reflect changes made

* Add link to is_human function

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

* Psp34 and client (#9)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* packages update

* abi update

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

Co-authored-by: Chris Taylor <forgetso86@gmail.com>

* update config and env

* implement repeating captchas

* fix scroll blocking

* up pkgs

* fix ws connect and prevent errors

* ui fixes

* add loading bar on route change

* remove unused package

* fixes

* quick fix

* up pkgs

* update nft urls (#17)

* quick fix (#16)

* Linting (#15)

* update linting

* fix lint:fix script

* Nft image url update (#18)

* update nft urls

* update url

* README (#21)

* Brief explanation of protection

* Add headers and more code examples

* Move text and add screenshots

* add screenshot

* Add images again

* add alt text

* Remove broken images

* Add images again

* Update screenshots

* Remove fixed width

* Remove deploy section

* Update headers

* More info

* Explain constants

* Add flow diagram

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>

* Add apache license

* add wallet instructions

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>
forgetso added a commit that referenced this pull request Jul 29, 2022
* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* Integration (#6)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>

* packages update

* abi update

* Milestone2 docs (#7)

* Update docs to reflect changes made

* Add link to is_human function

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

* Psp34 and client (#9)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* packages update

* abi update

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

Co-authored-by: Chris Taylor <forgetso86@gmail.com>

* update config and env

* implement repeating captchas

* fix scroll blocking

* up pkgs

* fix ws connect and prevent errors

* ui fixes

* add loading bar on route change

* remove unused package

* fixes

* quick fix

* up pkgs

* update nft urls (#17)

* quick fix (#16)

* Linting (#15)

* update linting

* fix lint:fix script

* Nft image url update (#18)

* update nft urls

* update url

* README (#21)

* Brief explanation of protection

* Add headers and more code examples

* Move text and add screenshots

* add screenshot

* Add images again

* add alt text

* Remove broken images

* Add images again

* Update screenshots

* Remove fixed width

* Remove deploy section

* Update headers

* More info

* Explain constants

* Add flow diagram

* New readme (#23)

* Develop (#19)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* Integration (#6)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>

* packages update

* abi update

* Milestone2 docs (#7)

* Update docs to reflect changes made

* Add link to is_human function

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

* Psp34 and client (#9)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* packages update

* abi update

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

Co-authored-by: Chris Taylor <forgetso86@gmail.com>

* update config and env

* implement repeating captchas

* fix scroll blocking

* up pkgs

* fix ws connect and prevent errors

* ui fixes

* add loading bar on route change

* remove unused package

* fixes

* quick fix

* up pkgs

* update nft urls (#17)

* quick fix (#16)

* Linting (#15)

* update linting

* fix lint:fix script

* Nft image url update (#18)

* update nft urls

* update url

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>

* Develop (#22)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* Integration (#6)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>

* packages update

* abi update

* Milestone2 docs (#7)

* Update docs to reflect changes made

* Add link to is_human function

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

* Psp34 and client (#9)

* update contract

* add demo api

* update marketplace (remove ethereum stuff)

* cleanup

* mint 100 items on deploy

* hide product card bg image

* clean up

* update buy function

* remove unused assets

* add prices, buying and estimated gas

* update is_human and errors

* fix and move contract

* update nft marketplace

* update demo contract

* add setup

* add gas input

* Docker files for deploying demo-nft-marketplace

* packages update

* abi update

* pre-conference stuff

* add wallet modal

* add faucet backend

* add faucet frontend

* minor fixes

Co-authored-by: Chris Taylor <forgetso86@gmail.com>

* update config and env

* implement repeating captchas

* fix scroll blocking

* up pkgs

* fix ws connect and prevent errors

* ui fixes

* add loading bar on route change

* remove unused package

* fixes

* quick fix

* up pkgs

* update nft urls (#17)

* quick fix (#16)

* Linting (#15)

* update linting

* fix lint:fix script

* Nft image url update (#18)

* update nft urls

* update url

* README (#21)

* Brief explanation of protection

* Add headers and more code examples

* Move text and add screenshots

* add screenshot

* Add images again

* add alt text

* Remove broken images

* Add images again

* Update screenshots

* Remove fixed width

* Remove deploy section

* Update headers

* More info

* Explain constants

* Add flow diagram

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>

* Add apache license

* add wallet instructions

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>

Co-authored-by: Sinisa Canak <sinisa.canak997@gmail.com>
Co-authored-by: Seth Montenegro <seth@hyx.net>
Co-authored-by: seht <seht@hyx.net>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants