Skip to content

Commit

Permalink
releasef fixing profile icons + default bracket
Browse files Browse the repository at this point in the history
  • Loading branch information
Sammers21 committed Sep 17, 2024
1 parent ca27d57 commit 09b5d25
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions frontend/src/containers/Activity/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import Footer from '@/components/Footer';

import { REGION } from '@/constants/region';
import { BRACKETS } from '@/constants/pvp-activity';
import { getActivityFromUrl } from '@/utils/urlparts';
import { getActivityFromUrl, getBracket, getRegion } from '@/utils/urlparts';
import { capitalizeFirstLetter } from '@/utils/common';
import { fetchBracketActivity } from '@/services/stats.service';
import MClassLeaderboard from '../MClassLeaderboard';

function Activity() {
const { region = REGION.eu, bracket = BRACKETS["3v3"] } = useParams();
const { region = getRegion(), bracket = getBracket() } = useParams();
const activity = getActivityFromUrl();

const [bracketActivity, setBracketActivity] = useState<Record<BRACKETS, string>>();
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/containers/Profile/PvpBrackets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ const PvpBracket = ({
<div className="flex flex-col w-full justify-start py-2">
<div className="flex w-full justify-between items-center">
{specIcon ? (
<div className="flex flex-row items-center w-full w-full">
<div className="flex flex-row items-center">
<img
className="pr-2 h-9 w-9 rounded border border-solid border-[#37415180]"
className="h-9 w-9 rounded border border-solid border-[#37415180]"
src={specIcon}
alt={title}
/>
<span className="text-base sm:text-2xl text-white">{zoloName}</span>
<span className="pl-2 text-base sm:text-2xl text-white">{zoloName}</span>
</div>
) : (
<span className="text-base sm:text-3xl text-white">{title}</span>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/utils/urlparts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { REGION } from '../constants/region';

export function getBracket(bracket?: string) {
const validBracket = Object.values(BRACKETS).find((r) => bracket === r);
return validBracket ?? BRACKETS['3v3'];
return validBracket ?? BRACKETS.shuffle;
}

export function getRegion(region?: string) {
Expand All @@ -14,7 +14,7 @@ export function getRegion(region?: string) {

export function getActivityFromUrl() {
const splitx = window.location.pathname.split('/');
return splitx.length >= 4 ? splitx[2] : 'ladder';
return splitx.length >= 4 ? splitx[2] : 'activity';
}

export function capitalizeNickname(nickname?: string) {
Expand Down

0 comments on commit 09b5d25

Please sign in to comment.