Skip to content

Commit 00ed42d

Browse files
dragoni7dragoni7
committed
Reorganized files. Added statIcon const
1 parent 97b3ae3 commit 00ed42d

18 files changed

+60
-72
lines changed

‎src/app/routes/Dashboard.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
filterPermutations,
99
} from '../../features/armor-optimization/filter-permutations';
1010
import SingleDiamondButton from '../../components/SingleDiamondButton';
11-
import NumberBoxes from '../../features/armor-optimization/NumberBoxes';
11+
import NumberBoxes from '../../features/armor-optimization/components/NumberBoxes';
1212
import { getDestinyMembershipId } from '../../features/membership/bungie-account';
1313
import { updateMembership } from '../../store/MembershipReducer';
1414
import {
@@ -22,7 +22,7 @@ import {
2222
StatName,
2323
SubclassConfig,
2424
} from '../../types/d2l-types';
25-
import PermutationsList from '../../features/armor-optimization/PermutationsList';
25+
import PermutationsList from '../../features/armor-optimization/components/PermutationsList';
2626
import HeaderComponent from '../../components/HeaderComponent';
2727
import { db } from '../../store/db';
2828
import {
@@ -34,28 +34,28 @@ import {
3434
updateSubclass,
3535
updateSubclassMods,
3636
} from '../../store/LoadoutReducer';
37-
import SubclassCustomizationWrapper from '../../features/subclass/SubclassCustomizationWrapper';
37+
import SubclassCustomizationWrapper from '../../features/subclass/components/SubclassCustomizationWrapper';
3838
import { updateManifest } from '../../lib/bungie_api/manifest';
3939
import LoadoutCustomization from '../../components/LoadoutCustomization';
4040
import greyBackground from '/assets/grey.png';
41-
import ExoticSelector from '../../features/armor-optimization/ExoticSelector';
41+
import ExoticSelector from '../../features/armor-optimization/components/ExoticSelector';
4242
import { DAMAGE_TYPE } from '../../lib/bungie_api/constants';
4343
import { decodeLoadout } from '../../features/loadouts/util/loadout-encoder';
4444
import {
4545
resetDashboard,
4646
updateSelectedCharacter,
4747
updateSelectedExoticItemHash,
4848
} from '../../store/DashboardReducer';
49-
import StatModifications from '../../features/subclass/StatModifications';
5049
import { Grid } from '@mui/material';
5150
import { ManifestArmorStatMod, ManifestExoticArmor } from '../../types/manifest-types';
5251
import { SharedLoadoutDto } from '../../features/loadouts/types';
5352
import { updateProfileCharacters } from '../../store/ProfileReducer';
5453
import { getProfileData } from '../../util/profile-characters';
5554
import RefreshCharacters from '../../components/RefreshCharacters';
56-
import LogoutButton from '../../features/auth/LogoutButton';
55+
import LogoutButton from '../../features/auth/components/LogoutButton';
5756
import useArtificeMods from '../../hooks/use-artifice-mods';
5857
import useStatMods from '../../hooks/use-stat-mods';
58+
import StatModifications from '../../features/subclass/components/StatModifications';
5959

6060
const DashboardContent = styled(Grid)(({ theme }) => ({
6161
backgroundImage: `url(${greyBackground})`,

‎src/app/routes/Landing.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useEffect, useState } from 'react';
22
import { useNavigate } from 'react-router';
3-
import BungieLogin from '../../features/auth/BungieLogin';
3+
import BungieLogin from '../../features/auth/components/BungieLogin';
44
import { regenerateTokens } from '../../lib/bungie_api/token-services';
55
import { isAuthenticated } from '../../lib/bungie_api/authorization';
66
import { Container, Grid, Paper, Box, Typography } from '@mui/material';

‎src/app/routes/Return.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useEffect } from 'react';
22
import { useNavigate } from 'react-router-dom';
3-
import { handleAuthReturn } from '../../features/auth/AuthReturn';
3+
import { handleAuthReturn } from '../../features/auth/components/AuthReturn';
44

55
/**
66
* Bungie OAuth redirects here

‎src/components/LoadoutCustomization.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import React from 'react';
2-
import { Button, Box, Container, Grid } from '@mui/material';
3-
import { styled } from '@mui/material/styles';
2+
import { Box, Container, Grid } from '@mui/material';
43
import ModCustomization from '../features/armor-mods/components/ModCustomization';
54
import EquipLoadout from '../features/loadouts/components/EquipLoadout';
6-
import AbilitiesModification from '../features/subclass/AbilitiesModification';
5+
import AbilitiesModification from '../features/subclass/components/AbilitiesModification';
76
import ShareLoadout from '../features/loadouts/components/ShareLoadout';
87
import { SubclassConfig } from '../types/d2l-types';
9-
import TotalStatsDisplay from '../features/subclass/TotalStatsDisplay';
108
import { BackButton } from './BackButton';
9+
import TotalStatsDisplay from '../features/subclass/components/TotalStatsDisplay';
1110

1211
interface LoadoutCustomizationProps {
1312
onBackClick: () => void;

‎src/features/armor-optimization/ExoticSelector.tsx renamed to ‎src/features/armor-optimization/components/ExoticSelector.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import React, { useEffect, useState } from 'react';
22
import { styled } from '@mui/material/styles';
33
import { Autocomplete, TextField, Popper } from '@mui/material';
4-
import { db } from '../../store/db';
5-
import { armor, Character, ExoticClassCombo } from '../../types/d2l-types';
4+
import { db } from '../../../store/db';
5+
import { armor, Character, ExoticClassCombo } from '../../../types/d2l-types';
66
import {
77
updateSelectedExoticClassCombo,
88
updateSelectedExoticItemHash,
9-
} from '../../store/DashboardReducer';
9+
} from '../../../store/DashboardReducer';
1010
import { useDispatch } from 'react-redux';
11-
import { ManifestExoticArmor } from '../../types/manifest-types';
12-
import { ARMOR } from '../../lib/bungie_api/constants';
11+
import { ManifestExoticArmor } from '../../../types/manifest-types';
12+
import { ARMOR } from '../../../lib/bungie_api/constants';
1313

1414
const NewComponentContainer = styled('div')({
1515
backgroundColor: 'transparent',

‎src/features/armor-optimization/NumberBoxes.tsx renamed to ‎src/features/armor-optimization/components/NumberBoxes.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import React from 'react';
22
import { styled } from '@mui/material/styles';
33
import { Box, Grid, ButtonBase, Stack } from '@mui/material';
4-
import { STATS } from '../../lib/bungie_api/constants';
5-
import { updateSelectedValues } from '../../store/DashboardReducer';
4+
import { STATS } from '../../../lib/bungie_api/constants';
5+
import { updateSelectedValues } from '../../../store/DashboardReducer';
66
import { useDispatch, useSelector } from 'react-redux';
7-
import { RootState } from '../../store';
7+
import { RootState } from '../../../store';
8+
import { statIcons } from '../../../util/constants';
89

910
const StatRow = styled(Grid)(({ theme }) => ({
1011
marginBottom: theme.spacing(1),
@@ -41,15 +42,6 @@ const StatIcon = styled('img')({
4142
height: '50%',
4243
});
4344

44-
const statIcons: Record<string, string> = {
45-
mobility: '/assets/mob.png',
46-
resilience: '/assets/res.png',
47-
recovery: '/assets/rec.png',
48-
discipline: '/assets/disc.png',
49-
intellect: '/assets/int.png',
50-
strength: '/assets/str.png',
51-
};
52-
5345
const NumberBoxes: React.FC = () => {
5446
const dispatch = useDispatch();
5547
const selectedValues = useSelector((state: RootState) => state.dashboard.selectedValues);

‎src/features/armor-optimization/PermutationsList.tsx renamed to ‎src/features/armor-optimization/components/PermutationsList.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,18 @@ import {
1313
} from '@mui/material';
1414
import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
1515
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
16-
import { FilteredPermutation, DestinyArmor, StatName, StatModifiers } from '../../types/d2l-types';
16+
import {
17+
FilteredPermutation,
18+
DestinyArmor,
19+
StatName,
20+
StatModifiers,
21+
} from '../../../types/d2l-types';
1722
import { useSelector } from 'react-redux';
18-
import ArmorIcon from '../../components/ArmorIcon';
19-
import { STATS } from '../../lib/bungie_api/constants';
20-
import { RootState } from '../../store';
21-
import useStatMods from '../../hooks/use-stat-mods';
22-
import useArtificeMods from '../../hooks/use-artifice-mods';
23+
import ArmorIcon from '../../../components/ArmorIcon';
24+
import { STATS } from '../../../lib/bungie_api/constants';
25+
import { RootState } from '../../../store';
26+
import useStatMods from '../../../hooks/use-stat-mods';
27+
import useArtificeMods from '../../../hooks/use-artifice-mods';
2328

2429
interface PermutationsListProps {
2530
permutations: FilteredPermutation[];

‎src/features/auth/AuthReturn.tsx renamed to ‎src/features/auth/components/AuthReturn.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { generateToken } from '../../lib/bungie_api/token-services';
1+
import { generateToken } from '../../../lib/bungie_api/token-services';
22

33
function getAuthCodeFromURL(): string | null {
44
return window.location.href.includes('code=') ? window.location.href.split('code=')[1] : null;

‎src/features/auth/BungieLogin.tsx renamed to ‎src/features/auth/components/BungieLogin.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { authenticate } from '../../lib/bungie_api/authorization';
2+
import { authenticate } from '../../../lib/bungie_api/authorization';
33
import { Button } from '@mui/material';
44

55
const BungieLogin: React.FC = () => {

‎src/features/auth/LogoutButton.tsx renamed to ‎src/features/auth/components/LogoutButton.tsx

File renamed without changes.

‎src/features/loadouts/components/ShareLoadout.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { styled } from '@mui/material/styles';
2525
import { CharacterClass, StatName } from '../../../types/d2l-types';
2626
import { SharedLoadoutDto } from '../types';
2727
import { D2LButton } from '../../../components/D2LButton';
28+
import { statIcons } from '../../../util/constants';
2829

2930
const StyledDialog = styled(Dialog)(({ theme }) => ({
3031
'& .MuiDialog-paper': {
@@ -114,15 +115,6 @@ const ArrowContainer = styled(Box)(({ theme }) => ({
114115
width: '24px',
115116
}));
116117

117-
const statIcons: Record<StatName, string> = {
118-
mobility: '/assets/mob.png',
119-
resilience: '/assets/res.png',
120-
recovery: '/assets/rec.png',
121-
discipline: '/assets/disc.png',
122-
intellect: '/assets/int.png',
123-
strength: '/assets/str.png',
124-
};
125-
126118
const selectLoadoutState = createSelector(
127119
(state: RootState) => state.loadoutConfig.loadout,
128120
(state: RootState) => state.dashboard,

‎src/features/subclass/AbilitiesModification.css renamed to ‎src/features/subclass/components/AbilitiesModification.css

File renamed without changes.

‎src/features/subclass/AbilitiesModification.tsx renamed to ‎src/features/subclass/components/AbilitiesModification.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ import React, { useCallback, useEffect, useState } from 'react';
22
import { useSelector, useDispatch } from 'react-redux';
33
import { Paper, Button, Typography, styled, CircularProgress } from '@mui/material';
44
import { Box, Container } from '@mui/system';
5-
import { PLUG_CATEGORY_HASH } from '../../lib/bungie_api/subclass-constants';
6-
import { RootState } from '../../store';
7-
import { db } from '../../store/db';
8-
import { updateSubclassMods } from '../../store/LoadoutReducer';
5+
import { PLUG_CATEGORY_HASH } from '../../../lib/bungie_api/subclass-constants';
6+
import { RootState } from '../../../store';
7+
import { db } from '../../../store/db';
8+
import { updateSubclassMods } from '../../../store/LoadoutReducer';
99
import {
1010
ManifestPlug,
1111
ManifestAspect,
1212
ManifestStatPlug,
1313
ManifestSubclass,
14-
} from '../../types/manifest-types';
15-
import { DamageType, SubclassConfig } from '../../types/d2l-types';
16-
import { EMPTY_ASPECT, EMPTY_FRAGMENT } from '../../lib/bungie_api/constants';
17-
import HoverCard from '../../components/HoverCard';
14+
} from '../../../types/manifest-types';
15+
import { DamageType, SubclassConfig } from '../../../types/d2l-types';
16+
import { EMPTY_ASPECT, EMPTY_FRAGMENT } from '../../../lib/bungie_api/constants';
17+
import HoverCard from '../../../components/HoverCard';
1818

1919
interface AbilitiesModificationProps {
2020
subclass: SubclassConfig;

‎src/features/subclass/StatModifications.tsx renamed to ‎src/features/subclass/components/StatModifications.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import React from 'react';
22
import { Box, styled } from '@mui/material';
33
import { useSelector } from 'react-redux';
44
import { createSelector } from '@reduxjs/toolkit';
5-
import { RootState } from '../../store';
6-
import { ManifestStatPlug } from '../../types/manifest-types';
5+
import { RootState } from '../../../store';
6+
import { ManifestStatPlug } from '../../../types/manifest-types';
7+
import { statIcons } from '../../../util/constants';
78

89
const StatModificationsContainer = styled(Box)(({ theme }) => ({
910
padding: theme.spacing(2),
@@ -29,15 +30,6 @@ const StatIcon = styled('img')({
2930
marginRight: '8px',
3031
});
3132

32-
const statIcons: Record<string, string> = {
33-
mobility: 'assets/mob.png',
34-
resilience: 'assets/res.png',
35-
recovery: 'assets/rec.png',
36-
discipline: 'assets/disc.png',
37-
intellect: 'assets/int.png',
38-
strength: 'assets/str.png',
39-
};
40-
4133
const selectFragmentStatModifications = createSelector(
4234
(state: RootState) => state.loadoutConfig.loadout.subclassConfig.fragments,
4335
(fragments: ManifestStatPlug[]) =>

‎src/features/subclass/SubclassCustomizationWrapper.css renamed to ‎src/features/subclass/components/SubclassCustomizationWrapper.css

File renamed without changes.

‎src/features/subclass/SubclassCustomizationWrapper.tsx renamed to ‎src/features/subclass/components/SubclassCustomizationWrapper.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
22
import AbilitiesModification from './AbilitiesModification';
3-
import StatModifications from './StatModifications';
43
import './SubclassCustomizationWrapper.css';
54
import { Box } from '@mui/material';
6-
import { SubclassConfig } from '../../types/d2l-types';
7-
import { BackButton } from '../../components/BackButton';
5+
import { SubclassConfig } from '../../../types/d2l-types';
6+
import { BackButton } from '../../../components/BackButton';
7+
import StatModifications from './StatModifications';
88

99
interface SubclassCustomizationWrapperProps {
1010
onBackClick: () => void;

‎src/features/subclass/TotalStatsDisplay.tsx renamed to ‎src/features/subclass/components/TotalStatsDisplay.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import React, { useMemo } from 'react';
22
import { useSelector } from 'react-redux';
33
import { styled } from '@mui/material/styles';
44
import { Box, Typography, Grid } from '@mui/material';
5-
import { RootState } from '../../store';
6-
import { StatName, DestinyArmor } from '../../types/d2l-types';
7-
import { STATS } from '../../lib/bungie_api/constants';
8-
import { ManifestArmorStatMod, ManifestStatPlug } from '../../types/manifest-types';
5+
import { STATS } from '../../../lib/bungie_api/constants';
6+
import { RootState } from '../../../store';
7+
import { StatName, DestinyArmor } from '../../../types/d2l-types';
8+
import { ManifestArmorStatMod, ManifestStatPlug } from '../../../types/manifest-types';
99

1010
const StatsContainer = styled(Box)(({ theme }) => ({
1111
display: 'flex',

‎src/util/constants.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export const statIcons: Record<string, string> = {
2+
mobility: '/assets/mob.png',
3+
resilience: '/assets/res.png',
4+
recovery: '/assets/rec.png',
5+
discipline: '/assets/disc.png',
6+
intellect: '/assets/int.png',
7+
strength: '/assets/str.png',
8+
};

0 commit comments

Comments
 (0)