Skip to content

Commit

Permalink
Merge branch 'master' into user-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
jordus100 authored Mar 17, 2024
2 parents a355c44 + d4dedf9 commit de3a98f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function App() {
</Link>
</div>
<div className="menu-btn">
<Link to="about.html">
<Link to="about">
<button className="btn">About</button>
</Link>
</div>
Expand Down
15 changes: 15 additions & 0 deletions src/about.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Link } from 'react-router-dom';
function About() {

return (
<div className="list about">
<h1>About</h1>
<p>Witaj w projekcie Bot-Wars. Jako entuzjaści gier, sztucznej inteligencji oraz koleżeńskiej rywalizacji, chcielibyśmy stworzyć platformę on-line umożliwiającą pojedynkowanie naszych botów.</p>
<p>Serwis będzie docelowo pozwalał na stworzenie konta i branie udziału w turniejach poprzez wgranie swojego bot'a.</p>
<p>Będzie możliwość inspekcji swoich wyników w turniejach i innych graczy też.</p>
<div class="menu-btn"><Link to="/"><button class="btn">Home</button></Link></div>
</div>
);
}

export default About;
6 changes: 5 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import AddTournamentForm from "./forms/AddTournamentForm";
import EditTournamentForm from "./forms/EditTournamentForm";
import TournamentDetails from "./Tournaments/TournamentDetails";
import ProfileView from "./User/ProfileView/ProfileView";
import About from "./about.js";
import { Provider } from 'react-redux';
import store from './User/store';
import { getListOfTournaments } from './Tournaments/getListOfTournaments';
Expand Down Expand Up @@ -72,7 +73,10 @@ const router = createBrowserRouter([
{
path: "/settings",
element: <UserSettings/>,
}
},
path: "/about",
element: <About/>,
},
]);

const root = ReactDOM.createRoot(document.getElementById('root'));
Expand Down

0 comments on commit de3a98f

Please sign in to comment.