Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename and move UI component files #483

Merged
merged 3 commits into from
Jun 8, 2024
+62 −63
Merged

Rename and move UI component files #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46f73f3
Move and rename UI summary component files
iamlogand Jun 8, 2024
ca9c21c
Rename more UI component files
iamlogand Jun 8, 2024
d8757a5
Rename UI term component files
iamlogand Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions frontend/componentTables/termComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
import PriorConsulTerm from "@/components/terms/Term_PriorConsul"
import FactionTerm from "@/components/terms/Term_Faction"
import SecretTerm from "@/components/terms/Term_Secret"
import SenatorTerm from "@/components/terms/Term_Senator"
import MortalityPhaseTerm from "@/components/terms/Term_MortalityPhase"
import ForumPhaseTerm from "@/components/terms/Term_ForumPhase"
import RevolutionPhaseTerm from "@/components/terms/Term_RevolutionPhase"
import CombatPhaseTerm from "@/components/terms/Term_CombatPhase"
import PopulationPhaseTerm from "@/components/terms/Term_PopulationPhase"
import RevenuePhaseTerm from "@/components/terms/Term_RevenuePhase"
import SenatePhaseTerm from "@/components/terms/Term_SenatePhase"
import TurnTerm from "@/components/terms/Term_Turn"
import FactionPhaseTerm from "@/components/terms/Term_FactionPhase"
import FinalForumPhaseTerm from "@/components/terms/Term_FinalForumPhase"
import RomeConsulTerm from "@/components/terms/Term_RomeConsul"
import HraoTerm from "@/components/terms/Term_Hrao"
import WarTerm from "@/components/terms/Term_War"
import ActiveWarTerm from "@/components/terms/Term_ActiveWar"
import FactionLeaderTerm from "@/components/terms/Term_FactionLeader"
import AlignedSenatorTerm from "@/components/terms/Term_AlignedSenator"
import UnalignedSenatorTerm from "@/components/terms/Term_UnalignedSenator"
import FamilyTerm from "@/components/terms/Term_Family"
import StatesmanTerm from "@/components/terms/Term_Statesman"
import ImminentWarTerm from "@/components/terms/Term_ImminentWar"
import InactiveWarTerm from "@/components/terms/Term_InactiveWar"
import EnemyLeaderTerm from "@/components/terms/Term_EnemyLeader"
import MatchingWarsAndEnemyLeadersTerm from "@/components/terms/Term_MatchingWarsAndEnemyLeadersTerm"
import MilitaryTerm from "@/components/terms/Term_Military"
import OratoryTerm from "@/components/terms/Term_Oratory"
import LoyaltyTerm from "@/components/terms/Term_Loyalty"
import InfluenceTerm from "@/components/terms/Term_Influence"
import PersonalTreasuryTerm from "@/components/terms/Term_PersonalTreasury"
import PopularityTerm from "@/components/terms/Term_Popularity"
import VotesTerm from "@/components/terms/Term_Votes"
import KnightsTerm from "@/components/terms/Term_Knights"
import TalentTerm from "@/components/terms/Term_Talents"
import PriorConsulTerm from "@/components/terms/PriorConsulTerm"
import FactionTerm from "@/components/terms/FactionTerm"
import SecretTerm from "@/components/terms/SecretTerm"
import SenatorTerm from "@/components/terms/SenatorTerm"
import MortalityPhaseTerm from "@/components/terms/MortalityPhaseTerm"
import ForumPhaseTerm from "@/components/terms/ForumPhaseTerm"
import RevolutionPhaseTerm from "@/components/terms/RevolutionPhaseTerm"
import CombatPhaseTerm from "@/components/terms/CombatPhaseTerm"
import PopulationPhaseTerm from "@/components/terms/PopulationPhaseTerm"
import RevenuePhaseTerm from "@/components/terms/RevenuePhaseTerm"
import SenatePhaseTerm from "@/components/terms/SenatePhaseTerm"
import TurnTerm from "@/components/terms/TurnTerm"
import FactionPhaseTerm from "@/components/terms/FactionPhaseTerm"
import FinalForumPhaseTerm from "@/components/terms/FinalForumPhaseTerm"
import RomeConsulTerm from "@/components/terms/RomeConsulTerm"
import HraoTerm from "@/components/terms/HraoTerm"
import WarTerm from "@/components/terms/WarTerm"
import ActiveWarTerm from "@/components/terms/ActiveWarTerm"
import FactionLeaderTerm from "@/components/terms/FactionLeaderTerm"
import AlignedSenatorTerm from "@/components/terms/AlignedSenatorTerm"
import UnalignedSenatorTerm from "@/components/terms/UnalignedSenatorTerm"
import FamilyTerm from "@/components/terms/FamilyTerm"
import StatesmanTerm from "@/components/terms/StatesmanTerm"
import ImminentWarTerm from "@/components/terms/ImminentWarTerm"
import InactiveWarTerm from "@/components/terms/InactiveWarTerm"
import EnemyLeaderTerm from "@/components/terms/EnemyLeaderTerm"
import MatchingWarsAndEnemyLeadersTerm from "@/components/terms/MatchingWarsAndEnemyLeadersTerm"
import MilitaryTerm from "@/components/terms/MilitaryTerm"
import OratoryTerm from "@/components/terms/OratoryTerm"
import LoyaltyTerm from "@/components/terms/LoyaltyTerm"
import InfluenceTerm from "@/components/terms/InfluenceTerm"
import PersonalTreasuryTerm from "@/components/terms/PersonalTreasuryTerm"
import PopularityTerm from "@/components/terms/PopularityTerm"
import VotesTerm from "@/components/terms/VotesTerm"
import KnightsTerm from "@/components/terms/KnightsTerm"
import TalentTerm from "@/components/terms/TalentsTerm"

interface TermComponents {
[key: string]: JSX.Element
Expand Down
28 changes: 14 additions & 14 deletions frontend/components/ActionLog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import ActionLog from "@/classes/ActionLog"
import NewFactionLeaderActionLog from "@/components/actionLogs/ActionLog_NewFactionLeader"
import MortalityActionLog from "@/components/actionLogs/ActionLog_Mortality"
import TemporaryRomeConsulActionLog from "@/components/actionLogs/ActionLog_TemporaryRomeConsul"
import NewTurnActionLog from "@/components/actionLogs/ActionLog_NewTurn"
import NewFamilyActionLog from "@/components/actionLogs/ActionLog_NewFamily"
import NewWarActionLog from "@/components/actionLogs/ActionLog_NewWar"
import MatchedWarActionLog from "@/components/actionLogs/ActionLog_MatchedWar"
import NewEnemyLeaderActionLog from "@/components/actionLogs/ActionLog_NewEnemyLeader"
import MatchedEnemyLeaderActionLog from "@/components/actionLogs/ActionLog_MatchedEnemyLeader"
import NewSecretActionLog from "@/components/actionLogs/ActionLog_NewSecret"
import PersonalRevenueActionLog from "@/components/actionLogs/ActionLog_PersonalRevenue"
import EraEndsActionLog from "@/components/actionLogs/ActionLog_EraEnds"
import FactionWinsActionLog from "@/components/actionLogs/ActionLog_FactionWins"
import NewConcessionActionLog from "@/components/actionLogs/ActionLog_NewConcession"
import NewFactionLeaderActionLog from "@/components/actionLogs/NewFactionLeaderActionLog"
import MortalityActionLog from "@/components/actionLogs/MortalityActionLog"
import TemporaryRomeConsulActionLog from "@/components/actionLogs/TemporaryRomeConsulActionLog"
import NewTurnActionLog from "@/components/actionLogs/NewTurnActionLog"
import NewFamilyActionLog from "@/components/actionLogs/NewFamilyActionLog"
import NewWarActionLog from "@/components/actionLogs/NewWarActionLog"
import MatchedWarActionLog from "@/components/actionLogs/MatchedWarActionLog"
import NewEnemyLeaderActionLog from "@/components/actionLogs/NewEnemyLeaderActionLog"
import MatchedEnemyLeaderActionLog from "@/components/actionLogs/MatchedEnemyLeaderActionLog"
import NewSecretActionLog from "@/components/actionLogs/NewSecretActionLog"
import PersonalRevenueActionLog from "@/components/actionLogs/PersonalRevenueActionLog"
import EraEndsActionLog from "@/components/actionLogs/EraEndsActionLog"
import FactionWinsActionLog from "@/components/actionLogs/FactionWinsActionLog"
import NewConcessionActionLog from "@/components/actionLogs/NewConcessionActionLog"

interface ActionLogItemProps {
notification: ActionLog
Expand Down
8 changes: 4 additions & 4 deletions frontend/components/DetailSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { IconButton } from "@mui/material"
import CloseIcon from "@mui/icons-material/Close"
import ArrowBackIcon from "@mui/icons-material/ArrowBack"

import SenatorDetailSection from "@/components/entityDetails/EntityDetail_Senator"
import FactionDetailSection from "@/components/entityDetails/EntityDetail_Faction"
import SenatorDetails from "@/components/entityDetails/SenatorDetails"
import FactionDetails from "@/components/entityDetails/FactionDetails"
import { useGameContext } from "@/contexts/GameContext"
import SelectedDetail from "@/types/SelectedDetail"
import terms from "@/componentTables/termComponents"
Expand Down Expand Up @@ -111,9 +111,9 @@ const DetailSection = () => {
className="box-border h-full flex-1 overflow-y-auto bg-white dark:bg-neutral-600 rounded-b"
>
{selectedDetail.type === "Senator" && (
<SenatorDetailSection detailSectionRef={detailSectionRef} />
<SenatorDetails detailSectionRef={detailSectionRef} />
)}
{selectedDetail.type === "Faction" && <FactionDetailSection />}
{selectedDetail.type === "Faction" && <FactionDetails />}
{selectedDetail.type === "Term" && getTermDetails()}
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions frontend/components/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import React from "react"

import Collection from "@/classes/Collection"
import Action from "@/classes/Action"
import SelectFactionLeaderDialog from "@/components/actionDialogs/ActionDialog_SelectFactionLeader"
import FaceMortalityDialog from "@/components/actionDialogs/ActionDialog_FaceMortality"
import InitiateSituationDialog from "@/components/actionDialogs/ActionDialog_InitiateSituation"
import AssignConcessionsDialog from "@/components/actionDialogs/ActionDialog_AssignConcessions"
import SelectFactionLeaderDialog from "@/components/actionDialogs/SelectFactionLeaderDialog"
import FaceMortalityDialog from "@/components/actionDialogs/FaceMortalityDialog"
import InitiateSituationDialog from "@/components/actionDialogs/InitiateSituationDialog"
import AssignConcessionsDialog from "@/components/actionDialogs/AssignConcessionsDialog"

interface ActionDialogProps {
open: boolean
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/FactionIcon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Faction from "@/classes/Faction"
import SelectedDetail from "@/types/SelectedDetail"
import { useGameContext } from "@/contexts/GameContext"
import FactionSummary from "@/components/FactionSummary"
import FactionSummary from "@/components/entitySummaries/FactionSummary"

interface FactionIconProps {
size: number
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/FactionLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useGameContext } from "@/contexts/GameContext"
import Faction from "@/classes/Faction"
import SelectedDetail from "@/types/SelectedDetail"
import FactionIcon from "@/components/FactionIcon"
import FactionSummary from "@/components/FactionSummary"
import FactionSummary from "@/components/entitySummaries/FactionSummary"

interface FactionLinkProps {
faction: Faction
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/SenatorLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Link } from "@mui/material"
import { useGameContext } from "@/contexts/GameContext"
import Senator from "@/classes/Senator"
import SelectedDetail from "@/types/SelectedDetail"
import SenatorSummary from "@/components/SenatorSummary"
import SenatorSummary from "@/components/entitySummaries/SenatorSummary"

interface SenatorLinkProps {
senator: Senator
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/SenatorPortrait.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import FactionLeaderPattern from "@/images/patterns/factionLeader.svg"
import DeadIcon from "@/images/icons/dead.svg"
import { useGameContext } from "@/contexts/GameContext"
import Collection from "@/classes/Collection"
import SenatorSummary from "@/components/SenatorSummary"
import SenatorSummary from "@/components/entitySummaries/SenatorSummary"

import Cornelius from "@/images/portraits/cornelius.png"
import Fabius from "@/images/portraits/fabius.png"
Expand Down
0 ...ialogs/ActionDialog_AssignConcessions.tsx → ...actionDialogs/AssignConcessionsDialog.tsx
View file
Open in desktop
File renamed without changes.
0 ...ionDialogs/ActionDialog_FaceMortality.tsx → ...nts/actionDialogs/FaceMortalityDialog.tsx
View file
Open in desktop
File renamed without changes.
0 ...ialogs/ActionDialog_InitiateSituation.tsx → ...actionDialogs/InitiateSituationDialog.tsx
View file
Open in desktop
File renamed without changes.
0 ...logs/ActionDialog_SelectFactionLeader.tsx → ...tionDialogs/SelectFactionLeaderDialog.tsx
View file
Open in desktop
File renamed without changes.
0 ...mponents/actionLogs/ActionLog_EraEnds.tsx → ...omponents/actionLogs/EraEndsActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...ents/actionLogs/ActionLog_FactionWins.tsx → ...nents/actionLogs/FactionWinsActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...tionLogs/ActionLog_MatchedEnemyLeader.tsx → ...ctionLogs/MatchedEnemyLeaderActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...nents/actionLogs/ActionLog_MatchedWar.tsx → ...onents/actionLogs/MatchedWarActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...onents/actionLogs/ActionLog_Mortality.tsx → ...ponents/actionLogs/MortalityActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...ts/actionLogs/ActionLog_NewConcession.tsx → ...nts/actionLogs/NewConcessionActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...s/actionLogs/ActionLog_NewEnemyLeader.tsx → ...ts/actionLogs/NewEnemyLeaderActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...actionLogs/ActionLog_NewFactionLeader.tsx → .../actionLogs/NewFactionLeaderActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...onents/actionLogs/ActionLog_NewFamily.tsx → ...ponents/actionLogs/NewFamilyActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...onents/actionLogs/ActionLog_NewSecret.tsx → ...ponents/actionLogs/NewSecretActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...mponents/actionLogs/ActionLog_NewTurn.tsx → ...omponents/actionLogs/NewTurnActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...omponents/actionLogs/ActionLog_NewWar.tsx → ...components/actionLogs/NewWarActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 .../actionLogs/ActionLog_PersonalRevenue.tsx → ...s/actionLogs/PersonalRevenueActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...ionLogs/ActionLog_TemporaryRomeConsul.tsx → ...tionLogs/TemporaryRomeConsulActionLog.tsx
View file
Open in desktop
File renamed without changes.
0 ...ts/entityDetails/EntityDetail_Faction.tsx → ...mponents/entityDetails/FactionDetails.tsx
View file
Open in desktop
File renamed without changes.
0 ...ts/entityDetails/EntityDetail_Senator.tsx → ...mponents/entityDetails/SenatorDetails.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/FactionSummary.tsx → ...onents/entitySummaries/FactionSummary.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/SenatorSummary.tsx → ...onents/entitySummaries/SenatorSummary.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_ActiveWar.tsx → frontend/components/terms/ActiveWarTerm.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/terms/Term_AlignedSenator.tsx → ...d/components/terms/AlignedSenatorTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...end/components/terms/Term_CombatPhase.tsx → ...tend/components/terms/CombatPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...end/components/terms/Term_EnemyLeader.tsx → ...tend/components/terms/EnemyLeaderTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...d/components/terms/Term_FactionLeader.tsx → ...nd/components/terms/FactionLeaderTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...nd/components/terms/Term_FactionPhase.tsx → ...end/components/terms/FactionPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Faction.tsx → frontend/components/terms/FactionTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Family.tsx → frontend/components/terms/FamilyTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...components/terms/Term_FinalForumPhase.tsx → .../components/terms/FinalForumPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...tend/components/terms/Term_ForumPhase.tsx → frontend/components/terms/ForumPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Hrao.tsx → frontend/components/terms/HraoTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...end/components/terms/Term_ImminentWar.tsx → ...tend/components/terms/ImminentWarTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...end/components/terms/Term_InactiveWar.tsx → ...tend/components/terms/InactiveWarTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Influence.tsx → frontend/components/terms/InfluenceTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Knights.tsx → frontend/components/terms/KnightsTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Loyalty.tsx → frontend/components/terms/LoyaltyTerm.tsx
View file
Open in desktop
File renamed without changes.
0 .../Term_MatchingWarsAndEnemyLeadersTerm.tsx → ...terms/MatchingWarsAndEnemyLeadersTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Military.tsx → frontend/components/terms/MilitaryTerm.tsx
View file
Open in desktop
File renamed without changes.
0 .../components/terms/Term_MortalityPhase.tsx → ...d/components/terms/MortalityPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Oratory.tsx → frontend/components/terms/OratoryTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...omponents/terms/Term_PersonalTreasury.tsx → ...components/terms/PersonalTreasuryTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...tend/components/terms/Term_Popularity.tsx → frontend/components/terms/PopularityTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...components/terms/Term_PopulationPhase.tsx → .../components/terms/PopulationPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...end/components/terms/Term_PriorConsul.tsx → ...tend/components/terms/PriorConsulTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...nd/components/terms/Term_RevenuePhase.tsx → ...end/components/terms/RevenuePhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...components/terms/Term_RevolutionPhase.tsx → .../components/terms/RevolutionPhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...tend/components/terms/Term_RomeConsul.tsx → frontend/components/terms/RomeConsulTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Secret.tsx → frontend/components/terms/SecretTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...end/components/terms/Term_SenatePhase.tsx → ...tend/components/terms/SenatePhaseTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Senator.tsx → frontend/components/terms/SenatorTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Statesman.tsx → frontend/components/terms/StatesmanTerm.tsx
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion frontend/components/terms/Term_Talents.tsx → frontend/components/terms/TalentsTerm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const TalentTerm = () => (
<Image src={TalentIcon} height={40} width={40} alt="Talent icon" />
</Avatar>
}
category="attribute"
wikipediaPage="Talent_(measurement)"
>
<p>
Expand Down
0 frontend/components/terms/Term_Turn.tsx → frontend/components/terms/TurnTerm.tsx
View file
Open in desktop
File renamed without changes.
0 ...omponents/terms/Term_UnalignedSenator.tsx → ...components/terms/UnalignedSenatorTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_Votes.tsx → frontend/components/terms/VotesTerm.tsx
View file
Open in desktop
File renamed without changes.
0 frontend/components/terms/Term_War.tsx → frontend/components/terms/WarTerm.tsx
View file
Open in desktop
File renamed without changes.
Loading