Skip to content

Commit

Permalink
1.4.0 STG : Merge pull request #122 from Itheum/milestone-1.4.0
Browse files Browse the repository at this point in the history
Milestone 1.4.0 > STG
  • Loading branch information
newbreedofgeek authored Sep 7, 2023
2 parents 0915c61 + 571aaa6 commit ef98d7d
Show file tree
Hide file tree
Showing 50 changed files with 3,053 additions and 1,041 deletions.
1,495 changes: 1,144 additions & 351 deletions package-lock.json

Large diffs are not rendered by default.

15 changes: 12 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.2",
"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 @@ -35,6 +42,8 @@
"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
37 changes: 20 additions & 17 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { apiTimeout, walletConnectV2ProjectId, sampleAuthenticatedDomains, ELRON
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.multiversxinfographics}/:targetNonce/:targetMessageToBeSigned`} element={<MultiversxInfographics />} />
<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.
Loading

0 comments on commit ef98d7d

Please sign in to comment.