Skip to content
Merged

Alpha #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7f30565
Merge pull request #88 from Brighter-Applications/features/add_cobra5
alex-williams Dec 13, 2024
60a05d9
Features/add_corsair (#93)
alex-williams Apr 10, 2025
a3d7c8b
Features/add corsair (#94)
alex-williams Jun 28, 2025
f38a091
Features/add corsair (#121)
alex-williams Oct 9, 2025
f404e77
packages
alex-williams Oct 11, 2025
298bb97
Basic React 16 upgrade and some minimal fixes
alex-williams Oct 11, 2025
7c2809c
lifecycle changes fixed
alex-williams Oct 11, 2025
7e4f009
Functioning React 19 changes, with more edits to make
alex-williams Oct 12, 2025
875da01
semi-broken, but almost functional
alex-williams Oct 13, 2025
500b689
Workflow to deploy alpha
alex-williams Oct 14, 2025
fce42b1
permitting upgrade in build (#138)
alex-williams Oct 14, 2025
b3f1782
Feat/react 16 upgrade (#139)
alex-williams Oct 14, 2025
1d44a8c
Feat/react-16-upgrade (#140)
alex-williams Oct 15, 2025
262bdb7
Feat/react 16 upgrade (#141)
alex-williams Oct 15, 2025
b95f601
Feat/react 16 upgrade (#142)
alex-williams Oct 15, 2025
9e02ae6
Feat/react 16 upgrade (#143)
alex-williams Oct 15, 2025
0113b5c
category menu (#144)
alex-williams Oct 15, 2025
8dbc1fa
Fixing icon placement (#145)
alex-williams Oct 16, 2025
e681da3
Improving search feature (#146)
alex-williams Oct 16, 2025
5346846
Adding Powerplay Icon (#147)
alex-williams Oct 21, 2025
2a908a6
Adding in the Caspian Explorer, fixing ship ordering, etc. (#148)
alex-williams Dec 6, 2025
c33a8e0
Merge branch 'beta' into alpha
alex-williams Dec 6, 2025
d6784fd
Fixing broken stuff from alpha PR (#150)
alex-williams Dec 6, 2025
5b39515
Merge branch 'beta' into alpha
alex-williams Dec 6, 2025
681dcd0
fixed again (#152)
alex-williams Dec 6, 2025
7aecc97
fixes (#154)
alex-williams Dec 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions src/app/components/AvailableModulesMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,38 +124,6 @@ const HPTCAT = {
'mining': ['ml', 'scl', 'sdm', 'abl'],
};

const INTCAT = {
'auto field-maintenance unit': ['am'] ,
'cargo racks': ['cr', 'crl'],
'fsd interdictor': ['fi'],
'fuel': ['ft', 'fs'],
'hangars': ['fh', 'pv'],
'limpet controllers': ['cc', 'fx', 'hb', 'pc', 'rpl', 'mlc'],
'passenger cabins': ['pce', 'pci', 'pcm', 'pcq'],
'refineries': ['rf'],
'shields': ['sg', 'bsg', 'psg', 'scb'],
'structural reinforcement': ['hr', 'mrp'],
// Assists
'flight assists': ['dc', 'sua'],
// Scanners
'scanners': ['ss'],
// Experimental
'experimental': ['rcpl', 'dtl', 'mahr', 'rsl'],
// Stabilizers
'weapon stabilizers': ['ews'],
// Guardian
'guardian': ['gsrp', 'gfsb', 'ghrp', 'gmrp'],
}

const HPTCAT = {
'lasers': ['pl', 'ul', 'bl'],
'projectiles': ['mc', 'advmc', 'c', 'fc', 'pa', 'rg'],
'ordnance': ['mr', 'amr', 'tp', 'nl'],
'mining': ['ml', 'scl', 'sdm', 'abl'],
'experimental': ['axmc', 'axmce', 'axmr', 'axmre', 'ntp','rfl', 'tbrfl', 'tbsc', 'tbem', 'xs', 'sfn'],
'guardian': ['gpc', 'ggc', 'gsc'],
}

/**
* Available modules menu
*/
Expand Down
10 changes: 0 additions & 10 deletions src/app/components/HardpointSlot.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,6 @@ export default class HardpointSlot extends Slot {
}
}

let cgmod = null;
let cgttip = '';
if (m.preEngineered && m.preEngineered.availability === 'CG') {
cgmod = <CommunityGoalSmall className={'community'}/>;
cgttip = 'CG module';
}else if (m.preEngineered && typeof(m.preEngineered.availability) === 'undefined') {
cgmod = <TechBrokerSmall className={'technomargin'}/>;
cgttip = 'Tech Broker module';
}

let cgttip = '';
// Get availability icon (CG, Tech Broker, or PowerPlay)
const availabilityIcon = this._getAvailabilityIcon(m);
Expand Down
1 change: 0 additions & 1 deletion src/app/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ export default class Header extends TranslatedComponent {
let tips = Persist.showTooltips();
let promptCG = Persist.promptCGModules();
let moduleResistances = Persist.showModuleResistances();
let promptCG = Persist.promptCG();

return (
<div className='menu-list no-wrap cap' onClick={ (e) => e.stopPropagation() }>
Expand Down
11 changes: 7 additions & 4 deletions src/app/components/InternalSlot.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import React from 'react';
import cn from 'classnames';
import Slot from './Slot';
import Persist from '../stores/Persist';
import { ListModifications, Modified, CommunityGoalSmall, TechBrokerSmall } from './SvgIcons';
import { ListModifications, Modified, CommunityGoalSmall, TechBrokerSmall, PowerPlaySmall } from './SvgIcons';
import { Modifications } from 'coriolis-data/dist';
import { stopCtxPropagation } from '../utils/UtilityFunctions';
import { blueprintTooltip } from '../utils/BlueprintFunctions';
import { CommunityGoalSmall, TechBrokerSmall, PowerPlaySmall } from './SvgIcons';

/**
* Internal Slot
Expand Down Expand Up @@ -104,11 +103,15 @@ export default class InternalSlot extends Slot {
else if (availabilityIcon && availabilityIcon === <CommunityGoalSmall className='community' />) {
cgttip = 'Community Goal Module';
}
else if (availabilityIcon && availabilityIcon === <TechBrokerSmall className='techbroker' />) {
cgttip = 'Tech Broker Module';
}
else if (availabilityIcon && availabilityIcon === <CommunityGoalSmall className='community' />) {
cgttip = 'Community Goal Module';
}

let mass = m.getMass() || m.cargo || m.fuel || 0;

const className = cn('details', enabled ? '' : 'disabled');
let mass = m.getMass() || m.cargo || m.fuel || 0;

return <div className={className} draggable='true' onDragStart={drag} onDragEnd={drop}>
<div className={'cb'}>
Expand Down
1 change: 0 additions & 1 deletion src/app/components/InternalSlotSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ export default class InternalSlotSection extends SlotSection {
eligible={s.eligible}
slot={s}
m={s.m}
menu={menu}
drag={this._drag.bind(this, s)}
dragOver={this._dragOverSlot.bind(this, s)}
drop={this._drop}
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/ErrorDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class ErrorDetails extends React.Component {
</div>
<div style={{ marginTop: '2em' }}>
<div><span className='warning'>Browser:</span> {window.navigator.userAgent}</div>
<div><span className='warning'>Path:</span> {this.context.route.canonicalPath}</div>
<div><span className='warning'>Path:</span> {this.context.route && this.context.route.canonicalPath ? this.context.route.canonicalPath : 'Unknown'}</div>
<div><span className='warning'>Error:</span> {ed["error"] || 'Unknown'}</div>
<div className='warning'>Details:</div>
<div><pre>{typeof ed == 'object' ? Object.keys(ed).map((e) => `${e}: ${ed[e]}\n`) : ed}</pre></div>
Expand Down