diff --git a/package-lock.json b/package-lock.json index 34d699c..a69ceec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "dependencies": { "react": "^18.3.1", "react-dom": "^18.3.1", + "react-icons": "^5.4.0", "react-scripts": "5.0.1" }, "devDependencies": { @@ -13619,6 +13620,15 @@ "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==", "license": "MIT" }, + "node_modules/react-icons": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.4.0.tgz", + "integrity": "sha512-7eltJxgVt7X64oHh6wSWNwwbKTCtMfK35hcjvJS0yxEAhPM8oUKdS3+kqaW1vicIltw+kR2unHaa12S9pPALoQ==", + "license": "MIT", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/package.json b/package.json index 52326bb..b6bba5b 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "dependencies": { "react": "^18.3.1", "react-dom": "^18.3.1", + "react-icons": "^5.4.0", "react-scripts": "5.0.1" }, "devDependencies": { diff --git a/public/favicon.ico b/public/favicon.ico index a11777c..6555146 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/App.css b/src/App.css index 13214c5..d92a006 100644 --- a/src/App.css +++ b/src/App.css @@ -1,23 +1,87 @@ .App { text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; + height: 100vh; + display: flex; + flex-direction: column; } .App-header { - background-color: #282c34; - min-height: 100vh; + position: relative; + flex: 1; display: flex; flex-direction: column; align-items: center; justify-content: center; font-size: calc(10px + 2vmin); color: white; + padding: 2rem 0; + background-color: rgba(40, 44, 52, 0.85); + /* Adjust the opacity of the background */ +} + +.App-header::before { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-image: url('/src/Resources/simbackground.png'); + /* Update the path to your image */ + background-size: cover; + background-position: center; + background-repeat: no-repeat; + opacity: 0.4; + /* Adjust the opacity of the image */ + z-index: -1; + /* Ensure the image is behind the content */ +} + +.App-content { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + z-index: 1; + /* Ensure content is above the background */ +} + +.App-title { + font-size: 4rem; + margin: 0; +} + +.App-subtitle { + font-size: 1.5rem; + margin: 0.5rem 0 2rem 0; +} + +.App-button { + display: inline-block; + padding: 0.75rem 1.5rem; + margin-top: 1rem; + font-size: 1.2rem; + color: white; + background-color: #007bff; + border: none; + border-radius: 4px; + text-decoration: none; + transition: background-color 0.3s ease; +} + +.App-button:hover { + background-color: #0056b3; +} + +.App-iconContainer { + display: flex; + justify-content: center; + gap: 1rem; + padding: 1rem; + position: absolute; + bottom: 2rem; } .App-link { color: #61dafb; -} +} \ No newline at end of file diff --git a/src/App.js b/src/App.js index bc7bc55..25a51bd 100644 --- a/src/App.js +++ b/src/App.js @@ -1,50 +1,26 @@ -import logo from './logo.png'; -import './App.css' +import React from 'react'; +import { FaDiscord, FaGithub } from 'react-icons/fa'; +import { FaXTwitter } from "react-icons/fa6"; +import IconButton from './components/IconButton/IconButton'; +import './App.css'; function App() { return (
- logo -

- EconoSim Project Homepage -

- - EconoSim Demo - -

- Other Sites -

- - Discord - - - GitHub - - - X - +
+

econosim

+

Your gateway to economic simulations

