diff --git a/app/components/allianceInfo.tsx b/app/components/allianceInfo.tsx index f763c20d..cb283200 100644 --- a/app/components/allianceInfo.tsx +++ b/app/components/allianceInfo.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { serverDateToMoment } from 'app/util'; import QueryState from 'app/components/queryState'; import EmpireLink from 'app/components/empireLink'; import { AllianceInfoWindowOptions } from 'app/interfaces/window'; import { useAllianceProfileQuery } from 'app/queries/alliance'; +import TimeInWords from 'app/components/menu/timeInWords'; type Props = { options: AllianceInfoWindowOptions; @@ -16,21 +16,34 @@ const AllianceInfoWindow: React.FunctionComponent = ({ options }) => { {profile && (
-
    -
  • - Name: {profile.name} -
  • -
  • - Description: {profile.description} -
  • -
  • - Founded: {serverDateToMoment(profile.date_created).format('LL')} -
  • -
  • - Leader:{' '} - {profile.members.find((member) => member.id === profile.leader_id)?.name} -
  • -
+ + + + + + + + + + + + + + + + + +
+ Name + {profile.name}
+ Description + {profile.description}
+ Founded + + +
+ Leader + {profile.members.find((member) => member.id === profile.leader_id)?.name}

Members ({profile.members.length})

    diff --git a/app/components/bodyDetails/bodyDetailsHeader.tsx b/app/components/bodyDetails/bodyDetailsHeader.tsx index 6de6f74f..18779f23 100644 --- a/app/components/bodyDetails/bodyDetailsHeader.tsx +++ b/app/components/bodyDetails/bodyDetailsHeader.tsx @@ -34,13 +34,13 @@ const BodyDetailsHeader = ({ options }: Props) => { - Type: + Type {options.type} - Empire: + Empire {body?.empire ? ( @@ -52,19 +52,19 @@ const BodyDetailsHeader = ({ options }: Props) => { - Water: + Water {body?.water} - Planet Size: + Planet Size {options.size} - Location: + Location {options.x}, {options.y} @@ -72,34 +72,34 @@ const BodyDetailsHeader = ({ options }: Props) => { - Zone: + Zone {body?.zone} {MenuStore.shouldShowIds ? ( - Body ID: + Body ID {options.id} ) : undefined} - Star: + Star {body?.star_name}{' '} {MenuStore.shouldShowIds ? ( <> - (ID: {body?.star_id}) + (ID {body?.star_id}) ) : undefined} - Orbit: + Orbit {body?.orbit} diff --git a/app/components/builder/buildableRow.tsx b/app/components/builder/buildableRow.tsx index 883f8449..ba89fd87 100644 --- a/app/components/builder/buildableRow.tsx +++ b/app/components/builder/buildableRow.tsx @@ -77,7 +77,7 @@ const BuildableRow: React.FunctionComponent = ({ - Cost: + Cost @@ -143,7 +143,7 @@ const BuildableRow: React.FunctionComponent = ({ - Production: + Production diff --git a/app/components/empireInfo.tsx b/app/components/empireInfo.tsx index c5a74524..34e9b517 100644 --- a/app/components/empireInfo.tsx +++ b/app/components/empireInfo.tsx @@ -7,6 +7,8 @@ import WindowsStore from 'app/stores/windows'; import AllianceLink from 'app/components/allianceLink'; import { EmpireInfoWindowOptions } from 'app/interfaces/window'; import { usePublicProfileQuery } from 'app/queries/empire'; +import { BUILDING_WINDOW_SCROLL_SMALL } from 'app/constants'; +import TimeInWords from 'app/components/menu/timeInWords'; type Props = { options: EmpireInfoWindowOptions; @@ -27,35 +29,62 @@ const EmpireInfoWindow: React.FunctionComponent = ({ options }) => { return (
    -
      -
    • - Empire: {profile.name} -
    • -
    • - Status: {profile.status_message} -
    • -
    • - Description: {profile.description} -
    • -
    • - Species: {profile.species} -
    • -
    • - Alliance:{' '} - {alliance ? : ''} -
    • -
    • - Colonies: {profile.colony_count} -
    • -
    • - Founded:{' '} - {serverDateToMoment(profile.date_founded).format('LL')} -
    • -
    • - Last Login:{' '} - {serverDateToMoment(profile.last_login).format('LL')} -
    • -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + Empire + {profile.name}
    + Status + {profile.status_message}
    + Description + {profile.description}
    + Species + {profile.species}
    + Alliance + + {alliance ? : ''} +
    + Colonies + {profile.colony_count}
    + Founded + + +
    + Last Login + + +