Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

update: merkl configuration#27

Merged
clmntsnr merged 7 commits intomainfrom
tweak-config
Nov 29, 2024
Merged

update: merkl configuration#27
clmntsnr merged 7 commits intomainfrom
tweak-config

Conversation

@clmntsnr
Copy link
Copy Markdown
Collaborator

@clmntsnr clmntsnr commented Nov 29, 2024

No description provided.

@clmntsnr clmntsnr force-pushed the tweak-config branch 2 times, most recently from fc0289f to 00baa60 Compare November 29, 2024 11:44
@clmntsnr clmntsnr marked this pull request as ready for review November 29, 2024 15:28
hugolxt
hugolxt reviewed Nov 29, 2024
View reviewed changes
src/api/services/chain.service.ts

// biome-ignore lint/complexity/noStaticOnlyClass: <explanation>
export abstract class ChainService {
static async #fetch<R, T extends { data: R; status: number }>(
Copy link
Copy Markdown
Contributor

@hugolxt hugolxt Nov 29, 2024

Choose a reason for hiding this comment

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

theses services can extends a class name base.service.ts that have common methods like

static async #fetch<R, T extends { data: R; status: number }>

src/api/services/chain.service.ts
return data;
}

static async getAll(): Promise<Chain[]> {
Copy link
Copy Markdown
Contributor

@hugolxt hugolxt Nov 29, 2024

Choose a reason for hiding this comment

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

We need to find correct naming for our services (CRUD)

In our case difficulte to quickly understand the difference btw getAll getMany get

CREATE
create() -> create an entry

READ
get() -> Get all
getByQuery() -> get all by query
(Both can be merge as we want)

getByXXX() -> Get single entry by name for instance

UPDATE
update() -> update an entry

Copy link
Copy Markdown
Collaborator Author

@clmntsnr clmntsnr Nov 29, 2024

Choose a reason for hiding this comment

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

to me get is single and getMany is multiple no ?

src/api/types.ts
@@ -0,0 +1,3 @@
import type { MerklApi } from "@angleprotocol/merkl-api";
Copy link
Copy Markdown
Contributor

@hugolxt hugolxt Nov 29, 2024

Choose a reason for hiding this comment

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

All of this can be included in base.service.ts

src/components/layout/ErrorContent.tsx

return (
<Container>
{Array(10).fill(<Space size="xl" />)}
Copy link
Copy Markdown
Contributor

@hugolxt hugolxt Nov 29, 2024

Choose a reason for hiding this comment

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

is it intentional?

{Array(10).fill()}

Copy link
Copy Markdown
Collaborator Author

@clmntsnr clmntsnr Nov 29, 2024

Choose a reason for hiding this comment

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

yes, not the ideal way but it's a placeholder, added it to the figma

@clmntsnr clmntsnr merged commit 61ecaf9 into AngleProtocol:main Nov 29, 2024
clmntsnr added a commit that referenced this pull request Dec 16, 2024
@clmntsnr
fix: protocl filter (#27)
8cc70a9
clmntsnr added a commit that referenced this pull request Dec 16, 2024
@clmntsnr @indaviande
@Picodes @hugolxt
sync: merkl app changes (#46)
af7653b 
* fix: some type errors

* add: services model draft

* change: more opportunity types

* fix: lint

* add: themes and theme switcher in dev mode (#4)

* add: theme selector when in dev mode

* add: theme switcher in dev mode

* fix: protocol empty tag

* fix: lint error

* Tabs sync (#5)

* tabs, capitalize, socials

* fix lint

* change links to terms & priuvacy

* lint

* move edit address to breadcrumbs

* user edit in component

* footer issue ok

* show bg-main color instead of banner outside of home and opportunities

* add link to protocol header

* implement zkSync colors/fonts as default

* commit hash

* lint

* remove comments

* lint

* feat: re add CI (#6)

* Feat/leaderboard display (#7)

* Update the display of daily rewards

* refactor: update CampaignTableRow to use Dropdown for blacklist and whitelist, and improve layout with Divider

* wip handling rewards

* update: dashboard styling (#8)

* tweak: dashboard

* tweak: dappkit

* fix: no user warning

* remove: input from description

* fix: lint

* add(front): modal, hero, select, tabs/tags, pagination (#9)

* pagination wip

* review Hero cpt
gp

* change pagination

* change modal

* change Hero + connect wallet and search results modals

* lint

* commit hash

* comit hash

* commit

* update: opportunity campaigns/leaderboard view (#11)

* update: campaign information collapsible

* update: campaign information

* add: campaign rules

* update: leaderboard

* fixes

* fix: lint

* tweaks

* fix: aggregate

* feat: add APR modal and table components for opportunity details on h… (#10)

* feat: add APR modal and table components for opportunity details on hover opportunities table

* lint

* Apr tvl modal end

* Feat Hero campaign and protocol (#13)

* Feat Hero campaign and protocol

* fix api call on subpage

* lint and request can't be undefinable on service

* feat(opportunity): new hero, tableRow, OpportunityFilters (#15)

* working on table row + new hero image

* add fitlers

* add todos

* lint

* lint

* ✨ sum daily rewards fora  protocol (#16)

* Fix/campaign page (#17)

* wording

* fix hero link default home

* lint

* wording

* wording

* show icon

* ✨ redirect to Etherscan on TOken tooltip

* 🐛 change Time zone UTC

* update: opportunities pages (#14)

* add: metrics badges

* update: opportunity list

* fix: rewardsRecord sometimes being missing

* add: apply button

* add: loading bar

* rm: log & lint

* add: protocols filter

* fix: search params

* fix:

* fix: lint

* add: missing chains

* fixes

* update: dappkit

* fix: lint

* remove: comment

* add: constant

* apr (#18)

* apr done

* hide forwards if none + change border

* lint

* replace content null

* Fix/campaign page (#20)

* wording

* fix lint error

* fix time when live

* wording

* link to dashboard on leaderboard addresses

* Leaderboard campaign selector display

* lint

* add lastSnapshot

* add lastSnapshot (#21)

* fixes: feedback, mainly opportunities & dashboard (#22)

* fix: search & filters

* update: descriptions

* add: rewards siorting

* add: tvl filter

* fix

* fix: redirect

* fix: whitelist

* add: selective claim

* add: selective token

* add: global claim

* fix

* lint

* typo

* fix: explorer

* caching

* add caching test

* lint

* update

* add: cache on static resoruces (#23)

* Enhance opportunity data retrieval with APR and daily rewards metrics (#24)

* fix: pagination defaulting  & cache (#25)

* fix: bugs in selectors

* fix: dappkit

* clean wip: comment out static sideDatas for dynamic implementation (#26)

* fix: protocl filter (#27)

* fix: protocol desc (#28)

* fix: protocol: description

* rm: log

* token stats + cleaning (#29)

* Small APR Fix (#19)

* lint

* commit hash

* commit hash

* commit hash

* Fixes on protocol, chain, token and campaign pages (#30)

* Fixes on protocol, chain, token and campaign pages

* lint

* fix tooltip

* add: depositor (#31)

* update: dappkit (#33)

* remove: workflwos

---------

Co-authored-by: sheykei <47207681+clement4saunier@users.noreply.github.com>
Co-authored-by: Viande <33333630+indaviande@users.noreply.github.com>
Co-authored-by: Picodes <41673773+Picodes@users.noreply.github.com>
Co-authored-by: hugolxt <87241914+hugolxt@users.noreply.github.com>
Co-authored-by: Hugo Lextrait <hugo.lextrait@gmail.com>
indaviande added a commit that referenced this pull request Dec 16, 2024
@indaviande @clmntsnr
@Picodes @hugolxt
Sync merkl app to merkl lite (#48)
efc72d3 
* fix: some type errors

* add: services model draft

* change: more opportunity types

* fix: lint

* add: themes and theme switcher in dev mode (#4)

* add: theme selector when in dev mode

* add: theme switcher in dev mode

* fix: protocol empty tag

* fix: lint error

* Tabs sync (#5)

* tabs, capitalize, socials

* fix lint

* change links to terms & priuvacy

* lint

* move edit address to breadcrumbs

* user edit in component

* footer issue ok

* show bg-main color instead of banner outside of home and opportunities

* add link to protocol header

* implement zkSync colors/fonts as default

* commit hash

* lint

* remove comments

* lint

* feat: re add CI (#6)

* Feat/leaderboard display (#7)

* Update the display of daily rewards

* refactor: update CampaignTableRow to use Dropdown for blacklist and whitelist, and improve layout with Divider

* wip handling rewards

* update: dashboard styling (#8)

* tweak: dashboard

* tweak: dappkit

* fix: no user warning

* remove: input from description

* fix: lint

* add(front): modal, hero, select, tabs/tags, pagination (#9)

* pagination wip

* review Hero cpt
gp

* change pagination

* change modal

* change Hero + connect wallet and search results modals

* lint

* commit hash

* comit hash

* commit

* update: opportunity campaigns/leaderboard view (#11)

* update: campaign information collapsible

* update: campaign information

* add: campaign rules

* update: leaderboard

* fixes

* fix: lint

* tweaks

* fix: aggregate

* feat: add APR modal and table components for opportunity details on h… (#10)

* feat: add APR modal and table components for opportunity details on hover opportunities table

* lint

* Apr tvl modal end

* Feat Hero campaign and protocol (#13)

* Feat Hero campaign and protocol

* fix api call on subpage

* lint and request can't be undefinable on service

* feat(opportunity): new hero, tableRow, OpportunityFilters (#15)

* working on table row + new hero image

* add fitlers

* add todos

* lint

* lint

* ✨ sum daily rewards fora  protocol (#16)

* Fix/campaign page (#17)

* wording

* fix hero link default home

* lint

* wording

* wording

* show icon

* ✨ redirect to Etherscan on TOken tooltip

* 🐛 change Time zone UTC

* update: opportunities pages (#14)

* add: metrics badges

* update: opportunity list

* fix: rewardsRecord sometimes being missing

* add: apply button

* add: loading bar

* rm: log & lint

* add: protocols filter

* fix: search params

* fix:

* fix: lint

* add: missing chains

* fixes

* update: dappkit

* fix: lint

* remove: comment

* add: constant

* apr (#18)

* apr done

* hide forwards if none + change border

* lint

* replace content null

* Fix/campaign page (#20)

* wording

* fix lint error

* fix time when live

* wording

* link to dashboard on leaderboard addresses

* Leaderboard campaign selector display

* lint

* add lastSnapshot

* add lastSnapshot (#21)

* fixes: feedback, mainly opportunities & dashboard (#22)

* fix: search & filters

* update: descriptions

* add: rewards siorting

* add: tvl filter

* fix

* fix: redirect

* fix: whitelist

* add: selective claim

* add: selective token

* add: global claim

* fix

* lint

* typo

* fix: explorer

* caching

* add caching test

* lint

* update

* add: cache on static resoruces (#23)

* Enhance opportunity data retrieval with APR and daily rewards metrics (#24)

* fix: pagination defaulting  & cache (#25)

* fix: bugs in selectors

* fix: dappkit

* clean wip: comment out static sideDatas for dynamic implementation (#26)

* fix: protocl filter (#27)

* fix: protocol desc (#28)

* fix: protocol: description

* rm: log

* token stats + cleaning (#29)

* Small APR Fix (#19)

* lint

* commit hash

* commit hash

* commit hash

* Fixes on protocol, chain, token and campaign pages (#30)

* Fixes on protocol, chain, token and campaign pages

* lint

* fix tooltip

* add: depositor (#31)

* update: dappkit (#33)

* feat(front): apr modal, layermenu, issues !!! (#32)

* redesign APR

* responsive

* layermenu

* lint

* change title

* remove comment

* lint

* rename homepage to home (#34)

* feat(front): change header logo & selects (#35)

* change logo size

* commiut hash

* fix: update Dropdown component to use onHover for APR and TVL columns (#36)

* remove workflows

---------

Co-authored-by: sheykei <clement4saunier@gmail.com>
Co-authored-by: sheykei <47207681+clement4saunier@users.noreply.github.com>
Co-authored-by: Picodes <41673773+Picodes@users.noreply.github.com>
Co-authored-by: hugolxt <87241914+hugolxt@users.noreply.github.com>
Co-authored-by: Hugo Lextrait <hugo.lextrait@gmail.com>
Co-authored-by: sheykei <47207681+clmntsnr@users.noreply.github.com>
clmntsnr added a commit to AngleProtocol/merkl-puffer that referenced this pull request Dec 16, 2024
@clmntsnr @Picodes
@indaviande @hugolxt
update: merkl app (#5)
c1750aa 
* create: merkl-lite

* chore: update CI

* sync: merkl app changes (AngleProtocol#46)

* fix: some type errors

* add: services model draft

* change: more opportunity types

* fix: lint

* add: themes and theme switcher in dev mode (#4)

* add: theme selector when in dev mode

* add: theme switcher in dev mode

* fix: protocol empty tag

* fix: lint error

* Tabs sync (#5)

* tabs, capitalize, socials

* fix lint

* change links to terms & priuvacy

* lint

* move edit address to breadcrumbs

* user edit in component

* footer issue ok

* show bg-main color instead of banner outside of home and opportunities

* add link to protocol header

* implement zkSync colors/fonts as default

* commit hash

* lint

* remove comments

* lint

* feat: re add CI (#6)

* Feat/leaderboard display (#7)

* Update the display of daily rewards

* refactor: update CampaignTableRow to use Dropdown for blacklist and whitelist, and improve layout with Divider

* wip handling rewards

* update: dashboard styling (#8)

* tweak: dashboard

* tweak: dappkit

* fix: no user warning

* remove: input from description

* fix: lint

* add(front): modal, hero, select, tabs/tags, pagination (#9)

* pagination wip

* review Hero cpt
gp

* change pagination

* change modal

* change Hero + connect wallet and search results modals

* lint

* commit hash

* comit hash

* commit

* update: opportunity campaigns/leaderboard view (#11)

* update: campaign information collapsible

* update: campaign information

* add: campaign rules

* update: leaderboard

* fixes

* fix: lint

* tweaks

* fix: aggregate

* feat: add APR modal and table components for opportunity details on h… (#10)

* feat: add APR modal and table components for opportunity details on hover opportunities table

* lint

* Apr tvl modal end

* Feat Hero campaign and protocol (AngleProtocol#13)

* Feat Hero campaign and protocol

* fix api call on subpage

* lint and request can't be undefinable on service

* feat(opportunity): new hero, tableRow, OpportunityFilters (AngleProtocol#15)

* working on table row + new hero image

* add fitlers

* add todos

* lint

* lint

* ✨ sum daily rewards fora  protocol (AngleProtocol#16)

* Fix/campaign page (AngleProtocol#17)

* wording

* fix hero link default home

* lint

* wording

* wording

* show icon

* ✨ redirect to Etherscan on TOken tooltip

* 🐛 change Time zone UTC

* update: opportunities pages (AngleProtocol#14)

* add: metrics badges

* update: opportunity list

* fix: rewardsRecord sometimes being missing

* add: apply button

* add: loading bar

* rm: log & lint

* add: protocols filter

* fix: search params

* fix:

* fix: lint

* add: missing chains

* fixes

* update: dappkit

* fix: lint

* remove: comment

* add: constant

* apr (AngleProtocol#18)

* apr done

* hide forwards if none + change border

* lint

* replace content null

* Fix/campaign page (AngleProtocol#20)

* wording

* fix lint error

* fix time when live

* wording

* link to dashboard on leaderboard addresses

* Leaderboard campaign selector display

* lint

* add lastSnapshot

* add lastSnapshot (AngleProtocol#21)

* fixes: feedback, mainly opportunities & dashboard (AngleProtocol#22)

* fix: search & filters

* update: descriptions

* add: rewards siorting

* add: tvl filter

* fix

* fix: redirect

* fix: whitelist

* add: selective claim

* add: selective token

* add: global claim

* fix

* lint

* typo

* fix: explorer

* caching

* add caching test

* lint

* update

* add: cache on static resoruces (AngleProtocol#23)

* Enhance opportunity data retrieval with APR and daily rewards metrics (AngleProtocol#24)

* fix: pagination defaulting  & cache (AngleProtocol#25)

* fix: bugs in selectors

* fix: dappkit

* clean wip: comment out static sideDatas for dynamic implementation (AngleProtocol#26)

* fix: protocl filter (AngleProtocol#27)

* fix: protocol desc (AngleProtocol#28)

* fix: protocol: description

* rm: log

* token stats + cleaning (AngleProtocol#29)

* Small APR Fix (AngleProtocol#19)

* lint

* commit hash

* commit hash

* commit hash

* Fixes on protocol, chain, token and campaign pages (AngleProtocol#30)

* Fixes on protocol, chain, token and campaign pages

* lint

* fix tooltip

* add: depositor (AngleProtocol#31)

* update: dappkit (AngleProtocol#33)

* remove: workflwos

---------

Co-authored-by: sheykei <47207681+clement4saunier@users.noreply.github.com>
Co-authored-by: Viande <33333630+indaviande@users.noreply.github.com>
Co-authored-by: Picodes <41673773+Picodes@users.noreply.github.com>
Co-authored-by: hugolxt <87241914+hugolxt@users.noreply.github.com>
Co-authored-by: Hugo Lextrait <hugo.lextrait@gmail.com>

* remove: extra files

* fix

* fix

---------

Co-authored-by: picodes <picodes@angle.money>
Co-authored-by: sheykei <47207681+clement4saunier@users.noreply.github.com>
Co-authored-by: Viande <33333630+indaviande@users.noreply.github.com>
Co-authored-by: Picodes <41673773+Picodes@users.noreply.github.com>
Co-authored-by: hugolxt <87241914+hugolxt@users.noreply.github.com>
Co-authored-by: Hugo Lextrait <hugo.lextrait@gmail.com>
clmntsnr added a commit that referenced this pull request Dec 19, 2024
@Picodes @clmntsnr
@indaviande @hugolxt
chore: new changes (#52)
9920a89 
* fix: some type errors

* add: services model draft

* change: more opportunity types

* fix: lint

* add: themes and theme switcher in dev mode (#4)

* add: theme selector when in dev mode

* add: theme switcher in dev mode

* fix: protocol empty tag

* fix: lint error

* Tabs sync (#5)

* tabs, capitalize, socials

* fix lint

* change links to terms & priuvacy

* lint

* move edit address to breadcrumbs

* user edit in component

* footer issue ok

* show bg-main color instead of banner outside of home and opportunities

* add link to protocol header

* implement zkSync colors/fonts as default

* commit hash

* lint

* remove comments

* lint

* feat: re add CI (#6)

* Feat/leaderboard display (#7)

* Update the display of daily rewards

* refactor: update CampaignTableRow to use Dropdown for blacklist and whitelist, and improve layout with Divider

* wip handling rewards

* update: dashboard styling (#8)

* tweak: dashboard

* tweak: dappkit

* fix: no user warning

* remove: input from description

* fix: lint

* add(front): modal, hero, select, tabs/tags, pagination (#9)

* pagination wip

* review Hero cpt
gp

* change pagination

* change modal

* change Hero + connect wallet and search results modals

* lint

* commit hash

* comit hash

* commit

* update: opportunity campaigns/leaderboard view (#11)

* update: campaign information collapsible

* update: campaign information

* add: campaign rules

* update: leaderboard

* fixes

* fix: lint

* tweaks

* fix: aggregate

* feat: add APR modal and table components for opportunity details on h… (#10)

* feat: add APR modal and table components for opportunity details on hover opportunities table

* lint

* Apr tvl modal end

* Feat Hero campaign and protocol (#13)

* Feat Hero campaign and protocol

* fix api call on subpage

* lint and request can't be undefinable on service

* feat(opportunity): new hero, tableRow, OpportunityFilters (#15)

* working on table row + new hero image

* add fitlers

* add todos

* lint

* lint

* ✨ sum daily rewards fora  protocol (#16)

* Fix/campaign page (#17)

* wording

* fix hero link default home

* lint

* wording

* wording

* show icon

* ✨ redirect to Etherscan on TOken tooltip

* 🐛 change Time zone UTC

* update: opportunities pages (#14)

* add: metrics badges

* update: opportunity list

* fix: rewardsRecord sometimes being missing

* add: apply button

* add: loading bar

* rm: log & lint

* add: protocols filter

* fix: search params

* fix:

* fix: lint

* add: missing chains

* fixes

* update: dappkit

* fix: lint

* remove: comment

* add: constant

* apr (#18)

* apr done

* hide forwards if none + change border

* lint

* replace content null

* Fix/campaign page (#20)

* wording

* fix lint error

* fix time when live

* wording

* link to dashboard on leaderboard addresses

* Leaderboard campaign selector display

* lint

* add lastSnapshot

* add lastSnapshot (#21)

* fixes: feedback, mainly opportunities & dashboard (#22)

* fix: search & filters

* update: descriptions

* add: rewards siorting

* add: tvl filter

* fix

* fix: redirect

* fix: whitelist

* add: selective claim

* add: selective token

* add: global claim

* fix

* lint

* typo

* fix: explorer

* caching

* add caching test

* lint

* update

* add: cache on static resoruces (#23)

* Enhance opportunity data retrieval with APR and daily rewards metrics (#24)

* fix: pagination defaulting  & cache (#25)

* fix: bugs in selectors

* fix: dappkit

* clean wip: comment out static sideDatas for dynamic implementation (#26)

* fix: protocl filter (#27)

* fix: protocol desc (#28)

* fix: protocol: description

* rm: log

* token stats + cleaning (#29)

* Small APR Fix (#19)

* lint

* commit hash

* commit hash

* commit hash

* Fixes on protocol, chain, token and campaign pages (#30)

* Fixes on protocol, chain, token and campaign pages

* lint

* fix tooltip

* add: depositor (#31)

* update: dappkit (#33)

* feat(front): apr modal, layermenu, issues !!! (#32)

* redesign APR

* responsive

* layermenu

* lint

* change title

* remove comment

* lint

* rename homepage to home (#34)

* feat(front): change header logo & selects (#35)

* change logo size

* commiut hash

* fix: update Dropdown component to use onHover for APR and TVL columns (#36)

* add: fonts config (#37)

* add: fonts config

* lint

---------

Co-authored-by: indaviande <vianney@double.cat>

* feat: icons & uuid (#41)

* icon on protocols

* replace import { v4 as uuidv4 } from uuid;
uuidv4();

* lint

* chore: add test filter (#38)

* chore: add test filter

* chore: remove isTest

* fix: lint

* add: deposit modal (#42)

* update: token

* add: hooks

* add: supply modal

* wip display zk rewards (#39)

* wip display zk rewards

* wip

* refactor: clean up reward components and end single line rewards display

* lint

* feat(api): enhance ProtocolService to include tags from config in API queries (#43)

* update: dappkit

* fix(campaign): update chain reference in CampaignTableRow component (#44)

* fix(campaign): update chain reference in CampaignTableRow component

* refactor(leaderboard): remove campaign ID display from leaderboard component

* lint

* feat(rewards): add rewards navigation mode configuration and update C… (#45)

* feat(rewards): add rewards navigation mode configuration and update ClaimRewardsLibrary component accordingly

* lint

* chore: historical claim tab

* chore: historical claims

* chore: lint

* fix: add auto linting

* chore: remove useless type

* fix: lint

* feat: position route (#47)

* feat: position route

* fix: issue

* chore: position page

* lint

* rmv workflows

---------

Co-authored-by: sheykei <clement4saunier@gmail.com>
Co-authored-by: sheykei <47207681+clement4saunier@users.noreply.github.com>
Co-authored-by: Viande <33333630+indaviande@users.noreply.github.com>
Co-authored-by: hugolxt <87241914+hugolxt@users.noreply.github.com>
Co-authored-by: Hugo Lextrait <hugo.lextrait@gmail.com>
Co-authored-by: sheykei <47207681+clmntsnr@users.noreply.github.com>
Co-authored-by: indaviande <vianney@double.cat>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@hugolxt hugolxt hugolxt left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@clmntsnr @hugolxt