Commit Graph

297 Commits

Author SHA1 Message Date
Camila Sosa Morales 0af0da7477
feat: mint step 1 UI layout connect with GitHub (#113)
* feat: add gh steps

* fix: fix import as change the component name

* chore: add context for mint view

* fix: fix styles for dropdown

* chore: add dropdown on github components

* styles: fix styles for github repository config card

* fix: apply PR review comments

* style: reuse no results component
2023-02-09 10:21:48 -05:00
Felipe Mendes 3e1373682f
test: improve foundry test with best practices (#102)
* test: add FleekERC721 test base mint and uri

* chore: update forge-std version

* test: add FleekERC721 burn tests

* test: fix role getter

* test: add access tests for random address

* test: add access tests for owner address

* test: add test revert assertions

* test: apply revert assertions

* test: remove already split tests

* fix: wrong renamed file

* test: move access point tests

* test: refactor access control tests

* test: add deploy test cases

* test: add balance before and after mint test

* test: remove old testsuit

* chore: update foundry test folder strcture

* test: add assertion to verify added role for random address

* test: fix test functions names

* test: remove test_addAccessPoint

* test: add assertion for appAccessPoints length

* test: remove unnecessary assertions on test_tokenURI

* test: rename test files

* test: refactor testFail to test
2023-02-08 17:27:39 -03:00
Camila Sosa Morales 33ebac510c
chore: dropdown component (#90)
* wip: add dropdown component

* wip: added search functionality on dropdown

* chore: dropdown component with properties

* style: set width pase on parent

* refactor: remove old dropdown component and add headless ui

* chore: remove unsued radix component dependency

* chore: add yarn.lock on root fodler

* refactor: remove old folders from root project

* chore: add import on index

* chore: apply PR review
2023-02-08 09:10:59 -05:00
Camila Sosa Morales 292f550466
chore: card component (#112)
* chore: add card component

* refactor: refactor con input styles and added icon

* chore: add missing files

* Update ui/src/components/card/card.styles.ts

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

* Update ui/src/components/card/card.tsx

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

* Update ui/src/components/card/card.tsx

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

* Update ui/src/components/card/card.tsx

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

* chore: change CardText to Text

---------

Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2023-02-08 08:34:04 -05:00
Camila Sosa Morales 3901033f81
styles: fix styles icon button (#98)
* chore: rename files

* styles: fix styles icon button

* chore: remove commented lines
2023-02-06 16:37:35 -05:00
Janison Sivarajah e8baad8303
Forgot to add yarn.lock so separate hotfix pr for it (#108) 2023-02-06 15:56:42 -05:00
Janison Sivarajah 6a827263b7
chore: change top level folder structure (#105)
* folder restructure init - WIP

* Update husky for folder change

* Properly ignore local zeppelin file

* change folder strucutre: update readme and contribution files

* remove chakra from readme list of key dependencies

* run contract workflow steps in contract dir

* Cleanup readmes, split contract into it's own

* Apply some suggestions from code review

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

* Move .env.example to contracts folder, and use consistent format for directory references in docs

* More readme dir ref fixes

* Update poc note in readme, and removed deploy folder from readme

* Prettier refactor

* Revert "Prettier refactor"

This reverts commit 82249e32aaf6a6e9a4d432c4f89ca365c18972f8.

* Clean up package.json and add prettier ignore

---------

Co-authored-by: Shredder <110225819+EmperorOrokuSaki@users.noreply.github.com>
Co-authored-by: Felipe Mendes <zo.fmendes@gmail.com>
2023-02-06 15:15:44 -05:00
Shredder f37fcbc315
feat: replace the Holder entity with the Owner and handle transfer and mint cases. (#100) 2023-02-03 18:16:26 +03:30
Shredder 7e46146a24
feat: add controller entity and handlers. (#99)
* feat: add controller entity and handlers.

* chore: update the log messages to be more precise

* fix: mistake in the log of roleRevoked events.
2023-02-03 12:13:18 +03:30
Felipe Mendes 94e8ba3856
refactor: change svg generation to match design and update how it is write/read in contract (#95)
* refactor: update contract with logo and color, add new svg styling

* refactor: fix color storaging

* test: fix tests for new app metadata

* test: fix solidity tests

* chore: update latest deployment files

* feat: update mint script and add assets files

* refactor: move assets files

* refactor: update svg generation styling

* feat: add library deployment storage

* test: fix contract tests

* feat: add setTokenLogo and setTokenColor contract functions

* test: add hardhat tests for new set functions

* test: add foundry tests for new set functions, split out constant strings to constants library

* chore: remove leftover comment

* feat: add setTokenLogoAndColor function

* test: add test for setTokenLogoAndColor function

* test: add test for setTokenLogoAndColor function on foundry
2023-01-31 14:12:48 -03:00
Janison Sivarajah ce1a3fc141
feat: add token and holder entities (#94)
* chore: add the verify command to the package.json file

* docs: add the re-deployment section to the README.md file

* feat: add support for token and holder entities based on transfer events that are emitted from the contract during the mint process.

---------

Co-authored-by: EmperorOrokuSaki <artie.eth@gmail.com>
2023-01-31 19:13:23 +03:30
Felipe Mendes 91aeb47aef
chore: prepare the contracts to be upgradable using openzeppelin proxy plugin (#76)
* feat: add proxy upgradable base setting

* refactor: upgrade contracts to fit upgradable pattern

* fix: hardhat test default fixture

* test: trying to fix foundry tests

* fix: remove wrong modifier from FleekAccessControl initializer

* refactor: change __FleekAccessControl_init function from public to internal

* refactor: add __FleekAccessControl_init modifier

* feat: proxy store script

* chore: add .openzeppelin development files in gitignore

* refactor: update local deploy script to use proxy

* refactor: mumbai deployment with proxy and fix interaction scripts

* test: fix proxy storing values

* refactor: proxy storage deploy order

* test: move proxy test to deploy folder

* refactor: deployment scripts

* docs: fix local deploy command

* refactor: add more logs in deploy scripts

* feat: write deployment files script

* refactor: use file scripts in proxy-deploy

* refactor: deployment files for mumbai
2023-01-31 12:09:12 -03:00
Shredder 61aeaaae66
feat: subgraph setup for the FleekNFA contracts (#72)
* Add verify script and update hardhat config to automate all future code verifications on polygonscan

* Update deployments to match the new deployed instance of the contract on polygon mumbai testnet (verified)

* feat: Generate the base of the subgraph by graph-cli based on the verified deployed instance on mumbai

* bug: fixed type errors in the typescript specification file.

* chore: generate a new build of the subgraph

* feat: write a script to perform multiple types of queries on the subgraph

* docs: Write a README for the query-examples directory to guide users on how they can perform queries

* chore: remove the heavy subgraph generated WASM and add all .WASM files to .gitignore

* chore: apply the requested changes from Zoruka on the verify_polyscan.js file

* docs: write the readme doc for the subgraph

* chore: remove deploy from package.json and add build, abis, and generated to .gitignore

* chore: remove abis, build, and generated from the branch

* chore: move query-examples to examples/query/ and gitignore .graphclient

* docs: update readme (add a section for developing and describe build and generated directories better)

* chore: remove graphql from the root package.json file
2023-01-31 18:29:42 +03:30
Camila Sosa Morales 325fdb8361
feature: stepper component (#91) 2023-01-30 20:46:13 -05:00
Camila Sosa Morales 77b20d527d
fix: fix button stories (#87) 2023-01-30 12:11:54 -05:00
Camila Sosa Morales 4e9023ce3f
chore: input component (#84) 2023-01-30 12:10:47 -05:00
Shredder e81132a9b8
test: foundry tests for access points (#79)
* feat: add mirror mapping and management

* test: add mirrors tests

* chore: add new functions header comments

* feat: add isMirrorVerified function

* feat: add a list of mirrors to token

* feat: add require minted to appMirrors function

* chore: update solidity compiler on hardhat config

* refactor: add token id to other mirror events

* refactor: change from mirror to access point and update its metadata

* test: updates tests due to contract changes

* refactor: clean up string parser from main contract

* refactor: remove wronge requirement comments

* refactor: strings library (#71)

* refactor: move string parse functions to a library

* refactor: remove not used modifier

* refactor: move svg generation to library

* refactor: remove source from aps

* refactor: rename accessPoint function

* test: fix two foundry test cases

* test: fix tests that were not working.

* fix: apply requested changes.

---------

Co-authored-by: zoruka <zo.fmendes@gmail.com>
2023-01-27 22:00:50 +03:30
Felipe Mendes 2b030f60b0
feat: svg preview test screen (#88)
* feat: add svg test screen

* chore: add svg test comments
2023-01-27 07:50:43 -03:00
Camila Sosa Morales 0553bef914
chore: remove chakra (#86)
* refactor: remove chakra

* refactor: remove stitches folder
2023-01-26 16:02:08 -05:00
Camila Sosa Morales 75a6de5ac7
chore: button component (#81)
* chore: add button component with storybook

* chore: add stories button

* refactor: remove github custom logo

* fix: fix build

* chore: changes based on PR review
2023-01-23 15:01:02 -05:00
Camila Sosa Morales 1dd06c6baf
chore: stitches config for drip (#80)
* style: add config stithces for drip and storybook

* reafctor: remove commented lines

* chore: remove unused library

* refactor: merge with develop and fix conflicts

* fix: fix storybook

* style: add black bg color for dark mode on storybook
2023-01-20 10:08:37 -05:00
Shredder f74c2f7e2e
docs: fix mistakes in CONTRIBUTING.md (#64)
* Update CONTRIBUTING.md

* Apply requested changes.
2023-01-19 21:05:07 +03:30
Camila Sosa Morales 95d15582b2
chore: add tailwind and stitches (#75)
* styles: add stitches

* style: add tailwaind

* style: remove sizes

* chore: add storybook with sample story

* refactor: remove storybook eslint

* refactor: add tailwind with vite

* fix: fix storybook script

* style: dark mode

* style: add google fonts

* style: add radix colors

* style: add radix library

* refactor: remove light colors, not used for now

* chore: add comment to remove story example
2023-01-18 11:41:08 -05:00
Felipe Mendes fc20f02b7f
feat: add app access points and libraries clean up (#69)
* feat: add mirror mapping and management

* test: add mirrors tests

* chore: add new functions header comments

* feat: add isMirrorVerified function

* feat: add list of mirrors to token

* feat: add require minted to appMirrors function

* chore: update solidity compiler on hardhat config

* refactor: add token id to other mirror events

* refactor: change from mirror to access point and update its metadata

* test: updates tests due to contract changes

* refactor: clean up string parser from main contract

* refactor: remove wronge requirement comments

* refactor: strings library (#71)

* refactor: move string parse functions to a library

* refactor: remove not used modifier

* refactor: move svg generation to library

* refactor: remove source from aps

* refactor: rename accessPoint function
2023-01-18 11:39:44 -03:00
Camila Sosa Morales 66e041f63f
refactor: UI improvements (#67)
* feat: add pointer on SiteCard

* fix: don`t show ens when it`s empty

* style: add icons on wallet button

* styles: align home button on same splace in all views

* style: add tooltip on attributes card

* chore: install react-icons

* feat: add paste feature on owner address field

* style: add icon of connected wallet

* style: add icon metamask

* fix: fix error message on owner address field

* chore: remove console.log

* style: add colors theme

* refactor: refactor icons. Create icon component

* refactor: remove function from component

* fix: fix husky precommit to add jsx and tsx files

* refactor: add metamask icon

* fix: fix import

* chore: remove metamask svg from assets
2023-01-11 16:34:05 -05:00
Shredder 482203529c
Initialize contract SVG code with placeholder base 2023-01-11 20:10:44 +03:30
EmperorOrokuSaki 69de99467f Fix the HardHat decoding bug by adding base URI to _generateSVG() and updating foundry tests 2023-01-11 18:55:51 +03:30
EmperorOrokuSaki 94caa633ff Remove foundry test cases that call setTokenImage() since that function is removed from the code base 2023-01-11 17:51:35 +03:30
EmperorOrokuSaki 9013bd9faf Change _generateSVG() mutability to pure from view 2023-01-11 17:46:33 +03:30
EmperorOrokuSaki 75ae5fa440 Move calling _genenrateSVG() to tokenURI() from mint() 2023-01-11 17:36:50 +03:30
Camila Sosa Morales 99155edf2f
fix: broken json (#66)
* fix: fix broken json error. saving the description correctly

* fix: fix pr review comments

* fix: fix text display when theres no breakline

* fix: fix break lines text on details view. Move the \n replacing to the lib
2023-01-09 17:01:38 -05:00
Camila Sosa Morales 23dc080c7a
fix: refetching queries (#65)
* fix: fix refetcing data on focused

* fix: add key to SiteCard items
2023-01-09 13:03:39 -05:00
EmperorOrokuSaki 810739c740 Add optimization to hardhat config & comment the tokenURI hardhat test 2023-01-09 19:48:17 +03:30
EmperorOrokuSaki 090c1e1477 Add SVG generation test and function. 2023-01-09 18:52:04 +03:30
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