From 5de312b1dc65196ec3616b980c5501fb2863a53b Mon Sep 17 00:00:00 2001
From: simmmpleweb <90040741+simmmpleweb@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:52:53 +0300
Subject: [PATCH] Added roboto 2.0.3

---
 .gitignore                     |  1 +
 CHANGELOG.md                   |  5 ++++
 README.md                      |  1 -
 public/index.html              |  5 +++-
 src/theme/foundations/fonts.js |  3 --
 src/theme/styles.js            | 34 +++++++++++-----------
 src/theme/theme.js             | 52 ++++++++++++++++------------------
 7 files changed, 52 insertions(+), 49 deletions(-)
 delete mode 100644 src/theme/foundations/fonts.js

diff --git a/.gitignore b/.gitignore
index d1cb904cf..5eb9aecc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
+yarn.lock
 package-lock.json
 build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 923870dd3..475256619 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [2.0.3] 2022-09-08
+
+### Update v2.0.3
+
+- We deleted `fonts.js` and now you can change the fonts directly in `src/theme/styles.js`.
 ## [2.0.2] 2022-05-16
 
 ### Update v2.0.2
diff --git a/README.md b/README.md
index 27e078e35..2b3fc7d00 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,6 @@ purity-ui-dashboard/
     │   │   └── drawer.js
     │   ├── foundations
     │   │   ├── breakpoints.js
-    │   │   ├── fonts.js
     │   │   └── text.js
     │   ├── styles.js
     │   └── theme.js
diff --git a/public/index.html b/public/index.html
index 669378993..e74550a4f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -67,7 +67,10 @@
     <link
       href="https://fonts.googleapis.com/icon?family=Material+Icons"
       rel="stylesheet"
-    />
+    />    
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet">
     <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
     <link rel="shortcut icon" type="image/x-icon" href="./favicon.ico" />
     <!--
diff --git a/src/theme/foundations/fonts.js b/src/theme/foundations/fonts.js
deleted file mode 100644
index 4ef539787..000000000
--- a/src/theme/foundations/fonts.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const font = {
-    body: 'Roboto'
-};
\ No newline at end of file
diff --git a/src/theme/styles.js b/src/theme/styles.js
index 3802c9e55..94f8b26aa 100644
--- a/src/theme/styles.js
+++ b/src/theme/styles.js
@@ -1,20 +1,20 @@
-import { mode } from "@chakra-ui/theme-tools";
+import { mode } from '@chakra-ui/theme-tools';
 
 export const globalStyles = {
-  colors: {
-    gray: {
-      700: "#1f2733",
-    },
-  },
-  styles: {
-    global: (props) => ({
-      body: {
-        bg: mode("gray.50", "gray.800")(props),
-        fontFamily: 'Helvetica, sans-serif'
-      },
-      html: {
-        fontFamily: 'Helvetica, sans-serif'
-      }
-    }),
-  },
+	colors: {
+		gray: {
+			700: '#1f2733'
+		}
+	},
+	styles: {
+		global: (props) => ({
+			body: {
+				bg: mode('gray.50', 'gray.800')(props),
+				fontFamily: "'Roboto', sans-serif"
+			},
+			html: {
+				fontFamily: "'Roboto', sans-serif"
+			}
+		})
+	}
 };
diff --git a/src/theme/theme.js b/src/theme/theme.js
index 11686dcce..446f13b25 100644
--- a/src/theme/theme.js
+++ b/src/theme/theme.js
@@ -1,30 +1,28 @@
-import { extendTheme } from "@chakra-ui/react";
-import { globalStyles } from "./styles";
-import { font } from "./foundations/fonts";
-import { breakpoints } from "./foundations/breakpoints";
-import { buttonStyles } from "./components/button";
-import { badgeStyles } from "./components/badge";
-import { linkStyles } from "./components/link";
-import { drawerStyles } from "./components/drawer";
-import { CardComponent } from "./additions/card/Card";
-import { CardBodyComponent } from "./additions/card/CardBody";
-import { CardHeaderComponent } from "./additions/card/CardHeader";
-import { MainPanelComponent } from "./additions/layout/MainPanel";
-import { PanelContentComponent } from "./additions/layout/PanelContent";
-import { PanelContainerComponent } from "./additions/layout/PanelContainer";
+import { extendTheme } from '@chakra-ui/react';
+import { globalStyles } from './styles';
+import { breakpoints } from './foundations/breakpoints';
+import { buttonStyles } from './components/button';
+import { badgeStyles } from './components/badge';
+import { linkStyles } from './components/link';
+import { drawerStyles } from './components/drawer';
+import { CardComponent } from './additions/card/Card';
+import { CardBodyComponent } from './additions/card/CardBody';
+import { CardHeaderComponent } from './additions/card/CardHeader';
+import { MainPanelComponent } from './additions/layout/MainPanel';
+import { PanelContentComponent } from './additions/layout/PanelContent';
+import { PanelContainerComponent } from './additions/layout/PanelContainer';
 // import { mode } from "@chakra-ui/theme-tools";
 export default extendTheme(
-  { breakpoints }, // Breakpoints
-  globalStyles,
-  font, // Global styles
-  buttonStyles, // Button styles
-  badgeStyles, // Badge styles
-  linkStyles, // Link styles
-  drawerStyles, // Sidebar variant for Chakra's drawer
-  CardComponent, // Card component
-  CardBodyComponent, // Card Body component
-  CardHeaderComponent, // Card Header component
-  MainPanelComponent, // Main Panel component
-  PanelContentComponent, // Panel Content component
-  PanelContainerComponent // Panel Container component
+	{ breakpoints }, // Breakpoints
+	globalStyles,
+	buttonStyles, // Button styles
+	badgeStyles, // Badge styles
+	linkStyles, // Link styles
+	drawerStyles, // Sidebar variant for Chakra's drawer
+	CardComponent, // Card component
+	CardBodyComponent, // Card Body component
+	CardHeaderComponent, // Card Header component
+	MainPanelComponent, // Main Panel component
+	PanelContentComponent, // Panel Content component
+	PanelContainerComponent // Panel Container component
 );