Просмотр исходного кода

Merge branch 'belanger/por-83-usage-enforcement' of https://github.com/porter-dev/porter into belanger/por-83-usage-enforcement

jusrhee 4 лет назад
Родитель
Сommit
adc9c7713d

+ 11 - 11
dashboard/package-lock.json

@@ -2497,24 +2497,24 @@
       "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
     },
     "@ironplans/api": {
-      "version": "0.1.1-alpha.0",
-      "resolved": "https://registry.npmjs.org/@ironplans/api/-/api-0.1.1-alpha.0.tgz",
-      "integrity": "sha512-sOtVjG/9O67DSKnTBQr+z2JROQoDsM6FrU02jIYF1tet0ZsQlmxHXT7rWQh2bSrK7IIkhp+5wgUsfRHeexCr1g=="
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@ironplans/api/-/api-0.4.0.tgz",
+      "integrity": "sha512-1bMPL5nNoUQKG8ZT+IqpC40TFkO95lvo0MIYs9R54iEG2T0iSGgUDwOT12pNvRV5pjYk1Xs49SW6x4XBkbrMZA=="
     },
     "@ironplans/react": {
-      "version": "0.1.1-alpha.1",
-      "resolved": "https://registry.npmjs.org/@ironplans/react/-/react-0.1.1-alpha.1.tgz",
-      "integrity": "sha512-5uBZb9kgHdnG144znEGQGbpDo4y2Jy4xHZRegerhOhTyuFVaI8Yrm6xKJucFeDkQIQCh1NqeVTy8a+sPwQl2CQ==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@ironplans/react/-/react-0.4.0.tgz",
+      "integrity": "sha512-ZeNGcd0+4NcQ9RuSGCmd1mbi7DpDSD5bG3UCMziC1W+3/aw2jDOXRsZWTFFxpW4AVL2AZlbngYPYsbutFPR0Yw==",
       "requires": {
-        "@ironplans/sdk": "^0.1.1-alpha.1"
+        "@ironplans/sdk": "^0.4.0"
       }
     },
     "@ironplans/sdk": {
-      "version": "0.1.1-alpha.1",
-      "resolved": "https://registry.npmjs.org/@ironplans/sdk/-/sdk-0.1.1-alpha.1.tgz",
-      "integrity": "sha512-8nno59ZRKju3KYNj9KBHL6xpltZPuIvfUBih14H4R1SpLtEprASy5eurK/Cdxgq3s7uwygU1ompyLKGtdB/ORg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@ironplans/sdk/-/sdk-0.4.0.tgz",
+      "integrity": "sha512-eTtAY9QCMotrjP6uls/AH9bS9yh9e/iUZu0s5F57wB1hb05KziQL8J9z6wTfqznY0OF+eEOO6jdxJ7wWjLQJ4g==",
       "requires": {
-        "@ironplans/api": "^0.1.1-alpha.0",
+        "@ironplans/api": "^0.4.0",
         "@ironplans/types": "^0.0.30-alpha.0",
         "js-cookie": "^3.0.1",
         "jwt-decode": "^3.1.2",

+ 1 - 1
dashboard/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@ironplans/react": "^0.1.1-alpha.1",
+    "@ironplans/react": "^0.4.0",
     "@material-ui/core": "^4.11.3",
     "@sentry/react": "^6.13.2",
     "@sentry/tracing": "^6.13.2",

+ 23 - 3
dashboard/src/main/home/project-settings/BillingPage.tsx

@@ -31,9 +31,29 @@ function BillingPage() {
         <PlanSelect
           theme={{
             base: {
-              darkMode: "on",
-              primaryColor: "white",
-              fontFamily: "sans-serif",
+              customFont: 'Work Sans',
+              fontFamily: '"Work Sans", sans-serif',
+              darkMode: 'on',
+              colors: {
+                primary: 'rgba(97, 111, 238, 0.8)',
+                secondary: 'rgb(103, 108, 124)',
+                danger: 'rgb(227, 54, 109)',
+                success: 'rgb(56, 168, 138)',
+              },
+            },
+            card: {
+              backgroundColor: 'rgb(38, 40, 47)',
+              boxShadow: 'rgb(0 0 0 / 33%) 0px 4px 15px 0px',
+              borderRadius: '8px',
+              border: '2px solid rgba(158, 180, 255, 0)',
+            },
+            button: {
+              base: {
+                boxShadow: 'rgb(0 0 0 / 19%) 0px 2px 5px 0px',
+                borderRadius: '5px',
+                fontSize: '14px',
+                fontWeight: '500',
+              },
             },
           }}
         ></PlanSelect>