Skip to content

Commit

Permalink
chore: merge develop into main #93
Browse files Browse the repository at this point in the history
  • Loading branch information
@ItsANameToo
ItsANameToo authored Jul 7, 2022
2 parents eae9e6c + 6d218e8 commit 2f0b526
Show file tree
Hide file tree
Showing 159 changed files with 10,635 additions and 839 deletions.
48 changes: 36 additions & 12 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<meta name="apple-mobile-web-app-capable" content="yes" />

<meta name="theme-color" content="#ffffff" media="(prefers-color-scheme: light)" />
<meta name="theme-color" content="#235b95" media="(prefers-color-scheme: dark)" />
<meta name="theme-color" content="#212225" media="(prefers-color-scheme: dark)" />

<!-- Meta -->
<title>ARKVault - Control Your Assets </title>
Expand All @@ -29,17 +29,41 @@
<meta property="twitter:description" content="Web-based cryptocurrency wallet that is compatible with ARK blockchains." />
<meta property="twitter:image" content="/meta-image.png" />

<!-- Apple - Splashcreens -->
<link href="splashscreens/iphone5_splash.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="splashscreens/iphone6_splash.png" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="splashscreens/iphoneplus_splash.png" media="(device-width: 621px) and (device-height: 1104px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="splashscreens/iphonex_splash.png" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="splashscreens/iphonexr_splash.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="splashscreens/iphonexsmax_splash.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />
<link href="splashscreens/ipad_splash.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="splashscreens/ipadpro1_splash.png" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="splashscreens/ipadpro3_splash.png" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<link href="splashscreens/ipadpro2_splash.png" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
<!-- iPhone 5 / SE -->
<link href="splashscreens/apple_320x568x2.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />

<!-- iPhone 6s / 7 / 8 / SE 2020 / SE 2022 -->
<link href="splashscreens/apple_375x667x2.png" media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />

<!-- iPhone XS / X / 11 Pro / 12 Mini / 13 Mini -->
<link href="splashscreens/apple_375x812x3.png" media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />

<!-- iPhone 12 Pro / 12 / 13 Pro / 13 -->
<link href="splashscreens/apple_390x844x3.png" media="(device-width: 390px) and (device-height: 844px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />

<!-- iPhone 6s Plus / 7 Plus / 8 Plus -->
<link href="splashscreens/apple_414x736x2.6.png" media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 2.6)" rel="apple-touch-startup-image" />

<!-- iPhone XR / 11 -->
<link href="splashscreens/apple_414x896x2.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />

<!-- iPhone XS Max / 11 Pro Max -->
<link href="splashscreens/apple_414x896x3.png" media="(device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />

<!-- iPhone 12 Pro Max / 13 Pro Max -->
<link href="splashscreens/apple_428x926x3.png" media="(device-width: 428px) and (device-height: 926px) and (-webkit-device-pixel-ratio: 3)" rel="apple-touch-startup-image" />

<!-- iPad Pro 9-->
<link href="splashscreens/apple_768x1024x2.png" media="(device-width: 768px) and (device-height: 1024px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />

<!-- iPad Pro 10 -->
<link href="splashscreens/apple_834x1112x2.png" media="(device-width: 834px) and (device-height: 1112px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />

<!-- iPad Pro 11 -->
<link href="splashscreens/apple_834x1194x2.png" media="(device-width: 834px) and (device-height: 1194px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />

<!-- iPad Pro 12 -->
<link href="splashscreens/apple_1024x1366x2.png" media="(device-width: 1024px) and (device-height: 1366px) and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image" />
</head>
<body>
<div id="root"></div>
Expand Down
19 changes: 11 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
"sdk:check-updates": "npx npm-check-updates \"/^@ardenthq.*$/\" -u"
},
"dependencies": {
"@ardenthq/sdk": "^1.0.1",
"@ardenthq/sdk-ark": "^1.0.1",
"@ardenthq/sdk-cryptography": "^1.0.1",
"@ardenthq/sdk-helpers": "^1.0.1",
"@ardenthq/sdk-intl": "^1.0.1",
"@ardenthq/sdk-ledger": "^1.0.1",
"@ardenthq/sdk-news": "^1.0.1",
"@ardenthq/sdk-profiles": "^1.0.1",
"@ardenthq/sdk": "^1.1.1",
"@ardenthq/sdk-ark": "^1.1.1",
"@ardenthq/sdk-cryptography": "^1.1.1",
"@ardenthq/sdk-helpers": "^1.1.1",
"@ardenthq/sdk-intl": "^1.1.1",
"@ardenthq/sdk-ledger": "^1.1.1",
"@ardenthq/sdk-news": "^1.1.1",
"@ardenthq/sdk-profiles": "^1.1.1",
"@emotion/cache": "^11.7.1",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
Expand All @@ -68,6 +68,7 @@
"locale-currency": "^0.0.2",
"multiformats": "^9.6.4",
"react": "^17.0.0",
"react-datepicker": "^4.8.0",
"react-dom": "^17.0.0",
"react-error-boundary": "^3.1.4",
"react-hook-form": "^6.15.5",
Expand Down Expand Up @@ -106,6 +107,7 @@
"@testing-library/user-event": "^13.5.0",
"@types/postcss-import": "^14.0.0",
"@types/react": "^17.0.0",
"@types/react-datepicker": "^4.4.2",
"@types/react-dom": "^17.0.0",
"@types/react-linkify": "^1.0.0",
"@types/react-router-config": "^5.0.6",
Expand Down Expand Up @@ -199,6 +201,7 @@
"locale-currency",
"multiformats",
"react",
"react-datepicker",
"react-dom",
"react-error-boundary",
"react-hook-form",
Expand Down
Loading

1 comment on commit 2f0b526

@vercel
Copy link

@vercel vercel bot commented on 2f0b526 Jul 7, 2022

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

arkvault – ./

arkvault-ardent.vercel.app
arkvault-git-main-ardent.vercel.app
app.arkvault.io
app.payvo.com
beta.payvo.com

Please sign in to comment.