Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
c8612f1
wip
BDANG Jun 7, 2022
47804ad
resolve conflicts
BDANG Jun 7, 2022
8fb1efa
initial structure of Modal
BDANG Jun 7, 2022
dec843b
asset class dropdown
BDANG Jun 7, 2022
d85c240
return data collection
BDANG Jun 7, 2022
e1c5867
checkpointing progress
BDANG Jun 7, 2022
7a4504a
initial persist and display summary of inputs
BDANG Jun 7, 2022
cfcc3c0
reorganize pages of the modal into their own views
BDANG Jun 7, 2022
68ffade
reorganize summary tables into a new view
BDANG Jun 7, 2022
0b4caad
refactor to allow for ergonomic modifications to the fund-creation flow
BDANG Jun 7, 2022
574eefa
refactor fund info to a view
BDANG Jun 8, 2022
7962e1e
refactor stakeholders into view
BDANG Jun 8, 2022
ce15bea
refactor fund config into a view
BDANG Jun 8, 2022
8afe1dd
upgrade nextUI to beta8 for Dropdown
BDANG Jun 8, 2022
7e5ee4b
working most of the time
Jun 8, 2022
e381e96
working most of the time
Jun 8, 2022
5269fe6
handle fee input
BDANG Jun 8, 2022
9376c71
additional config values
BDANG Jun 8, 2022
c42c2d2
code comments
BDANG Jun 8, 2022
8d4c665
initial gov config declaration
BDANG Jun 8, 2022
89f0afe
merge in feature/create-dao-integration; resolve conflicts on package…
BDANG Jun 8, 2022
b4cf641
functional dao creation
BDANG Jun 8, 2022
9de57f3
minor debugging changes
BDANG Jun 8, 2022
a999bab
reorder console
BDANG Jun 8, 2022
3850589
replace input styling type to non-animated version
BDANG Jun 8, 2022
148477d
cursed styling attempt
BDANG Jun 8, 2022
73f29c2
attempt at using dropdown for integer select
BDANG Jun 8, 2022
6954c46
fun little progress bar
BDANG Jun 8, 2022
e598c4d
fixed height modal with scrollable
BDANG Jun 8, 2022
fc42c5a
improved styling of the review table
BDANG Jun 8, 2022
23c88e8
merge in dev branch
BDANG Jun 9, 2022
861d0a8
regenerated package-lock.json to be certain of merge conflicts
BDANG Jun 9, 2022
cb31635
revert the success color and manually specify on the create button fo…
BDANG Jun 9, 2022
c589922
cleanup according to PR feedback
BDANG Jun 9, 2022
7ca5502
merge in dev, resolve conflicts
BDANG Jun 9, 2022
6e9d263
merge in fund-creation / dev
BDANG Jun 10, 2022
561ae4a
fund term as selectable presets
BDANG Jun 10, 2022
70dcbe0
do not set a default asset type
BDANG Jun 10, 2022
f2c0e67
description and context of each page
BDANG Jun 10, 2022
fad22c4
additional styling
BDANG Jun 10, 2022
5cf5bdd
wip
Jun 13, 2022
a496d65
separate investment terms into its own page
BDANG Jun 13, 2022
a862c8a
minor text styling
BDANG Jun 13, 2022
35c9f12
disable create button unless scrolled to the bottom
BDANG Jun 13, 2022
2f0cb0b
wip
Jun 13, 2022
0d37bed
merge in develop, resolve conflicts
BDANG Jun 13, 2022
859d84b
Merge branch 'fund-creation' into ux-fund-creation
BDANG Jun 13, 2022
c525dee
rely on themes construct for coloring
BDANG Jun 13, 2022
efad6a5
minor styling around colors & back button
BDANG Jun 13, 2022
104331f
Merge pull request #73 from Tokr-Labs/ux-fund-creation
BDANG Jun 13, 2022
ee3e545
wip
Jun 13, 2022
0b86c94
reworked dao creation
Jun 13, 2022
6959b5c
fixing merge conflicts
Jun 13, 2022
8b25724
merge in feature/create-dao-integration
BDANG Jun 13, 2022
9069b13
Merge branch 'fund-creation' of github.com:Tokr-Labs/fullstak into fu…
BDANG Jun 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

496 changes: 221 additions & 275 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"name": "tokr-fi",
"version": "0.1.0",
"private": true,
"engines": {
"node": ">=16"
},
"scripts": {
"start": "craco start",
"test": "craco test",
Expand Down Expand Up @@ -46,6 +49,7 @@
}
},
"dependencies": {
"bn.js": "5.2.0",
"@nextui-org/react": "1.0.0-beta.9",
"@project-serum/common": "0.0.1-beta.3",
"@solana/buffer-layout-utils": "0.2.0",
Expand All @@ -58,7 +62,7 @@
"@solana/wallet-adapter-wallets": "0.15.5",
"@solana/web3.js": "1.43.1",
"@tokr-labs/cap-table": "0.3.0",
"@tokr-labs/governance": "0.2.0",
"@tokr-labs/governance": "0.3.0",
"@tokr-labs/identity-verification": "0.7.0",
"amplitude-js": "8.18.1",
"boxicons": "2.1.2",
Expand All @@ -73,7 +77,8 @@
"typescript": "4.7.2",
"underscore": "1.13.2",
"use-dark-mode": "2.3.1",
"web-vitals": "2.1.4"
"web-vitals": "2.1.4",
"random-word-slugs": "0.1.6"
},
"devDependencies": {
"@craco/craco": "6.4.3",
Expand Down
51 changes: 51 additions & 0 deletions src/assets/create-dao-config.localnet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"governanceProgramId": "5Hyx5g6n82uZpVYRLZqssLSj5V6mZc2QYQFtPcj83Jp2",
"name": "",
"description": "Miami Fund is a private real estate investment fund focused on producing market-beating returns through a disciplined, value-add investing approach in one of the fastest growing markets in the world, Miami, FL. We pride ourselves on sourcing proprietary deal-flow below-market, and generating opportunities in under-managed assets.",
"active": false,
"strategy": 0,
"token": {
"ticker": "",
"image": "https://dummyimage.com/100x100/000/fff"
},
"stakeholders": {
"sponsor": {
"name": "John Smith",
"company": "Smith & Co. Investments",
"image": "https://dummyimage.com/400x400/000/fff"
},
"delegate": {
"name": "Tokr Labs",
"company": "Tokr Labs",
"image": "https://dummyimage.com/400x400/000/fff"
}
},
"details": {
"minRaise": 7500000,
"maxRaise": 10000000,
"minInvestment": 100000,
"raiseClose": 1672531200,
"vintageYear": "2022",
"fundTerm": 5,
"dataRoom": "",
"targetReturns": {
"irr": 2400,
"coc": 1000,
"tvpi": 430,
"dpi": 210
},
"fees": {
"closing": 1000,
"annual": 1000
}
},
"governance": {
"voteThresholdPercentage": 25,
"minCommunityTokensToCreateProposal": 10000000,
"minInstructionHoldUpTime": 0,
"maxVotingTime": 259250,
"voteTipping": 0,
"proposalCoolOffTime": 0,
"minCouncilTokensToCreateProposal": 1
}
}
Loading