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

Sync Prod and Dev Branches #235

Merged
merged 42 commits into from
Nov 28, 2023
Merged

Sync Prod and Dev Branches #235

merged 42 commits into from
Nov 28, 2023

Conversation

0xIchigo
Copy link
Contributor

This PR aims to build upon #233 and #234 to sync the remaining commits in production back to the dev branch. With this PR, all of our branches will be updated, allowing us to follow an established workflow

qudo-code and others added 30 commits June 7, 2023 08:25
* citrus config types

* foreclose loan

* stake & unstake token config

* search resolves cnfts

* chore: add recommendations for vscode

* chore: add .env template file

* Update config.ts

* feat: update to helius icarus endpoint

* fix: formatting and new url

psa: cloudflare enterprise for startups sucks, do not recommend.

* readme typo

* feeBasisPoints on asset route - string util - icons - aditional info on collapsible - share per creator

* typo

* oopsie

* fix (#194)

* fix (#193)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft details (#191)

* asset route update

* ownership stuff

* compression info

* finishing touches

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft burn (#190)

* parser

* config

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Cover readme update (#188)

* jpg and readme update

* jpg fix

* account current merkle tree detail (#184)

* route addition

* turned button into anchor tags

* fixed active tab border logic on transactions tab

* concurrent merkle tree tab shows conditionally

* concurrent merkle tree route

* display cmt info

* descriptions and links

* icons

* removed console log

* fixes

* loader

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* removed helius section on home page (#173)

* log messages improved formatting (#171)

* log messages component

* log messages format improvement

* program names

* styling changes

* finishing touches

* removed unnecessary package

* fixed invoke and logged colors

---------

Co-authored-by: qudo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* switch back to rpc.helius.xyz (#185)

* route addition

* switch beta rpc link back to rpc.helius.xyz

* delete unwanted files

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft transfer fix (#178)

* fix

* futureproof

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* proton documentation redo  (#165)

* deleted outdated stuff

* update

---------

Co-authored-by: qudo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* base hooks for linting and formatting pre commit and testing pre push (#187)

* more transaction type configs (#160)

* add item and update item types

* token market configs

* extra tx configs

---------

Co-authored-by: qudo <[email protected]>

* username provider (#141)

* account page title replacement

* backpack and bonfida username trpc route

* account usernames route to router

* temp

* backpack username display

* updated bonfida package

* get bonfida domain

* usernames alignment fix

* ans domain username

* tldparser fix

* added fix to prev commit

* ans test

* added catch to ans method

* alternating username color styles

* simplified username functions & get multiple .sol

* skeleton loader & temp layout changes

* temp domain

* bonfida domain

* deleted a bunch of useless code in ans func

* responsiveness for numerous domains

* remove ans code

* ui adjustments

* fix dev

* get token2022 tokens from account

* token2022 metadata

* search resolve for token2022

* solarmoon token add

---------

Co-authored-by: ssamkkim <[email protected]>
Co-authored-by: Jimii <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Miles Smith <[email protected]>
Co-authored-by: Miles Smith <[email protected]>
Co-authored-by: joaomendoncaa <[email protected]>
* citrus config types

* foreclose loan

* stake & unstake token config

* search resolves cnfts

* chore: add recommendations for vscode

* chore: add .env template file

* Update config.ts

* feat: update to helius icarus endpoint

* fix: formatting and new url

psa: cloudflare enterprise for startups sucks, do not recommend.

* readme typo

* feeBasisPoints on asset route - string util - icons - aditional info on collapsible - share per creator

* typo

* oopsie

* fix (#194)

* fix (#193)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft details (#191)

* asset route update

* ownership stuff

* compression info

* finishing touches

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft burn (#190)

* parser

* config

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Cover readme update (#188)

* jpg and readme update

* jpg fix

* account current merkle tree detail (#184)

* route addition

* turned button into anchor tags

* fixed active tab border logic on transactions tab

* concurrent merkle tree tab shows conditionally

* concurrent merkle tree route

* display cmt info

* descriptions and links

* icons

* removed console log

* fixes

* loader

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* removed helius section on home page (#173)

* log messages improved formatting (#171)

* log messages component

* log messages format improvement

* program names

* styling changes

* finishing touches

* removed unnecessary package

* fixed invoke and logged colors

---------

Co-authored-by: qudo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* switch back to rpc.helius.xyz (#185)

* route addition

* switch beta rpc link back to rpc.helius.xyz

* delete unwanted files

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft transfer fix (#178)

* fix

* futureproof

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* proton documentation redo  (#165)

* deleted outdated stuff

* update

---------

Co-authored-by: qudo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* base hooks for linting and formatting pre commit and testing pre push (#187)

* more transaction type configs (#160)

* add item and update item types

* token market configs

* extra tx configs

---------

Co-authored-by: qudo <[email protected]>

* username provider (#141)

* account page title replacement

* backpack and bonfida username trpc route

* account usernames route to router

* temp

* backpack username display

* updated bonfida package

* get bonfida domain

* usernames alignment fix

* ans domain username

* tldparser fix

* added fix to prev commit

* ans test

* added catch to ans method

* alternating username color styles

* simplified username functions & get multiple .sol

* skeleton loader & temp layout changes

* temp domain

* bonfida domain

* deleted a bunch of useless code in ans func

* responsiveness for numerous domains

* remove ans code

* ui adjustments

* fix dev

* get token2022 tokens from account

* token2022 metadata

* search resolve for token2022

* solarmoon token add

* remove turbo

* build command

* fix paths

---------

Co-authored-by: ssamkkim <[email protected]>
Co-authored-by: Jimii <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Miles Smith <[email protected]>
Co-authored-by: Miles Smith <[email protected]>
Co-authored-by: joaomendoncaa <[email protected]>
* citrus config types

* foreclose loan

* stake & unstake token config

* search resolves cnfts

* chore: add recommendations for vscode

* chore: add .env template file

* Update config.ts

* feat: update to helius icarus endpoint

* fix: formatting and new url

psa: cloudflare enterprise for startups sucks, do not recommend.

* readme typo

* feeBasisPoints on asset route - string util - icons - aditional info on collapsible - share per creator

* typo

* oopsie

* fix (#194)

* fix (#193)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft details (#191)

* asset route update

* ownership stuff

* compression info

* finishing touches

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft burn (#190)

* parser

* config

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Cover readme update (#188)

* jpg and readme update

* jpg fix

* account current merkle tree detail (#184)

* route addition

* turned button into anchor tags

* fixed active tab border logic on transactions tab

* concurrent merkle tree tab shows conditionally

* concurrent merkle tree route

* display cmt info

* descriptions and links

* icons

* removed console log

* fixes

* loader

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* removed helius section on home page (#173)

* log messages improved formatting (#171)

* log messages component

* log messages format improvement

* program names

* styling changes

* finishing touches

* removed unnecessary package

* fixed invoke and logged colors

---------

Co-authored-by: qudo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* switch back to rpc.helius.xyz (#185)

* route addition

* switch beta rpc link back to rpc.helius.xyz

* delete unwanted files

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* compressed nft transfer fix (#178)

* fix

* futureproof

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* proton documentation redo  (#165)

* deleted outdated stuff

* update

---------

Co-authored-by: qudo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* base hooks for linting and formatting pre commit and testing pre push (#187)

* more transaction type configs (#160)

* add item and update item types

* token market configs

* extra tx configs

---------

Co-authored-by: qudo <[email protected]>

* username provider (#141)

* account page title replacement

* backpack and bonfida username trpc route

* account usernames route to router

* temp

* backpack username display

* updated bonfida package

* get bonfida domain

* usernames alignment fix

* ans domain username

* tldparser fix

* added fix to prev commit

* ans test

* added catch to ans method

* alternating username color styles

* simplified username functions & get multiple .sol

* skeleton loader & temp layout changes

* temp domain

* bonfida domain

* deleted a bunch of useless code in ans func

* responsiveness for numerous domains

* remove ans code

* ui adjustments

* fix dev

* get token2022 tokens from account

* token2022 metadata

* search resolve for token2022

* solarmoon token add

* remove turbo

* build command

* fix paths

* update rpc url (#205)

* updated env key (#206)

---------

Co-authored-by: ssamkkim <[email protected]>
Co-authored-by: Jimii <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Miles Smith <[email protected]>
Co-authored-by: Miles Smith <[email protected]>
Co-authored-by: joaomendoncaa <[email protected]>
* better media view

* asset gallery

* asset gallery

* fix compressed tree index
* cnft history and format

* format

* format

* refresh if compressed
lowering opacity of docs button
Copy link

vercel bot commented Nov 22, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
xray-web ✅ Ready (Inspect) Visit Preview Nov 22, 2023 11:10pm

@0xIchigo 0xIchigo requested a review from owenventer November 22, 2023 23:11
@0xIchigo 0xIchigo self-assigned this Nov 22, 2023
Copy link
Contributor

@owenventer owenventer left a comment

Choose a reason for hiding this comment

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

Looks good.

@0xIchigo 0xIchigo added this pull request to the merge queue Nov 28, 2023
Merged via the queue into dev with commit b8fefdb Nov 28, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants