Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/farming page 15 #26

Merged
merged 44 commits into from Mar 3, 2022
Merged

Feature/farming page 15 #26

merged 44 commits into from Mar 3, 2022

Conversation

natonnelier
Copy link
Contributor

farming-page

Changes:

  • Right align the value and left align the token name in "Underlying Token" column
  • Staked, in USD - move the column next to TVL
  • Active campaigns displayed by default
  • Select box added to switch between Active campaigns and Expired campaigns.

Mi-Lan
Mi-Lan requested changes Nov 12, 2021
View reviewed changes
Copy link
Collaborator

@Mi-Lan Mi-Lan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments. Good job overall!

src/components/FarmingList/index.js Outdated Show resolved Hide resolved
src/pages/FarmingPage.js Outdated Show resolved Hide resolved
@Mi-Lan
Copy link
Collaborator

Mi-Lan commented Nov 12, 2021

Screenshot 2021-11-12 at 18 37 58
Also this compile error

@natonnelier
Copy link
Contributor Author

Left some comments. Good job overall!

fixes added @Mi-Lan ! Please take a look

Mi-Lan
Mi-Lan reviewed Nov 18, 2021
View reviewed changes
src/pages/FarmingPage.js Outdated Show resolved Hide resolved
@Mi-Lan Mi-Lan requested review from luzzif and Mi-Lan November 26, 2021 12:54
Mi-Lan and others added 20 commits November 30, 2021 14:26
@Mi-Lan
base layout
c0df81b
@Mi-Lan
fix: Added farming to mobile nav
786259d
@Mi-Lan
style: Added farming icon
5e2e40d
@Mi-Lan
analyzing staking subgraph data
e079f9f
@Mi-Lan
debug
03a13e3
@Mi-Lan
feature: Added staked amount and appropriate sorting
5cf2e4c
@Mi-Lan
debug
2626e90
@Mi-Lan
feature: Implemeting data for farming table
e24545b
@Mi-Lan
Delete Project_Default.xml
b9bc409
@Mi-Lan
Delete yarn.lock~6392ee34904d87efb7d697b41c3aa7abcbae9535
d596470
@Mi-Lan
Delete misc.xml
8d3e066
@Mi-Lan
Delete modules.xml
d5326e8
@Mi-Lan
Delete vcs.xml
955408f
@Mi-Lan
Delete swapr-info.iml
32595f7
@Mi-Lan
feature: Added dependencies
f4ae1e6
@Mi-Lan
feature: Added new data fetching for mining campaigns and integrated …
066f361 
…it into farming list
@Mi-Lan
feature: Apy calcualtion in progress
0027004
@Mi-Lan
feature: Finished campaign object for fetchibg apy
0460fd8
@Mi-Lan
feature: Added correct apy
9309591
@Mi-Lan
fix: Bunch of small style and formatting fixes
627d532
Mi-Lan and others added 19 commits November 30, 2021 14:26
@Mi-Lan
feature: Added yield per 1000 field
7369b6d
@Mi-Lan
fix: Changed old area names
1250f99
@Mi-Lan
fix: Deleted unused old qury
4287821
@Mi-Lan
Delete workspace.xml
fe7282f
@Mi-Lan
Delete Project_Default.xml
e477653
@Mi-Lan
Delete misc.xml
e79c3c9
@Mi-Lan
Delete vcs.xml
324b358
@Mi-Lan
Delete swapr-info.iml
d9aa683
@Mi-Lan
Delete modules.xml
070f7d2
@Mi-Lan
fix: Deleted promiseAll since its not asynchronous
aa0e491
@Mi-Lan
feature: Added evalution for just active campaigns and formatting fixes
63d4044
@Mi-Lan
fix: Added cleaner solution for fetching active proposals over subgraph
ef97e93
@Mi-Lan
fix: Improved sorting and deleted unused data passed in Farming page …
fb897de 
…and renamed it
@Mi-Lan
fix: Improved sorting and deleted unused data passed in Farming page …
cb14e9f 
…and renamed it
@Mi-Lan
feature: Implemented stake in dollars and bunch of small modifications
017e7e1
@natonnelier
farming page enhancements
63ff5e6
@natonnelier
comments removed
dc4fc11
@natonnelier
filter campaigns moved to PairData and inline styling removed
fc44389
miningData hooks joined
e03e1a6
@natonnelier natonnelier changed the base branch from feature/farming-page-15 to develop November 30, 2021 12:27
Mi-Lan
Mi-Lan reviewed Dec 1, 2021
View reviewed changes
src/contexts/PairData.js Outdated Show resolved Hide resolved
@0xVenky 0xVenky merged commit 4a04422 into SwaprHQ:develop Mar 3, 2022
@0xVenky 0xVenky mentioned this pull request Mar 3, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@luzzif luzzif Awaiting requested review from luzzif

@Mi-Lan Mi-Lan Awaiting requested review from Mi-Lan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@natonnelier @Mi-Lan @0xVenky