Merge branch 'main' into show-sig-id

* hotfix: add ARM64 compatible Docker image

.github/workflows/build.yml

@@ -135,6 +135,7 @@ jobs:
       matrix:
         platform:
           - linux/amd64
+          - linux/arm64
     steps:
       - name: Prepare
         run: |

CHANGELOG.md

@@ -2,6 +2,112 @@
 
 <!-- changelog -->
 
+## [v1.38.3](https://github.com/wanderer-industries/wanderer/compare/v1.38.2...v1.38.3) (2025-01-12)
+
+
+
+
+## [v1.38.2](https://github.com/wanderer-industries/wanderer/compare/v1.38.1...v1.38.2) (2025-01-11)
+
+
+
+
+### Bug Fixes:
+
+* Fix connections remove timeouts
+
+## [v1.38.1](https://github.com/wanderer-industries/wanderer/compare/v1.38.0...v1.38.1) (2025-01-10)
+
+
+
+
+### Bug Fixes:
+
+* restored default theme colors (#115)
+
+## [v1.38.0](https://github.com/wanderer-industries/wanderer/compare/v1.37.9...v1.38.0) (2025-01-10)
+
+
+
+
+### Features:
+
+* Map: Ability to store/view audit logs up to 3 months
+
+* Map: Inroduced Env settings for connection auto EOL/remove timeouts
+
+## [v1.37.9](https://github.com/wanderer-industries/wanderer/compare/v1.37.8...v1.37.9) (2025-01-10)
+
+
+
+
+### Bug Fixes:
+
+* restore system status colors (#112)
+
+* restore system status colors
+
+## [v1.37.8](https://github.com/wanderer-industries/wanderer/compare/v1.37.7...v1.37.8) (2025-01-10)
+
+
+
+
+### Bug Fixes:
+
+* fix issue with newly added systems not adding a connection (#114)
+
+* resolve issue with newly added systems not connecting
+
+## [v1.37.7](https://github.com/wanderer-industries/wanderer/compare/v1.37.6...v1.37.7) (2025-01-10)
+
+
+
+
+### Bug Fixes:
+
+* support additional theme names
+
+## [v1.37.6](https://github.com/wanderer-industries/wanderer/compare/v1.37.5...v1.37.6) (2025-01-09)
+
+
+
+
+### Bug Fixes:
+
+* support additional theme names
+
+## [v1.37.5](https://github.com/wanderer-industries/wanderer/compare/v1.37.4...v1.37.5) (2025-01-09)
+
+
+
+
+### Bug Fixes:
+
+* restore node styling, simplify framework for new themes
+
+## [v1.37.4](https://github.com/wanderer-industries/wanderer/compare/v1.37.3...v1.37.4) (2025-01-09)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fixed dbclick behaviour
+
+## [v1.37.3](https://github.com/wanderer-industries/wanderer/compare/v1.37.2...v1.37.3) (2025-01-09)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fixed dbclick behaviour
+
+## [v1.37.2](https://github.com/wanderer-industries/wanderer/compare/v1.37.1...v1.37.2) (2025-01-09)
+
+
+
+
 ## [v1.37.1](https://github.com/wanderer-industries/wanderer/compare/v1.37.0...v1.37.1) (2025-01-08)
 
 

Dockerfile

@@ -9,6 +9,9 @@ WORKDIR /app
 # set build ENV
 ENV MIX_ENV="prod"
 
+# Set ERL_FLAGS for ARM compatibility
+ENV ERL_FLAGS="+JPperf true"
+
 # install mix dependencies
 COPY mix.exs mix.lock ./
 RUN rm -Rf _build deps && mix deps.get --only $MIX_ENV

assets/js/hooks/Mapper/components/hooks/useSolarSystemNode.ts

@@ -0,0 +1,181 @@
+// feel free to rename these imports or the file path as you see fit
+import { useMemo } from 'react';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api';
+import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
+import { useDoubleClick } from '@/hooks/Mapper/hooks/useDoubleClick.ts';
+import { REGIONS_MAP, Spaces } from '@/hooks/Mapper/constants';
+import { MapSolarSystemType } from '../../map.types';
+import { LABELS_INFO, LABELS_ORDER, getActivityType } from '@/hooks/Mapper/components/map/constants.ts';
+import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
+import { getSystemClassStyles, prepareUnsplashedChunks } from '@/hooks/Mapper/components/map/helpers';
+import { sortWHClasses } from '@/hooks/Mapper/helpers';
+import { LabelsManager } from '@/hooks/Mapper/utils/labelsManager.ts';
+import { OutCommand } from '@/hooks/Mapper/types';
+
+const SpaceToClass: Record<string, string> = {
+  [Spaces.Caldari]: 'Caldaria',
+  [Spaces.Matar]: 'Mataria',
+  [Spaces.Amarr]: 'Amarria',
+  [Spaces.Gallente]: 'Gallente',
+};
+
+const sortedLabels = (labels: string[]) => {
+  if (!labels) return [];
+  return LABELS_ORDER.filter(x => labels.includes(x)).map(x => LABELS_INFO[x]);
+};
+
+interface UseSolarSystemNodeParams {
+  data: MapSolarSystemType;
+  selected: boolean;
+}
+
+export function useSolarSystemNode({ data, selected }: UseSolarSystemNodeParams) {
+  // 1) Bring in relevant global state
+  const { interfaceSettings } = useMapRootState();
+  const { isShowUnsplashedSignatures } = interfaceSettings;
+  const isTempSystemNameEnabled = useMapGetOption('show_temp_system_name') === 'true';
+  const isShowLinkedSigId = useMapGetOption('show_linked_signature_id') === 'true';
+
+  const {
+    data: {
+      characters,
+      presentCharacters,
+      wormholesData,
+      hubs,
+      kills,
+      userCharacters,
+      isConnecting,
+      hoverNodeId,
+      visibleNodes,
+      showKSpaceBG,
+      isThickConnections,
+    },
+    outCommand,
+  } = useMapState();
+
+  // 2) Extract data from the node
+  const {
+    system_class,
+    security,
+    class_title,
+    solar_system_id,
+    statics,
+    effect_name,
+    region_name,
+    region_id,
+    is_shattered,
+    solar_system_name,
+  } = data.system_static_info;
+
+  const {
+    locked,
+    name,
+    tag,
+    status,
+    labels,
+    id,
+    temporary_name: temporaryName,
+    linked_sig_eve_id: linkedSigEveId = '',
+  } = data || {};
+  const signatures = data.system_signatures;
+
+  // 3) Compute derived values
+  const visible = useMemo(() => visibleNodes.has(id), [id, visibleNodes]);
+
+  const charactersInSystem = useMemo(() => {
+    return characters.filter(c => c.location?.solar_system_id === solar_system_id).filter(c => c.online);
+  }, [characters, presentCharacters, solar_system_id]);
+
+  const isWormhole = isWormholeSpace(system_class);
+
+  const classTitleColor = useMemo(
+    () => getSystemClassStyles({ systemClass: system_class, security }),
+    [security, system_class],
+  );
+
+  const sortedStatics = useMemo(() => sortWHClasses(wormholesData, statics), [wormholesData, statics]);
+
+  const linkedSigPrefix = useMemo(() => (linkedSigEveId ? linkedSigEveId.split('-')[0] : null), [linkedSigEveId]);
+
+  const labelsManager = useMemo(() => new LabelsManager(labels ?? ''), [labels]);
+  const labelsInfo = useMemo(() => sortedLabels(labelsManager.list), [labelsManager]);
+  const labelCustom = useMemo(
+    () =>
+      isShowLinkedSigId && linkedSigPrefix
+        ? `${linkedSigPrefix}・${labelsManager.customLabel}`
+        : labelsManager.customLabel,
+    [linkedSigPrefix, isShowLinkedSigId, labelsManager],
+  );
+
+  const killsCount = useMemo(() => {
+    const systemKills = kills[solar_system_id];
+    if (!systemKills) return null;
+    return systemKills;
+  }, [kills, solar_system_id]);
+
+  const hasUserCharacters = useMemo(() => {
+    return charactersInSystem.some(x => userCharacters.includes(x.eve_id));
+  }, [charactersInSystem, userCharacters]);
+
+  const dbClick = useDoubleClick(() => {
+    outCommand({
+      type: OutCommand.openSettings,
+      data: {
+        system_id: solar_system_id.toString(),
+      },
+    });
+  });
+
+  const showHandlers = isConnecting || hoverNodeId === id;
+
+  const space = showKSpaceBG ? REGIONS_MAP[region_id] : '';
+  const regionClass = showKSpaceBG ? SpaceToClass[space] : null;
+
+  const systemName = (isTempSystemNameEnabled && temporaryName) || solar_system_name;
+  const customName = (isTempSystemNameEnabled && temporaryName && name) || (solar_system_name !== name && name);
+
+  const [unsplashedLeft, unsplashedRight] = useMemo(() => {
+    if (!isShowUnsplashedSignatures) {
+      return [[], []];
+    }
+    return prepareUnsplashedChunks(
+      signatures
+        .filter(s => s.group === 'Wormhole' && !s.linked_system)
+        .map(s => ({
+          eve_id: s.eve_id,
+          type: s.type,
+          custom_info: s.custom_info,
+        })),
+    );
+  }, [isShowUnsplashedSignatures, signatures]);
+
+  return {
+    selected,
+    visible,
+    isWormhole,
+    classTitleColor,
+    killsCount,
+    hasUserCharacters,
+    showHandlers,
+    regionClass,
+    systemName,
+    customName,
+    labelCustom,
+    is_shattered,
+    tag,
+    status,
+    labelsInfo,
+    dbClick,
+    sortedStatics,
+    effect_name,
+    region_name,
+    solar_system_id,
+    locked,
+    hubs,
+    charactersInSystem,
+    unsplashedLeft,
+    unsplashedRight,
+    isThickConnections,
+  };
+}

assets/js/hooks/Mapper/components/map/Map.module.scss

@@ -1,8 +1,11 @@
 .MapRoot {
   width: 100%;
   height: 100%;
-}
 
-.BackgroundAlternateColor {
-  background-color: var(--rf-soft-bg-color, #2f2f2f);
+  background-color: var(--rf-bg-color, #0C0A09);
+
+  &.BackgroundAlternateColor {
+    background-color: var(--rf-soft-bg-color, #171717);
+    --rf-node-bg-color: var(--rf-node-soft-bg-color, #202020);
+  }
 }

assets/js/hooks/Mapper/components/map/Map.tsx

@@ -1,4 +1,4 @@
-import { ForwardedRef, forwardRef, MouseEvent, useCallback, useEffect } from 'react';
+import { ForwardedRef, forwardRef, MouseEvent, useCallback, useEffect, useMemo } from 'react';
 import ReactFlow, {
   Background,
   ConnectionMode,
@@ -23,10 +23,12 @@ import {
   ContextMenuConnection,
   ContextMenuRoot,
   SolarSystemEdge,
-  SolarSystemNode,
+  SolarSystemNodeDefault,
+  SolarSystemNodeTheme,
   useContextMenuConnectionHandlers,
   useContextMenuRootHandlers,
 } from './components';
+import { wrapNode } from './utils/wrapNode';
 import { OnMapAddSystemCallback, OnMapSelectionChange } from './map.types';
 import { SESSION_KEY } from '@/hooks/Mapper/constants.ts';
 import { SolarSystemConnection, SolarSystemRawType } from '@/hooks/Mapper/types';
@@ -75,11 +77,8 @@ const initialEdges = [
   },
 ];
 
-const nodeTypes = {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore
-  custom: SolarSystemNode,
-} as never;
+
+
 
 const edgeTypes = {
   floating: SolarSystemEdge,
@@ -124,6 +123,17 @@ const MapComp = ({
   const [nodes, , onNodesChange] = useNodesState<Node<SolarSystemRawType>>(initialNodes);
   const [edges, , onEdgesChange] = useEdgesState<Edge<SolarSystemConnection>>(initialEdges);
 
+
+  const nodeTypes = useMemo(() => {
+    return {
+      custom:
+        theme !== '' && theme !== 'default'
+          ? wrapNode(SolarSystemNodeTheme)
+          : wrapNode(SolarSystemNodeDefault),
+    };
+  }, [theme]);
+  
+
   useMapHandlers(refn, onSelectionChange);
   useUpdateNodes(nodes);
   const { handleRootContext, ...rootCtxProps } = useContextMenuRootHandlers({ onAddSystem });

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.module.scss

@@ -1,257 +0,0 @@
-@import '@/hooks/Mapper/components/map/styles/eve-common-variables';
-
-.RootCustomNode {
-  position: relative;
-  z-index: 1;
-  overflow: hidden;
-}
-
-/* Region backgrounds */
-.Mataria,
-.Amarria,
-.Gallente,
-.Caldaria {
-  &::before {
-    content: '';
-    position: absolute;
-    inset: 0;
-    background-size: cover;
-    background-position: 50% 50%;
-    background-repeat: no-repeat;
-    z-index: -1;
-    border-radius: 3px;
-  }
-}
-.Mataria::before {
-  background-image: url('/images/mataria-180.png');
-  opacity: 0.6;
-  background-position-x: 1px;
-  background-position-y: -14px;
-}
-.Caldaria::before {
-  background-image: url('/images/caldaria-180.png');
-  opacity: 0.6;
-  background-position-x: 1px;
-  background-position-y: -10px;
-}
-.Amarria::before {
-  opacity: 0.45;
-  background-image: url('/images/amarr-180.png');
-  background-position-x: 0;
-  background-position-y: -13px;
-}
-.Gallente::before {
-  opacity: 0.5;
-  background-image: url('/images/gallente-180.png');
-  background-position-x: 1px;
-  background-position-y: 0;
-}
-
-/* Node selected styling */
-.selected {
-  border-color: var(--pastel-pink);
-  box-shadow: 0 0 10px #9a1af1c2;
-}
-
-/* Eve system status backgrounds, etc. */
-.eve-system-status-home {
-  border: 1px solid var(--eve-solar-system-status-color-home-dark30);
-  background-image: linear-gradient(275deg, var(--eve-solar-system-status-friendly), transparent);
-  &.selected {
-    border-color: var(--eve-solar-system-status-color-home);
-  }
-}
-.eve-system-status-friendly {
-  border: 1px solid var(--eve-solar-system-status-color-friendly-dark20);
-  background-image: linear-gradient(275deg, var(--eve-solar-system-status-friendly-dark30), transparent);
-  &.selected {
-    border-color: var(--eve-solar-system-status-color-friendly-dark5);
-  }
-}
-.eve-system-status-lookingFor {
-  border: 1px solid var(--eve-solar-system-status-color-lookingFor-dark15);
-  background-image: linear-gradient(275deg, #45ff8f2f, #457fff2f);
-  &.selected {
-    border-color: var(--pastel-pink);
-  }
-}
-.eve-system-status-warning {
-  background-image: linear-gradient(275deg, var(--eve-solar-system-status-warning), transparent);
-}
-.eve-system-status-dangerous {
-  background-image: linear-gradient(275deg, var(--eve-solar-system-status-dangerous), transparent);
-}
-.eve-system-status-target {
-  background-image: linear-gradient(275deg, var(--eve-solar-system-status-target), transparent);
-}
-
-/* Bookmarks row */
-.Bookmarks {
-  position: absolute;
-  width: 100%;
-  z-index: 1;
-  display: flex;
-  left: 4px;
-}
-.Bookmark {
-  min-width: 13px;
-  height: 22px;
-  position: relative;
-  top: -13px;
-  border-radius: 5px;
-  color: #ffffff;
-  font-size: 8px;
-  text-align: center;
-  padding-top: 2px;
-  font-weight: bolder;
-  padding-left: 3px;
-  padding-right: 3px;
-  &:not(:first-child) {
-    box-shadow: inset 4px -3px 4px rgba(0, 0, 0, 0.3);
-  }
-}
-.BookmarkWithIcon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-top: -2px;
-  text-shadow: 0 0 3px rgba(0, 0, 0, 1);
-  padding-right: 2px;
-  .icon {
-    width: 8px;
-    height: 8px;
-    font-size: 8px;
-  }
-  .text {
-    margin-top: 1px;
-    font-size: 9px;
-  }
-}
-
-/* Slight shadow for text */
-.textShadowThin {
-  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4);
-}
-.tagSkyFontMedium {
-  color: #38bdf8;
-  font-weight: 500;
-}
-
-/* HeadRow near the top, possibly ~19px tall. */
-.HeadRow {
-  position: relative;
-  top: 1px;
-  .classTitle {
-    font-weight: bold;
-    text-shadow: 0 0 2px rgba(0, 0, 0, 0.73);
-    font-size: 11px;
-  }
-  .TagTitle {
-    font-size: 11px;
-    font-weight: bold;
-    text-shadow: 0 0 2px rgba(231, 146, 52, 0.73);
-    color: #ffb01d;
-  }
-  @-moz-document url-prefix() {
-    .classSystemName {
-      font-family: inherit !important;
-      font-weight: bold;
-    }
-  }
-}
-
-/* Usually ~19px tall for bottom row. */
-.BottomRow {
-  height: 19px;
-  .localCounter {
-    display: flex;
-    gap: 2px;
-  }
-  .hasUserCharacters {
-    color: #fbbf24;
-  }
-}
-
-/* Overflows, effect icons, etc. */
-.systemNameOverflow {
-  flex-grow: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-family: sans-serif;
-}
-.effect {
-  width: 8px;
-  height: 8px;
-  margin-top: -2px;
-  border-radius: 2px;
-  margin-left: 1px;
-}
-.statics {
-  @-moz-document url-prefix() {
-    position: relative;
-    top: -1px;
-  }
-}
-
-/* The node handlers / double-click area */
-.Handlers {
-  position: absolute;
-  z-index: 2;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-.Handle {
-  border: 1px solid var(--pastel-blue);
-  width: 5px;
-  height: 5px;
-  &.selected {
-    border-color: var(--pastel-pink);
-  }
-  &.HandleTop {
-    top: -2px;
-  }
-  &.HandleRight {
-    right: -2px;
-  }
-  &.HandleBottom {
-    bottom: -2px;
-  }
-  &.HandleLeft {
-    left: -2px;
-  }
-
-  &.Tick {
-    width: 7px;
-    height: 7px;
-
-    &.HandleTop {
-      top: -3px;
-    }
-    &.HandleRight {
-      right: -3px;
-    }
-    &.HandleBottom {
-      bottom: -3px;
-    }
-    &.HandleLeft {
-      left: -3px;
-    }
-  }
-}
-
-/* Unsplashed signature containers */
-.Unsplashed {
-  position: absolute;
-  width: calc(50% - 4px);
-  z-index: -1;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 2px;
-  left: 2px;
-  &--right {
-    left: calc(50% + 6px);
-  }
-}

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.tsx

@@ -1,336 +0,0 @@
-import { memo, useMemo } from 'react';
-import { Handle, Position, WrapNodeProps } from 'reactflow';
-import { MapSolarSystemType } from '../../map.types';
-import classes from './SolarSystemNode.module.scss';
-import clsx from 'clsx';
-import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import { useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api';
-
-
-import {
-  EFFECT_BACKGROUND_STYLES,
-  LABELS_INFO,
-  LABELS_ORDER,
-  MARKER_BOOKMARK_BG_STYLES,
-  STATUS_CLASSES,
-} from '@/hooks/Mapper/components/map/constants.ts';
-import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
-import { WormholeClassComp } from '@/hooks/Mapper/components/map/components/WormholeClassComp';
-import { UnsplashedSignature } from '@/hooks/Mapper/components/map/components/UnsplashedSignature';
-import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
-import { getSystemClassStyles, prepareUnsplashedChunks } from '@/hooks/Mapper/components/map/helpers';
-import { sortWHClasses } from '@/hooks/Mapper/helpers';
-import { PrimeIcons } from 'primereact/api';
-import { LabelsManager } from '@/hooks/Mapper/utils/labelsManager.ts';
-import { OutCommand } from '@/hooks/Mapper/types';
-import { useDoubleClick } from '@/hooks/Mapper/hooks/useDoubleClick.ts';
-import { REGIONS_MAP, Spaces } from '@/hooks/Mapper/constants';
-
-const SpaceToClass: Record<string, string> = {
-  [Spaces.Caldari]: classes.Caldaria,
-  [Spaces.Matar]: classes.Mataria,
-  [Spaces.Amarr]: classes.Amarria,
-  [Spaces.Gallente]: classes.Gallente,
-};
-
-const sortedLabels = (labels: string[]) => {
-  if (!labels) {
-    return [];
-  }
-
-  return LABELS_ORDER.filter(x => labels.includes(x)).map(x => LABELS_INFO[x]);
-};
-
-export const getActivityType = (count: number) => {
-  if (count <= 5) {
-    return 'activityNormal';
-  }
-
-  if (count <= 30) {
-    return 'activityWarn';
-  }
-
-  return 'activityDanger';
-};
-
-// eslint-disable-next-line react/display-name
-export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarSystemType>) => {
-  const { interfaceSettings } = useMapRootState();
-  const { isShowUnsplashedSignatures } = interfaceSettings;
-
-  const isTempSystemNameEnabled = useMapGetOption('show_temp_system_name') === 'true';
-
-  const {
-    system_class,
-    security,
-    class_title,
-    solar_system_id,
-    statics,
-    effect_name,
-    region_name,
-    region_id,
-    is_shattered,
-    solar_system_name,
-  } = data.system_static_info;
-
-  const signatures = data.system_signatures;
-
-  const { locked, name, tag, status, labels, id, temporary_name: temporaryName } = data || {};
-
-
-  const {
-    data: {
-      characters,
-      presentCharacters,
-      wormholesData,
-      hubs,
-      kills,
-      userCharacters,
-      isConnecting,
-      hoverNodeId,
-      visibleNodes,
-      showKSpaceBG,
-      isThickConnections,
-    },
-    outCommand,
-  } = useMapState();
-
-  const visible = useMemo(() => visibleNodes.has(id), [id, visibleNodes]);
-
-  const charactersInSystem = useMemo(() => {
-    return characters
-      .filter(c => c.location?.solar_system_id === solar_system_id)
-      .filter(c => c.online);
-  }, [characters, presentCharacters, solar_system_id]);
-
-  const isWormhole = isWormholeSpace(system_class);
-  const classTitleColor = useMemo(
-    () => getSystemClassStyles({ systemClass: system_class, security }),
-    [security, system_class],
-  );
-  const sortedStatics = useMemo(() => sortWHClasses(wormholesData, statics), [wormholesData, statics]);
-  const lebM = useMemo(() => new LabelsManager(labels ?? ''), [labels]);
-  const labelsInfo = useMemo(() => sortedLabels(lebM.list), [lebM]);
-  const labelCustom = useMemo(() => lebM.customLabel, [lebM]);
-
-  const killsCount = useMemo(() => {
-    const systemKills = kills[solar_system_id];
-    if (!systemKills) {
-      return null;
-    }
-    return systemKills;
-  }, [kills, solar_system_id]);
-
-  const hasUserCharacters = useMemo(() => {
-    return charactersInSystem.some(x => userCharacters.includes(x.eve_id));
-  }, [charactersInSystem, userCharacters]);
-
-  const dbClick = useDoubleClick(() => {
-    outCommand({
-      type: OutCommand.openSettings,
-      data: {
-        system_id: solar_system_id.toString(),
-      },
-    });
-  });
-
-  const showHandlers = isConnecting || hoverNodeId === id;
-
-  const space = showKSpaceBG ? REGIONS_MAP[region_id] : '';
-  const regionClass = showKSpaceBG ? SpaceToClass[space] : null;
-
-  const systemName = (isTempSystemNameEnabled && temporaryName) || solar_system_name;
-  const customName = (isTempSystemNameEnabled && temporaryName && name) || (solar_system_name !== name && name);
-
-  const [unsplashedLeft, unsplashedRight] = useMemo(() => {
-    if (!isShowUnsplashedSignatures) {
-      return [[], []];
-    }
-    return prepareUnsplashedChunks(
-      signatures
-        .filter(s => s.group === 'Wormhole' && !s.linked_system)
-        .map(s => ({
-          eve_id: s.eve_id,
-          type: s.type,
-          custom_info: s.custom_info,
-        })),
-    );
-  }, [isShowUnsplashedSignatures, signatures]);
-
-  return (
-    <>
-      {visible && (
-        <div className={classes.Bookmarks}>
-          {labelCustom !== '' && (
-            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
-              <span className={classes.textShadowThin}>{labelCustom}</span>
-            </div>
-          )}
-
-          {is_shattered && (
-            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.shattered)}>
-              <span className={clsx('pi pi-chart-pie text-[0.55rem]')} />
-            </div>
-          )}
-
-          {killsCount && (
-            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[getActivityType(killsCount)])}>
-              <div className={clsx(classes.BookmarkWithIcon)}>
-                <span className={clsx(PrimeIcons.BOLT, 'text-[0.65rem]')} />
-                <span className={clsx(classes.text)}>{killsCount}</span>
-              </div>
-            </div>
-          )}
-
-          {labelsInfo.map(x => (
-            <div key={x.id} className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[x.id])}>
-              {x.shortName}
-            </div>
-          ))}
-        </div>
-      )}
-      <div
-        onMouseDownCapture={dbClick}
-        className={clsx(
-          classes.RootCustomNode,
-          regionClass,
-          classes[STATUS_CLASSES[status]],
-          { [classes.selected]: selected },
-          'flex flex-col w-[130px] h-[34px]',
-          'px-[6px] pt-[2px] pb-[3px] text-[10px]',
-          'leading-[1] space-y-[1px]',
-          'bg-[var(--tooltip-bg)] shadow-[0_0_5px_rgba(45,45,45,0.5)]',
-          'border border-[var(--pastel-blue-darken10)] rounded-[5px]'
-        )}
-      >
-        {visible && (
-          <>
-            <div className={clsx(classes.HeadRow, 'flex items-center gap-[3px]')}>
-              <div className={clsx(classes.classTitle, classTitleColor, classes.textShadowThin)}>
-                {class_title ?? '-'}
-              </div>
-
-              {tag != null && tag !== '' && (
-                <div className={clsx(classes.TagTitle, classes.tagSkyFontMedium)}>
-                  {tag}
-                </div>
-              )}
-
-              <div
-                className={clsx(
-                  classes.classSystemName,
-                  classes.textShadowThin,
-                  classes.systemNameOverflow,
-                  'overflow-hidden'
-                )}
-              >
-                {systemName}
-              </div>
-
-              {isWormhole && (
-                <div className={clsx(classes.statics, 'flex gap-[2px] text-[8px]')}>
-                  {sortedStatics.map(x => (
-                    <WormholeClassComp key={x} id={x} />
-                  ))}
-                </div>
-              )}
-
-              {effect_name !== null && isWormhole && (
-                <div className={clsx(classes.effect, EFFECT_BACKGROUND_STYLES[effect_name])}></div>
-              )}
-            </div>
-
-            <div className={clsx(classes.BottomRow, 'flex items-center gap-[3px]')}>
-              {customName && (
-                <div className={clsx('font-bold', classes.customName)}>
-                  {customName}
-                </div>
-              )}
-              {!isWormhole && !customName && <div className={clsx(classes.regionName)}>{region_name}</div>}
-              {isWormhole && !customName && <div />}
-
-              <div className="flex items-center ml-auto gap-[2px]">
-                {locked && (
-                  <i className={clsx(PrimeIcons.LOCK, 'text-[0.45rem] font-bold')} />
-                )}
-                {hubs.includes(solar_system_id.toString()) && (
-                  <i className={clsx(PrimeIcons.MAP_MARKER, 'text-[0.45rem] font-bold')} />
-                )}
-                {charactersInSystem.length > 0 && (
-                  <div
-                    className={clsx(
-                      classes.localCounter,
-                      { [classes.hasUserCharacters]: hasUserCharacters },
-                      'flex gap-[2px]'
-                    )}
-                  >
-                    <i className="pi pi-users text-[0.50rem]" />
-                    <span className="font-sans text-[0.65rem]">{charactersInSystem.length}</span>
-                  </div>
-                )}
-              </div>
-            </div>
-          </>
-        )}
-      </div>
-
-      {visible && isShowUnsplashedSignatures && (
-        <div className={classes.Unsplashed}>
-          {unsplashedLeft.map(x => (
-            <UnsplashedSignature key={x.sig_id} signature={x} />
-          ))}
-        </div>
-      )}
-      {visible && isShowUnsplashedSignatures && (
-        <div className={clsx(classes.Unsplashed, classes['Unsplashed--right'])}>
-          {unsplashedRight.map(x => (
-            <UnsplashedSignature key={x.sig_id} signature={x} />
-          ))}
-        </div>
-      )}
-
-      <div className={classes.Handlers}>
-        <Handle
-          type="source"
-          className={clsx(classes.Handle, classes.HandleTop, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
-          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
-          position={Position.Top}
-          id="a"
-        />
-        <Handle
-          type="source"
-          className={clsx(classes.Handle, classes.HandleRight, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
-          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
-          position={Position.Right}
-          id="b"
-        />
-        <Handle
-          type="source"
-          className={clsx(classes.Handle, classes.HandleBottom, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
-          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
-          position={Position.Bottom}
-          id="c"
-        />
-        <Handle
-          type="source"
-          className={clsx(classes.Handle, classes.HandleLeft, {
-            [classes.selected]: selected,
-            [classes.Tick]: isThickConnections,
-          })}
-          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
-          position={Position.Left}
-          id="d"
-        />
-      </div>
-    </>
-  );
-});

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.module.scss

@@ -0,0 +1,390 @@
+@import '@/hooks/Mapper/components/map/styles/eve-common-variables';
+
+$pastel-blue: #5a7d9a;
+$pastel-pink: #d291bc;
+$pastel-green: #88b04b;
+$pastel-yellow: #ffdd59;
+$dark-bg: #2d2d2d;
+$text-color: #ffffff;
+$tooltip-bg: #202020; // Dark background for tooltips
+
+.RootCustomNode {
+  display: flex;
+  width: 130px;
+  height: 34px;
+
+  flex-direction: column;
+  padding: 2px 6px;
+  font-size: 10px;
+
+  background-color: $tooltip-bg;
+  box-shadow: 0 0 5px rgba($dark-bg, 0.5);
+  border: 1px solid darken($pastel-blue, 10%);
+  border-radius: 5px;
+  position: relative;
+  z-index: 1;
+  overflow: hidden;
+
+  &.Mataria,
+  &.Amarria,
+  &.Gallente,
+  &.Caldaria {
+    &::before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background-size: cover;
+      background-position: 50% 50%;
+      z-index: -1;
+      background-repeat: no-repeat;
+      border-radius: 3px;
+    }
+  }
+
+  &.Mataria {
+    &::before {
+      background-image: url('/images/mataria-180.png');
+      opacity: 0.6;
+      background-position-x: 1px;
+      background-position-y: -14px;
+    }
+  }
+
+  &.Caldaria {
+    &::before {
+      background-image: url('/images/caldaria-180.png');
+      opacity: 0.6;
+      background-position-x: 1px;
+      background-position-y: -10px;
+    }
+  }
+
+  &.Amarria {
+    &::before {
+      opacity: 0.45;
+      background-image: url('/images/amarr-180.png');
+      background-position-x: 0;
+      background-position-y: -13px;
+    }
+  }
+
+  &.Gallente {
+    &::before {
+      opacity: 0.5;
+      background-image: url('/images/gallente-180.png');
+      background-position-x: 1px;
+      background-position-y: 0;
+    }
+  }
+
+  &.selected {
+    border-color: $pastel-pink;
+    box-shadow: 0 0 10px #9a1af1c2;
+  }
+
+  &.tooltip {
+    background-color: $tooltip-bg;
+    color: $text-color;
+    padding: 5px 10px;
+    border-radius: 3px;
+    border: 1px solid $pastel-pink;
+  }
+
+  &.eve-system-status-home {
+    border: 1px solid var(--eve-solar-system-status-color-home-dark30);
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-home),
+      transparent
+    );
+    &.selected {
+      border-color: var(--eve-solar-system-status-color-home);
+    }
+  }
+
+  &.eve-system-status-friendly {
+    border: 1px solid var(--eve-solar-system-status-color-friendly-dark20);
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-friendly-dark30),
+      transparent
+    );
+    &.selected {
+      border-color: var(--eve-solar-system-status-color-friendly-dark5);
+    }
+  }
+
+  &.eve-system-status-lookingFor {
+    border: 1px solid var(--eve-solar-system-status-color-lookingFor-dark15);
+    background-image: linear-gradient(275deg, #45ff8f2f, #457fff2f);
+    &.selected {
+      border-color: $pastel-pink;
+    }
+  }
+
+  &.eve-system-status-warning {
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-warning),
+      transparent
+    );
+  }
+
+  &.eve-system-status-dangerous {
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-dangerous),
+      transparent
+    );
+  }
+
+  &.eve-system-status-target {
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-target),
+      transparent
+    );
+  }
+}
+
+.Bookmarks {
+  position: absolute;
+  width: 100%;
+  z-index: 1;
+  display: flex;
+  left: 4px;
+
+  & > .Bookmark {
+    min-width: 13px;
+    height: 22px;
+    position: relative;
+    top: -13px;
+    border-radius: 5px;
+    color: #ffffff;
+    font-size: 8px;
+    text-align: center;
+    padding-top: 2px;
+    font-weight: bolder;
+    padding-left: 3px;
+    padding-right: 3px;
+
+    //background-color: #833ca4;
+
+    &:not(:first-child) {
+      box-shadow: inset 4px -3px 4px rgba(0, 0, 0, 0.3);
+    }
+  }
+
+  .BookmarkWithIcon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: -2px;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 1);
+    padding-right: 2px;
+
+    & > .icon {
+      width: 8px;
+      height: 8px;
+      font-size: 8px;
+    }
+
+    & > .text {
+      margin-top: 1px;
+      font-size: 9px;
+    }
+  }
+}
+
+.Unsplashed {
+  position: absolute;
+  width: calc(50% - 4px);
+  z-index: -1;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 2px;
+  left: 2px;
+
+  &--right {
+    left: calc(50% + 6px);
+  }
+
+  & > .Signature {
+    width: 13px;
+    height: 4px;
+    position: relative;
+    top: 3px;
+    border-radius: 5px;
+    color: #ffffff;
+    font-size: 8px;
+    text-align: center;
+    padding-top: 2px;
+    font-weight: bolder;
+    padding-left: 3px;
+    padding-right: 3px;
+    display: block;
+
+    background-color: #833ca4;
+
+    &:not(:first-child) {
+      box-shadow: inset 4px -3px 4px rgba(0, 0, 0, 0.3);
+    }
+  }
+}
+
+.icon {
+  width: 8px;
+  height: 8px;
+  font-size: 8px;
+}
+
+.HeadRow {
+  display: flex;
+  align-items: center;
+  gap: 3px;
+  font-size: 11px;
+  line-height: 14px;
+  font-weight: 500;
+  position: relative;
+  top: 1px;
+
+  .classTitle {
+    font-size: 11px;
+    font-weight: bold;
+    text-shadow: 0 0 2px rgb(0 0 0 / 73%);
+  }
+
+  .TagTitle {
+    font-size: 11px;
+    font-weight: medium;
+    text-shadow: 0 0 2px rgba(231, 146, 52, 0.73);
+
+    color: var(--rf-tag-color, #38BDF8);
+  }
+
+  /* Firefox kostyl */
+  @-moz-document url-prefix() {
+    .classSystemName {
+      font-family: inherit !important;
+      font-weight: bold;
+    }
+  }
+
+  .classSystemName {
+    //font-weight: bold;
+  }
+
+  .solarSystemName {
+  }
+}
+
+.BottomRow {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 19px;
+
+  .localCounter {
+    display: flex;
+    //align-items: center;
+    gap: 2px;
+
+    & > i {
+      position: relative;
+      top: 1px;
+    }
+
+    & > span {
+      font-size: 9px;
+      line-height: 9px;
+      font-weight: 500;
+      //margin-top: 1px;
+    }
+  }
+}
+
+.effect {
+  width: 8px;
+  height: 8px;
+  margin-top: -2px;
+  box-sizing: border-box;
+  border-radius: 2px;
+  margin-left: 1px;
+}
+
+.statics {
+  display: flex;
+  gap: 2px;
+  font-size: 8px;
+
+  & > * {
+    line-height: 10px;
+  }
+
+  /* Firefox kostyl */
+  @-moz-document url-prefix() {
+    position: relative;
+    top: -1px;
+  }
+}
+
+.Handlers {
+  position: absolute;
+  z-index: 2;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.Handle {
+  min-width: initial;
+  min-height: initial;
+  border: 1px solid $pastel-blue;
+  width: 5px;
+  height: 5px;
+
+  &.selected {
+    border-color: $pastel-pink;
+  }
+
+  &.HandleTop {
+    top: -2px;
+  }
+
+  &.HandleRight {
+    right: -2px;
+  }
+
+  &.HandleBottom {
+    bottom: -2px;
+  }
+
+  &.HandleLeft {
+    left: -2px;
+  }
+
+  &.Tick {
+    width: 7px;
+    height: 7px;
+
+    &.HandleTop {
+      top: -3px;
+    }
+
+    &.HandleRight {
+      right: -3px;
+    }
+
+    &.HandleBottom {
+      bottom: -3px;
+    }
+
+    &.HandleLeft {
+      left: -3px;
+    }
+  }
+}

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.tsx

@@ -0,0 +1,227 @@
+import { memo } from 'react';
+import { Handle, Position } from 'reactflow';
+import clsx from 'clsx';
+
+import classes from './SolarSystemNodeDefault.module.scss';
+import { PrimeIcons } from 'primereact/api';
+
+import { useSolarSystemNode } from '../../hooks/useSolarSystemNode';
+
+import {
+  MARKER_BOOKMARK_BG_STYLES,
+  STATUS_CLASSES,
+  EFFECT_BACKGROUND_STYLES,
+} from '@/hooks/Mapper/components/map/constants';
+import { WormholeClassComp } from '@/hooks/Mapper/components/map/components/WormholeClassComp';
+import { UnsplashedSignature } from '@/hooks/Mapper/components/map/components/UnsplashedSignature';
+
+export const SolarSystemNodeDefault = memo(props => {
+  const {
+    charactersInSystem,
+    classTitle,
+    classTitleColor,
+    customName,
+    effectName,
+    hasUserCharacters,
+    hubs,
+    visible,
+    labelCustom,
+    labelsInfo,
+    locked,
+    isShattered,
+    isThickConnections,
+    isWormhole,
+    killsCount,
+    killsActivityType,
+    regionClass,
+    regionName,
+    status,
+    selected,
+    tag,
+    showHandlers,
+    systemName,
+    sortedStatics,
+    solarSystemId,
+    unsplashedLeft,
+    unsplashedRight,
+    dbClick: handleDbClick,
+  } = useSolarSystemNode(props);
+
+  return (
+    <>
+      {visible && (
+        <div className={classes.Bookmarks}>
+          {labelCustom !== '' && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
+              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] ">{labelCustom}</span>
+            </div>
+          )}
+
+          {isShattered && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.shattered)}>
+              <span className={clsx('pi pi-chart-pie', classes.icon)} />
+            </div>
+          )}
+
+          {killsCount && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[killsActivityType!])}>
+              <div className={clsx(classes.BookmarkWithIcon)}>
+                <span className={clsx(PrimeIcons.BOLT, classes.icon)} />
+                <span className={clsx(classes.text)}>{killsCount}</span>
+              </div>
+            </div>
+          )}
+
+          {labelsInfo.map(x => (
+            <div key={x.id} className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[x.id])}>
+              {x.shortName}
+            </div>
+          ))}
+        </div>
+      )}
+
+      <div
+        className={clsx(classes.RootCustomNode, regionClass && classes[regionClass], classes[STATUS_CLASSES[status]], {
+          [classes.selected]: selected,
+        })}
+      >
+        {visible && (
+          <>
+            <div className={classes.HeadRow}>
+              <div className={clsx(classes.classTitle, classTitleColor, '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]')}>
+                {classTitle ?? '-'}
+              </div>
+
+              {tag != null && tag !== '' && (
+                <div className={clsx(classes.TagTitle, 'text-sky-400 font-medium')}>{tag}</div>
+              )}
+
+              <div
+                className={clsx(
+                  classes.classSystemName,
+                  '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] flex-grow overflow-hidden text-ellipsis whitespace-nowrap font-sans',
+                )}
+              >
+                {systemName}
+              </div>
+
+              {isWormhole && (
+                <div className={classes.statics}>
+                  {sortedStatics.map(whClass => (
+                    <WormholeClassComp key={whClass} id={whClass} />
+                  ))}
+                </div>
+              )}
+
+              {effectName !== null && isWormhole && (
+                <div className={clsx(classes.effect, EFFECT_BACKGROUND_STYLES[effectName])} />
+              )}
+            </div>
+
+            <div className={clsx(classes.BottomRow, 'flex items-center justify-between')}>
+              {customName && (
+                <div className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] text-blue-300 whitespace-nowrap overflow-hidden text-ellipsis mr-0.5">
+                  {customName}
+                </div>
+              )}
+
+              {!isWormhole && !customName && (
+                <div className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] text-stone-300 whitespace-nowrap overflow-hidden text-ellipsis mr-0.5">
+                  {regionName}
+                </div>
+              )}
+
+              {isWormhole && !customName && <div />}
+
+              <div className="flex items-center justify-end">
+                <div className="flex gap-1 items-center">
+                  {locked && <i className={PrimeIcons.LOCK} style={{ fontSize: '0.45rem', fontWeight: 'bold' }} />}
+
+                  {hubs.includes(solarSystemId.toString()) && (
+                    <i className={PrimeIcons.MAP_MARKER} style={{ fontSize: '0.45rem', fontWeight: 'bold' }} />
+                  )}
+
+                  {charactersInSystem.length > 0 && (
+                    <div
+                      className={clsx(classes.localCounter, {
+                        ['text-amber-300']: hasUserCharacters,
+                      })}
+                    >
+                      <i className="pi pi-users" style={{ fontSize: '0.50rem' }} />
+                      <span className="font-sans">{charactersInSystem.length}</span>
+                    </div>
+                  )}
+                </div>
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+
+      {visible && (
+        <>
+          {unsplashedLeft.length > 0 && (
+            <div className={classes.Unsplashed}>
+              {unsplashedLeft.map(sig => (
+                <UnsplashedSignature key={sig.sig_id} signature={sig} />
+              ))}
+            </div>
+          )}
+
+          {unsplashedRight.length > 0 && (
+            <div className={clsx(classes.Unsplashed, classes['Unsplashed--right'])}>
+              {unsplashedRight.map(sig => (
+                <UnsplashedSignature key={sig.sig_id} signature={sig} />
+              ))}
+            </div>
+          )}
+        </>
+      )}
+
+      <div onMouseDownCapture={handleDbClick} className={classes.Handlers}>
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleTop, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Top}
+          id="a"
+        />
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleRight, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Right}
+          id="b"
+        />
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleBottom, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Bottom}
+          id="c"
+        />
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleLeft, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Left}
+          id="d"
+        />
+      </div>
+    </>
+  );
+});
+
+SolarSystemNodeDefault.displayName = 'SolarSystemNodeDefault';

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.module.scss

