Merge pull request #66 from WHIZENx/update-patch

improve performance

src/App.tsx

@@ -40,7 +40,7 @@ import StatsRanking from './pages/Sheets/StatsRanking/StatsRanking';
 import { loadTheme } from './store/effects/theme.effects';
 import { ThemeProvider, createTheme } from '@mui/material/styles';
 import Box from '@mui/material/Box';
-import { getDesignThemes } from './assets/themes/themes';
+import { getDesignThemes } from './util/models/overrides/themes.model';
 import { TRANSITION_TIME } from './util/Constants';
 import { PaletteMode } from '@mui/material';
 import { TypeTheme } from './enums/type.enum';

src/components/Card/CardMove.tsx

@@ -28,16 +28,16 @@ const CardMove = (props: ICardMoveComponent) => {
             height={64}
             alt="type-logo"
             style={{ marginRight: 10 }}
-            src={APIService.getTypeSprite(capitalize(data?.type ?? ''))}
+            src={APIService.getTypeSprite(capitalize(data.type ?? ''))}
           />
           <span style={{ marginRight: 5 }}>
-            <b>{splitAndCapitalize(data?.name, '_', ' ')}</b>
+            <b>{splitAndCapitalize(data.name, '_', ' ')}</b>
           </span>
           <span className="d-flex">
-            {data?.elite && <span className="type-icon-small ic elite-ic">Elite</span>}
-            {data?.shadow && <span className="type-icon-small ic shadow-ic">{capitalize(FORM_SHADOW)}</span>}
-            {data?.purified && <span className="type-icon-small ic purified-ic">{capitalize(FORM_PURIFIED)}</span>}
-            {data?.special && <span className="type-icon-small ic special-ic">Special</span>}
+            {data.elite && <span className="type-icon-small ic elite-ic">Elite</span>}
+            {data.shadow && <span className="type-icon-small ic shadow-ic">{capitalize(FORM_SHADOW)}</span>}
+            {data.purified && <span className="type-icon-small ic purified-ic">{capitalize(FORM_PURIFIED)}</span>}
+            {data.special && <span className="type-icon-small ic special-ic">Special</span>}
           </span>
         </div>
       )}

src/components/Find/FormSelect.tsx

