Merge pull request #983 from ChainSafe/dev

Release latest to Staging
ChainSafe · Apr 26, 2021 · c60b181 · c60b181
2 parents ef657f1 + 056889d
commit c60b181
Show file tree

Hide file tree

Showing 42 changed files with 861 additions and 1,174 deletions.
diff --git a/packages/common-components/src/Helpers/Dates.ts b/packages/common-components/src/Helpers/Dates.ts
diff --git a/packages/common-components/src/Helpers/index.ts b/packages/common-components/src/Helpers/index.ts
@@ -1,2 +1 @@
-export * from "./Dates"
 export * from "./StringFormatters"
diff --git a/packages/files-landing-page/.linguirc b/packages/files-landing-page/.linguirc
@@ -5,6 +5,7 @@
       "exclude": ["**/node_modules/**", "<rootdir>/src/locales/**"]
    }],
    "compileNamespace": "cjs",
+   "format": "po",
    "formatOptions": { 
       "origins": false
    },

diff --git a/packages/files-landing-page/package.json b/packages/files-landing-page/package.json
@@ -5,8 +5,8 @@
   "dependencies": {
     "@babel/core": "^7.12.10",
     "@craco/craco": "^5.9.0",
-    "@lingui/react": "^3.7.2",
     "@lingui/core": "^3.7.2",
+    "@lingui/react": "^3.7.2",
     "@material-ui/styles": "^4.11.2",
     "@testing-library/jest-dom": "^5.11.6",
     "@testing-library/react": "^11.2.2",
@@ -19,6 +19,7 @@
     "babel-plugin-macros": "^2.8.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
+    "clsx": "^1.1.1",
     "formik": "2.2.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
@@ -53,8 +54,8 @@
     ]
   },
   "devDependencies": {
-    "@lingui/cli": "^3.7.2",
     "@lingui/babel-preset-react": "^2.9.2",
+    "@lingui/cli": "^3.7.2",
     "@lingui/macro": "3.7.2"
   }
 }
diff --git a/packages/files-landing-page/public/ChainSafe_Logo.png b/packages/files-landing-page/public/ChainSafe_Logo.png
diff --git a/packages/files-landing-page/public/assets/15@0.5x.png b/packages/files-landing-page/public/assets/15@0.5x.png
diff --git a/packages/files-landing-page/public/assets/box.png b/packages/files-landing-page/public/assets/box.png
diff --git a/packages/files-landing-page/public/assets/feature2.jpg b/packages/files-landing-page/public/assets/feature2.jpg
diff --git a/packages/files-landing-page/public/assets/landing.png b/packages/files-landing-page/public/assets/landing.png
diff --git a/packages/files-landing-page/public/assets/mockup.png b/packages/files-landing-page/public/assets/mockup.png
diff --git a/packages/files-landing-page/public/assets/phone.png b/packages/files-landing-page/public/assets/phone.png
diff --git a/packages/files-landing-page/public/assets/why.png b/packages/files-landing-page/public/assets/why.png
diff --git a/packages/files-landing-page/public/csf_logo.png b/packages/files-landing-page/public/csf_logo.png
diff --git a/packages/files-landing-page/public/favicon.ico b/packages/files-landing-page/public/favicon.ico
diff --git a/packages/files-landing-page/public/index.html b/packages/files-landing-page/public/index.html
@@ -3,11 +3,11 @@
 
 <head>
   <meta charset="utf-8" />
-  <link rel="icon" href="%PUBLIC_URL%/ChainSafe_Logo.png" />
+  <link rel="icon" href="%PUBLIC_URL%/csf_logo.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#000000" />
   <meta name="description" content="ChainSafe Files - Decentralized Cloud Storage for Everyone" />
-  <link rel="apple-touch-icon" href="%PUBLIC_URL%/ChainSafe_Logo.png" />
+  <link rel="apple-touch-icon" href="%PUBLIC_URL%/csf_logo.png" />
   <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/packages/files-landing-page/src/App.tsx b/packages/files-landing-page/src/App.tsx
@@ -2,17 +2,43 @@ import React from "react"
 import { ThemeProvider, createTheme } from "@chainsafe/common-theme"
 import { LanguageProvider } from "./LanguageContext"
 import { CssBaseline, Router } from "@chainsafe/common-components"
+import "@chainsafe/common-theme/dist/font-faces.css"
 import Routes from "./Components/Routes"
 
 const theme = createTheme({
   globalStyling: {
     body: {
-      color: "#fafafa",
-    },
-    a: {
-      color: "#fafafa",
+      backgroundColor: "#fafafa",
     },
   },
+  themeConfig: {
+    palette: {
+      primary: {
+        main: "#5165DC",
+      }
+    },
+    constants: {
+      headerHeight: 70,
+    },
+    typography: {
+      h1: {
+        fontSize: "72px",
+        lineHeight: "80px",
+      },
+      h2: {
+        fontSize: "48px",
+        lineHeight: "56px",
+      },
+      h3: {
+        fontSize: "30px",
+        lineHeight: "38px",
+      },
+      h4: {
+        fontSize: "24px",
+        lineHeight: "28px"
+      }
+    }
+  }
 })
 
 const App: React.FC<{}> = () => {