diff --git a/.env.sample b/.env.sample index 7ca14d9..7ad807f 100644 --- a/.env.sample +++ b/.env.sample @@ -1,3 +1,3 @@ -REACT_APP_NAME = CoinWind +REACT_APP_NAME = "Cloud Computing" REACT_APP_I18N_ENABLED = true REACT_APP_DEV_ENDPOINT = http://coinwind.test/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 3b24329..1d94e48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2434,6 +2434,11 @@ "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.10.tgz", "integrity": "sha512-MrtTDfWb1Tu9YxVh2KaKmsKBn6O3KL/lHZS0KRKK58jgqvdwuiDt4QW4udmW4FQf0XOWgnZ+4vKUF80F3SqBAA==" }, + "@fontsource/roboto-flex": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@fontsource/roboto-flex/-/roboto-flex-4.5.0.tgz", + "integrity": "sha512-4w944UkhoO+8rc/bJiSi0KLWWVfCcWGLtgjm6wsyQmSxn25zpJ6qBgSEqANin/R8k0Aou2n6R9nQTlhFOsvMkQ==" + }, "@humanwhocodes/config-array": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", diff --git a/package.json b/package.json index fc3d8c2..b449254 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@fontsource/open-sans": "^4.5.10", + "@fontsource/roboto-flex": "^4.5.0", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^10.4.9", "@testing-library/user-event": "^12.8.3", diff --git a/public/favicon.ico.bak b/public/favicon.ico.bak deleted file mode 100644 index a11777c..0000000 Binary files a/public/favicon.ico.bak and /dev/null differ diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000..331f96c Binary files /dev/null and b/public/favicon.png differ diff --git a/public/index.html b/public/index.html index f5316fb..99b6ecb 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,7 @@ - + diff --git a/public/logo192.png b/public/logo192.png index fc44b0a..bab2eae 100644 Binary files a/public/logo192.png and b/public/logo192.png differ diff --git a/public/logo512.png b/public/logo512.png index a4e47a6..2822f43 100644 Binary files a/public/logo512.png and b/public/logo512.png differ diff --git a/src/App.js b/src/App.js index 716fb59..10bf62a 100644 --- a/src/App.js +++ b/src/App.js @@ -7,6 +7,7 @@ import { Layout } from './components' import { Outlet } from 'react-router-dom' import { AppContextProvider } from './AppContext' import '@fontsource/open-sans/400.css' +import '@fontsource/roboto-flex/400.css' function App() { diff --git a/src/AppContext.js b/src/AppContext.js index e8732ca..e13af5b 100644 --- a/src/AppContext.js +++ b/src/AppContext.js @@ -60,7 +60,7 @@ export const AppContextProvider = ({ children }) => { const b = res.data.base setTitle(o.title) - document.title = o.title + ' - DeFi platform for professor' + document.title = config.APP_NAME + ' - DeFi platform for professor' let banr = [] o.banner?.forEach((item) => { diff --git a/src/components/FloatingBtn.js b/src/components/FloatingBtn.js index 2b94dca..bd96874 100644 --- a/src/components/FloatingBtn.js +++ b/src/components/FloatingBtn.js @@ -1,5 +1,4 @@ import { Image, Flex, IconButton } from "@chakra-ui/react" -import { Images } from "../data" export const FloatingBtn = ({ name, pic, url, ...rest }) => { diff --git a/src/config.js b/src/config.js index 36d4f4a..9afafa6 100644 --- a/src/config.js +++ b/src/config.js @@ -9,7 +9,7 @@ const items = { } export const config = { - APP_NAME: process.env.REACT_APP_NAME || 'CoinWind', + APP_NAME: process.env.REACT_APP_NAME, ENABLE_WALLETCONNECT: true, ENABLE_COINBASE: true, AUTO_CONN_WALLET: false, diff --git a/src/data/Images.js b/src/data/Images.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/data/Navs.js b/src/data/Navs.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/data/index.js b/src/data/index.js deleted file mode 100644 index e69de29..0000000 diff --git a/src/theme.js b/src/theme.js index c8455b3..bac923a 100644 --- a/src/theme.js +++ b/src/theme.js @@ -5,7 +5,7 @@ const config = { useSystemColorMode: false, fonts: { heading: 'Open Sans, sans-serif', - body: 'Open Sans, sans-serif', + body: 'Roboto Flex, sans-serif', }, }