Skip to content
Snippets Groups Projects
Commit a3bbae34 authored by Simon Magnusson's avatar Simon Magnusson
Browse files

Stuff has been done, don't know what, just wanted to push

parent 9490c929
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
"@testing-library/react": "^13.4.0", "@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"firebase": "^10.11.1", "firebase": "^10.11.1",
"gl-matrix": "^3.4.3",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-google-button": "^0.8.0", "react-google-button": "^0.8.0",
...@@ -9713,6 +9714,11 @@ ...@@ -9713,6 +9714,11 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/gl-matrix": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA=="
},
"node_modules/glob": { "node_modules/glob": {
"version": "7.2.3", "version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"@testing-library/react": "^13.4.0", "@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
"firebase": "^10.11.1", "firebase": "^10.11.1",
"gl-matrix": "^3.4.3",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-google-button": "^0.8.0", "react-google-button": "^0.8.0",
......
...@@ -15,12 +15,11 @@ const Home=()=>{ ...@@ -15,12 +15,11 @@ const Home=()=>{
<div className='grid-container'> <div className='grid-container'>
<section className='logo'> <section className='logo'>
<div> <div>
<img src={logo} width={300} height={300} alt="tic-tic warfare"/> <img src={logo} width={300} height={300} alt="tic-tic warfare"/>
</div> </div>
<p className='welcoming-text'>Head to the lobby to fetch you a worthy opponent</p> <p className='welcoming-text'>Head to the lobby to fetch you a worthy opponent</p>
</section> </section>
</div> </div>
) )
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
border-radius: 10px; border-radius: 10px;
border: solid rgba(255, 255, 255, 0.0); border: solid rgba(255, 255, 255, 0.0);
color: black; color: black;
background: #efeeee;
transition: box-shadow 0.3s ease; transition: box-shadow 0.3s ease;
text-decoration: none; /* No line underneath text */ text-decoration: none; /* No line underneath text */
} }
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
/* background-color: #efeeee; */ /* background-color: #efeeee; */
box-shadow: -6px -6px 16px rgba(255, 255, 255, 1.0), box-shadow: -6px -6px 16px rgba(255, 255, 255, 1.0),
6px 6px 16px rgba(209, 205, 199, 1.0); 6px 6px 16px rgba(209, 205, 199, 1.0);
border: solid rgba(255, 255, 255, 0.1) border: solid rgba(255, 255, 255, 0.1);
} }
.icon-text { .icon-text {
......
...@@ -31,16 +31,16 @@ function SideBar({pageTitle}) { ...@@ -31,16 +31,16 @@ function SideBar({pageTitle}) {
<text className="icon-text">Home</text> <text className="icon-text">Home</text>
</NavLink> </NavLink>
<NavLink to="/lobby" className="icon" title="Lobby" style={({ isActive }) => isActive ? { boxShadow: '-6px -6px 16px rgba(255, 255, 255, 1.0), 6px 6px 16px rgba(209, 205, 199, 1.0)'} : {}}>
<IoIosChatboxes size={40} />
<text className="icon-text">Lobby</text>
</NavLink>
<NavLink to="/play" className="icon" title="Play" style={({ isActive }) => isActive ? { boxShadow: '-6px -6px 16px rgba(255, 255, 255, 1.0), 6px 6px 16px rgba(209, 205, 199, 1.0)'} : {}}> <NavLink to="/play" className="icon" title="Play" style={({ isActive }) => isActive ? { boxShadow: '-6px -6px 16px rgba(255, 255, 255, 1.0), 6px 6px 16px rgba(209, 205, 199, 1.0)'} : {}}>
<GiTicTacToe size={40} /> <GiTicTacToe size={40} />
<text className="icon-text">Play</text> <text className="icon-text">Play</text>
</NavLink> </NavLink>
<NavLink to="/lobby" className="icon" title="Lobby" style={({ isActive }) => isActive ? { boxShadow: '-6px -6px 16px rgba(255, 255, 255, 1.0), 6px 6px 16px rgba(209, 205, 199, 1.0)'} : {}}>
<IoIosChatboxes size={40} />
<text className="icon-text">Lobby</text>
</NavLink>
<NavLink to="/profile" className="icon" title="Profile" style={({ isActive }) => isActive ? { boxShadow: '-6px -6px 16px rgba(255, 255, 255, 1.0), 6px 6px 16px rgba(209, 205, 199, 1.0)'} : {}}> <NavLink to="/profile" className="icon" title="Profile" style={({ isActive }) => isActive ? { boxShadow: '-6px -6px 16px rgba(255, 255, 255, 1.0), 6px 6px 16px rgba(209, 205, 199, 1.0)'} : {}}>
<GiVikingHelmet size={40} /> <GiVikingHelmet size={40} />
<text className="icon-text">Profile</text> <text className="icon-text">Profile</text>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment