Skip to content

Commit

Permalink
Merge pull request #309 from zstenger93/api_new
Browse files Browse the repository at this point in the history
Api new
  • Loading branch information
zstenger93 authored Mar 23, 2024
2 parents a20eedb + e6c6298 commit 7454de7
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
18 changes: 16 additions & 2 deletions frontend/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import { WelcomeButtonStyle } from "./components/buttons/ButtonStyle";
import BackButton from "./components/buttons/BackButton";
import backgroundimage from "./images/pongbg.png";
import TwoFA from "./pages/TwoFA";
import Tournament from "./pages/Games/Tournament";

process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;

Expand All @@ -46,7 +47,7 @@ const PageWrapper = ({ children, image, showSidebar = true, redirectUri }) => {
function App() {
const { i18n } = useTranslation();
const basename = "";
// process.env.NODE_ENV === "production" ? "/Transcendence" : "";
// process.env.NODE_ENV === "production" ? "/Transcendence" : "";
let REDIRECT_URI;

if (process.env.NODE_ENV === "development") {
Expand Down Expand Up @@ -164,13 +165,26 @@ function App() {
</PageWrapper>
}
/>
<Route
<Route
path="multiplayer"
element={
<PageWrapper image={Background} redirectUri={REDIRECT_URI}>
<Multiplayer />
</PageWrapper>
}
/>
<Route
path="tournament"
element={
<PageWrapper image={Background} redirectUri={REDIRECT_URI}>
<StartScreen
Game={Tournament}
backgroundImage={backgroundimage}
WelcomeButtonStyle={WelcomeButtonStyle}
BackButton={BackButton}
/>
</PageWrapper>
}
/>
<Route
path="choosepongmode"
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/pages/Games/ChoosePongMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ function ChoosePongMode() {
</Link>
<Link to="/multiplayer" className={`mb-8 ${ButtonStyle}`}>
{t("Multiplayer")}
</Link>
<Link to="/tournament" className={`mb-8 ${ButtonStyle}`}>
{t("Tournament")}
</Link>
<Link
onClick={(e) => {
Expand Down
14 changes: 14 additions & 0 deletions frontend/src/pages/Games/Tournament.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React, { useEffect, useRef, useState } from "react";
import backgroundImage from "../../images/pongbg.png";
import { useLocation, useNavigate } from "react-router-dom";
import BackButton from "../../components/buttons/BackButton";
import { useTranslation } from "react-i18next";
import { WelcomeButtonStyle } from "../../components/buttons/ButtonStyle";
import LoseScreen from "../../components/game/LoseScreen";
import WinScreen from "../../components/game/WinScreen";
import handleResize from "../../components/game/HandleResize";
import FullScreenButton from "../../components/buttons/FullScreen";

const Tournament = () => { };

export default Tournament;

0 comments on commit 7454de7

Please sign in to comment.