diff --git a/src/App.js b/src/App.js index 76c0346..6379ff6 100644 --- a/src/App.js +++ b/src/App.js @@ -5,6 +5,13 @@ import config from './config'; import { Switch, Route } from 'react-router-dom'; import socketIOClient from 'socket.io-client'; + +import Account from './pages/Account/Account'; +import Game from './pages/Game/Game'; +import Home from './pages/Home/Home'; +import News from './pages/News/News'; +import Room from './pages/Room/Room'; + export const socket = socketIOClient(config.apiAddress); function App() { @@ -20,12 +27,25 @@ function App() { {socketData ?

{socketData}

: <>} - -

Index

+ + - -

Game

+ + + + + + + + + + + + + + {/* Add ternary for login */} +
diff --git a/src/pages/Account/Account.js b/src/pages/Account/Account.js index 93a189f..5c7c255 100644 --- a/src/pages/Account/Account.js +++ b/src/pages/Account/Account.js @@ -1,9 +1,10 @@ import React from 'react'; -import './Accounts.scss'; +import './Account.scss'; const Account = () => { return ( <> +

Account

); } diff --git a/src/pages/Game/Game.js b/src/pages/Game/Game.js index b1f4bb1..17aaaaf 100644 --- a/src/pages/Game/Game.js +++ b/src/pages/Game/Game.js @@ -1,9 +1,10 @@ import React from 'react'; -import './Accounts.scss'; +import './Game.scss'; const Game = () => { return ( <> +

Game

); } diff --git a/src/pages/Game/Game.test.scss b/src/pages/Game/Game.test.js similarity index 100% rename from src/pages/Game/Game.test.scss rename to src/pages/Game/Game.test.js diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js index 1708f74..292eba5 100644 --- a/src/pages/Home/Home.js +++ b/src/pages/Home/Home.js @@ -1,9 +1,10 @@ import React from 'react'; -import './Accounts.scss'; +import './Home.scss'; const Home = () => { return ( <> +

Home

); } diff --git a/src/pages/Home/Home.test.scss b/src/pages/Home/Home.test.js similarity index 100% rename from src/pages/Home/Home.test.scss rename to src/pages/Home/Home.test.js diff --git a/src/pages/Landing/Landing.js b/src/pages/Landing/Landing.js deleted file mode 100644 index c11710e..0000000 --- a/src/pages/Landing/Landing.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; -import './Accounts.scss'; - -const Landing = () => { - return ( - <> - - ); -} - -export default Landing; \ No newline at end of file diff --git a/src/pages/News/News.js b/src/pages/News/News.js new file mode 100644 index 0000000..f328772 --- /dev/null +++ b/src/pages/News/News.js @@ -0,0 +1,12 @@ +import React from 'react'; +import './News.scss'; + +const News = () => { + return ( + <> +

News

+ + ); +} + +export default News; \ No newline at end of file diff --git a/src/pages/Landing/Landing.scss b/src/pages/News/News.scss similarity index 100% rename from src/pages/Landing/Landing.scss rename to src/pages/News/News.scss diff --git a/src/pages/Landing/Landing.test.scss b/src/pages/News/News.test.js similarity index 100% rename from src/pages/Landing/Landing.test.scss rename to src/pages/News/News.test.js diff --git a/src/pages/Room/Room.js b/src/pages/Room/Room.js index f67119c..115002e 100644 --- a/src/pages/Room/Room.js +++ b/src/pages/Room/Room.js @@ -1,9 +1,10 @@ import React from 'react'; -import './Accounts.scss'; +import './Room.scss'; const Room = () => { return ( <> +

Room

); } diff --git a/src/pages/Room/Room.test.scss b/src/pages/Room/Room.test.js similarity index 100% rename from src/pages/Room/Room.test.scss rename to src/pages/Room/Room.test.js