Skip to content

Commit

Permalink
Merge pull request #5 from EconoSim/new-design
Browse files Browse the repository at this point in the history
New design
  • Loading branch information
josephbuhler authored Dec 18, 2024
2 parents 727de18 + 16a3c62 commit af903c5
Show file tree
Hide file tree
Showing 18 changed files with 315 additions and 49 deletions.
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
80 changes: 72 additions & 8 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -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;
}
}
56 changes: 16 additions & 40 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -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 (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
EconoSim Project Homepage
</p>
<a
className="App-link"
href="/demo"
>
EconoSim Demo
</a>
<p>
Other Sites
</p>
<a
className="App-link"
href="https://discord.gg/Urk6BtzX"
target="_blank"
rel="noopener noreferrer"
>
Discord
</a>
<a
className="App-link"
href="https://github.com/EconoSim"
target="_blank"
rel="noopener noreferrer"
>
GitHub
</a>
<a
className="App-link"
href="https://x.com/EconoSim"
target="_blank"
rel="noopener noreferrer"
>
X
</a>
<div className="App-content">
<p className="App-title">econosim</p>
<p className="App-subtitle">Your gateway to economic simulations</p>
<a className="App-button" href="/demo">Run Demo</a>
</div>
<div className="App-iconContainer">
<IconButton icon={FaDiscord} href="https://discord.gg/Urk6BtzX" size={40} />
<IconButton icon={FaGithub} href="https://github.com/EconoSim" size={40} />
<IconButton icon={FaXTwitter} href="https://twitter.com/EconoSim" size={40} />
</div>
</header>
</div>
);
}

export default App;
export default App;
Binary file added src/Resources/Fira_Code.zip
Binary file not shown.
Binary file not shown.
93 changes: 93 additions & 0 deletions src/Resources/Fira_Code/OFL.txt
Original file line number Diff line number Diff line change
@@ -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.
67 changes: 67 additions & 0 deletions src/Resources/Fira_Code/README.txt
Original file line number Diff line number Diff line change
@@ -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.
Binary file added src/Resources/Fira_Code/static/FiraCode-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/Resources/simbackground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions src/components/IconButton/IconButton.css
Original file line number Diff line number Diff line change
@@ -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%;
}
Loading

0 comments on commit af903c5

Please sign in to comment.