From 5f58645b4142bc19556651a0b890a9fbf272358c Mon Sep 17 00:00:00 2001 From: guarzo Date: Fri, 10 Jan 2025 04:04:05 -0500 Subject: [PATCH 1/4] fix: fix issue with newly added systems not adding a connection (#114) * fix: resolve issue with newly added systems not connecting --- CHANGELOG.md | 9 +++++++++ lib/wanderer_app/map/server/map_server_systems_impl.ex | 6 +++--- mix.exs | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5675f5c3..21f46bc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ +## [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) diff --git a/lib/wanderer_app/map/server/map_server_systems_impl.ex b/lib/wanderer_app/map/server/map_server_systems_impl.ex index da0f45b0..811f1264 100644 --- a/lib/wanderer_app/map/server/map_server_systems_impl.ex +++ b/lib/wanderer_app/map/server/map_server_systems_impl.ex @@ -284,7 +284,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 +292,8 @@ 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!() @ddrt.insert( {existing_system.solar_system_id, diff --git a/mix.exs b/mix.exs index 96449b65..03b0f743 100644 --- a/mix.exs +++ b/mix.exs @@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do @source_url "https://github.com/wanderer-industries/wanderer" - @version "1.37.6" + @version "1.37.7" def project do [ From fa0c7f3c6608371a2444f46c4e886b38580c101b Mon Sep 17 00:00:00 2001 From: CI Date: Fri, 10 Jan 2025 09:04:36 +0000 Subject: [PATCH 2/4] chore: release version v1.37.8 --- CHANGELOG.md | 11 +++++++++++ mix.exs | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21f46bc0..3d7d9fed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ +## [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) diff --git a/mix.exs b/mix.exs index 03b0f743..3541b494 100644 --- a/mix.exs +++ b/mix.exs @@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do @source_url "https://github.com/wanderer-industries/wanderer" - @version "1.37.7" + @version "1.37.8" def project do [ From d34e7b8d8a402d3c1149334b92943ec8469a5e2c Mon Sep 17 00:00:00 2001 From: guarzo Date: Fri, 10 Jan 2025 04:15:31 -0500 Subject: [PATCH 3/4] fix: restore system status colors (#112) * fix: restore system status colors --- .../SolarSystemNode/SolarSystemNode.Old.tsx | 377 ------------------ .../SolarSystemNodeDefault.module.scss | 27 +- .../SolarSystemNodeTheme.module.scss | 27 +- .../map/styles/eve-common-variables.scss | 219 +++++----- .../components/map/styles/eve-common.scss | 58 ++- 5 files changed, 202 insertions(+), 506 deletions(-) delete mode 100644 assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.Old.tsx diff --git a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.Old.tsx b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.Old.tsx deleted file mode 100644 index 7c94bdf6..00000000 --- a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNode.Old.tsx +++ /dev/null @@ -1,377 +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 = { - [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) => { - 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, - wormholesData, - hubs, - kills, - 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, 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 dbClick = useDoubleClick(() => { - outCommand({ - type: OutCommand.openSettings, - data: { - system_id: solar_system_id.toString(), - }, - }); - }); - - - const showHandlers = isConnecting || hoverNodeId === id; - const dropHandler = isConnecting ? 'all' : 'none'; - - const space = showKSpaceBG ? REGIONS_MAP[region_id] : ''; - const regionClass = showKSpaceBG ? SpaceToClass[space] : null; - - const hasTempName = isTempSystemNameEnabled && temporaryName; - - // systemName: if temporary name is enabled and present, use it; otherwise use solar_system_name - const systemName = hasTempName - ? temporaryName - : solar_system_name; - - // hsCustomLabel: if temporary name is enabled and present, show region_name, otherwise labelCustom - const hsCustomLabel = hasTempName - ? region_name - : labelCustom; - - // whCustomLabel: default to solar_system_name; if that's falsy, use labelCustom - const whCustomLabel = solar_system_name || labelCustom; - - // customLabel: if wormhole, use whCustomLabel; otherwise hsCustomLabel - const customLabel = isWormhole - ? whCustomLabel - : hsCustomLabel; - - // whCustomName: if name differs from solar_system_name, use name; otherwise blank - const whCustomName = (name !== solar_system_name) - ? name - : ''; - - // hsSuffix: if name differs from solar_system_name, append name; otherwise blank - const needsHsSuffix = (name !== solar_system_name); - const hsSuffix = needsHsSuffix - ? name - : ''; - - // hsCustomName: if there's a temp name, show "solar_system_name + suffix", otherwise "region_name + suffix" - const hsCustomName = hasTempName - ? `${solar_system_name} ${hsSuffix}` - : `${region_name} ${hsSuffix}`; - - // customName: if wormhole, use whCustomName; otherwise hsCustomName - const customName = isWormhole - ? whCustomName - : hsCustomName; - - 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 && ( -
- {customLabel !== '' && ( -
- {customLabel} -
- )} - - {is_shattered && ( -
- -
- )} - - {killsCount && ( -
-
- - {killsCount} -
-
- )} - - {labelsInfo.map(x => ( -
- {x.shortName} -
- ))} -
- )} -
- {visible && ( - <> -
-
- {class_title ?? '-'} -
- -
- {systemName} -
- - {isWormhole && ( -
- {sortedStatics.map(x => ( - - ))} -
- )} - - {effect_name !== null && isWormhole && ( -
- )} -
- -
-
- {tag != null && tag !== '' && ( -
{`[${tag}]`}
- )} -
- {customName} {labelCustom} -
-
- -
- {locked && } - {hubs.includes(solar_system_id.toString()) && ( - - )} - {charactersInSystem.length > 0 && ( -
- {charactersInSystem.length} -
- )} -
-
- - )} -
- - {visible && isShowUnsplashedSignatures && ( -
- {unsplashedLeft.map(x => ( - - ))} -
- )} - {visible && isShowUnsplashedSignatures && ( -
- {unsplashedRight.map(x => ( - - ))} -
- )} - -
- - - - - -
- - ); -}); diff --git a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.module.scss b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.module.scss index 44014889..1e425077 100644 --- a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.module.scss +++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeDefault.module.scss @@ -80,12 +80,12 @@ $tooltip-bg: #202020; // Dark background for tooltips } } - .selected { - border-color: var($pastel-pink, #d291bc); + &.selected { + border-color: $pastel-pink; box-shadow: 0 0 10px #9a1af1c2; } - .tooltip { + &.tooltip { background-color: $tooltip-bg; color: $text-color; padding: 5px 10px; @@ -93,18 +93,19 @@ $tooltip-bg: #202020; // Dark background for tooltips border: 1px solid $pastel-pink; } - .eve-system-status-home { + &.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), + var(--eve-solar-system-status-home), transparent ); &.selected { border-color: var(--eve-solar-system-status-color-home); } } - .eve-system-status-friendly { + + &.eve-system-status-friendly { border: 1px solid var(--eve-solar-system-status-color-friendly-dark20); background-image: linear-gradient( 275deg, @@ -115,28 +116,32 @@ $tooltip-bg: #202020; // Dark background for tooltips border-color: var(--eve-solar-system-status-color-friendly-dark5); } } - .eve-system-status-lookingFor { + + &.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, #d291bc); + border-color: $pastel-pink; } } - .eve-system-status-warning { + + &.eve-system-status-warning { background-image: linear-gradient( 275deg, var(--eve-solar-system-status-warning), transparent ); } - .eve-system-status-dangerous { + + &.eve-system-status-dangerous { background-image: linear-gradient( 275deg, var(--eve-solar-system-status-dangerous), transparent ); } - .eve-system-status-target { + + &.eve-system-status-target { background-image: linear-gradient( 275deg, var(--eve-solar-system-status-target), diff --git a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.module.scss b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.module.scss index 15095f3b..f940512f 100644 --- a/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.module.scss +++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemNode/SolarSystemNodeTheme.module.scss @@ -84,12 +84,12 @@ $tooltip-bg: #202020; // Dark background for tooltips } } - .selected { - border-color: var($pastel-pink, #d291bc); + &.selected { + border-color: $pastel-pink; box-shadow: 0 0 10px #9a1af1c2; } - .tooltip { + &.tooltip { background-color: $tooltip-bg; color: $text-color; padding: 5px 10px; @@ -97,18 +97,19 @@ $tooltip-bg: #202020; // Dark background for tooltips border: 1px solid $pastel-pink; } - .eve-system-status-home { + &.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), + var(--eve-solar-system-status-home), transparent ); &.selected { border-color: var(--eve-solar-system-status-color-home); } } - .eve-system-status-friendly { + + &.eve-system-status-friendly { border: 1px solid var(--eve-solar-system-status-color-friendly-dark20); background-image: linear-gradient( 275deg, @@ -119,28 +120,32 @@ $tooltip-bg: #202020; // Dark background for tooltips border-color: var(--eve-solar-system-status-color-friendly-dark5); } } - .eve-system-status-lookingFor { + + &.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, #d291bc); + border-color: $pastel-pink; } } - .eve-system-status-warning { + + &.eve-system-status-warning { background-image: linear-gradient( 275deg, var(--eve-solar-system-status-warning), transparent ); } - .eve-system-status-dangerous { + + &.eve-system-status-dangerous { background-image: linear-gradient( 275deg, var(--eve-solar-system-status-dangerous), transparent ); } - .eve-system-status-target { + + &.eve-system-status-target { background-image: linear-gradient( 275deg, var(--eve-solar-system-status-target), diff --git a/assets/js/hooks/Mapper/components/map/styles/eve-common-variables.scss b/assets/js/hooks/Mapper/components/map/styles/eve-common-variables.scss index 7634f892..ea08945b 100644 --- a/assets/js/hooks/Mapper/components/map/styles/eve-common-variables.scss +++ b/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); +} diff --git a/assets/js/hooks/Mapper/components/map/styles/eve-common.scss b/assets/js/hooks/Mapper/components/map/styles/eve-common.scss index bb7c4789..889e07c5 100644 --- a/assets/js/hooks/Mapper/components/map/styles/eve-common.scss +++ b/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%); } From f83b4a2ba753c269eb3e81c83d33952c692dad64 Mon Sep 17 00:00:00 2001 From: CI Date: Fri, 10 Jan 2025 09:15:58 +0000 Subject: [PATCH 4/4] chore: release version v1.37.9 --- CHANGELOG.md | 11 +++++++++++ mix.exs | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d7d9fed..7eda0a24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ +## [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) diff --git a/mix.exs b/mix.exs index 3541b494..d30e1334 100644 --- a/mix.exs +++ b/mix.exs @@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do @source_url "https://github.com/wanderer-industries/wanderer" - @version "1.37.8" + @version "1.37.9" def project do [