@@ -0,0 +1,407 @@
+@import '@/hooks/Mapper/components/map/styles/eve-common-variables';
+
+$pastel-blue: #5a7d9a;
+$pastel-pink: #d291bc;
+$pastel-green: #88b04b;
+$pastel-yellow: #ffdd59;
+$dark-bg: #2d2d2d;
+$text-color: #ffffff;
+$tooltip-bg: #202020; // Dark background for tooltips
+
+.RootCustomNode {
+  display: flex;
+  width: 130px;
+  height: 34px;
+
+  flex-direction: column;
+  padding: 2px 6px;
+  font-size: 10px;
+
+  background-color: var(--rf-node-bg-color, #202020) !important;
+  color: var(--rf-text-color, #ffffff);
+  font-family: var(--rf-node-font-family, inherit) !important;
+  font-weight: var(--rf-node-font-weight, inherit) !important;
+
+  box-shadow: 0 0 5px rgba($dark-bg, 0.5);
+  border: 1px solid darken($pastel-blue, 10%);
+  border-radius: 5px;
+  position: relative;
+  z-index: 1;
+  overflow: hidden;
+
+  &.Mataria,
+  &.Amarria,
+  &.Gallente,
+  &.Caldaria {
+    &::before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background-size: cover;
+      background-position: 50% 50%;
+      z-index: -1;
+      background-repeat: no-repeat;
+      border-radius: 3px;
+    }
+  }
+
+  &.Mataria {
+    &::before {
+      background-image: url('/images/mataria-180.png');
+      opacity: 0.6;
+      background-position-x: 1px;
+      background-position-y: -14px;
+    }
+  }
+
+  &.Caldaria {
+    &::before {
+      background-image: url('/images/caldaria-180.png');
+      opacity: 0.6;
+      background-position-x: 1px;
+      background-position-y: -10px;
+    }
+  }
+
+  &.Amarria {
+    &::before {
+      opacity: 0.45;
+      background-image: url('/images/amarr-180.png');
+      background-position-x: 0;
+      background-position-y: -13px;
+    }
+  }
+
+  &.Gallente {
+    &::before {
+      opacity: 0.5;
+      background-image: url('/images/gallente-180.png');
+      background-position-x: 1px;
+      background-position-y: 0;
+    }
+  }
+
+  &.selected {
+    border-color: $pastel-pink;
+    box-shadow: 0 0 10px #9a1af1c2;
+  }
+
+  &.tooltip {
+    background-color: $tooltip-bg;
+    color: $text-color;
+    padding: 5px 10px;
+    border-radius: 3px;
+    border: 1px solid $pastel-pink;
+  }
+
+  &.eve-system-status-home {
+    border: 1px solid var(--eve-solar-system-status-color-home-dark30);
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-home),
+      transparent
+    );
+    &.selected {
+      border-color: var(--eve-solar-system-status-color-home);
+    }
+  }
+
+  &.eve-system-status-friendly {
+    border: 1px solid var(--eve-solar-system-status-color-friendly-dark20);
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-friendly-dark30),
+      transparent
+    );
+    &.selected {
+      border-color: var(--eve-solar-system-status-color-friendly-dark5);
+    }
+  }
+
+  &.eve-system-status-lookingFor {
+    border: 1px solid var(--eve-solar-system-status-color-lookingFor-dark15);
+    background-image: linear-gradient(275deg, #45ff8f2f, #457fff2f);
+    &.selected {
+      border-color: $pastel-pink;
+    }
+  }
+
+  &.eve-system-status-warning {
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-warning),
+      transparent
+    );
+  }
+
+  &.eve-system-status-dangerous {
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-dangerous),
+      transparent
+    );
+  }
+
+  &.eve-system-status-target {
+    background-image: linear-gradient(
+      275deg,
+      var(--eve-solar-system-status-target),
+      transparent
+    );
+  }
+}
+
+.Bookmarks {
+  position: absolute;
+  width: 100%;
+  z-index: 1;
+  display: flex;
+  left: 4px;
+
+  & > .Bookmark {
+    min-width: 13px;
+    height: 22px;
+    position: relative;
+    top: -13px;
+    border-radius: 5px;
+    color: #ffffff;
+    font-size: 8px;
+    text-align: center;
+    padding-top: 2px;
+    font-weight: bolder;
+    padding-left: 3px;
+    padding-right: 3px;
+
+    //background-color: #833ca4;
+
+    &:not(:first-child) {
+      box-shadow: inset 4px -3px 4px rgba(0, 0, 0, 0.3);
+    }
+  }
+
+  .BookmarkWithIcon {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: -2px;
+    text-shadow: 0 0 3px rgba(0, 0, 0, 1);
+    padding-right: 2px;
+
+    & > .icon {
+      width: 8px;
+      height: 8px;
+      font-size: 8px;
+    }
+
+    & > .text {
+      margin-top: 1px;
+      font-size: 9px;
+    }
+  }
+}
+
+.Unsplashed {
+  position: absolute;
+  width: calc(50% - 4px);
+  z-index: -1;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 2px;
+  left: 2px;
+
+  &--right {
+    left: calc(50% + 6px);
+  }
+
+  & > .Signature {
+    width: 13px;
+    height: 4px;
+    position: relative;
+    top: 3px;
+    border-radius: 5px;
+    color: #ffffff;
+    font-size: 8px;
+    text-align: center;
+    padding-top: 2px;
+    font-weight: bolder;
+    padding-left: 3px;
+    padding-right: 3px;
+    display: block;
+
+    background-color: #833ca4;
+
+    &:not(:first-child) {
+      box-shadow: inset 4px -3px 4px rgba(0, 0, 0, 0.3);
+    }
+  }
+}
+
+.icon {
+  width: 8px;
+  height: 8px;
+  font-size: 8px;
+}
+
+.HeadRow {
+  display: flex;
+  align-items: center;
+  gap: 3px;
+  font-size: 11px;
+  line-height: 14px;
+  font-weight: 500;
+  position: relative;
+  top: 1px;
+
+  .classTitle {
+    font-size: 11px;
+    font-weight: bold;
+    text-shadow: 0 0 2px rgb(0 0 0 / 73%);
+  }
+
+  .TagTitle {
+    font-size: 11px;
+    font-weight: medium;
+    text-shadow: 0 0 2px rgba(231, 146, 52, 0.73);
+
+    color: var(--rf-tag-color, #38BDF8);
+  }
+
+  /* Firefox kostyl */
+  @-moz-document url-prefix() {
+    .classSystemName {
+      font-family: inherit !important;
+      font-weight: bold;
+    }
+  }
+
+  .classSystemName {
+    font-family: inherit !important;
+    font-weight: bold;
+  }
+
+  .solarSystemName {
+  }
+}
+
+.BottomRow {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 19px;
+
+  .regionName {
+    color: var(--rf-region-name, #D6D3D1)
+  }
+
+  .customName {
+    color: var(--rf-custom-name, #93C5FD)
+  }
+
+  .localCounter {
+    display: flex;
+    //align-items: center;
+    gap: 2px;
+
+    .hasUserCharacters {
+      color: var(--rf-has-user-characters, #fbbf24);
+    }
+
+    & > i {
+      position: relative;
+      top: 1px;
+    }
+
+    & > span {
+      font-size: 9px;
+      line-height: 9px;
+      font-weight: 500;
+      //margin-top: 1px;
+    }
+  }
+}
+
+.effect {
+  width: 8px;
+  height: 8px;
+  margin-top: -2px;
+  box-sizing: border-box;
+  border-radius: 2px;
+  margin-left: 1px;
+}
+
+.statics {
+  display: flex;
+  gap: 2px;
+  font-size: 8px;
+
+  & > * {
+    line-height: 10px;
+  }
+
+  /* Firefox kostyl */
+  @-moz-document url-prefix() {
+    position: relative;
+    top: -1px;
+  }
+}
+
+.Handlers {
+  position: absolute;
+  z-index: 2;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.Handle {
+  min-width: initial;
+  min-height: initial;
+  border: 1px solid $pastel-blue;
+  width: 5px;
+  height: 5px;
+
+  &.selected {
+    border-color: $pastel-pink;
+  }
+
+  &.HandleTop {
+    top: -2px;
+  }
+
+  &.HandleRight {
+    right: -2px;
+  }
+
+  &.HandleBottom {
+    bottom: -2px;
+  }
+
+  &.HandleLeft {
+    left: -2px;
+  }
+
+  &.Tick {
+    width: 7px;
+    height: 7px;
+
+    &.HandleTop {
+      top: -3px;
+    }
+
+    &.HandleRight {
+      right: -3px;
+    }
+
+    &.HandleBottom {
+      bottom: -3px;
+    }
+
+    &.HandleLeft {
+      left: -3px;
+    }
+  }
+}

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.tsx

@@ -0,0 +1,235 @@
+import { memo } from 'react';
+import { Handle, Position } from 'reactflow';
+import clsx from 'clsx';
+
+import classes from './SolarSystemNodeTheme.module.scss';
+import { PrimeIcons } from 'primereact/api';
+
+import { useSolarSystemNode } from '../../hooks/useSolarSystemNode';
+
+import {
+  MARKER_BOOKMARK_BG_STYLES,
+  STATUS_CLASSES,
+  EFFECT_BACKGROUND_STYLES,
+} from '@/hooks/Mapper/components/map/constants';
+import { WormholeClassComp } from '@/hooks/Mapper/components/map/components/WormholeClassComp';
+import { UnsplashedSignature } from '@/hooks/Mapper/components/map/components/UnsplashedSignature';
+
+export const SolarSystemNodeTheme = memo(props => {
+  const {
+    charactersInSystem,
+    classTitle,
+    classTitleColor,
+    customName,
+    effectName,
+    hasUserCharacters,
+    hubs,
+    visible,
+    labelCustom,
+    labelsInfo,
+    locked,
+    isShattered,
+    isThickConnections,
+    isWormhole,
+    killsCount,
+    killsActivityType,
+    regionClass,
+    regionName,
+    status,
+    selected,
+    tag,
+    showHandlers,
+    systemName,
+    sortedStatics,
+    solarSystemId,
+    unsplashedLeft,
+    unsplashedRight,
+    dbClick: handleDbClick,
+  } = useSolarSystemNode(props);
+
+  return (
+    <>
+      {visible && (
+        <div className={classes.Bookmarks}>
+          {labelCustom !== '' && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
+              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] ">{labelCustom}</span>
+            </div>
+          )}
+
+          {isShattered && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.shattered)}>
+              <span className={clsx('pi pi-chart-pie', classes.icon)} />
+            </div>
+          )}
+
+          {killsCount && (
+            <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[killsActivityType!])}>
+              <div className={clsx(classes.BookmarkWithIcon)}>
+                <span className={clsx(PrimeIcons.BOLT, classes.icon)} />
+                <span className={clsx(classes.text)}>{killsCount}</span>
+              </div>
+            </div>
+          )}
+
+          {labelsInfo.map(x => (
+            <div key={x.id} className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES[x.id])}>
+              {x.shortName}
+            </div>
+          ))}
+        </div>
+      )}
+
+      <div
+        className={clsx(classes.RootCustomNode, regionClass && classes[regionClass], classes[STATUS_CLASSES[status]], {
+          [classes.selected]: selected,
+        })}
+      >
+        {visible && (
+          <>
+            <div className={classes.HeadRow}>
+              <div className={clsx(classes.classTitle, classTitleColor, '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]')}>
+                {classTitle ?? '-'}
+              </div>
+
+              {tag != null && tag !== '' && <div className={clsx(classes.TagTitle)}>{tag}</div>}
+
+              <div
+                className={clsx(
+                  classes.classSystemName,
+                  '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] flex-grow overflow-hidden text-ellipsis whitespace-nowrap',
+                )}
+              >
+                {systemName}
+              </div>
+
+              {isWormhole && (
+                <div className={classes.statics}>
+                  {sortedStatics.map(whClass => (
+                    <WormholeClassComp key={whClass} id={whClass} />
+                  ))}
+                </div>
+              )}
+
+              {effectName !== null && isWormhole && (
+                <div className={clsx(classes.effect, EFFECT_BACKGROUND_STYLES[effectName])} />
+              )}
+            </div>
+
+            <div className={clsx(classes.BottomRow, 'flex items-center justify-between')}>
+              {customName && (
+                <div
+                  className={clsx(
+                    classes.CustomName,
+                    '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] whitespace-nowrap overflow-hidden text-ellipsis mr-0.5',
+                  )}
+                >
+                  {customName}
+                </div>
+              )}
+
+              {!isWormhole && !customName && (
+                <div
+                  className={clsx(
+                    classes.RegionName,
+                    '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] whitespace-nowrap overflow-hidden text-ellipsis mr-0.5',
+                  )}
+                >
+                  {regionName}
+                </div>
+              )}
+
+              {isWormhole && !customName && <div />}
+
+              <div className="flex items-center justify-end">
+                <div className="flex gap-1 items-center">
+                  {locked && <i className={PrimeIcons.LOCK} style={{ fontSize: '0.45rem', fontWeight: 'bold' }} />}
+
+                  {hubs.includes(solarSystemId.toString()) && (
+                    <i className={PrimeIcons.MAP_MARKER} style={{ fontSize: '0.45rem', fontWeight: 'bold' }} />
+                  )}
+
+                  {charactersInSystem.length > 0 && (
+                    <div
+                      className={clsx(classes.localCounter, {
+                        [classes.hasUserCharacters]: hasUserCharacters,
+                      })}
+                    >
+                      <i className="pi pi-users" style={{ fontSize: '0.50rem' }} />
+                      <span className="font-sans">{charactersInSystem.length}</span>
+                    </div>
+                  )}
+                </div>
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+
+      {visible && (
+        <>
+          {unsplashedLeft.length > 0 && (
+            <div className={classes.Unsplashed}>
+              {unsplashedLeft.map(sig => (
+                <UnsplashedSignature key={sig.sig_id} signature={sig} />
+              ))}
+            </div>
+          )}
+
+          {unsplashedRight.length > 0 && (
+            <div className={clsx(classes.Unsplashed, classes['Unsplashed--right'])}>
+              {unsplashedRight.map(sig => (
+                <UnsplashedSignature key={sig.sig_id} signature={sig} />
+              ))}
+            </div>
+          )}
+        </>
+      )}
+
+      <div onMouseDownCapture={handleDbClick} className={classes.Handlers}>
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleTop, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Top}
+          id="a"
+        />
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleRight, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Right}
+          id="b"
+        />
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleBottom, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Bottom}
+          id="c"
+        />
+        <Handle
+          type="source"
+          className={clsx(classes.Handle, classes.HandleLeft, {
+            [classes.selected]: selected,
+            [classes.Tick]: isThickConnections,
+          })}
+          style={{ visibility: showHandlers ? 'visible' : 'hidden' }}
+          position={Position.Left}
+          id="d"
+        />
+      </div>
+    </>
+  );
+});
+
+SolarSystemNodeTheme.displayName = 'SolarSystemNodeTheme';

