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

Milestone 1.4.0 > STG #122

Merged
merged 54 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f344d03
fonts done in explorer
Enciusan Aug 8, 2023
17b2ada
some style translated to tailwind
Enciusan Aug 11, 2023
b2d39aa
added shadcn component library
Enciusan Aug 11, 2023
97e4fab
#57
damienen Aug 14, 2023
96cc63a
#66
damienen Aug 14, 2023
74dcf1c
#101
damienen Aug 14, 2023
52d2f58
tailwind integration + trailblazer page responsive
Enciusan Aug 14, 2023
366ad76
App marketplace almost done
Enciusan Aug 14, 2023
ad5fa10
Final 1.3.X to Main : Merge pull request #116 from Itheum/stg
newbreedofgeek Aug 15, 2023
ff6226d
issue #53 rename Browser Wallet to Defi Wallet
911-Benedek-RobertGeorge Aug 15, 2023
87ecd65
Update Unlock.tsx
911-Benedek-RobertGeorge Aug 15, 2023
6dc0255
release candidate 1.3.2 : full PDF support, MultiversX Infographics a…
newbreedofgeek Aug 16, 2023
5c64b2b
some fixes + my listed data
Enciusan Aug 16, 2023
f20eb02
solved web wallet pdf signing
damienen Aug 16, 2023
3f81f13
Merge pull request #117 from Itheum/main-to-1.4.0
newbreedofgeek Aug 16, 2023
94f51ef
Merge pull request #123 from Itheum/feature-101-pdf
newbreedofgeek Aug 16, 2023
69fe2ae
merge 1.4.0
damienen Aug 16, 2023
c5bcda8
Merge pull request #108 from Itheum/d-damian
icegriffinguru Aug 16, 2023
3f937b5
Merge branch 'milestone-1.4.0' into d-enciu-1.4.0
Enciusan Aug 16, 2023
04a9b47
my data nft + merged 1.4.0 into my branch
Enciusan Aug 16, 2023
150dd91
Created a reusable component for every page and done mvx infographic
Enciusan Aug 16, 2023
6707f7a
Merge pull request #107 from Itheum/d-enciu-1.4.0
damienen Aug 16, 2023
25c8474
added new devnet test nonce for infographics app
newbreedofgeek Aug 17, 2023
e913a76
issue #38
911-Benedek-RobertGeorge Aug 17, 2023
ad17fce
add support for text files
911-Benedek-RobertGeorge Aug 17, 2023
656eaa4
Merge pull request #124 from Itheum/d-robert
newbreedofgeek Aug 17, 2023
e416b07
no image icons for new app, removed ununsed blur-chart image, rename …
newbreedofgeek Aug 18, 2023
3833a74
Navbar WIP
Enciusan Aug 21, 2023
e3f3383
Merge remote-tracking branch 'origin/feature-101-pdf' into feature-10…
Enciusan Aug 21, 2023
42a21aa
fixed conflicts
Enciusan Aug 21, 2023
c1ff573
deleted blur chart
Enciusan Aug 21, 2023
30407a1
Merge pull request #127 from Itheum/feature-101-pdf
Enciusan Aug 21, 2023
89e4989
navbar done
Enciusan Aug 21, 2023
4b784d9
done
Enciusan Aug 24, 2023
41a3f87
Merge branch 'milestone-1.4.0' into d-enciu-1.4.0
Enciusan Aug 24, 2023
1f9178e
some fixes
Enciusan Aug 24, 2023
a79d583
Merge remote-tracking branch 'origin/d-enciu-1.4.0' into d-enciu-1.4.0
Enciusan Aug 24, 2023
8a8c249
dark mode button on mobile
Enciusan Aug 28, 2023
dd04dab
my wallet goes to my wallet fix
Enciusan Aug 29, 2023
941e3b7
login logout button on mobile
Enciusan Aug 29, 2023
17919da
my listed fix
Enciusan Aug 29, 2023
eca220b
Merge pull request #132 from Itheum/d-enciu-1.4.0
newbreedofgeek Aug 30, 2023
39a9327
Merge branch 'milestone-1.4.0' into d-robert-not-supported-file
newbreedofgeek Aug 30, 2023
beb3609
resolve json file rendering on my walle
newbreedofgeek Aug 30, 2023
b5729c7
Merge pull request #125 from Itheum/d-robert-not-supported-file
newbreedofgeek Aug 30, 2023
8683720
v1.4.0-beta.X version bump
newbreedofgeek Aug 30, 2023
9d1f08e
fix #135 / #133
Enciusan Aug 31, 2023
01ca325
deleted unused code
Enciusan Aug 31, 2023
67c10b9
changed the design of theme button added support for system theme
Enciusan Sep 1, 2023
b754d2f
Itheum SDK upgrade, new devnet nonces for pdf and svg tests
newbreedofgeek Sep 1, 2023
e4a790e
Merge pull request #138 from Itheum/d-mark-1.4
newbreedofgeek Sep 1, 2023
f61067d
table text + see more visible
Enciusan Sep 1, 2023
1d25d31
Merge pull request #136 from Itheum/d-enciu-1.4.0
damienen Sep 1, 2023
571aaa6
v1.4.0 version locked
newbreedofgeek Sep 7, 2023
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
1,979 changes: 1,598 additions & 381 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 13 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
{
"name": "explorer-dapp",
"description": "Itheum Explorer the public explore the Itheum protocol components",
"version": "1.3.1",
"description": "Itheum Explorer is a DApp for the public to explore and visualize data within the Itheum protocol",
"version": "1.4.0",
"author": "Itheum",
"license": "GPL-3.0-or-later",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.1.0",
"@fortawesome/free-solid-svg-icons": "6.1.0",
"@fortawesome/react-fontawesome": "0.1.18",
"@headlessui/react": "1.7.15",
"@itheum/sdk-mx-data-nft": "0.0.7",
"@itheum/sdk-mx-data-nft": "^0.1.1",
"@multiversx/sdk-core": "12.6.0",
"@multiversx/sdk-dapp": "2.19.2",
"@multiversx/sdk-network-providers": "1.5.0",
"@radix-ui/react-dropdown-menu": "^2.0.5",
"@radix-ui/react-navigation-menu": "^1.1.3",
"@radix-ui/react-slot": "^1.0.2",
"@radix-ui/react-switch": "^1.0.3",
"@types/react-modal": "3.16.0",
"axios": "0.24.0",
"bootstrap": "4.6.2",
"chartjs-plugin-zoom": "2.0.1",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"d3": "7.8.5",
"dompurify": "^3.0.5",
"lucide-react": "^0.265.0",
"moment": "2.29.4",
"moment-timezone": "0.5.43",
"react": "18.2.0",
Expand All @@ -30,10 +37,13 @@
"react-icons": "4.8.0",
"react-inlinesvg": "^3.0.2",
"react-modal": "3.16.1",
"react-pdf": "^7.3.3",
"react-router-dom": "6.14.2",
"react-tooltip": "5.11.1",
"react-vertical-timeline-component": "3.6.0",
"styled-components": "5.3.11",
"tailwind-merge": "^1.14.0",
"tailwindcss-animate": "^1.0.6",
"web-vitals": "1.0.1"
},
"scripts": {
Expand Down
39 changes: 21 additions & 18 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import {
} from "components";
import { TransactionsToastList, NotificationModal, SignTransactionsModals } from "components";
import { apiTimeout, walletConnectV2ProjectId, sampleAuthenticatedDomains, ELROND_NETWORK } from "config";
import { MultiversxBubbles, MyWallet, PageNotFound, Unlock } from "pages";
import { MultiversxBubbles, MultiversxInfographics, MyWallet, PageNotFound, Unlock } from "pages";
import { ItheumTrailblazer } from "pages/ItheumTrailblazer";
import { routes, routeNames } from "routes";
import { ThemeProvider } from "./libComponents/ThemeProvider";

export const App = () => {
return (
Expand All @@ -26,24 +27,26 @@ export const App = () => {
dappConfig={{
shouldUseWebViewProvider: true,
}}>
<Layout>
<AxiosInterceptorContext.Listener />
<TransactionsToastList />
<NotificationModal />
<SignTransactionsModals className="custom-class-for-modals" />
<Routes>
<Route path={routeNames.unlock} element={<Unlock />} />
{routes.map((route, index) => (
<Route path={route.path} key={"route-key-" + index} element={<route.component />} />
))}
<ThemeProvider defaultTheme="dark" storageKey="explorer-ui-theme">
<Layout>
<AxiosInterceptorContext.Listener />
<TransactionsToastList />
<NotificationModal />
<SignTransactionsModals className="custom-class-for-modals" />
<Routes>
<Route path={routeNames.unlock} element={<Unlock />} />
{routes.map((route, index) => (
<Route path={route.path} key={"route-key-" + index} element={<route.component />} />
))}

<Route path={`${routeNames.itheumtrailblazer}/:targetNonce/:targetMessageToBeSigned`} element={<ItheumTrailblazer />} />
<Route path={`${routeNames.multiversxbubbles}/:targetNonce/:targetMessageToBeSigned`} element={<MultiversxBubbles />} />

<Route path={`${routeNames.mywallet}/:targetNonce/:targetMessageToBeSigned`} element={<MyWallet />} />
<Route path="*" element={<PageNotFound />} />
</Routes>
</Layout>
<Route path={`${routeNames.itheumtrailblazer}/:targetNonce/:targetMessageToBeSigned`} element={<ItheumTrailblazer />} />
<Route path={`${routeNames.multiversxbubbles}/:targetNonce/:targetMessageToBeSigned`} element={<MultiversxBubbles />} />
<Route path={`${routeNames.multiversxinfographics}/:targetNonce/:targetMessageToBeSigned`} element={<MultiversxInfographics />} />
<Route path={`${routeNames.mywallet}/:targetNonce/:targetMessageToBeSigned`} element={<MyWallet />} />
<Route path="*" element={<PageNotFound />} />
</Routes>
</Layout>
</ThemeProvider>
</DappProvider>
</Router>
</AxiosInterceptorContext.Interceptor>
Expand Down
70 changes: 70 additions & 0 deletions src/assets/clashDisplay.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/**
* @license
*
* Font Family: Clash Display
* Designed by: Indian Type Foundry
* URL: https://www.fontshare.com/fonts/clash-display
* © 2023 Indian Type Foundry
*
* Font Styles:
* Clash Display Variable(Variable font)
* Clash Display Extralight
* Clash Display Light
* Clash Display Regular
* Clash Display Medium
* Clash Display Semibold
* Clash Display Bold
*
*/


/**
* This is a variable font
* You can controll variable axes as shown below:
* font-variation-settings: 'wght' 700.0;
*
* available axes:

* 'wght' (range from 200.0 to 700.0)

*/

@font-face {
font-family: 'Clash-Variable';
src: url(./fonts/ClashDisplay-Variable.woff2) format('woff2');
font-weight: 200 700;
font-style: normal;
}


@font-face {
font-family: 'Clash-Light';
src: url(./fonts/ClashDisplay-Light.woff2) format('woff2');
font-weight: 300;
font-style: normal;
}


@font-face {
font-family: 'Clash-Regular';
src: url(./fonts/ClashDisplay-Regular.woff2) format('woff2');
font-weight: 400;
font-style: normal;
}


@font-face {
font-family: 'Clash-Medium';
src: url(./fonts/ClashDisplay-Medium.woff2) format('woff2');
font-weight: 500;
font-style: normal;
}


@font-face {
font-family: 'Clash-Bold';
src: url(./fonts/ClashDisplay-Bold.woff2) format('woff2');
font-weight: 600;
font-style: normal;
}

Binary file added src/assets/fonts/ClashDisplay-Bold.woff2
Binary file not shown.
Binary file added src/assets/fonts/ClashDisplay-Light.woff2
Binary file not shown.
Binary file added src/assets/fonts/ClashDisplay-Medium.woff2
Binary file not shown.
Binary file added src/assets/fonts/ClashDisplay-Regular.woff2
Binary file not shown.
Binary file added src/assets/fonts/ClashDisplay-Variable.woff2
Binary file not shown.
Binary file added src/assets/fonts/Satoshi-Black.woff2
Binary file not shown.
Binary file added src/assets/fonts/Satoshi-Bold.woff2
Binary file not shown.
Binary file added src/assets/fonts/Satoshi-Light.woff2
Binary file not shown.
Binary file added src/assets/fonts/Satoshi-Medium.woff2
Binary file not shown.
Binary file added src/assets/fonts/Satoshi-Regular.woff2
Binary file not shown.
Binary file added src/assets/fonts/Satoshi-Variable.woff2
Binary file not shown.
Binary file removed src/assets/img/blur-chart.png
Binary file not shown.
Binary file removed src/assets/img/blur-chart_.png
Binary file not shown.
Binary file added src/assets/img/custom-app-header-infographs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/img/expl-app-bubblemaps-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/expl-app-infographics-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/img/expl-app-trailblazer-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/img/guide-unblock-popups.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading