Merge pull request #257 from I3uckwheat/fix/directory-refactor

Fix/216 directory refactor
I3uckwheat · Apr 24, 2021 · a5ddd13 · a5ddd13
2 parents 3c31697 + ee8389b
commit a5ddd13
Show file tree

Hide file tree

Showing 58 changed files with 66 additions and 1,289 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -3,9 +3,9 @@ import React, { useState } from 'react';
 import './reset.css';
 import './App.css';
 
-import WelcomeScreen from './components/screens/WelcomeScreen/WelcomeScreen';
-import HostScreenController from './components/screenControllers/HostScreenController/HostScreenController';
-import PlayerScreenController from './components/screenControllers/PlayerScreenController/PlayerScreenController';
+import WelcomeScreen from './screens/WelcomeScreen/WelcomeScreen';
+import HostScreenController from './screenControllers/HostScreenController/HostScreenController';
+import PlayerScreenController from './screenControllers/PlayerScreenController/PlayerScreenController';
 import { PlayerProvider } from './contexts/PlayerContext/PlayerContext';
 import HostProvider from './contexts/HostContext/HostContext';
 

diff --git a/frontend/src/components/SocketTest.js b/frontend/src/components/SocketTest.js
diff --git a/...mponents/CardHandLayout/CardHandLayout.js → .../layouts/CardHandLayout/CardHandLayout.js b/...mponents/CardHandLayout/CardHandLayout.js → .../layouts/CardHandLayout/CardHandLayout.js
@@ -3,8 +3,8 @@ import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
-import Button from '../Buttons/Button';
-import Header from '../Header/Header';
+import Button from '../../components/Buttons/Button';
+import Header from '../../components/Header/Header';
 
 const propTypes = {
   title: PropTypes.shape({

diff --git a/...nts/CardHandLayout/CardHandLayout.spec.js → ...uts/CardHandLayout/CardHandLayout.spec.js b/...nts/CardHandLayout/CardHandLayout.spec.js → ...uts/CardHandLayout/CardHandLayout.spec.js
diff --git a/...__snapshots__/CardHandLayout.spec.js.snap → ...__snapshots__/CardHandLayout.spec.js.snap b/...__snapshots__/CardHandLayout.spec.js.snap → ...__snapshots__/CardHandLayout.spec.js.snap
diff --git a/...tend/src/components/layouts/HostLayout.js → frontend/src/layouts/HostLayout.js b/...tend/src/components/layouts/HostLayout.js → frontend/src/layouts/HostLayout.js
@@ -2,9 +2,9 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 
-import HamburgerMenu from '../Buttons/HamburgerMenu/HamburgerMenu.js';
-import Header from '../Header/Header.js';
-import Modal from '../Modal/Modal.js';
+import HamburgerMenu from '../components/Buttons/HamburgerMenu/HamburgerMenu.js';
+import Header from '../components/Header/Header.js';
+import Modal from '../components/Modal/Modal.js';
 
 const propTypes = {
   left: PropTypes.node.isRequired,

diff --git a/...src/components/layouts/HostLayout.spec.js → frontend/src/layouts/HostLayout.spec.js b/...src/components/layouts/HostLayout.spec.js → frontend/src/layouts/HostLayout.spec.js
diff --git a/...uts/__snapshots__/HostLayout.spec.js.snap → ...uts/__snapshots__/HostLayout.spec.js.snap b/...uts/__snapshots__/HostLayout.spec.js.snap → ...uts/__snapshots__/HostLayout.spec.js.snap
diff --git a/...tScreenController/HostScreenController.js → ...tScreenController/HostScreenController.js b/...tScreenController/HostScreenController.js → ...tScreenController/HostScreenController.js
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
+import { HostContext } from '../../contexts/HostContext/HostContext';
 import HostPregameScreen from '../../screens/HostPregameScreen/HostPregameScreen';
 import WinnerSelectScreen from '../../screens/WinnerSelectScreen/WinnerSelectScreen';
 import HostBlackCardScreen from '../../screens/HostBlackCardScreen/HostBlackCardScreen';

diff --git a/...enController/HostScreenController.spec.js → ...enController/HostScreenController.spec.js b/...enController/HostScreenController.spec.js → ...enController/HostScreenController.spec.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
+import { HostContext } from '../../contexts/HostContext/HostContext';
 
 import HostScreenController from './HostScreenController';
 import HostPregameScreen from '../../screens/HostPregameScreen/HostPregameScreen';

diff --git a/...creenController/PlayerScreenController.js → ...creenController/PlayerScreenController.js b/...creenController/PlayerScreenController.js → ...creenController/PlayerScreenController.js
@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 import PlayerJoinScreen from '../../screens/PlayerJoinScreen/PlayerJoinScreen';
 import PlayerMessageScreen from '../../screens/PlayerMessageScreen/PlayerMessageScreen';
 import PlayerHandScreen from '../../screens/PlayerHandScreen/PlayerHandScreen';

diff --git a/...Controller/PlayerScreenController.spec.js → ...Controller/PlayerScreenController.spec.js b/...Controller/PlayerScreenController.spec.js → ...Controller/PlayerScreenController.spec.js
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
 import PlayerScreenController from './PlayerScreenController';
 import PlayerJoinScreen from '../../screens/PlayerJoinScreen/PlayerJoinScreen';

diff --git a/.../screens/CzarHandScreen/CzarHandScreen.js → .../screens/CzarHandScreen/CzarHandScreen.js b/.../screens/CzarHandScreen/CzarHandScreen.js → .../screens/CzarHandScreen/CzarHandScreen.js
@@ -1,8 +1,8 @@
 import React, { useContext, useState } from 'react';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
-import CardHandLayout from '../../CardHandLayout/CardHandLayout';
-import CzarHand from '../../CzarHand/CzarHand';
+import CardHandLayout from '../../layouts/CardHandLayout/CardHandLayout';
+import CzarHand from '../../components/CzarHand/CzarHand';
 
 export default function CzarHandScreen() {
   const { state, dispatch } = useContext(PlayerContext);

diff --git a/...ens/CzarHandScreen/CzarHandScreen.spec.js → ...ens/CzarHandScreen/CzarHandScreen.spec.js b/...ens/CzarHandScreen/CzarHandScreen.spec.js → ...ens/CzarHandScreen/CzarHandScreen.spec.js
@@ -3,7 +3,7 @@ import { render, screen, act } from '@testing-library/react';
 import renderer from 'react-test-renderer';
 import userEvent from '@testing-library/user-event';
 import CzarHandScreen from './CzarHandScreen';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
 describe('CzarHandScreen', () => {
   describe('render', () => {

diff --git a/...__snapshots__/CzarHandScreen.spec.js.snap → ...__snapshots__/CzarHandScreen.spec.js.snap b/...__snapshots__/CzarHandScreen.spec.js.snap → ...__snapshots__/CzarHandScreen.spec.js.snap
diff --git a/...ostBlackCardScreen/HostBlackCardScreen.js → ...ostBlackCardScreen/HostBlackCardScreen.js b/...ostBlackCardScreen/HostBlackCardScreen.js → ...ostBlackCardScreen/HostBlackCardScreen.js
@@ -1,11 +1,11 @@
 import React, { useContext, useEffect } from 'react';
 import styled from 'styled-components';
 import HostLayout from '../../layouts/HostLayout';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
-import PlayerList from '../../PlayerList/PlayerList';
-import InGameSettingsModal from '../../HostSettingsMenu/InGameSettingsModal.js';
-import JoinCode from '../../JoinCode/JoinCode';
-import BlackCard from '../../Cards/BlackCard';
+import { HostContext } from '../../contexts/HostContext/HostContext';
+import PlayerList from '../../components/PlayerList/PlayerList';
+import InGameSettingsModal from '../../components/HostSettingsMenu/InGameSettingsModal.js';
+import JoinCode from '../../components/JoinCode/JoinCode';
+import BlackCard from '../../components/Cards/BlackCard';
 
 const LeftPanelWrapper = styled.div`
   display: flex;

diff --git a/...ackCardScreen/HostBlackCardScreen.spec.js → ...ackCardScreen/HostBlackCardScreen.spec.js b/...ackCardScreen/HostBlackCardScreen.spec.js → ...ackCardScreen/HostBlackCardScreen.spec.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
 import renderer from 'react-test-renderer';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
+import { HostContext } from '../../contexts/HostContext/HostContext';
 import HostBlackCardScreen from './HostBlackCardScreen';
 
-jest.mock('../../GameSettings/GameSettings', () => () => (
+jest.mock('../../components/GameSettings/GameSettings', () => () => (
   <div data-testid="game-settings" />
 ));
 

diff --git a/...pshots__/HostBlackCardScreen.spec.js.snap → ...pshots__/HostBlackCardScreen.spec.js.snap b/...pshots__/HostBlackCardScreen.spec.js.snap → ...pshots__/HostBlackCardScreen.spec.js.snap
diff --git a/...ns/HostPregameScreen/HostPregameScreen.js → ...ns/HostPregameScreen/HostPregameScreen.js b/...ns/HostPregameScreen/HostPregameScreen.js → ...ns/HostPregameScreen/HostPregameScreen.js
@@ -1,13 +1,13 @@
 import React, { useContext, useEffect } from 'react';
 import styled from 'styled-components';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
+import { HostContext } from '../../contexts/HostContext/HostContext';
 import HostLayout from '../../layouts/HostLayout';
-import PlayerList from '../../PlayerList/PlayerList';
-import GameSettings from '../../GameSettings/GameSettings';
-import PregameSettingsModal from '../../HostSettingsMenu/PregameSettingsModal';
-import JoinCode from '../../JoinCode/JoinCode';
-import Button from '../../Buttons/Button';
-import LoadingIndicator from '../../LoadingIndicator/LoadingIndicator';
+import PlayerList from '../../components/PlayerList/PlayerList';
+import GameSettings from '../../components/GameSettings/GameSettings';
+import PregameSettingsModal from '../../components/HostSettingsMenu/PregameSettingsModal';
+import JoinCode from '../../components/JoinCode/JoinCode';
+import Button from '../../components/Buttons/Button';
+import LoadingIndicator from '../../components/LoadingIndicator/LoadingIndicator';
 
 const LeftPanelWrapper = styled.div`
   display: flex;

diff --git a/...stPregameScreen/HostPregameScreen.spec.js → ...stPregameScreen/HostPregameScreen.spec.js b/...stPregameScreen/HostPregameScreen.spec.js → ...stPregameScreen/HostPregameScreen.spec.js
@@ -2,10 +2,10 @@ import React from 'react';
 import { render, screen, act } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import renderer from 'react-test-renderer';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
+import { HostContext } from '../../contexts/HostContext/HostContext';
 import HostPregameScreen from './HostPregameScreen';
 
-jest.mock('../../GameSettings/GameSettings', () => () => (
+jest.mock('../../components/GameSettings/GameSettings', () => () => (
   <div data-testid="game-settings" />
 ));
 

diff --git a/...napshots__/HostPregameScreen.spec.js.snap → ...napshots__/HostPregameScreen.spec.js.snap b/...napshots__/HostPregameScreen.spec.js.snap → ...napshots__/HostPregameScreen.spec.js.snap
diff --git a/...eens/HostWinnerScreen/HostWinnerScreen.js → ...eens/HostWinnerScreen/HostWinnerScreen.js b/...eens/HostWinnerScreen/HostWinnerScreen.js → ...eens/HostWinnerScreen/HostWinnerScreen.js
@@ -1,12 +1,12 @@
 import React, { useContext, useEffect } from 'react';
 import styled from 'styled-components';
 import HostLayout from '../../layouts/HostLayout';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
-import PlayerList from '../../PlayerList/PlayerList';
-import InGameSettingsModal from '../../HostSettingsMenu/InGameSettingsModal.js';
-import JoinCode from '../../JoinCode/JoinCode';
-import BlackCard from '../../Cards/BlackCard';
-import WhiteCard from '../../Cards/WhiteCard';
+import { HostContext } from '../../contexts/HostContext/HostContext';
+import PlayerList from '../../components/PlayerList/PlayerList';
+import InGameSettingsModal from '../../components/HostSettingsMenu/InGameSettingsModal.js';
+import JoinCode from '../../components/JoinCode/JoinCode';
+import BlackCard from '../../components/Cards/BlackCard';
+import WhiteCard from '../../components/Cards/WhiteCard';
 
 const LeftPanelWrapper = styled.div`
   display: flex;

diff --git a/...HostWinnerScreen/HostWinnerScreen.spec.js → ...HostWinnerScreen/HostWinnerScreen.spec.js b/...HostWinnerScreen/HostWinnerScreen.spec.js → ...HostWinnerScreen/HostWinnerScreen.spec.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import renderer from 'react-test-renderer';
-import { HostContext } from '../../../contexts/HostContext/HostContext';
+import { HostContext } from '../../contexts/HostContext/HostContext';
 import HostWinnerScreen from './HostWinnerScreen';
 
 describe('Host Winner Screen', () => {

diff --git a/...snapshots__/HostWinnerScreen.spec.js.snap → ...snapshots__/HostWinnerScreen.spec.js.snap b/...snapshots__/HostWinnerScreen.spec.js.snap → ...snapshots__/HostWinnerScreen.spec.js.snap
diff --git a/...eens/PlayerHandScreen/PlayerHandScreen.js → ...eens/PlayerHandScreen/PlayerHandScreen.js b/...eens/PlayerHandScreen/PlayerHandScreen.js → ...eens/PlayerHandScreen/PlayerHandScreen.js
@@ -1,8 +1,8 @@
 import React, { useState, useContext } from 'react';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
-import CardHandLayout from '../../CardHandLayout/CardHandLayout';
-import PlayerHand from '../../PlayerHand/PlayerHand';
+import CardHandLayout from '../../layouts/CardHandLayout/CardHandLayout';
+import PlayerHand from '../../components/PlayerHand/PlayerHand';
 
 export default function PlayerHandScreen() {
   const { state, dispatch } = useContext(PlayerContext);

diff --git a/...PlayerHandScreen/PlayerHandScreen.spec.js → ...PlayerHandScreen/PlayerHandScreen.spec.js b/...PlayerHandScreen/PlayerHandScreen.spec.js → ...PlayerHandScreen/PlayerHandScreen.spec.js
@@ -3,7 +3,7 @@ import { render, screen, act } from '@testing-library/react';
 import renderer from 'react-test-renderer';
 import userEvent from '@testing-library/user-event';
 import PlayerHandScreen from './PlayerHandScreen';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
 describe('PlayerHandScreen', () => {
   describe('render', () => {

diff --git a/...snapshots__/PlayerHandScreen.spec.js.snap → ...snapshots__/PlayerHandScreen.spec.js.snap b/...snapshots__/PlayerHandScreen.spec.js.snap → ...snapshots__/PlayerHandScreen.spec.js.snap
diff --git a/...eens/PlayerJoinScreen/PlayerJoinScreen.js → ...eens/PlayerJoinScreen/PlayerJoinScreen.js b/...eens/PlayerJoinScreen/PlayerJoinScreen.js → ...eens/PlayerJoinScreen/PlayerJoinScreen.js
@@ -1,9 +1,9 @@
 import React, { useContext, useState } from 'react';
 import styled from 'styled-components';
-import Button from '../../Buttons/Button';
-import Header from '../../Header/Header';
-import Footer from '../../Footer/Footer';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import Button from '../../components/Buttons/Button';
+import Header from '../../components/Header/Header';
+import Footer from '../../components/Footer/Footer';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
 const propTypes = {};
 

diff --git a/...PlayerJoinScreen/PlayerJoinScreen.spec.js → ...PlayerJoinScreen/PlayerJoinScreen.spec.js b/...PlayerJoinScreen/PlayerJoinScreen.spec.js → ...PlayerJoinScreen/PlayerJoinScreen.spec.js
@@ -6,7 +6,7 @@ import PlayerJoinScreen from './PlayerJoinScreen';
 import {
   PlayerContext,
   PlayerProvider,
-} from '../../../contexts/PlayerContext/PlayerContext';
+} from '../../contexts/PlayerContext/PlayerContext';
 
 describe('PlayerJoin', () => {
   describe('render', () => {

diff --git a/...snapshots__/PlayerJoinScreen.spec.js.snap → ...snapshots__/PlayerJoinScreen.spec.js.snap b/...snapshots__/PlayerJoinScreen.spec.js.snap → ...snapshots__/PlayerJoinScreen.spec.js.snap
diff --git a/...layerMessageScreen/PlayerMessageScreen.js → ...layerMessageScreen/PlayerMessageScreen.js b/...layerMessageScreen/PlayerMessageScreen.js → ...layerMessageScreen/PlayerMessageScreen.js
@@ -1,10 +1,10 @@
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import cardTrioDiagonal from '../../../assets/card-trio-diagonal.svg';
-import blackCardDiagonal from '../../../assets/black-card-diagonal.svg';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
-import LoadingIndicator from '../../LoadingIndicator/LoadingIndicator';
+import cardTrioDiagonal from '../../assets/card-trio-diagonal.svg';
+import blackCardDiagonal from '../../assets/black-card-diagonal.svg';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
+import LoadingIndicator from '../../components/LoadingIndicator/LoadingIndicator';
 
 const propTypes = {
   bigText: PropTypes.string.isRequired,

diff --git a/...MessageScreen/PlayerMessageScreen.spec.js → ...MessageScreen/PlayerMessageScreen.spec.js b/...MessageScreen/PlayerMessageScreen.spec.js → ...MessageScreen/PlayerMessageScreen.spec.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import PlayerMessageScreen from './PlayerMessageScreen';
-import { PlayerContext } from '../../../contexts/PlayerContext/PlayerContext';
+import { PlayerContext } from '../../contexts/PlayerContext/PlayerContext';
 
 describe('Player message screen', () => {
   describe('Rendering', () => {