assets/js/hooks/Mapper/components/map/components/SolarSystemNode/index.ts

@@ -1 +1,2 @@
-export * from './SolarSystemNode';
+export * from './SolarSystemNodeDefault';
+export * from './SolarSystemNodeTheme';

assets/js/hooks/Mapper/components/map/hooks/useBackgroundVars.ts

@@ -1,15 +1,17 @@
 import { useEffect, useState } from 'react';
 import { BackgroundVariant } from 'reactflow';
 
-
 export function useBackgroundVars(themeName?: string) {
   const [variant, setVariant] = useState<BackgroundVariant>(BackgroundVariant.Dots);
   const [gap, setGap] = useState<number>(16);
   const [size, setSize] = useState<number>(1);
-  const [color, setColor] = useState('#81818b')
+  const [color, setColor] = useState('#81818b');
 
-  useEffect(() => { 
-    let themeEl = document.querySelector('.pathfinder-theme, .neon-theme');
+  useEffect(() => {
+    // match any element whose entire `class` attribute ends with "-theme"
+    let themeEl = document.querySelector('[class$="-theme"]');
+
+    // If none is found, fall back to the <html> element
     if (!themeEl) {
       themeEl = document.documentElement;
     }
@@ -18,6 +20,7 @@ export function useBackgroundVars(themeName?: string) {
 
     const rawVariant = style.getPropertyValue('--rf-bg-variant').replace(/['"]/g, '').trim().toLowerCase();
     let finalVariant: BackgroundVariant = BackgroundVariant.Dots;
+
     if (rawVariant === 'lines') {
       finalVariant = BackgroundVariant.Lines;
     } else if (rawVariant === 'cross') {
@@ -26,7 +29,7 @@ export function useBackgroundVars(themeName?: string) {
 
     const cssVarGap = style.getPropertyValue('--rf-bg-gap');
     const cssVarSize = style.getPropertyValue('--rf-bg-size');
-    const cssColor = style.getPropertyValue('--rf-bg-color');
+    const cssColor = style.getPropertyValue('--rf-bg-pattern-color');
 
     const gapNum = parseInt(cssVarGap, 10) || 16;
     const sizeNum = parseInt(cssVarSize, 10) || 1;
@@ -35,8 +38,7 @@ export function useBackgroundVars(themeName?: string) {
     setGap(gapNum);
     setSize(sizeNum);
     setColor(cssColor);
-
-  }, [themeName]); 
+  }, [themeName]);
 
   return { variant, gap, size, color };
 }

assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts

@@ -0,0 +1,189 @@
+import { useMemo } from 'react';
+
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api';
+import { useMapState } from '@/hooks/Mapper/components/map/MapProvider';
+import { useDoubleClick } from '@/hooks/Mapper/hooks/useDoubleClick';
+import { REGIONS_MAP, Spaces } from '@/hooks/Mapper/constants';
+import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace';
+import { getSystemClassStyles, prepareUnsplashedChunks } from '@/hooks/Mapper/components/map/helpers';
+import { sortWHClasses } from '@/hooks/Mapper/helpers';
+import { LabelsManager } from '@/hooks/Mapper/utils/labelsManager';
+import { OutCommand } from '@/hooks/Mapper/types';
+import { LABELS_INFO, LABELS_ORDER } from '@/hooks/Mapper/components/map/constants';
+
+function getActivityType(count: number) {
+  if (count <= 5) return 'activityNormal';
+  if (count <= 30) return 'activityWarn';
+  return 'activityDanger';
+}
+
+const SpaceToClass: Record<string, string> = {
+  [Spaces.Caldari]: 'Caldaria',
+  [Spaces.Matar]: 'Mataria',
+  [Spaces.Amarr]: 'Amarria',
+  [Spaces.Gallente]: 'Gallente',
+};
+
+function sortedLabels(labels: string[]) {
+  if (!labels) return [];
+  return LABELS_ORDER.filter(x => labels.includes(x)).map(x => LABELS_INFO[x]);
+}
+
+export function useSolarSystemNode(props: any) {
+  const { data, selected, id } = props;
+  const {
+    system_static_info,
+    system_signatures,
+    locked,
+    name,
+    tag,
+    status,
+    labels,
+    temporary_name,
+    linked_sig_eve_id: linkedSigEveId = '',
+  } = data;
+
+  const {
+    system_class,
+    security,
+    class_title,
+    solar_system_id,
+    statics,
+    effect_name,
+    region_name,
+    region_id,
+    is_shattered,
+    solar_system_name,
+  } = system_static_info;
+
+  // Global map state
+  const { interfaceSettings } = useMapRootState();
+  const { isShowUnsplashedSignatures } = interfaceSettings;
+  const isTempSystemNameEnabled = useMapGetOption('show_temp_system_name') === 'true';
+  const isShowLinkedSigId = useMapGetOption('show_linked_signature_id') === 'true';
+
+  const {
+    data: {
+      characters,
+      presentCharacters,
+      wormholesData,
+      hubs,
+      kills,
+      userCharacters,
+      isConnecting,
+      hoverNodeId,
+      visibleNodes,
+      showKSpaceBG,
+      isThickConnections,
+    },
+    outCommand,
+  } = useMapState();
+
+  // logic
+  const visible = useMemo(() => visibleNodes.has(id), [id, visibleNodes]);
+
+  const charactersInSystem = useMemo(() => {
+    return characters.filter(c => c.location?.solar_system_id === solar_system_id).filter(c => c.online);
+    // eslint-disable-next-line
+  }, [characters, presentCharacters, solar_system_id]);
+
+  const isWormhole = isWormholeSpace(system_class);
+
+  const classTitleColor = useMemo(
+    () => getSystemClassStyles({ systemClass: system_class, security }),
+    [security, system_class],
+  );
+
+  const sortedStatics = useMemo(() => sortWHClasses(wormholesData, statics), [wormholesData, statics]);
+
+  const linkedSigPrefix = useMemo(() => (linkedSigEveId ? linkedSigEveId.split('-')[0] : null), [linkedSigEveId]);
+
+  const labelsManager = useMemo(() => new LabelsManager(labels ?? ''), [labels]);
+  const labelsInfo = useMemo(() => sortedLabels(labelsManager.list), [labelsManager]);
+  const labelCustom = useMemo(
+    () =>
+      isShowLinkedSigId && linkedSigPrefix
+        ? `${linkedSigPrefix}・${labelsManager.customLabel}`
+        : labelsManager.customLabel,
+    [linkedSigPrefix, isShowLinkedSigId, labelsManager],
+  );
+
+  const killsCount = useMemo(() => kills[solar_system_id] ?? null, [kills, solar_system_id]);
+  const killsActivityType = killsCount ? getActivityType(killsCount) : null;
+
+  const hasUserCharacters = useMemo(() => {
+    return charactersInSystem.some(x => userCharacters.includes(x.eve_id));
+  }, [charactersInSystem, userCharacters]);
+
+  const dbClick = useDoubleClick(() => {
+    outCommand({
+      type: OutCommand.openSettings,
+      data: { system_id: solar_system_id.toString() },
+    });
+  });
+
+  const showHandlers = isConnecting || hoverNodeId === id;
+
+  const space = showKSpaceBG ? REGIONS_MAP[region_id] : '';
+  const regionClass = showKSpaceBG ? SpaceToClass[space] : null;
+
+  const systemName = (isTempSystemNameEnabled && temporary_name) || solar_system_name;
+  const customName = (isTempSystemNameEnabled && temporary_name && name) || (solar_system_name !== name && name);
+
+  const [unsplashedLeft, unsplashedRight] = useMemo(() => {
+    if (!isShowUnsplashedSignatures) {
+      return [[], []];
+    }
+    return prepareUnsplashedChunks(
+      system_signatures
+        .filter(s => s.group === 'Wormhole' && !s.linked_system)
+        .map(s => ({
+          eve_id: s.eve_id,
+          type: s.type,
+          custom_info: s.custom_info,
+        })),
+    );
+  }, [isShowUnsplashedSignatures, system_signatures]);
+
+  const nodeVars = {
+    // original props
+    id,
+    selected,
+    // computed
+    visible,
+    isWormhole,
+    classTitleColor,
+    killsCount,
+    killsActivityType,
+    hasUserCharacters,
+    showHandlers,
+    regionClass,
+    systemName,
+    customName,
+    labelCustom,
+    isShattered: is_shattered,
+    tag,
+    status,
+    labelsInfo,
+    dbClick,
+    sortedStatics,
+    effectName: effect_name,
+    regionName: region_name,
+    solarSystemId: solar_system_id,
+    solarSystemName: solar_system_name,
+    locked,
+    hubs,
+    name: name,
+    isConnecting,
+    hoverNodeId,
+    charactersInSystem,
+    unsplashedLeft,
+    unsplashedRight,
+    isThickConnections,
+    classTitle: class_title,
+    temporaryName: temporary_name,
+  };
+
+  return nodeVars;
+}

assets/js/hooks/Mapper/components/map/styles/default-theme.scss

@@ -0,0 +1,31 @@
+@import './eve-common-variables';
+@import './eve-common';
+
+.default-theme {
+  --rf-bg-color: #0C0A09;
+  --rf-soft-bg-color: #171717;
+
+  --rf-node-bg-color: #202020;
+  --rf-node-soft-bg-color: #202020;
+  --rf-text-color: #ffffff;
+  --rf-tag-color:  #38BDF8;
+  --rf-region-name: #D6D3D1;
+  --rf-custom-name: #93C5FD;
+
+
+  --rf-bg-variant: "dots";
+  --rf-bg-gap: 15;
+  --rf-bg-size: 1;
+  --rf-bg-pattern-color: #81818a;
+
+  --pastel-blue: #5a7d9a;
+  --pastel-pink: #d291bc;
+  --pastel-green: #88b04b;
+  --pastel-yellow: #ffdd59;
+
+  --dark-bg: #2d2d2d;
+  --text-color: #ffffff;
+  --tooltip-bg: #202020;
+
+  
+}

assets/js/hooks/Mapper/components/map/styles/eve-common-variables.scss

@@ -1,114 +1,121 @@
+
+$friendlyBase: #3bbd39;              
+$friendlyAlpha: #3bbd3952;           
+$friendlyDark20: darken($friendlyBase, 20%);
+$friendlyDark30: darken($friendlyBase, 30%);
+$friendlyDark5:  darken($friendlyBase, 5%);
+
+$lookingForBase: #43c2fd;            
+$lookingForAlpha: rgba(67, 176, 253, 0.48);
+$lookingForDark15: darken($lookingForBase, 15%);
+
+$homeBase: rgb(197, 253, 67);
+$homeAlpha: rgba(197, 253, 67, 0.32);
+$homeDark30: darken($homeBase, 30%);
+
+
 :root {
-    --pastel-blue: #5a7d9a;
-    --pastel-pink: #d291bc;
-    --pastel-green: #88b04b;
-    --pastel-yellow: #ffdd59;
-    --dark-bg: #2d2d2d;
-    --text-color: #ffffff;
-    --tooltip-bg: #202020;
+  --pastel-blue: #5a7d9a;
+  --pastel-pink: #d291bc;
+  --pastel-green: #88b04b;
+  --pastel-yellow: #ffdd59;
+  --dark-bg: #2d2d2d;
+  --text-color: #ffffff;
+  --tooltip-bg: #202020;
 
-    --pastel-blue-darken10: #4f6b86;
-    --pastel-blue-lighten10: #6da3af;
-    --pastel-pink-darken10: #bb7ca9;
-    --pastel-pink-lighten10: #e0a6cb;
+  --pastel-blue-darken10: #4f6b86;
+  --pastel-blue-lighten10: #6da3af;
+  --pastel-pink-darken10: #bb7ca9;
+  --pastel-pink-lighten10: #e0a6cb;
+  --pastel-green-darken10: #79a244;
+  --pastel-green-lighten10: #99cf52;
+  --pastel-yellow-darken10: #e6c44f;
+  --pastel-yellow-lighten10: #ffe874;
 
-    --pastel-green-darken10: #79a244;
-    --pastel-green-lighten10: #99cf52;
+  --eve-link-color-default: #333;
+  --eve-link-color-top-mass-0: #333;
+  --eve-link-color-top-mass-1: #5a4520;
+  --eve-link-color-top-mass-2: #672c2c;
+  --eve-link-color-middle-mass-0: #333;
+  --eve-link-color-middle-mass-1: #333;
+  --eve-link-color-middle-mass-2: #333;
+  --eve-link-color-middle-time-0: #5c5c5c;
+  --eve-link-color-middle-time-1: #ff00cd;
+  --eve-link-color-middle-time-1-border: #99f3ff;
+  --eve-link-color-top-mass-1-time-1: #796300;
+  --eve-link-color-top-mass-2-time-1: #8c1717;
+  --eve-link-color-temp: orange;
 
-    --pastel-yellow-darken10: #e6c44f;
-    --pastel-yellow-lighten10: #ffe874;
+  --eve-effect-pulsar: #40aef5;
+  --eve-effect-magnetar: #f058f8;
+  --eve-effect-wolfRayet: #ef7843;
+  --eve-effect-blackHole: #1b1b1b;
+  --eve-effect-cataclysmicVariable: #ffea90;
+  --eve-effect-redGiant: #fd3c3c;
+  --eve-effect-dazhLiminalityLocus: #ff6464;
+  --eve-effect-imperialStellarObservatory: #6991ce;
+  --eve-effect-stateStellarObservatory: #6991ce;
+  --eve-effect-republicStellarObservatory: #6991ce;
+  --eve-effect-federalStellarObservatory: #6991ce;
 
-    /* Eve Link Colors */
-    --eve-link-color-default: #333;
-    --eve-link-color-top-mass-0: #333;
-    --eve-link-color-top-mass-1: #5a4520;
-    --eve-link-color-top-mass-2: #672c2c;
-    --eve-link-color-middle-mass-0: #333;
-    --eve-link-color-middle-mass-1: #333;
-    --eve-link-color-middle-mass-2: #333;
-    --eve-link-color-middle-time-0: #5c5c5c;
-    --eve-link-color-middle-time-1: #ff00cd;
-    --eve-link-color-middle-time-1-border: #99f3ff;
-    --eve-link-color-top-mass-1-time-1: #796300;
-    --eve-link-color-top-mass-2-time-1: #8c1717;
-    --eve-link-color-temp: orange;
+  --eve-wh-type-color-high: #5dffd2;
+  --eve-wh-type-color-low: #f79400;
+  --eve-wh-type-color-null: #fc3c3c;
+  --eve-wh-type-color-c1: #69bfce;
+  --eve-wh-type-color-c2: #6991ce;
+  --eve-wh-type-color-c3: #a8cb70;
+  --eve-wh-type-color-c4: #e39c68;
+  --eve-wh-type-color-c5: #de8686;
+  --eve-wh-type-color-c6: #e76363;
+  --eve-wh-type-color-c13: #988cb5;
+  --eve-wh-type-color-drifter: #ff44f6;
+  --eve-wh-type-color-thera: #ffffff;
+  --eve-wh-type-color-zarzakh: #212121;
 
-    /* Wormhole Effects */
-    --eve-effect-pulsar: #40aef5;
-    --eve-effect-magnetar: #f058f8;
-    --eve-effect-wolfRayet: #ef7843;
-    --eve-effect-blackHole: #1b1b1b;
-    --eve-effect-cataclysmicVariable: #ffea90;
-    --eve-effect-redGiant: #fd3c3c;
-    --eve-effect-dazhLiminalityLocus: #ff6464;
-    --eve-effect-imperialStellarObservatory: #6991ce;
-    --eve-effect-stateStellarObservatory: #6991ce;
-    --eve-effect-republicStellarObservatory: #6991ce;
-    --eve-effect-federalStellarObservatory: #6991ce;
+  --eve-security-color-10: #2c74df;
+  --eve-security-color-09: #3998e8;
+  --eve-security-color-08: #4dcbf5;
+  --eve-security-color-07: #60d8a2;
+  --eve-security-color-06: #71e454;
+  --eve-security-color-05: #f2fc81;
+  --eve-security-color-04: #d96c07;
+  --eve-security-color-03: #cb440f;
+  --eve-security-color-02: #b91117;
+  --eve-security-color-01: #732020;
+  --eve-security-color-00: #8b3263;
+  --eve-security-color-m-01: #8b3263;
+  --eve-security-color-m-02: #8b3263;
+  --eve-security-color-m-03: #8b3263;
+  --eve-security-color-m-04: #8b3263;
+  --eve-security-color-m-05: #8b3263;
+  --eve-security-color-m-06: #8b3263;
+  --eve-security-color-m-07: #8b3263;
+  --eve-security-color-m-08: #8b3263;
+  --eve-security-color-m-09: #8b3263;
+  --eve-security-color-m-10: #8b3263;
 
-    /* WH Types */
-    --eve-wh-type-color-high: #5dffd2;
-    --eve-wh-type-color-low: #f79400;
-    --eve-wh-type-color-null: #fc3c3c;
-    --eve-wh-type-color-c1: #69bfce;
-    --eve-wh-type-color-c2: #6991ce;
-    --eve-wh-type-color-c3: #a8cb70;
-    --eve-wh-type-color-c4: #e39c68;
-    --eve-wh-type-color-c5: #de8686;
-    --eve-wh-type-color-c6: #e76363;
-    --eve-wh-type-color-c13: #988cb5;
-    --eve-wh-type-color-drifter: #ff44f6;
-    --eve-wh-type-color-thera: #ffffff;
-    --eve-wh-type-color-zarzakh: #212121;
+  --eve-solar-system-status-unknown: transparent;
+  --eve-solar-system-status-color-unknown: transparent;
+  --eve-solar-system-status-home:                #{$homeAlpha};
+  --eve-solar-system-status-color-home:          #{$homeBase};
+  --eve-solar-system-status-color-home-dark30:   #{$homeDark30};
+  --eve-solar-system-status-friendly:            #{$friendlyAlpha};
+  --eve-solar-system-status-color-friendly:      #{$friendlyBase};
+  --eve-solar-system-status-friendly-dark30:     #{$friendlyDark30};
+  --eve-solar-system-status-color-friendly-dark20: #{$friendlyDark20};
+  --eve-solar-system-status-color-friendly-dark5:  #{$friendlyDark5};
+  --eve-solar-system-status-lookingFor:              #{$lookingForAlpha};
+  --eve-solar-system-status-color-lookingFor:        #{$lookingForBase};
+  --eve-solar-system-status-color-lookingFor-dark15: #{$lookingForDark15};
+  --eve-solar-system-status-warning: #906518a6;
+  --eve-solar-system-status-color-warning: #ffb93b;
+  --eve-solar-system-status-target: #b439ff6b;
+  --eve-solar-system-status-color-target: #b439ff;
+  --eve-solar-system-status-dangerous: #d54040;
+  --eve-solar-system-status-color-dangerous: #d54040;
 
-    /* Security Colors */
-    --eve-security-color-10: #2c74df;
-    --eve-security-color-09: #3998e8;
-    --eve-security-color-08: #4dcbf5;
-    --eve-security-color-07: #60d8a2;
-    --eve-security-color-06: #71e454;
-    --eve-security-color-05: #f2fc81;
-    --eve-security-color-04: #d96c07;
-    --eve-security-color-03: #cb440f;
-    --eve-security-color-02: #b91117;
-    --eve-security-color-01: #732020;
-    --eve-security-color-00: #8b3263;
-    --eve-security-color-m-01: #8b3263;
-    --eve-security-color-m-02: #8b3263;
-    --eve-security-color-m-03: #8b3263;
-    --eve-security-color-m-04: #8b3263;
-    --eve-security-color-m-05: #8b3263;
-    --eve-security-color-m-06: #8b3263;
-    --eve-security-color-m-07: #8b3263;
-    --eve-security-color-m-08: #8b3263;
-    --eve-security-color-m-09: #8b3263;
-    --eve-security-color-m-10: #8b3263;
-
-    /* Solar System Status */
-    --eve-solar-system-status-unknown: transparent;
-    --eve-solar-system-status-friendly: #3bbd3952;
-    --eve-solar-system-status-warning: #906518a6;
-    --eve-solar-system-status-target: #b439ff6b;
-    --eve-solar-system-status-dangerous: #d54040;
-    --eve-solar-system-status-lookingFor: rgba(67, 176, 253, 0.48);
-    --eve-solar-system-status-home: rgb(197, 253, 67);
-
-    --eve-solar-system-status-color-unknown: transparent;
-    --eve-solar-system-status-color-friendly: #3bbd39;
-    --eve-solar-system-status-color-warning: #ffb93b;
-    --eve-solar-system-status-color-target: #b439ff;
-    --eve-solar-system-status-color-dangerous: #d54040;
-    --eve-solar-system-status-color-lookingFor: #43c2fd;
-    --eve-solar-system-status-color-home: rgb(197, 253, 67);
-
-    --eve-solar-system-status-color-friendly-dark20: #2d9b2e;
-    --eve-solar-system-status-friendly-dark30: #28892a;
-    --eve-solar-system-status-color-friendly-dark5: #38b538;
-    --eve-solar-system-status-color-lookingFor-dark15: #32aadf;
-
-    /* Context Menu */
-    --conn-time-eol: #7452c3e3;
-    --conn-frigate: #325d88;
-    --conn-save: rgba(155, 102, 45, 0.85);
-    --selected-item-bg: rgba(98, 98, 98, 0.33);
-  }
+  --conn-time-eol: #7452c3e3;
+  --conn-frigate: #325d88;
+  --conn-save: rgba(155, 102, 45, 0.85);
+  --selected-item-bg: rgba(98, 98, 98, 0.33);
+}

assets/js/hooks/Mapper/components/map/styles/eve-common.scss

@@ -429,7 +429,63 @@
   color: var(--eve-solar-system-status-color-dangerous);
 }
 
-/* Shapes */
+.eve-system-status-clear {
+  background-color: var(--eve-solar-system-status-unknown);
+}
+.eve-system-status-home {
+  background-color: var(--eve-solar-system-status-home);
+}
+.eve-system-status-friendly {
+  background-color: var(--eve-solar-system-status-friendly);
+}
+.eve-system-status-lookingFor {
+  background-color: var(--eve-solar-system-status-lookingFor);
+}
+.eve-system-status-warning {
+  background-color: var(--eve-solar-system-status-warning);
+}
+.eve-system-status-target {
+  background-color: var(--eve-solar-system-status-target);
+}
+.eve-system-status-dangerous {
+  background-color: var(--eve-solar-system-status-dangerous);
+}
+
+.eve-system-status-clear {
+  background-color: var(--eve-solar-system-status-unknown);
+  color: var(--eve-solar-system-status-color-unknown);
+}
+
+.eve-system-status-home {
+  background-color: var(--eve-solar-system-status-home);
+  color: var(--eve-solar-system-status-color-home);
+}
+
+.eve-system-status-friendly {
+  background-color: var(--eve-solar-system-status-friendly);
+  color: var(--eve-solar-system-status-color-friendly);
+}
+
+.eve-system-status-lookingFor {
+  background-color: var(--eve-solar-system-status-lookingFor);
+  color: var(--eve-solar-system-status-color-lookingFor);
+}
+
+.eve-system-status-warning {
+  background-color: var(--eve-solar-system-status-warning);
+  color: var(--eve-solar-system-status-color-warning);
+}
+
+.eve-system-status-target {
+  background-color: var(--eve-solar-system-status-target);
+  color: var(--eve-solar-system-status-color-target);
+}
+
+.eve-system-status-dangerous {
+  background-color: var(--eve-solar-system-status-dangerous);
+  color: var(--eve-solar-system-status-color-dangerous);
+}
+
 .wd-route-system-shape-triangle {
   clip-path: polygon(50% 0, 0 100%, 100% 100%);
 }
@@ -485,3 +541,49 @@
 .wd-marker-bookmark-color-danger {
   background-color: #d10600;
 }
+
+.react-flow {
+  color: var(--text-color);
+
+  &__pane {
+    cursor: auto;
+  }
+
+  &__minimap {
+    background-color: rgba(66, 66, 66, 1);
+    opacity: 0.7;
+    border: 1px solid #2f2f2f;
+    border-radius: 4px;
+    overflow: hidden;
+  }
+
+  &__minimap-mask {
+    fill: rgba(28, 28, 28, 0.75);
+  }
+
+  &__controls {
+    filter: brightness(1.5);
+  }
+
+  &__minimap-node {
+    fill: #ffb03a;
+  }
+}
+
+.context-menu-active {
+  background-color: rgba(131, 131, 131, 0.33);
+}
+
+.p-dialog {
+  .p-dialog-header {
+    height: 40px;
+    padding: 1rem;
+    padding-right: 10px !important;
+  }
+  .p-dialog-title {
+    font-size: 1rem !important;
+  }
+  .p-dialog-header-icons {
+    align-self: initial !important;
+  }
+}

assets/js/hooks/Mapper/components/map/styles/index.scss

@@ -1,2 +1,2 @@
-@import './neon-theme.scss'; 
+@import './default-theme.scss'; 
 @import './pathfinder-theme.scss'; 

assets/js/hooks/Mapper/components/map/styles/neon-theme.scss

@@ -1,61 +0,0 @@
-@import './eve-common-variables';
-@import './eve-common';
-
-.neon-theme {
-  --pastel-blue: #5a7d9a;
-  --pastel-pink: #d291bc;
-  --pastel-green: #88b04b;
-  --pastel-yellow: #ffdd59;
-  --dark-bg: #2d2d2d;
-  --text-color: #ffffff;
-  --tooltip-bg: #202020;
-
-  --rf-bg-variant: "dots";
-  --rf-bg-gap: 16;
-
-  .react-flow {
-    color: var(--text-color);
-
-    &__pane {
-      cursor: auto;
-    }
-
-    &__minimap {
-      background-color: rgba(66, 66, 66, 1);
-      opacity: 0.7;
-      border: 1px solid #2f2f2f;
-      border-radius: 4px;
-      overflow: hidden;
-    }
-
-    &__minimap-mask {
-      fill: rgba(28, 28, 28, 0.75);
-    }
-
-    &__controls {
-      filter: brightness(1.5);
-    }
-
-    &__minimap-node {
-      fill: #ffb03a;
-    }
-  }
-
-  .context-menu-active {
-    background-color: rgba(131, 131, 131, 0.33);
-  }
-
-  .p-dialog {
-    .p-dialog-header {
-      height: 40px;
-      padding: 1rem;
-      padding-right: 10px !important;
-    }
-    .p-dialog-title {
-      font-size: 1rem !important;
-    }
-    .p-dialog-header-icons {
-      align-self: initial !important;
-    }
-  }
-}

assets/js/hooks/Mapper/components/map/styles/pathfinder-theme.scss

@@ -4,19 +4,23 @@
 @import url('https://fonts.googleapis.com/css2?family=Oxygen:wght@300;400;700&display=swap');
 
 .pathfinder-theme {
+  --rf-bg-color: #000000;
+  --rf-soft-bg-color: #282828;
 
-  --rf-bg-variant: "lines";
-  --rf-bg-gap: 32;
-  --rf-bg-color: #353535;
-  --rf-soft-bg-color: #282829;
+  --rf-node-bg-color: #202020;
+  --rf-node-soft-bg-color: #313335;
+  --rf-node-font-weight: bold;
+  --rf-text-color: #adadad;
+  --rf-region-name: var(--rf-text-color);
+  --rf-custom-name: var(--rf-text-color);
+
+  --tooltip-bg: #202020;
 
-  --pf-text-color: #adadad;
-  --pf-dark-bg: #2d2d2d;
-  --pf-tooltip-bg: #202020;
   --rf-bg-variant: "lines";
   --rf-bg-gap: 32;
   --rf-bg-size: 1;
-  --rf-bg-color: #313131;
+  --rf-bg-pattern-color: #313131;
+
   --eve-effect-pulsar: #428bca;
   --eve-effect-magnetar: #e06fdf;
   --eve-effect-wolfRayet: #e28a0d;
@@ -36,153 +40,12 @@
   --eve-wh-type-color-c13: #7986cb;
   --eve-wh-type-color-drifter: #44aa82;
 
-  .MapRoot {
-    background-color: var(--rf-bg-color);
 
-    &.isSoftBackground {
-      background-color: var(--rf-soft-bg-color);
-    }
-    &.soft-bg {
-      --rf-bg-color: var(--rf-soft-bg-color);
-    }
-  }
+  --rf-node-font-weight: bold;
+  --rf-node-line-height: normal;
+  --rf-node-font-family: 'Oxygen', sans-serif;
+  --rf-node-text-color: var(--pf-text-color);
 
-  .RootCustomNode {
-    background-color: #313335 !important;
-    font-weight: 600;
-    line-height: normal;
-    color: var(--pf-text-color);
-    font-family: 'Oxygen', sans-serif !important;
-  }
-
-  .HeadRow {
-    position: relative;
-    top: 1px;
-
-    .classTitle {
-      font-size: 11px;
-      font-weight: bold;
-      text-shadow: 0 0 1px rgba(0, 0, 0, 0.7);
-    }
-
-    @-moz-document url-prefix() {
-      .classSystemName {
-        font-family: inherit !important;
-        font-weight: bold;
-        mix-blend-mode: screen;
-      }
-    }
-
-    .classSystemName {
-      font-family: inherit !important;
-      font-weight: bold;
-      color: var(--pf-text-color);
-      mix-blend-mode: screen;
-      text-shadow: rgba(0, 0, 0, 0.4) 1px 1px;
-    }
-
-    .textEllipsis {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    .fontSans {
-      font-family: inherit !important;
-    }
-  }
-
-  .BottomRow {
-    .localCounter {
-      display: flex;
-
-      & > i {
-        position: relative;
-        top: 1px;
-      }
-      & > span {
-        font-size: 9px;
-        line-height: 9px;
-        font-weight: 700;
-        mix-blend-mode: screen;
-        color: #5cb85c;
-      }
-    }
-
-    .customName {
-      font-family: inherit !important;
-      font-weight: bold;
-      color: var(--pf-text-color);
-      mix-blend-mode: screen;
-      text-shadow: rgba(0, 0, 0, 0.4) 1px 1px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: inline-block;
-      flex-shrink: 1;
-    }
-
-    .tagTitle {
-      font-size: 9px;
-      font-family: inherit !important;
-      font-weight: bold;
-      color: #fbbf24 !important;
-      mix-blend-mode: screen;
-    }
-  }
-
-  .Handlers {
-    position: absolute;
-    z-index: 2;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-  }
-
-  .Handle {
-    min-width: initial;
-    min-height: initial;
-    border: 1px solid var(--pastel-blue, #5a7d9a);
-    width: 5px;
-    height: 5px;
-
-    &.selected {
-      border-color: var(--pastel-pink, #d291bc);
-    }
-
-    &.HandleTop {
-      top: -2px;
-    }
-    &.HandleRight {
-      right: -2px;
-    }
-    &.HandleBottom {
-      bottom: -2px;
-    }
-    &.HandleLeft {
-      left: -2px;
-    }
-
-    &.Tick {
-      width: 7px;
-      height: 7px;
-
-      &.HandleTop {
-        top: -3px;
-      }
-      &.HandleRight {
-        right: -3px;
-      }
-      &.HandleBottom {
-        bottom: -3px;
-      }
-      &.HandleLeft {
-        left: -3px;
-      }
-    }
-  }
-
-  .react-flow {
-    color: var(--pf-text-color);
-  }
+  --rf-tag-color: #fbbf24;
+  --rf-has-user-characters: #5cb85c;
 }

assets/js/hooks/Mapper/components/map/utils/wrapNode.tsx

@@ -0,0 +1,11 @@
+// wrapNode.ts
+import { NodeProps } from 'reactflow';
+import { SolarSystemNodeProps } from '../components/SolarSystemNode';
+
+export function wrapNode<T>(
+  SolarSystemNode: React.FC<SolarSystemNodeProps<T>>
+): React.FC<NodeProps<T>> {
+  return function NodeAdapter(props) {
+    return <SolarSystemNode {...props} />;
+  };
+}

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesList/RoutesList.module.scss

@@ -8,7 +8,6 @@
 .RouteSystem {
   width: 8px;
   height: 8px;
-  background: #ffffff;
 
   cursor: pointer;
   transition: opacity 200ms;

assets/js/hooks/Mapper/components/mapRootContent/MapRootContent.tsx

@@ -16,7 +16,7 @@ export const MapRootContent = ({}: MapRootContentProps) => {
   const { interfaceSettings } = useMapRootState();
   const { isShowMenu } = interfaceSettings;
 
-  const themeClass = `${interfaceSettings.theme ?? 'neon'}-theme`;
+  const themeClass = `${interfaceSettings.theme ?? 'default'}-theme`;
 
   const [showOnTheMap, setShowOnTheMap] = useState(false);
   const [showMapSettings, setShowMapSettings] = useState(false);

assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/MapSettings.tsx

@@ -115,7 +115,7 @@ const UI_CHECKBOXES_PROPS: SettingsListItem[] = [
 ];
 
 const THEME_OPTIONS = [
-  { label: 'Default', value: 'neon' },
+  { label: 'Default', value: 'default' },
   { label: 'Pathfinder', value: 'pathfinder' },
 ];
 

assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx

@@ -59,7 +59,7 @@ export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
   isShowUnsplashedSignatures: false,
   isShowBackgroundPattern: true,
   isSoftBackground: false,
-  theme: 'neon',
+  theme: 'default',
 }
 
 export interface MapRootContextProps {

config/runtime.exs

@@ -66,6 +66,18 @@ map_subscription_hubs_limit =
   config_dir
   |> get_int_from_path_or_env("WANDERER_MAP_SUBSCRIPTION_HUBS_LIMIT", 100)
 
+map_connection_auto_expire_hours =
+  config_dir
+  |> get_int_from_path_or_env("WANDERER_MAP_CONNECTION_AUTO_EXPIRE_HOURS", 24)
+
+map_connection_auto_eol_hours =
+  config_dir
+  |> get_int_from_path_or_env("WANDERER_MAP_CONNECTION_AUTO_EOL_HOURS", 21)
+
+map_connection_eol_expire_timeout_mins =
+  config_dir
+  |> get_int_from_path_or_env("WANDERER_MAP_CONNECTION_EOL_EXPIRE_TIMEOUT_MINS", 30)
+
 wallet_tracking_enabled =
   config_dir
   |> get_var_from_path_or_env("WANDERER_WALLET_TRACKING_ENABLED", "false")
@@ -90,6 +102,9 @@ config :wanderer_app,
   corp_wallet: System.get_env("WANDERER_CORP_WALLET", ""),
   public_api_disabled: public_api_disabled,
   map_subscriptions_enabled: map_subscriptions_enabled,
+  map_connection_auto_expire_hours: map_connection_auto_expire_hours,
+  map_connection_auto_eol_hours: map_connection_auto_eol_hours,
+  map_connection_eol_expire_timeout_mins: map_connection_eol_expire_timeout_mins,
   wallet_tracking_enabled: wallet_tracking_enabled,
   subscription_settings: %{
     plans: [

lib/wanderer_app/api/map_system.ex

@@ -48,6 +48,7 @@ defmodule WandererApp.Api.MapSystem do
     define(:update_tag, action: :update_tag)
     define(:update_temporary_name, action: :update_temporary_name)
     define(:update_labels, action: :update_labels)
+    define(:update_linked_sig_eve_id, action: :update_linked_sig_eve_id)
     define(:update_position, action: :update_position)
     define(:update_visible, action: :update_visible)
   end
@@ -117,6 +118,10 @@ defmodule WandererApp.Api.MapSystem do
       change(set_attribute(:visible, true))
     end
 
+    update :update_linked_sig_eve_id do
+      accept [:linked_sig_eve_id]
+    end
+
     update :update_visible do
       accept [:visible]
     end
@@ -193,6 +198,10 @@ defmodule WandererApp.Api.MapSystem do
       allow_nil? true
     end
 
+    attribute :linked_sig_eve_id, :string do
+      allow_nil? true
+    end
+
     create_timestamp(:inserted_at)
     update_timestamp(:updated_at)
   end

lib/wanderer_app/env.ex

@@ -1,5 +1,6 @@
 defmodule WandererApp.Env do
   @moduledoc false
+  use Nebulex.Caching
 
   @app :wanderer_app
 
@@ -17,5 +18,25 @@ defmodule WandererApp.Env do
   def corp_wallet, do: get_key(:corp_wallet, "")
   def corp_eve_id, do: get_key(:corp_id, -1)
   def subscription_settings, do: get_key(:subscription_settings)
+
+  @decorate cacheable(
+              cache: WandererApp.Cache,
+              key: "map-connection-auto-expire-hours"
+            )
+  def map_connection_auto_expire_hours, do: get_key(:map_connection_auto_expire_hours)
+
+  @decorate cacheable(
+              cache: WandererApp.Cache,
+              key: "map-connection-auto-eol-hours"
+            )
+  def map_connection_auto_eol_hours, do: get_key(:map_connection_auto_eol_hours)
+
+  @decorate cacheable(
+              cache: WandererApp.Cache,
+              key: "map-connection-eol-expire-timeout-mins"
+            )
+  def map_connection_eol_expire_timeout_mins,
+    do: get_key(:map_connection_eol_expire_timeout_mins)
+
   def get_key(key, default \\ nil), do: Application.get_env(@app, key, default)
 end

lib/wanderer_app/esi/api_client.ex

@@ -31,7 +31,7 @@ defmodule WandererApp.Esi.ApiClient do
   }
 
   @cache_opts [cache: true]
-  @retry_opts [retry: false, retry_log_level: :warning]
+  @retry_opts [max_retries: 1, retry_log_level: :warning]
   @timeout_opts [receive_timeout: :timer.seconds(30)]
   @api_retry_count 1
 

lib/wanderer_app/map.ex

@@ -70,6 +70,11 @@ defmodule WandererApp.Map do
   def get_characters_limit(map_id),
     do: {:ok, map_id |> get_map!() |> Map.get(:characters_limit, 100)}
 
+  def is_subscription_active?(map_id) do
+    {:ok, %{plan: plan}} = WandererApp.Map.SubscriptionManager.get_active_map_subscription(map_id)
+    not WandererApp.Env.map_subscriptions_enabled?() || plan != :alpha
+  end
+
   def get_options(map_id),
     do: {:ok, map_id |> get_map!() |> Map.get(:options, Map.new())}
 

lib/wanderer_app/map/map_audit.ex

@@ -9,20 +9,38 @@ defmodule WandererApp.Map.Audit do
   @logger Application.compile_env(:wanderer_app, :logger)
 
   @week_seconds :timer.hours(24 * 7)
+  @month_seconds @week_seconds * 4
+  @audit_expired_seconds @month_seconds * 3
+
+  def track_map_subscription_event(event_type, metadata) do
+    case event_type do
+      "subscription.created" ->
+        track_map_event(event_type, metadata)
+
+      "subscription.updated" ->
+        track_map_event(event_type, metadata)
+
+      "subscription.deleted" ->
+        track_map_event(event_type, metadata)
+
+      _ ->
+        {:ok, nil}
+    end
+  end
 
   def archive() do
-    @logger.info("Start map audit arhiving...")
+    Logger.info("Start map audit arhiving...")
 
     WandererApp.Api.UserActivity
-    |> Ash.Query.filter(inserted_at: [less_than: _get_expired_at()])
+    |> Ash.Query.filter(inserted_at: [less_than: get_expired_at()])
     |> Ash.bulk_destroy!(:archive, %{}, batch_size: 100)
 
-    @logger.info(fn -> "Audit arhived" end)
+    Logger.info(fn -> "Audit arhived" end)
     :ok
   end
 
   def get_activity_page(map_id, page, per_page, period, activity) do
-    {from, to} = period |> _get_period()
+    {from, to} = period |> get_period()
 
     query =
       WandererApp.Api.UserActivity
@@ -84,52 +102,43 @@ defmodule WandererApp.Map.Audit do
 
   def track_map_event(_event_type, _metadata), do: {:ok, nil}
 
-  defp _get_period("1H") do
+  defp get_period("1H") do
     now = DateTime.utc_now()
     start_date = now |> DateTime.add(-1 * 3600, :second)
     {start_date, now}
   end
 
-  defp _get_period("1D") do
+  defp get_period("1D") do
     now = DateTime.utc_now()
     start_date = now |> DateTime.add(-24 * 3600, :second)
     {start_date, now}
   end
 
-  defp _get_period("1W") do
+  defp get_period("1W") do
     now = DateTime.utc_now()
     start_date = now |> DateTime.add(-24 * 3600 * 7, :second)
     {start_date, now}
   end
 
-  # defp _get_period("1M") do
-  #   now = DateTime.utc_now()
-  #   start_date = now |> DateTime.add(-24 * 3600 * 31, :second)
-  #   {start_date, now}
-  # end
-
-  # defp _get_period("ALL") do
-  #   now = DateTime.utc_now()
-
-  #   start_date = %{
-  #     now
-  #     | year: 2000,
-  #       month: 1,
-  #       day: 1,
-  #       hour: 00,
-  #       minute: 00,
-  #       second: 00,
-  #       microsecond: {0, 0}
-  #   }
-
-  #   {start_date, now}
-  # end
-
-  defp _get_period(_) do
+  defp get_period("1M") do
     now = DateTime.utc_now()
-    start_date = now |> DateTime.add(-1 * 3600, :second)
+    start_date = now |> DateTime.add(-24 * 3600 * 31, :second)
     {start_date, now}
   end
 
-  defp _get_expired_at(), do: DateTime.utc_now() |> DateTime.add(-@week_seconds, :second)
+  defp get_period("2M") do
+    now = DateTime.utc_now()
+    start_date = now |> DateTime.add(-24 * 3600 * 31 * 2, :second)
+    {start_date, now}
+  end
+
+  defp get_period("3M") do
+    now = DateTime.utc_now()
+    start_date = now |> DateTime.add(-24 * 3600 * 31 * 3, :second)
+    {start_date, now}
+  end
+
+  defp get_period(_), do: get_period("1H")
+
+  defp get_expired_at(), do: DateTime.utc_now() |> DateTime.add(-@audit_expired_seconds, :second)
 end

lib/wanderer_app/map/map_server.ex

@@ -105,6 +105,12 @@ defmodule WandererApp.Map.Server do
       |> map_pid!
       |> GenServer.cast({&Impl.update_system_position/2, [update]})
 
+  def update_system_linked_sig_eve_id(map_id, update) when is_binary(map_id),
+    do:
+      map_id
+      |> map_pid!
+      |> GenServer.cast({&Impl.update_system_linked_sig_eve_id/2, [update]})
+
   def update_system_name(map_id, update) when is_binary(map_id),
     do:
       map_id
@@ -129,7 +135,7 @@ defmodule WandererApp.Map.Server do
       |> map_pid!
       |> GenServer.cast({&Impl.update_system_tag/2, [update]})
 
-    def update_system_temporary_name(map_id, update) when is_binary(map_id),
+  def update_system_temporary_name(map_id, update) when is_binary(map_id),
     do:
       map_id
       |> map_pid!

lib/wanderer_app/map/map_server_impl.ex

@@ -156,6 +156,8 @@ defmodule WandererApp.Map.Server.Impl do
 
   defdelegate update_system_labels(state, update), to: SystemsImpl
 
+  defdelegate update_system_linked_sig_eve_id(state, update), to: SystemsImpl
+
   defdelegate update_system_position(state, update), to: SystemsImpl
 
   defdelegate add_hub(state, hub_info), to: SystemsImpl
@@ -322,6 +324,8 @@ defmodule WandererApp.Map.Server.Impl do
       layout: options |> Map.get("layout", "left_to_right"),
       store_custom_labels:
         options |> Map.get("store_custom_labels", "false") |> String.to_existing_atom(),
+      show_linked_signature_id:
+        options |> Map.get("show_linked_signature_id", "false") |> String.to_existing_atom(),
       show_temp_system_name:
         options |> Map.get("show_temp_system_name", "false") |> String.to_existing_atom(),
       restrict_offline_showing:
@@ -432,7 +436,7 @@ defmodule WandererApp.Map.Server.Impl do
                                  "position" => %{"x" => x, "y" => y},
                                  "status" => status,
                                  "tag" => tag,
-                                 "temporary_name" => temporary_name,
+                                 "temporary_name" => temporary_name
                                } = _system,
                                acc ->
         acc
@@ -451,7 +455,10 @@ defmodule WandererApp.Map.Server.Impl do
         })
         |> update_system_status(%{solar_system_id: id |> String.to_integer(), status: status})
         |> update_system_tag(%{solar_system_id: id |> String.to_integer(), tag: tag})
-        |> update_system_temporary_name(%{solar_system_id: id |> String.to_integer(), temporary_name: temporary_name})
+        |> update_system_temporary_name(%{
+          solar_system_id: id |> String.to_integer(),
+          temporary_name: temporary_name
+        })
         |> update_system_locked(%{solar_system_id: id |> String.to_integer(), locked: locked})
         |> update_system_labels(%{solar_system_id: id |> String.to_integer(), labels: labels})
       end)

lib/wanderer_app/map/server/map_server_connections_impl.ex

@@ -67,20 +67,29 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
   # @unknown 100_100
   #
   @connection_time_status_eol 1
-  @connection_auto_eol_hours 21
-  @connection_auto_expire_hours 24
-  @connection_eol_expire_timeout :timer.hours(3) + :timer.minutes(30)
-
   @connection_type_wormhole 0
   @connection_type_stargate 1
 
+  def get_connection_auto_expire_hours(), do: WandererApp.Env.map_connection_auto_expire_hours()
+
+  def get_connection_auto_eol_hours(), do: WandererApp.Env.map_connection_auto_eol_hours()
+
+  def get_eol_expire_timeout_mins(), do: WandererApp.Env.map_connection_eol_expire_timeout_mins()
+
+  def get_eol_expire_timeout(),
+    do:
+      :timer.hours(get_connection_auto_expire_hours() - get_connection_auto_eol_hours()) +
+        :timer.minutes(get_eol_expire_timeout_mins())
+
   def init_eol_cache(map_id, connections_eol_time) do
+    eol_expire_timeout = get_eol_expire_timeout()
+
     connections_eol_time
     |> Enum.each(fn {connection_id, connection_eol_time} ->
       WandererApp.Cache.put(
         "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
         connection_eol_time,
-        ttl: @connection_eol_expire_timeout
+        ttl: eol_expire_timeout
       )
     end)
   end
@@ -155,7 +164,7 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
                 WandererApp.Cache.put(
                   "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
                   DateTime.utc_now(),
-                  ttl: @connection_eol_expire_timeout
+                  ttl: get_eol_expire_timeout()
                 )
 
               _ ->
@@ -194,6 +203,9 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
       do: update_connection(state, :update_custom_info, [:custom_info], connection_update)
 
   def cleanup_connections(%{map_id: map_id} = state) do
+    connection_auto_expire_hours = get_connection_auto_expire_hours()
+    connection_auto_eol_hours = get_connection_auto_eol_hours()
+
     state =
       map_id
       |> WandererApp.Map.list_connections!()
@@ -205,7 +217,7 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
                         } ->
         type != @connection_type_stargate &&
           DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
-            @connection_auto_eol_hours &&
+            connection_auto_eol_hours &&
           is_connection_valid(
             :wormholes,
             solar_system_source_id,
@@ -262,9 +274,9 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
         not is_connection_exist ||
           (type != @connection_type_stargate && is_connection_valid &&
              (DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
-                @connection_auto_expire_hours ||
+                connection_auto_expire_hours ||
                 DateTime.diff(DateTime.utc_now(), connection_mark_eol_time, :hour) >=
-                  @connection_auto_expire_hours - @connection_auto_eol_hours))
+                  connection_auto_expire_hours - connection_auto_eol_hours))
       end)
       |> Enum.reduce(state, fn %{
                                  solar_system_source: solar_system_source_id,
@@ -333,7 +345,7 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
 
         Impl.broadcast!(map_id, :maybe_select_system, %{
           character_id: character_id,
-          solar_system_id: location.solar_system_id,
+          solar_system_id: location.solar_system_id
         })
 
         Impl.broadcast!(map_id, :add_connection, connection)
@@ -346,20 +358,19 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
 
         :ok
 
-        {:error, :already_exists} ->
-          # Still broadcast location change in case of followed character
-          Impl.broadcast!(map_id, :maybe_select_system, %{
-            character_id: character_id,
-            solar_system_id: location.solar_system_id
-          })
+      {:error, :already_exists} ->
+        # Still broadcast location change in case of followed character
+        Impl.broadcast!(map_id, :maybe_select_system, %{
+          character_id: character_id,
+          solar_system_id: location.solar_system_id
+        })
 
-          :ok
+        :ok
 
-        {:error, error} ->
-          Logger.debug(fn -> "Failed to add connection: #{inspect(error, pretty: true)}" end)
-
-          :ok
+      {:error, error} ->
+        Logger.debug(fn -> "Failed to add connection: #{inspect(error, pretty: true)}" end)
 
+        :ok
     end
   end
 

lib/wanderer_app/map/server/map_server_systems_impl.ex

@@ -126,7 +126,7 @@ defmodule WandererApp.Map.Server.SystemsImpl do
         state,
         update
       ) do
-      state |> update_system(:update_temporary_name, [:temporary_name], update)
+    state |> update_system(:update_temporary_name, [:temporary_name], update)
   end
 
   def update_system_locked(
@@ -141,6 +141,12 @@ defmodule WandererApp.Map.Server.SystemsImpl do
       ),
       do: state |> update_system(:update_labels, [:labels], update)
 
+  def update_system_linked_sig_eve_id(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_linked_sig_eve_id, [:linked_sig_eve_id], update)
+
   def update_system_position(
         %{rtree_name: rtree_name} = state,
         update
@@ -284,7 +290,7 @@ defmodule WandererApp.Map.Server.SystemsImpl do
                location.solar_system_id
              ) do
           {:ok, existing_system} when not is_nil(existing_system) ->
-            {:ok, updated_system} =
+            updated_system =
               existing_system
               |> WandererApp.MapSystemRepo.update_position!(%{
                 position_x: position.x,
@@ -292,8 +298,9 @@ defmodule WandererApp.Map.Server.SystemsImpl do
               })
               |> WandererApp.MapSystemRepo.cleanup_labels!(map_opts)
               |> WandererApp.MapSystemRepo.update_visible!(%{visible: true})
-              |> WandererApp.MapSystemRepo.cleanup_tags()
-              |> WandererApp.MapSystemRepo.cleanup_temporary_name()
+              |> WandererApp.MapSystemRepo.cleanup_tags!()
+              |> WandererApp.MapSystemRepo.cleanup_temporary_name!()
+              |> WandererApp.MapSystemRepo.cleanup_linked_sig_eve_id!()
 
             @ddrt.insert(
               {existing_system.solar_system_id,
@@ -413,6 +420,7 @@ defmodule WandererApp.Map.Server.SystemsImpl do
             |> WandererApp.MapSystemRepo.cleanup_labels!(map_opts)
             |> WandererApp.MapSystemRepo.cleanup_tags!()
             |> WandererApp.MapSystemRepo.cleanup_temporary_name!()
+            |> WandererApp.MapSystemRepo.cleanup_linked_sig_eve_id!()
             |> WandererApp.MapSystemRepo.update_visible(%{visible: true})
           end
 

lib/wanderer_app/repositories/map_repo.ex

@@ -4,6 +4,7 @@ defmodule WandererApp.MapRepo do
   @default_map_options %{
     "layout" => "left_to_right",
     "store_custom_labels" => "false",
+    "show_linked_signature_id" => "false",
     "show_temp_system_name" => "false",
     "restrict_offline_showing" => "false"
   }

lib/wanderer_app/repositories/map_system_repo.ex

@@ -75,6 +75,13 @@ defmodule WandererApp.MapSystemRepo do
     })
   end
 
+  def cleanup_linked_sig_eve_id!(system) do
+    system
+    |> WandererApp.Api.MapSystem.update_linked_sig_eve_id!(%{
+      linked_sig_eve_id: nil
+    })
+  end
+
   def get_filtered_labels(labels, true) when is_binary(labels) do
     labels
     |> Jason.decode!()
@@ -116,8 +123,8 @@ defmodule WandererApp.MapSystemRepo do
       |> WandererApp.Api.MapSystem.update_tag(update)
 
   def update_temporary_name(system, update) do
-      system
-      |> WandererApp.Api.MapSystem.update_temporary_name(update)
+    system
+    |> WandererApp.Api.MapSystem.update_temporary_name(update)
   end
 
   def update_labels(system, update),
@@ -130,6 +137,16 @@ defmodule WandererApp.MapSystemRepo do
       system
       |> WandererApp.Api.MapSystem.update_labels!(update)
 
+  def update_linked_sig_eve_id(system, update),
+    do:
+      system
+      |> WandererApp.Api.MapSystem.update_linked_sig_eve_id(update)
+
+  def update_linked_sig_eve_id!(system, update),
+    do:
+      system
+      |> WandererApp.Api.MapSystem.update_linked_sig_eve_id!(update)
+
   def update_position(system, update),
     do:
       system

lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex

@@ -234,6 +234,12 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
               })
             end)
 
+            map_id
+            |> WandererApp.Map.Server.update_system_linked_sig_eve_id(%{
+              solar_system_id: solar_system_target,
+              linked_sig_eve_id: signature_eve_id
+            })
+
             Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
               event: :signatures_updated,
               payload: solar_system_source

lib/wanderer_app_web/live/maps/map_audit_live.ex

@@ -5,6 +5,8 @@ defmodule WandererAppWeb.MapAuditLive do
 
   alias WandererAppWeb.UserActivity
 
+  @active_subscription_periods ["2M", "3M"]
+
   def mount(
         %{"slug" => map_slug, "period" => period, "activity" => activity} = _params,
         _session,
@@ -38,6 +40,7 @@ defmodule WandererAppWeb.MapAuditLive do
                map_id: map_id,
                map_name: map_name,
                map_slug: map_slug,
+               map_subscription_active: WandererApp.Map.is_subscription_active?(map_id),
                activity: activity,
                can_undo_types: [:systems_removed],
                period: period || "1H",
@@ -117,23 +120,26 @@ defmodule WandererAppWeb.MapAuditLive do
     end
   end
 
-  def handle_event("undo", %{"event-data" => event_data, "event-type" => "systems_removed"}, %{assigns: %{map_id: map_id, current_user: current_user}} = socket) do
+  def handle_event(
+        "undo",
+        %{"event-data" => event_data, "event-type" => "systems_removed"},
+        %{assigns: %{map_id: map_id, current_user: current_user}} = socket
+      ) do
     {:ok, %{"solar_system_ids" => solar_system_ids}} = Jason.decode(event_data)
 
     solar_system_ids
-      |> Enum.each(fn solar_system_id ->
-        WandererApp.Map.Server.add_system(
-          map_id,
-          %{
-            solar_system_id: solar_system_id,
-            coordinates: nil,
-            use_old_coordinates: true
-          },
-          current_user.id,
-          nil
-        )
-      end)
-
+    |> Enum.each(fn solar_system_id ->
+      WandererApp.Map.Server.add_system(
+        map_id,
+        %{
+          solar_system_id: solar_system_id,
+          coordinates: nil,
+          use_old_coordinates: true
+        },
+        current_user.id,
+        nil
+      )
+    end)
 
     {:noreply, socket |> put_flash(:info, "Systems restored!")}
   end
@@ -171,9 +177,18 @@ defmodule WandererAppWeb.MapAuditLive do
   end
 
   defp load_activity(socket, new_page) when new_page >= 1 do
-    %{activity: activity, per_page: per_page, page: cur_page, map_id: map_id, period: period} =
+    %{
+      activity: activity,
+      per_page: per_page,
+      page: cur_page,
+      map_id: map_id,
+      map_subscription_active: map_subscription_active,
+      period: period
+    } =
       socket.assigns
 
+    period = get_valid_period(period, map_subscription_active)
+
     with {:ok, page} <-
            WandererApp.Map.Audit.get_activity_page(map_id, new_page, per_page, period, activity) do
       {activity, at, limit} =
@@ -199,4 +214,14 @@ defmodule WandererAppWeb.MapAuditLive do
       _ -> socket
     end
   end
+
+  defp get_valid_period(period, true), do: period
+
+  defp get_valid_period(period, _map_subscription_active) do
+    if period in @active_subscription_periods do
+      "1H"
+    else
+      period
+    end
+  end
 end

lib/wanderer_app_web/live/maps/map_audit_live.html.heex

@@ -65,7 +65,8 @@
         >
           WEEK
         </button>
-        <%!-- <button
+        <button
+          :if={@map_subscription_active}
           phx-click="set_period"
           phx-value-period="1M"
           class={[
@@ -73,8 +74,31 @@
             classes(" !bg-neutral-800  !text-white": @period == "1M")
           ]}
         >
-          M
+          1M
         </button>
+        <button
+          :if={@map_subscription_active}
+          phx-click="set_period"
+          phx-value-period="2M"
+          class={[
+            "btn btn-sm join-item font-medium text-neutral bg-neutral-700",
+            classes(" !bg-neutral-800  !text-white": @period == "2M")
+          ]}
+        >
+          2M
+        </button>
+        <button
+          :if={@map_subscription_active}
+          phx-click="set_period"
+          phx-value-period="3M"
+          class={[
+            "btn btn-sm join-item font-medium text-neutral bg-neutral-700",
+            classes(" !bg-neutral-800  !text-white": @period == "3M")
+          ]}
+        >
+          3M
+        </button>
+        <%!--
         <button
           phx-click="set_period"
           phx-value-period="ALL"

lib/wanderer_app_web/live/maps/map_event_handler.ex

@@ -245,6 +245,7 @@ defmodule WandererAppWeb.MapEventHandler do
           locked: locked,
           tag: tag,
           labels: labels,
+          linked_sig_eve_id: linked_sig_eve_id,
           temporary_name: temporary_name,
           status: status,
           visible: visible
@@ -269,6 +270,7 @@ defmodule WandererAppWeb.MapEventHandler do
       system_signatures: system_signatures,
       labels: labels,
       locked: locked,
+      linked_sig_eve_id: linked_sig_eve_id,
       status: status,
       tag: tag,
       temporary_name: temporary_name,

lib/wanderer_app_web/live/maps/maps_live.ex

@@ -180,7 +180,6 @@ defmodule WandererAppWeb.MapsLive do
     {:noreply, socket}
   end
 
-
   def handle_event("generate-map-api-key", _params, socket) do
     new_api_key = UUID.uuid4()
 
@@ -192,7 +191,6 @@ defmodule WandererAppWeb.MapsLive do
     {:noreply, assign(socket, public_api_key: new_api_key)}
   end
 
-
   @impl true
   def handle_event(
         "live_select_change",
@@ -685,6 +683,7 @@ defmodule WandererAppWeb.MapsLive do
       |> Map.take([
         "layout",
         "store_custom_labels",
+        "show_linked_signature_id",
         "show_temp_system_name",
         "restrict_offline_showing"
       ])

lib/wanderer_app_web/live/maps/maps_live.html.heex

@@ -317,7 +317,9 @@
                   :if={not WandererApp.Env.public_api_disabled?()}
                   class={[
                     "p-unselectable-text",
-                    classes("p-tabview-selected p-highlight": @active_settings_tab == "public_api")
+                    classes(
+                      "p-tabview-selected p-highlight": @active_settings_tab == "public_api"
+                    )
                   ]}
                   role="presentation"
                   data-pc-name=""
@@ -371,10 +373,15 @@
                     field={f[:store_custom_labels]}
                     label="Store system custom labels"
                   />
+                  <.input
+                    type="checkbox"
+                    field={f[:show_linked_signature_id]}
+                    label="Show linked signature ID as custom label part"
+                  />
                   <.input
                     type="checkbox"
                     field={f[:show_temp_system_name]}
-                    label="Allow Temporary System Names"
+                    label="Allow temporary system names"
                   />
                   <.input
                     type="checkbox"
@@ -408,7 +415,13 @@
                 </.button>
               </div>
 
-              <div :if={@active_settings_tab == "public_api"and not WandererApp.Env.public_api_disabled?()} class="p-6">
+              <div
+                :if={
+                  @active_settings_tab == "public_api" and
+                    not WandererApp.Env.public_api_disabled?()
+                }
+                class="p-6"
+              >
                 <h2 class="text-lg font-semibold mb-4">Public API</h2>
                 <div class="flex flex-col gap-3 items-start w-full">
                   <div>
@@ -428,29 +441,26 @@
                     />
                   </div>
                   <div class="flex items-center gap-2">
-                    <.button
-                      class="btn btn-primary rounded-md"
-                      phx-click="generate-map-api-key"
-                    >
+                    <.button class="btn btn-primary rounded-md" phx-click="generate-map-api-key">
                       Generate
                     </.button>
-                  <.button
-                    phx-hook="CopyToClipboard"
-                    id="copy-map-api-key"
-                    data-url={@public_api_key}
-                    disabled={is_nil(@public_api_key)}
-                    class={
-                      if is_nil(@public_api_key) do
-                        "copy-link btn rounded-md transition-colors duration-300
+                    <.button
+                      phx-hook="CopyToClipboard"
+                      id="copy-map-api-key"
+                      data-url={@public_api_key}
+                      disabled={is_nil(@public_api_key)}
+                      class={
+                        if is_nil(@public_api_key) do
+                          "copy-link btn rounded-md transition-colors duration-300
                         bg-gray-500 hover:bg-gray-500 text-gray-300 cursor-not-allowed"
-                      else
-                        "copy-link btn rounded-md transition-colors duration-300
+                        else
+                          "copy-link btn rounded-md transition-colors duration-300
                         bg-blue-600 hover:bg-blue-700 text-white cursor-pointer"
-                      end
-                    }
-                  >
-                    Copy
-                  </.button>
+                        end
+                      }
+                    >
+                      Copy
+                    </.button>
                   </div>
                 </div>
               </div>

mix.exs

@@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do
 
   @source_url "https://github.com/wanderer-industries/wanderer"
   
-  @version "1.37.1"
+  @version "1.38.3"
 
   def project do
     [

priv/posts/2025/01-11-map-settings-guide.md

@@ -0,0 +1,88 @@
+%{
+title: "Map User Settings (from our community member)",
+author: "Wanderer Community",
+cover_image_uri: "/images/news/01-11-map-settings-guide/cover.png",
+tags: ~w(map settings guide interface),
+description: "",
+}
+
+---
+
+## Map User Settings
+
+- Click on the **Map user settings** button on the bottom-right unless you have the dock disabled in which case you could click the menu button top-right.
+
+  Map user settings depending on whether the dock is enabled or not:
+  ![](/images/news/01-11-map-settings-guide/2024-12-05-08-38-59-image.png) or ![](/images/news/01-11-map-settings-guide/2025-01-11-16-06-36-image.png)
+
+- Disable the minimap in the **Common** section - it may cause performance issues for some
+
+![](/images/news/01-11-map-settings-guide/2024-12-05-08-39-19-image.png)
+
+- In the **Systems** section, Enable Auto-Select splashed unless you want only a specific character to be followed on the map and optionally the Highlight Low/High-security systems
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-08-10-image.png)\*
+
+- In the **Connections** section, enable the 'Delete connections to linked signatures' and the 'Thicker connections' options
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-09-07-image.png)
+
+- In the **Signatures** section, enable the 'Link signature on splash' and 'Show unsplashed signatures'
+
+![](/images/news/01-11-map-settings-guide/2024-12-05-08-40-20-image.png)
+
+- Under the **User Interface** section, you can select whatever options suite you. Below are my preferences
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-12-53-image.png)
+
+- For the theme, you can select what you want. I prefer the default.
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-14-43-image.png)
+
+- Under the tracking menu, you can select which character the map will follow while scanning and splashing holes.
+
+  ![](/images/news/01-11-map-settings-guide/2025-01-11-17-28-36-image.png)
+
+  This will ONLY work if you disable the **Auto-select splashed** option in the Map User settings menu. Otherwise, Wanderer will select the system most recently splashed by any of your tracked characters.
+
+![](/images/news/01-11-map-settings-guide/GamYHSA5Ij.png)
+
+---
+
+## Signature Widget setup
+
+- Click the signature settings button at the very top-right
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-15-42-image.png)
+
+- Under **Filters** you should have at least the 'Show Cosmic Signatures' and 'Show Wormholes' checked. All of the others are optional but having too many will make the widget difficult to read.
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-16-21-image.png)
+
+- Under the **User Interface** section, enable the 'Show Updated Column' and 'Show Description Column' options. The other options should be disabled.
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-17-45-image.png)
+
+- Click **'Save'**
+
+---
+
+## Map Settings
+
+### Admins and Corp / Alliance Leadership
+
+The below settings are recommended for usability and security.
+
+![](/images/news/01-11-map-settings-guide/2025-01-11-16-24-51-image.png)
+
+- **Allow Temporary System Names**
+
+  This feature enables a new text-box when editing system data. This can be used for details that may not carry over to the next time you visit the system
+
+  The temporary name is deleted when the system is removed from the map
+
+  ![](/images/news/01-11-map-settings-guide/2025-01-11-16-28-16-image.png)
+
+- **Show offline characters to admins and managers Only**
+
+   Prevents anyone that is not a manager or admin from seeing offline users and their ships and locations when viewing the 'On the map' feature.

priv/repo/migrations/20250111213133_system_linked_sig_eve_id.exs

@@ -0,0 +1,21 @@
+defmodule WandererApp.Repo.Migrations.SystemLinkedSigEveId do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    alter table(:map_system_v1) do
+      add :linked_sig_eve_id, :text
+    end
+  end
+
+  def down do
+    alter table(:map_system_v1) do
+      remove :linked_sig_eve_id
+    end
+  end
+end

priv/resource_snapshots/repo/map_character_settings_v1/20250111213133.json

@@ -0,0 +1,146 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": true,
+      "default": "false",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "tracked",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "false",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "followed",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "inserted_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "updated_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": true,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "map_character_settings_v1_map_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "maps_v1"
+      },
+      "size": null,
+      "source": "map_id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": true,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "map_character_settings_v1_character_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "character_v1"
+      },
+      "size": null,
+      "source": "character_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "03E6D5F913A8DB4EC1506A773B222542769B945776482E5BAE57D39CF1B79034",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "map_character_settings_v1_uniq_map_character_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "map_id"
+        },
+        {
+          "type": "atom",
+          "value": "character_id"
+        }
+      ],
+      "name": "uniq_map_character",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "map_character_settings_v1"
+}

priv/resource_snapshots/repo/map_system_v1/20250111213133.json

