Commit Graph

113 Commits

Author SHA1 Message Date
Janison Sivarajah 04991eaeff
Apply suggestions from code review
Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
2022-12-22 12:44:39 -05:00
Felipe Mendes d80a07a3af
fix: ui readme broken wiki link (#63) 2022-12-22 14:43:03 -03:00
Felipe Mendes 4004d650bd
fix: readme and contributing file wiki broken links (#62) 2022-12-22 14:34:03 -03:00
Felipe Mendes 6c901a6001
Release/0.0.1 fixes (#60)
* Update LICENSE

* Update README.md

* Update local_deploy.js

* Update FleekERC721.sol

* fix: mumbai deploy args

* fix: fix comments release (#61)

Co-authored-by: Janison Sivarajah <jsonsivar@gmail.com>
Co-authored-by: Camila Sosa Morales <camisosa@fleek.co>
2022-12-22 14:21:00 -03:00
Shredder f2db3ff0c6
Merge pull request #59 from fleekxyz/docs/modifier-headers
Add header docs for modifiers and constructors.
2022-12-22 17:52:23 +03:30
Felipe Mendes 2533f162cb
chore: add readme base (#12)
* chore: add readme base

* chore: add proof of concept section on readme

* chore: add contributing file

* chore: update contributing opening line

* chore: add nft presentable info for contract roadmap

* chore: add developing and testing sections on readme

* chore: remove deploy section on contributing

* chore: add code styling section in readme

* chore: add project structure section in readme

* Add readme with initialization text.

* chore: add user interface section in readme

* update the interactions guide

* Moved test and deployment guides to the main readme and implemented the requested changes.

* Change NPM commands to Yarn commands

* Add a note for forge-std

* docs: fix repo links

* style: add style on readme and remove comments from merge

* docs: add interaction script examples on readme

* docs: remove extra separator

* docs: remove extra separator

* docs: comment mainnet section on readme

* chore: fix repo links on package.json

* docs: update project sctructure

* chore: UI readme (#55)

* docs: update test output examples

* docs: add submodule fetch command

* docs: add new texts mentioned in pr

* docs: add new texts mentioned in pr

* docs: fix hardhat node command

* chore: move POC info to wiki

* docs: remove extra separator

* fix: deployment scripts (#56)

* chore: add comments in .env.example

* chore: update interaction scripts readme section position and link to a deployment guide

* docs: fix hint message position

* doc: add external lobraries section

* chore: update repo name and its bindings (#57)

* docs: update readme libraries section

Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
Co-authored-by: Camila Sosa Morales <camisosa@fleek.co>
Co-authored-by: Janison Sivarajah <jsonsivar@gmail.com>
2022-12-22 11:13:45 -03:00
EmperorOrokuSaki 90dc8c3bfc add header docs for modifiers and constructors. 2022-12-22 17:38:24 +03:30
Felipe Mendes 8b88cf2881
feat: UI metamask integration (#41)
* feat: add redux and metamask slice

* refactor: move from metamask to generic wallet using ethers

* feat: add wallet button base

* feat: add getContract function and mint functionality

* refactor: move functions to ethereum file

* feat: wallet menus and disconnect function

* refactor: Ethereum object typings

* feat: add FleekERC721 contract interaction abstraction

* refactor: remove token detail fetch mock using

* refactor: add ethereum mint function to mint site component

* feat: add wallet initialize

* wip: add signature for lastTokenId function

* feat: integrate list of tokens

* refactor: mint params construct

* fix: global window.ethereum type definition

* fix: remove console log

* fix: remove todo comment

* fix: list view items displaying
2022-12-20 14:24:41 -03:00
Shredder 0e67867560
Merge pull request #26 from fleekxyz/test/foundry
Solidity tests by foundry
2022-12-20 18:34:17 +03:30
Shredder 60850976a7
Merge pull request #54 from fleekxyz/docs/headers
Documentation headers for FleekAccessControl.sol
2022-12-20 18:24:08 +03:30
EmperorOrokuSaki 3ec0827ac1 add function headers for accesscontrole.sol 2022-12-20 18:17:43 +03:30
zoruka 5956cb7be9 chore: merge develop 2022-12-20 08:34:40 -03:00
Felipe Mendes 22198e76e3
refactor: remove extension AccessControl from FleekAccessControl (#28)
* refactor: remove extension AccessControl from FleekAccessControl

* refactor: add version for roles

* test: add collection roles tests

* test: add more token role hardhat tests

* refactor: remove lib/forge-std

* feat: add role grant and revoke events

* test: add access control role event emit tests

* refactor: remove abstract keyword from FleekAccessControl

* Merge conflicts for #28 (#49)

* Add msg.sender to the triggered_by field in events

* Document methods and make everything camelCase

* Make event params all camelCase

* fix: forge-std submodule

* make vars camelCase, remove baseURI header, remove addTokenController and removeTokenController, update tests

Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
Co-authored-by: zoruka <zo.fmendes@gmail.com>

Co-authored-by: Janison Sivarajah <jsonsivar@gmail.com>
Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
2022-12-19 15:45:15 -03:00
Shredder cc3979f3a6
Merge pull request #34 from fleekxyz/feat/events
Update events & function header documentations
2022-12-19 01:46:01 +03:30
zoruka 52b124c829 fix: forge-std submodule 2022-12-17 09:06:29 -03:00
zoruka 4dd1442e9d chore: merge develop 2022-12-17 09:03:08 -03:00
Felipe Mendes dc2f8849c2
chore: add test workflow (#19)
* chore: add test workflow

* chore: upgrade package lock

* chore: add ui tests workflow job

* chore: add compile and build steps for test workflow

* chore: remove ui test command to run just build on workflow

* chore: fix missed conflict

* chore: add foundry installation on test workflow

* fix: wrong sintax breaking test

* chore: set foundry version in workflow

* fix: foundry lib version
2022-12-16 17:51:54 -03:00
Camila Sosa Morales 27359bd45f
feat: add toast hook (#44)
* feat: add toast hook

* refactor: changes on useToast based on PR comments

* reactor: refactor on useToast
2022-12-16 16:51:35 -03:00
Felipe Mendes 4836dd0436
chore: precommit hooks (#18)
* chore: add husky and lint-staged

* chore: add postinstall script

* chore: add prepush test hook

* chore: add skip tests flag

* chore: remove skip tests flag

* chore: fix format command to verify json files
2022-12-16 14:57:49 -03:00
Camila Sosa Morales d96175fa3f
feat: list minted sites (#42)
* feat: add mintes sites list view

* wip: add card but need styles

* style: add style to site card component

* style: add style to site card

* fix: fix onClick propagation

* chore: remove unused param

* Apply suggestions from code review

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>

* Update list.tsx

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2022-12-16 11:27:39 -03:00
EmperorOrokuSaki d151b80319 fix tokenURI return json 2022-12-15 21:46:29 +03:30
EmperorOrokuSaki 3351812acc Fix hardhat tests by removing the author field. 2022-12-15 21:41:07 +03:30
EmperorOrokuSaki 54f665b572 fix 2022-12-15 21:40:57 +03:30
EmperorOrokuSaki 11bc4f9213 fix 2022-12-15 21:39:53 +03:30
zoruka 58242f6b51 chore: remove skip tests flag 2022-12-15 21:39:17 +03:30
zoruka 98385972ea chore: add skip tests flag 2022-12-15 21:39:17 +03:30
zoruka 13c5b44e85 chore: add prepush test hook 2022-12-15 21:39:17 +03:30
EmperorOrokuSaki 5f15530f33 fix merge 2022-12-15 21:39:10 +03:30
zoruka b4975926b5 chore: add husky and lint-staged 2022-12-15 21:37:28 +03:30
zoruka 5900488532 chore: add clear token function comment 2022-12-15 21:32:03 +03:30
zoruka f6510106cd test: add more token role hardhat tests 2022-12-15 21:32:03 +03:30
zoruka ea3a50f2a8 test: add collection roles tests 2022-12-15 21:32:03 +03:30
zoruka f6f48ba206 refactor: add version for roles 2022-12-15 21:32:03 +03:30
EmperorOrokuSaki ee520dcc73 fix erc721 2022-12-15 21:31:59 +03:30
EmperorOrokuSaki bf545ecbbd package.json fix 2022-12-15 21:31:13 +03:30
EmperorOrokuSaki 7de7672c0a fix merge conflict in gitignore 2022-12-15 21:28:09 +03:30
EmperorOrokuSaki 9e2c1368ca fix merge 2022-12-15 21:26:54 +03:30
EmperorOrokuSaki 5411e03675 fixing merge conflicts from rebasing 2022-12-15 21:19:42 +03:30
EmperorOrokuSaki a4679036b2 fix rebase conflict 2022-12-15 21:12:25 +03:30
zoruka 6e036f3b9e chore: readd removed submodule 2022-12-15 14:36:13 -03:00
zoruka 0c96f1db9d Merge branch 'develop' of github.com:fleekxyz/contracts into test/foundry 2022-12-15 14:31:40 -03:00
Camila Sosa Morales 6451208871
feat: minted site detail (#36)
* feat: add detail view. add home button component. add loading component

* feat: add tile info component

* style: change bg color and front family

* refactor: remove old file

* style: new style for detail view

* chore: fix comments

* refactor: change SiteNFTDetail type

* refactor: PR comments changes

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2022-12-14 18:28:15 -03:00
Shredder 8b40a0a140
Make event params all camelCase 2022-12-14 20:39:58 +03:30
Camila Sosa Morales 09d24f9723
feat: mint site view (#15)
* wip: add routes

* refactor: add config for hot reload con vite.config.js

* wip: added chakra-ui. start with the form

* feat: add formik for form validation

* feat: added validation for addresses

* feat: add success/failure message. add onSubmit handler

* feat: add setSubmitting false

* feat: update metadata fields

* wip: add mocked function

* feat: mocked onSubmit funciton

* Apply suggestions from code review

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>

* Apply suggestions from code review

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>

* refactor: PR review changes

* feat: add validation for image urls. remove controller address

* reafctor: refactor fields validation

* refactor: create input field component

* style: add responsive styles. change bg color and font. change back button

* refactor: apply PR comments

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2022-12-13 09:32:55 -03:00
EmperorOrokuSaki 1fd8ae7813 fix hardhat tests by removing the author arg 2022-12-13 00:03:48 +03:30
EmperorOrokuSaki e3ce81e385 remove lib/forge-std 2022-12-13 00:01:05 +03:30
EmperorOrokuSaki d7c31a0985 remove deployments/localhost 2022-12-12 23:59:47 +03:30
EmperorOrokuSaki d1621cea50 fix merge conflicts. 2022-12-12 23:56:10 +03:30
EmperorOrokuSaki 03615bf2b9 fix merge conflicts 2022-12-12 23:47:54 +03:30
EmperorOrokuSaki 7ac1502885 Document methods and make everything camelCase 2022-12-12 23:43:41 +03:30