@@ -17,7 +17,6 @@ import {
 import TypeInfo from '../Sprites/Type/Type';
 import { FormControlLabel, Radio } from '@mui/material';
 import { useDispatch } from 'react-redux';
-import { Action } from 'history';
 import { ToolSearching } from '../../core/models/searching.model';
 import { IPokemonName } from '../../core/models/pokemon.model';
 import {
@@ -37,6 +36,7 @@ import { IFormSelectComponent } from '../models/component.model';
 import { TypeRaid } from '../../enums/type.enum';
 import { SearchingActions } from '../../store/actions';
 import { SearchingModel } from '../../store/models/searching.model';
+import { Action } from 'history';
 
 interface OptionsPokemon {
   prev: IPokemonName | undefined;

src/components/Info/Assets/PokemonModel.tsx

@@ -13,7 +13,7 @@ import { IAsset } from '../../../core/models/asset.model';
 import { IPokemonModelComponent, PokemonModelComponent } from './models/pokemon-model.model';
 import { PokemonGender } from '../../../core/models/pokemon.model';
 import { IAssetPokemonModelComponent } from '../../models/component.model';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
 
 const PokemonModel = (props: IAssetPokemonModelComponent) => {
   const theme = useTheme<ThemeModify>();

src/components/Info/Evolution/Evolution.tsx

@@ -50,7 +50,7 @@ import { IForm } from '../../../core/models/API/form.model';
 import { IEvolutionComponent } from '../../models/component.model';
 import { TypeSex } from '../../../enums/type.enum';
 import { Action } from 'history';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
 
 interface IPokemonEvo {
   prev?: string;

src/components/Info/FormChange/FormChange.tsx

@@ -8,7 +8,7 @@ import Candy from '../../Sprites/Candy/Candy';
 import { StoreState } from '../../../store/models/state.model';
 import { IPokemonModelComponent, PokemonModelComponent } from '../Assets/models/pokemon-model.model';
 import { IFromChangeComponent } from '../../models/component.model';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
 
 const FromChange = (props: IFromChangeComponent) => {
   const theme = useTheme<ThemeModify>();

src/components/Info/Gender.tsx

@@ -4,7 +4,7 @@ import APIService from '../../services/API.service';
 import { IPokemonGenderRatio } from '../../core/models/pokemon.model';
 import { IGenderComponent } from '../models/component.model';
 import { TypeSex } from '../../enums/type.enum';
-import { ThemeModify } from '../../assets/themes/themes';
+import { ThemeModify } from '../../util/models/overrides/themes.model';
 
 const Gender = (props: IGenderComponent) => {
   const theme = useTheme<ThemeModify>();

src/components/Info/Stats/Stats.tsx

@@ -11,7 +11,7 @@ import { SHADOW_ATK_BONUS, SHADOW_DEF_BONUS } from '../../../util/Constants';
 import StatsBar from '../../Sprites/ProgressBar/StatsBar';
 import { IStatsComponent } from '../../models/component.model';
 import { TypeAction } from '../../../enums/type.enum';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
 
 const Stats = (props: IStatsComponent) => {
   const data = useSelector((state: StoreState) => state.store.data);

src/components/Raid/Raid.tsx

@@ -14,7 +14,7 @@ import { useTheme } from '@mui/material';
 import { StoreState } from '../../store/models/state.model';
 import { capitalize } from '../../util/Utils';
 import { IRaidComponent } from '../models/component.model';
-import { ThemeModify } from '../../assets/themes/themes';
+import { ThemeModify } from '../../util/models/overrides/themes.model';
 
 const Raid = (props: IRaidComponent) => {
   const theme = useTheme<ThemeModify>();

src/components/Sprites/Type/Type.tsx

@@ -6,7 +6,7 @@ import { capitalize, isNotEmpty } from '../../../util/Utils';
 import './Type.scss';
 import { ITypeComponent } from '../../models/component.model';
 import { TypeTheme } from '../../../enums/type.enum';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
 
 const TypeInfo = (props: ITypeComponent) => {
   const theme = useTheme<ThemeModify>();

src/components/Sprites/Weather.tsx

@@ -3,7 +3,7 @@ import React, { Fragment } from 'react';
 import APIService from '../../services/API.service';
 import { isNotEmpty, splitAndCapitalize } from '../../util/Utils';
 import { IWeatherComponent } from '../models/component.model';
-import { ThemeModify } from '../../assets/themes/themes';
+import { ThemeModify } from '../../util/models/overrides/themes.model';
 
 const Weather = (props: IWeatherComponent) => {
   const theme = useTheme<ThemeModify>();

src/components/Table/Counter/Counter.tsx

@@ -2,7 +2,14 @@ import { Checkbox, FormControlLabel, Switch, useTheme } from '@mui/material';
 import React, { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import APIService from '../../../services/API.service';
-import { capitalize, checkPokemonGO, convertPokemonDataName, isNotEmpty, splitAndCapitalize } from '../../../util/Utils';
+import {
+  capitalize,
+  checkPokemonGO,
+  convertColumnDataType,
+  convertPokemonDataName,
+  isNotEmpty,
+  splitAndCapitalize,
+} from '../../../util/Utils';
 import { findAssetForm } from '../../../util/Compute';
 import { counterPokemon } from '../../../util/Calculate';
 
@@ -14,7 +21,8 @@ import { FORM_MEGA, FORM_PRIMAL, FORM_PURIFIED, FORM_SHADOW, SHADOW_DEF_BONUS }
 import { ICounterModel } from './models/counter.model';
 import { ICounterComponent } from '../../models/component.model';
 import { TypeTheme } from '../../../enums/type.enum';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
+import { TableColumnModify } from '../../../util/models/overrides/data-table.model';
 
 const customStyles: TableStyles = {
   head: {
@@ -88,10 +96,10 @@ const Counter = (props: ICounterComponent) => {
   const [releasedGO, setReleaseGO] = useState(true);
   const [showMega, setShowMega] = useState(false);
 
-  const columns: any = [
+  const columns: TableColumnModify<ICounterModel>[] = [
     {
       name: 'Pokémon',
-      selector: (row: ICounterModel) => (
+      selector: (row) => (
         <Link to={`/pokemon/${row.pokemonId}${row.pokemonForme ? `?form=${row.pokemonForme.toLowerCase().replaceAll('_', '-')}` : ''}`}>
           <div className="d-flex justify-content-center">
             <div
@@ -122,7 +130,7 @@ const Counter = (props: ICounterComponent) => {
     },
     {
       name: 'Fast',
-      selector: (row: ICounterModel) => (
+      selector: (row) => (
         <Link to={'../move/' + row.fMove.id} className="d-grid">
           <div style={{ verticalAlign: 'text-bottom', marginRight: 5 }}>
             <img width={28} height={28} alt="img-pokemon" src={APIService.getTypeSprite(capitalize(row.fMove.type))} />
@@ -143,7 +151,7 @@ const Counter = (props: ICounterComponent) => {
     },
     {
       name: 'Charged',
-      selector: (row: ICounterModel) => (
+      selector: (row) => (
         <Link to={'../move/' + row.cMove.id} className="d-grid">
           <div style={{ verticalAlign: 'text-bottom', marginRight: 5 }}>
             <img width={28} height={28} alt="img-pokemon" src={APIService.getTypeSprite(capitalize(row.cMove.type))} />
@@ -179,7 +187,7 @@ const Counter = (props: ICounterComponent) => {
     },
     {
       name: '%',
-      selector: (row: ICounterModel) => parseFloat(row.ratio.toFixed(2)),
+      selector: (row) => parseFloat(row.ratio.toFixed(2)),
       sortable: true,
       width: '20%',
     },
@@ -280,7 +288,7 @@ const Counter = (props: ICounterComponent) => {
       </div>
       <DataTable
         className="table-counter-container"
-        columns={columns}
+        columns={convertColumnDataType<TableColumnModify<ICounterModel>[], ICounterModel>(columns)}
         pagination={true}
         customStyles={customStyles}
         fixedHeader={true}

src/components/Table/Move/MoveTable.tsx

@@ -18,7 +18,7 @@ import { IPokemonQueryMove, PokemonQueryRankMove } from '../../../util/models/po
 import { IPokemonData } from '../../../core/models/pokemon.model';
 import { ITableMoveComponent } from '../../models/component.model';
 import { TypeMove } from '../../../enums/type.enum';
-import { ThemeModify } from '../../../assets/themes/themes';
+import { ThemeModify } from '../../../util/models/overrides/themes.model';
 
 interface PokemonMoves {
   fastMoves: (ICombat | undefined)[];

src/components/models/component.model.ts

@@ -14,6 +14,7 @@ import {
   IStatsDef,
   IStatsProd,
   IStatsSta,
+  IStatsPokemonGO,
 } from '../../core/models/stats.model';
 import { ITypeEffChart } from '../../core/models/type-eff.model';
 import { ISelectMoveModel } from '../Input/models/select-move.model';
@@ -45,7 +46,7 @@ export interface ICardPokemonInfoComponent {
   forme: string;
   defaultImg: boolean;
   types: string[];
-  pokemonStat: IStatsPokemon;
+  pokemonStat: IStatsPokemonGO;
   stats: IStatsRank | null;
   icon: string;
   releasedGO: boolean;

src/core/models/API/db.model.ts

@@ -1,9 +1,9 @@
-interface IDatabase {
+interface IDatabase<T> {
   command: string;
   fields: IField[];
   rowAsArray?: boolean;
   rowCount: number;
-  rows: any[];
+  rows: T[];
   viaNeonFetch?: boolean;
 }
 
@@ -17,12 +17,12 @@ interface IField {
   tableID: number;
 }
 
-export class Database implements IDatabase {
+export class Database<T> implements IDatabase<T> {
   command: string = '';
   fields: IField[];
   rowAsArray?: boolean;
   rowCount: number = 0;
-  rows: any[];
+  rows: T[];
   viaNeonFetch?: boolean;
 
   constructor() {

src/core/models/league.model.ts

@@ -177,6 +177,12 @@ export class PokemonRewardSetLeague implements IPokemonRewardSetLeague {
     this.name = '';
     this.form = '';
   }
+
+  static create(value: IPokemonRewardSetLeague) {
+    const obj = new PokemonRewardSetLeague();
+    Object.assign(obj, value);
+    return obj;
+  }
 }
 
 // tslint:disable-next-line:max-classes-per-file

src/core/models/options.model.ts

@@ -149,7 +149,7 @@ class CombatOption implements ICombatOption {
 
   constructor() {
     this.stab = 0;
-    this.shadowBonus = new StatsBase(0, 0, 0);
+    this.shadowBonus = new StatsBase();
   }
 }
 
@@ -168,7 +168,7 @@ class BattleOption implements IBattleOption {
   constructor() {
     this.enemyAttackInterval = 0;
     this.stab = 0;
-    this.shadowBonus = new StatsBase(0, 0, 0);
+    this.shadowBonus = new StatsBase();
   }
 }
 

src/core/models/pokemon-home.model.ts

@@ -3,7 +3,7 @@ import { FORM_NORMAL } from '../../util/Constants';
 import { convertPokemonImageName, splitAndCapitalize } from '../../util/Utils';
 import { IImage } from './asset.model';
 import { IPokemonData } from './pokemon.model';
-import { IStatsPokemon } from './stats.model';
+import { IStatsPokemon, IStatsPokemonGO, StatsPokemon, StatsPokemonGO } from './stats.model';
 
 export interface IPokemonHomeModel {
   id: number;
@@ -17,7 +17,7 @@ export interface IPokemonHomeModel {
   gen: number;
   region: string | null;
   version: number;
-  goStats: IStatsPokemon;
+  goStats: IStatsPokemonGO;
   class: string | null;
   releasedGO: boolean;
   image: IImage;
@@ -31,11 +31,11 @@ export class PokemonHomeModel implements IPokemonHomeModel {
   color: string;
   sprite: string;
   baseSpecies: string | null;
-  baseStats: IStatsPokemon;
+  baseStats: IStatsPokemon = new StatsPokemon();
   gen: number;
   region: string | null;
   version: number;
-  goStats: IStatsPokemon;
+  goStats: IStatsPokemonGO = new StatsPokemonGO();
   class: string | null;
   releasedGO: boolean;
   image: IImage;
@@ -56,11 +56,12 @@ export class PokemonHomeModel implements IPokemonHomeModel {
     this.gen = item.gen;
     this.region = item.region;
     this.version = versionList.indexOf(splitAndCapitalize(item.version, '-', ' '));
-    this.goStats = {
+    this.goStats = StatsPokemonGO.create({
       atk: item.baseStats.atk,
       def: item.baseStats.def,
-      sta: item.baseStats.sta,
-    };
+      sta: item.baseStats.sta ?? 0,
+      prod: item.baseStats.atk * item.baseStats.def * (item.baseStats.sta ?? 0),
+    });
     this.class = item.pokemonClass;
     this.releasedGO = item.releasedGO;
     this.image = {

src/core/models/pokemon.model.ts

@@ -1,7 +1,7 @@
 import { capitalize, replaceTempMoveName } from '../../util/Utils';
 import { ICombat } from './combat.model';
 import { FORM_GALARIAN, FORM_HISUIAN, FORM_NORMAL, genList } from '../../util/Constants';
-import { IStatsPokemon, IStatsPokemonGO, StatsPokemon, StatsPokemonGO } from './stats.model';
+import { IStatsBase, IStatsPokemon, IStatsPokemonGO, StatsPokemon, StatsPokemonGO } from './stats.model';
 import { ISelectMoveModel } from '../../components/Input/models/select-move.model';
 import { IEvoList, ITempEvo } from './evolution.model';
 
@@ -20,7 +20,7 @@ export interface PokemonGender {
 export interface IPokemonDataStats {
   level: number;
   isShadow: boolean;
-  iv: IStatsPokemon;
+  iv: IStatsBase;
 }
 
 interface IPokemonFormChange {

src/core/models/pvp.model.ts

@@ -1,7 +1,7 @@
 import { IPokemonTeamData } from '../../pages/PVP/models/battle.model';
 import { ICombat } from './combat.model';
 import { IPokemonData, PokemonData } from './pokemon.model';
-import { IStatsAtk, IStatsDef, IStatsPokemon, IStatsSta } from './stats.model';
+import { IStatsAtk, IStatsBase, IStatsDef, IStatsSta } from './stats.model';
 
 export interface PVPDataModel {
   rankings: PVPInfo[];
@@ -27,7 +27,7 @@ export interface Performers {
   speciesId: string;
   pokemonData: IPokemonData | undefined;
   form: string | null;
-  stats: IStatsPokemon;
+  stats: IStatsBase;
   atk: IStatsAtk | undefined;
   def: IStatsDef | undefined;
   sta: IStatsSta | undefined;