diff --git a/.gitignore b/.gitignore index 01a7145..473c2b0 100644 --- a/.gitignore +++ b/.gitignore @@ -357,3 +357,4 @@ Pipfile env /data/leagues /simmadome/build +/simmadome/.eslintcache diff --git a/main_controller.py b/main_controller.py index 26de3b5..0ecfbef 100644 --- a/main_controller.py +++ b/main_controller.py @@ -98,7 +98,7 @@ def create_league(): new_league = league_structure(config['name']) new_league.setup( league_dic, - division_games=config['division_series'], # need to add a check that makes sure these values are ok + division_games=config['division_series'], inter_division_games=config['inter_division_series'], inter_league_games=config['inter_league_series'], ) diff --git a/simmadome/.eslintcache b/simmadome/.eslintcache deleted file mode 100644 index 32ab91c..0000000 --- a/simmadome/.eslintcache +++ /dev/null @@ -1 +0,0 @@ -[{"/Users/elijah/Documents/Projects/matteo/simmadome/src/index.tsx":"1","/Users/elijah/Documents/Projects/matteo/simmadome/src/reportWebVitals.ts":"2","/Users/elijah/Documents/Projects/matteo/simmadome/src/GamesPage.tsx":"3","/Users/elijah/Documents/Projects/matteo/simmadome/src/GamePage.tsx":"4","/Users/elijah/Documents/Projects/matteo/simmadome/src/CreateLeague.tsx":"5","/Users/elijah/Documents/Projects/matteo/simmadome/src/GamesUtil.tsx":"6","/Users/elijah/Documents/Projects/matteo/simmadome/src/util.tsx":"7","/Users/elijah/Documents/Projects/matteo/simmadome/src/Game.tsx":"8"},{"size":2368,"mtime":1610663769654,"results":"9","hashOfConfig":"10"},{"size":425,"mtime":1610566206674,"results":"11","hashOfConfig":"10"},{"size":4725,"mtime":1610664926203,"results":"12","hashOfConfig":"10"},{"size":1836,"mtime":1610677519051,"results":"13","hashOfConfig":"10"},{"size":18825,"mtime":1610778204901,"results":"14","hashOfConfig":"10"},{"size":1116,"mtime":1610677473305,"results":"15","hashOfConfig":"10"},{"size":961,"mtime":1610694553519,"results":"16","hashOfConfig":"10"},{"size":3089,"mtime":1610572714752,"results":"17","hashOfConfig":"10"},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1bvn6qu",{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/elijah/Documents/Projects/matteo/simmadome/src/index.tsx",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/reportWebVitals.ts",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/GamesPage.tsx",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/GamePage.tsx",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/CreateLeague.tsx",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/GamesUtil.tsx",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/util.tsx",[],"/Users/elijah/Documents/Projects/matteo/simmadome/src/Game.tsx",[]] \ No newline at end of file diff --git a/simmadome/public/index.html b/simmadome/public/index.html index ddec811..825a173 100644 --- a/simmadome/public/index.html +++ b/simmadome/public/index.html @@ -16,15 +16,5 @@
- diff --git a/simmadome/src/GamesPage.css b/simmadome/src/GamesPage.css index 8baef47..4ace427 100644 --- a/simmadome/src/GamesPage.css +++ b/simmadome/src/GamesPage.css @@ -70,10 +70,5 @@ @media only screen and (max-device-width: 800px) { .container { - display: grid; - grid-template-columns: repeat(1, minmax(700px, 90%)); - position: absolute; - left: 50%; - transform: translate(-50%, 0); } } diff --git a/simmadome/src/GamesPage.tsx b/simmadome/src/GamesPage.tsx index 4fdaacb..4877f55 100644 --- a/simmadome/src/GamesPage.tsx +++ b/simmadome/src/GamesPage.tsx @@ -5,23 +5,29 @@ import './GamesPage.css'; import Game from './Game'; function GamesPage() { + let gameList = useRef<(string | null)[]>([]); + let [search, setSearch] = useState(window.location.search); useEffect(() => { setSearch(window.location.search); + gameList.current = []; //eslint-disable-next-line react-hooks/exhaustive-deps }, [window.location.search]) + // get filter term let searchparams = new URLSearchParams(search); let filter = searchparams.get('league') ?? "" + // set up socket listener let [games, setGames] = useState<[string, GameState][]>([]); useListener(setGames); + // build filter list let filters = useRef(filter !== "" ? [filter] : []); games.forEach((game) => { if (game[1].is_league && !filters.current.includes(game[1].leagueoruser)) { filters.current.push(game[1].leagueoruser) }}); filters.current = filters.current.filter((f) => games.find((game) => game && game[1].is_league && game[1].leagueoruser === f) || f === filter); - let gameList = useRef<(string | null)[]>([]); + // update game list let filterGames = games.filter((game, i) => filter === "" || game[1].leagueoruser === filter); updateList(gameList.current, filterGames, searchparams.get('game')); diff --git a/simmadome/src/index.css b/simmadome/src/index.css index 9cf2b34..754da75 100644 --- a/simmadome/src/index.css +++ b/simmadome/src/index.css @@ -55,6 +55,12 @@ h2 { margin: auto; } +#links { + display: flex; + width: 100%; + justify-content: space-between; +} + #link_div { text-align: right; position: absolute; @@ -63,6 +69,12 @@ h2 { display: flex; } +#nav_links { + position: absolute; + top: 1rem; + left: 2rem; +} + .github_logo, .twitter_logo, .patreon_container { height: 2rem; width: 2rem; @@ -97,15 +109,18 @@ a:hover { color: white; } -#utility_links { - position: absolute; - top: 1rem; - left: 2rem; -} - img.emoji { height: 1em; width: 1em; margin: 0 .05em 0 .1em; vertical-align: -0.1em; +} + +@media only screen and (max-width: 800px) { + #link_div, #nav_links { + position: static; + margin-top: 0.5rem; + margin-left: 2rem; + margin-right: 2rem; + } } \ No newline at end of file diff --git a/simmadome/src/index.tsx b/simmadome/src/index.tsx index b0ec638..a6f4b73 100644 --- a/simmadome/src/index.tsx +++ b/simmadome/src/index.tsx @@ -29,6 +29,10 @@ ReactDOM.render( function Header() { return (