+ Run Demo +
+
+ + + +
); } -export default App; +export default App; \ No newline at end of file diff --git a/src/Resources/Fira_Code.zip b/src/Resources/Fira_Code.zip new file mode 100644 index 0000000..8cf4c27 Binary files /dev/null and b/src/Resources/Fira_Code.zip differ diff --git a/src/Resources/Fira_Code/FiraCode-VariableFont_wght.ttf b/src/Resources/Fira_Code/FiraCode-VariableFont_wght.ttf new file mode 100644 index 0000000..5655ed5 Binary files /dev/null and b/src/Resources/Fira_Code/FiraCode-VariableFont_wght.ttf differ diff --git a/src/Resources/Fira_Code/OFL.txt b/src/Resources/Fira_Code/OFL.txt new file mode 100644 index 0000000..b1540b0 --- /dev/null +++ b/src/Resources/Fira_Code/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2014-2020 The Fira Code Project Authors (https://github.com/tonsky/FiraCode) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/Resources/Fira_Code/README.txt b/src/Resources/Fira_Code/README.txt new file mode 100644 index 0000000..e70b485 --- /dev/null +++ b/src/Resources/Fira_Code/README.txt @@ -0,0 +1,67 @@ +Fira Code Variable Font +======================= + +This download contains Fira Code as both a variable font and static fonts. + +Fira Code is a variable font with this axis: + wght + +This means all the styles are contained in a single file: + FiraCode-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Fira Code: + static/FiraCode-Light.ttf + static/FiraCode-Regular.ttf + static/FiraCode-Medium.ttf + static/FiraCode-SemiBold.ttf + static/FiraCode-Bold.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/src/Resources/Fira_Code/static/FiraCode-Bold.ttf b/src/Resources/Fira_Code/static/FiraCode-Bold.ttf new file mode 100644 index 0000000..9a3d65f Binary files /dev/null and b/src/Resources/Fira_Code/static/FiraCode-Bold.ttf differ diff --git a/src/Resources/Fira_Code/static/FiraCode-Light.ttf b/src/Resources/Fira_Code/static/FiraCode-Light.ttf new file mode 100644 index 0000000..87ff012 Binary files /dev/null and b/src/Resources/Fira_Code/static/FiraCode-Light.ttf differ diff --git a/src/Resources/Fira_Code/static/FiraCode-Medium.ttf b/src/Resources/Fira_Code/static/FiraCode-Medium.ttf new file mode 100644 index 0000000..7a9c38e Binary files /dev/null and b/src/Resources/Fira_Code/static/FiraCode-Medium.ttf differ diff --git a/src/Resources/Fira_Code/static/FiraCode-Regular.ttf b/src/Resources/Fira_Code/static/FiraCode-Regular.ttf new file mode 100644 index 0000000..b8a44d2 Binary files /dev/null and b/src/Resources/Fira_Code/static/FiraCode-Regular.ttf differ diff --git a/src/Resources/Fira_Code/static/FiraCode-SemiBold.ttf b/src/Resources/Fira_Code/static/FiraCode-SemiBold.ttf new file mode 100644 index 0000000..45cfed7 Binary files /dev/null and b/src/Resources/Fira_Code/static/FiraCode-SemiBold.ttf differ diff --git a/src/Resources/simbackground.png b/src/Resources/simbackground.png new file mode 100644 index 0000000..c6f4126 Binary files /dev/null and b/src/Resources/simbackground.png differ diff --git a/src/components/IconButton/IconButton.css b/src/components/IconButton/IconButton.css new file mode 100644 index 0000000..eb311ec --- /dev/null +++ b/src/components/IconButton/IconButton.css @@ -0,0 +1,25 @@ +.icon-button { + display: inline-flex; + align-items: center; + justify-content: center; + width: var(--icon-size, 30px); + /* Default size */ + height: var(--icon-size, 30px); + /* Default size */ + text-decoration: none; + font-size: 16px; + cursor: pointer; + transition: color 0.2s; + color: var(--icon-color, black); +} + +.icon-button:hover { + color: #007bff; + /* Example hover color */ +} + +.icon { + flex-shrink: 0; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/src/components/IconButton/IconButton.js b/src/components/IconButton/IconButton.js new file mode 100644 index 0000000..200e93e --- /dev/null +++ b/src/components/IconButton/IconButton.js @@ -0,0 +1,24 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import './IconButton.css'; + +const IconButton = ({ icon: Icon, href, color = 'white', size = 30 }) => ( + + + +); + +IconButton.propTypes = { + icon: PropTypes.elementType.isRequired, + href: PropTypes.string.isRequired, + color: PropTypes.string, + size: PropTypes.number, +}; + +export default IconButton; \ No newline at end of file diff --git a/src/index.css b/src/index.css index 1532074..f1dc6ff 100644 --- a/src/index.css +++ b/src/index.css @@ -1,8 +1,14 @@ body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + font-family: 'Fira Code', '-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +@font-face { + font-family: 'Fira Code'; + src: url('./Resources/Fira_Code/static/FiraCode-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} \ No newline at end of file