@@ -0,0 +1,237 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "solar_system_id",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "custom_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "description",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "tag",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "temporary_name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "labels",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "status",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "true",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "visible",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "false",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "locked",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "position_x",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "position_y",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "added_at",
+      "type": "utc_datetime"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "linked_sig_eve_id",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "inserted_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "updated_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "map_system_v1_map_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "maps_v1"
+      },
+      "size": null,
+      "source": "map_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "177B40EB60054D454E7E3D2321214CD14DD2E75B89A691D3EDEA3523F4799E85",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "map_system_v1_map_solar_system_id_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "map_id"
+        },
+        {
+          "type": "atom",
+          "value": "solar_system_id"
+        }
+      ],
+      "name": "map_solar_system_id",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "map_system_v1"
+}

priv/resource_snapshots/repo/maps_v1/20250111213133.json

@@ -0,0 +1,196 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "slug",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "description",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "personal_note",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "public_api_key",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "[]",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "hubs",
+      "type": [
+        "array",
+        "text"
+      ]
+    },
+    {
+      "allow_nil?": false,
+      "default": "\"wormholes\"",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "scope",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "false",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "deleted",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "false",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "only_tracked_characters",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "options",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "inserted_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "updated_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "maps_v1_owner_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "character_v1"
+      },
+      "size": null,
+      "source": "owner_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "5266AED79B87A21A891B42E5315E5FC2AA9406184D66A41A1069514F2CB9B16C",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "maps_v1_unique_slug_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "slug"
+        }
+      ],
+      "name": "unique_slug",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "maps_v1"
+}