diff --git a/app/(interactive)/matches/[slug]/page.js b/app/(interactive)/matches/[slug]/page.js index 02ece32..5887095 100644 --- a/app/(interactive)/matches/[slug]/page.js +++ b/app/(interactive)/matches/[slug]/page.js @@ -1,7 +1,6 @@ 'use client' import React, { useState, useEffect } from 'react'; -import Select from 'react-select'; import { usePathname } from 'next/navigation' import filterStyles from '../../../styles/FilterList.module.css' @@ -125,48 +124,6 @@ const MatchPage = () => {

{matchData.name}

- {/* Options Container */} -
- setShowOptions(!showOptions)} - viewBox="0 0 24 24" - fill="black" - xmlns="http://www.w3.org/2000/svg"> - - - - - - - - -
- {showOptions && ( - <> -
- setShowPercent(!showPercent)} - /> - -
- {showPercent && ( - { + setShowPercent(false); + setShowCount(false); + }} + /> + +
+
+ { + setShowPercent(true); + setShowCount(false); + }} + /> + +
+
+ { + setShowPercent(false); + setShowCount(true); + }} + /> + +
+
diff --git a/app/components/FilterList.js b/app/components/FilterList.js index d4590ec..216a863 100644 --- a/app/components/FilterList.js +++ b/app/components/FilterList.js @@ -100,12 +100,12 @@ const FilterList = ({ pointsData, filterList, setFilterList, showPercent, showCo {/* Point Percentage */} {/* {console.log(value)} */} - {!showCount && showPercent && value && ( + {showPercent && value && ( // make a sum
  • {Math.round((countFilteredPointsForValue(key, value) / Math.round(countFilteredPointsTotal(key,value)) /* ERROR IS HERE */ ) * 100)}%
  • )} {/* Point Count */} - {showCount && showPercent && value && ( + {showCount && value && (
  • {countFilteredPointsForValue(key, value)} / {Math.round(countFilteredPointsTotal(key,value)) /* ERROR IS HERE */}
  • )} diff --git a/app/components/MatchTiles.js b/app/components/MatchTiles.js index 140306f..e78445a 100644 --- a/app/components/MatchTiles.js +++ b/app/components/MatchTiles.js @@ -40,11 +40,6 @@ const calculateWinner = (playerOne, playerTwo) => { return playerOneTotal > playerTwoTotal; }; -// Retrieve team information -const isWomensTeam = (match) => { - return match.includes("(W)"); -}; - //Retrieve Match Date const extractDateFromString = (inputString) => { const regexSlash = /\b(\d{1,2}\/\d{1,2}\/\d{2,4})\b/g; @@ -298,10 +293,10 @@ const MatchTiles = ({
    Matchup
    - UCLA {isWomensTeam(matchName) && "(Womens)"} + {clientTeam}
    - {finalScore[0].opponentTeam} {isWomensTeam(matchName) && "(Womens)"} + {opponentTeam}
    diff --git a/app/services/nameMap.js b/app/services/nameMap.js index 0386e5e..29a1b96 100644 --- a/app/services/nameMap.js +++ b/app/services/nameMap.js @@ -24,7 +24,7 @@ const nameMap = { "rallyCountFreq" : 'Rally Length', "atNetPlayer1" : 'Player Comes to Net', "pointWonBy" : 'Point Won By', - "side" : 'Deuce/Ad Side', + "side" : 'Deuce/Ad Serve', "setNum" : 'Set Number', //Group 5: Special Requests diff --git a/app/styles/FilterList.module.css b/app/styles/FilterList.module.css index 214bc56..86c9999 100644 --- a/app/styles/FilterList.module.css +++ b/app/styles/FilterList.module.css @@ -111,31 +111,12 @@ padding-left: 8px; /* Adjust padding to accommodate the border */ } -/* Styles for options menu */ -.optionsContainer{ - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: flex-end; - max-width: 100%; - box-sizing: border-box; - padding: 2px; - margin: 5px 0; - background-color: #ffffff; -} - .optionsList { padding: 0; list-style-type: none; margin: 0; display: flex; - flex-direction: column; -} + flex-direction: row; + justify-content: space-between; -.optionsToggle{ - color: #333; - cursor: pointer; - transition: all 0.2s ease-in-out; - height: 30px; - width: 30px; -} +} \ No newline at end of file diff --git a/app/styles/MatchTiles.module.css b/app/styles/MatchTiles.module.css index afb9fd0..a177251 100644 --- a/app/styles/MatchTiles.module.css +++ b/app/styles/MatchTiles.module.css @@ -54,4 +54,9 @@ .playerSchoolImg { width: 1.5em; padding: 0; -} \ No newline at end of file +} + +.playerSchoolImg img { + width: 100%; /* Set the width of the image to 100% of its container */ + height: auto; /* Automatically adjust the height to maintain aspect ratio */ + } \ No newline at end of file