mirror of
https://github.com/EDCD/coriolis.git
synced 2025-12-08 14:33:22 +00:00
Beta to live (#25)
* Update pt.json - Brazilian Portuguese translations (#752) * Update pt.json Update Brazilian Portuguese translations: - Updated Modules - Engineering & Experimental Effect - Corrections * Update Portuguese Brazilian Fixed Tab/Spaces indentation * Updated PT-BR translation with Planetary Approach Suite * Adds valid module checking to all types of modules on import * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Changes as per comments on the PR * Fix changed files issue (#3) * Copied de.js contents to new file de-fix.js * Copied de.js contents back from de-fix.js * Copied contents of ko.js to ko-fix.js * Copied ko.js contents back from ko-fix.js * Copied contents from BlueprintFunctions.js to BlueprintFunctions-fix.js * Copied contents back from BlueprintFunctions-fix.js to BlueprintFunctions.js * Copied contents of LineChart.jsx to LineChart-fix.jsx * Copied contents back from LineChart-fix.jsx to LineChart.jsx * Copied contents of PieChart.jsx to PieChart-fix.jsx * Copied contents back from PieChart-fix.jsx to PieChart.jsx * Copied contents from Slider.jsx to Slider-fix.jsx * Copied contents back from Slider-fix.jsx to Slider.jsx * Copied contents from VerticalBarChart.jsx to VerticalBarChart-fix.jsx * Copied contents back from VerticalBarChart-fix.jsx to VerticalBarChart.jsx * Deleting 'fix' files * Adding workflow for autodeploy * Improving workflow * Changed deployment ordering * Changing to clone single branch for deployment, not the whole repo * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#4) * Issue 754 imports need to be more graceful (#5) * Adds valid module checking to all types of modules on import * Changes as per comments on the PR * Added 'special' field to certain modules to allow for clearer appearance in search results that they are the special type of module. Updated English descriptions of Advanced Modules and Special Modules * Update PT-BR translations Added translated strings for coriolis-data PRs 106 & 107 * Fixed 'Missing Module' category showing up in Optional Selection drop-down and fixed 'Missing Power Plant', 'Missing Power Distributor' and 'Missing Frameshift Drive' showing up in the Selection drop-downs for those module slots. * Fixing bug introduced by the previous PR for ISSUE_764. The previous fix introduced a bug which caused Armour Selection to error, due to Armour modules being completely different to other modules of any other type * Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads. * Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade. * Issue 703 edomh integration (#7) * Adds valid module checking to all types of modules on import * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Changes as per comments on the PR * Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads. --------- Co-authored-by: David Sangrey <davidsangrey@gmail.com> Co-authored-by: Felix Linker <linkerfelix@gmail.com> * Fixed miscalculation of mats and got rid of unhelpful 'rolls' table, as the mats are calculated for the whole build and some blueprints may not be all the way up to g5. * Removed console.log lines which were only needed for testing. * Adding in buildname to EDOMH Export * Issue 703 edomh integration (#8) * Adds valid module checking to all types of modules on import * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Changes as per comments on the PR * Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads. * Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade. --------- Co-authored-by: David Sangrey <davidsangrey@gmail.com> Co-authored-by: Felix Linker <linkerfelix@gmail.com> * Issue 703 edomh integration (#9) * Adds valid module checking to all types of modules on import * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Changes as per comments on the PR * Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads. * Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade. * Fixed miscalculation of mats and got rid of unhelpful 'rolls' table, as the mats are calculated for the whole build and some blueprints may not be all the way up to g5. --------- Co-authored-by: David Sangrey <davidsangrey@gmail.com> Co-authored-by: Felix Linker <linkerfelix@gmail.com> * Issue 703 edomh integration (#10) * Adds valid module checking to all types of modules on import * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Changes as per comments on the PR * Modified export to EDOMH/EDEngineer page to be less 'bodged', allow EDOMH button to be clickable without checking for EDEngineer API (If they have EDOMH, they probably don't have EDEngineer...) and added a workaround for Coriolis sending bogus data for bulkheads. * Fixed autodeploy to do latest coriolis-data dist. Fixed sendToEDOMH function to only send the blueprint at the selected grade, not each grade up to that grade. * Fixed miscalculation of mats and got rid of unhelpful 'rolls' table, as the mats are calculated for the whole build and some blueprints may not be all the way up to g5. * Removed console.log lines which were only needed for testing. --------- Co-authored-by: David Sangrey <davidsangrey@gmail.com> Co-authored-by: Felix Linker <linkerfelix@gmail.com> * Issue 764 unknown modules are selectable (#11) * Adds valid module checking to all types of modules on import * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Changes as per comments on the PR * Fixed 'Missing Module' category showing up in Optional Selection drop-down and fixed 'Missing Power Plant', 'Missing Power Distributor' and 'Missing Frameshift Drive' showing up in the Selection drop-downs for those module slots. --------- Co-authored-by: David Sangrey <davidsangrey@gmail.com> Co-authored-by: Felix Linker <linkerfelix@gmail.com> * Adding tag to manual dispatch of workflow * Adding fix for broken Armour Module Selection * Fixed issue with special blueprint item not being correctly jsonified for export to EDOMH * Removing Autodeploy from this branch, it was merged in by github * Removing debugging console.log entries that are no longer needed for EDOMH fix * Adding autodeploy for new 'beta' branch * Fixing directory for beta deployment * Updating beta autodeploy with nvm info * Making autodeploy aware of its target branch name (#16) * Fixes for autodeploy (#17) * Autodeploy fixes (#18) * Fixes for autodeploy * Adding npm start command to build dist from coriolis-data * Removing unneccessary output lines from autodeploy (#19) * Adding missing Constants for Advanced and Enhanced Weaponry (#20) * Setting up definitive workflows, automatic for when coriolis is being updated, either on its own, or along with coriolis-data and manual, for when we've updated coriolis-data and need to re-deploy. * Compartmentalising the build stages in the workflows. * Fixed deployment steps * deployment fix * Deployment improvements and potential webpack fix * Removing webpack change that made no difference. * Changing deployment workflows to clear out old build before copying new build to web directory * Supressing npm warnings in build process to avoid failure of the pipeline erroneously. * Shifting node build to separate runner * Fixing syntax in autodeploy * issues with zipping * Adding GCP Auth to download job * Fixing unzipping process * fixes for autodeploy * zip path issues * zip path * rm command * Fixes for broken EDEngineer button, plus styling changes to improve the modal popup for exporting builds. (#24) --------- Co-authored-by: leonardofelin <33718368+leonardofelin@users.noreply.github.com> Co-authored-by: David Sangrey <davidsangrey@gmail.com> Co-authored-by: Felix Linker <linkerfelix@gmail.com>
This commit is contained in:
Alex Williams
GitHub
@@ -355,8 +355,8 @@ export default class ModalShoppingList extends TranslatedComponent {
|
||||
this.sendToEDEng = this.sendToEDEng.bind(this);
|
||||
this.sendToEDOMH = this.sendToEDOMH.bind(this);
|
||||
return <div className='modal' onClick={ (e) => e.stopPropagation() }>
|
||||
<h2>{translate('PHRASE_SHOPPING_MATS')}</h2>
|
||||
<p>{translate('PHRASE_DIFFERENT_ROLLS')}</p>
|
||||
<h3>{translate('PHRASE_SHOPPING_MATS')}</h3>
|
||||
|
||||
{/* <label>{translate('Grade 1 rolls ')}</label>
|
||||
<input id={1} type={'number'} min={0} defaultValue={this.state.matsPerGrade[1]} onChange={this.changeHandler} />
|
||||
<br/>
|
||||
@@ -373,22 +373,28 @@ export default class ModalShoppingList extends TranslatedComponent {
|
||||
<input id={5} type={'number'} min={0} value={this.state.matsPerGrade[5]} onChange={this.changeHandler} /> */}
|
||||
<div>
|
||||
<textarea className='cb json' readOnly value={this.state.matsList} />
|
||||
<p>{translate('PHRASE_DIFFERENT_ROLLS')}</p>
|
||||
</div>
|
||||
<p hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</p>
|
||||
<p hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAILED_TO_FIND_EDENGINEER')}</p>
|
||||
|
||||
<div id='edengineer' display={this.display} hidden={!!this.state.failed && !compatible}>
|
||||
<label hidden={!compatible || !!this.state.failed} className={'l cap'}>{translate('CMDR Name')}</label>
|
||||
<br/>
|
||||
<select hidden={!compatible || !!this.state.failed} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
|
||||
<hr />
|
||||
<h3>ED Engineer</h3>
|
||||
<h4 hidden={compatible} id={'browserbad'} className={'l'}>{translate('PHRASE_FIREFOX_EDENGINEER')}</h4>
|
||||
<h4 hidden={!this.state.failed} id={'failed'} className={'l'}>{translate('PHRASE_FAILED_TO_FIND_EDENGINEER')}</h4>
|
||||
<label for='cmdr-select' hidden={!!this.state.failed || !compatible} className={'l cap'}>{translate('CMDR Name:')}</label>
|
||||
<select id='cmdr-select' hidden={!!this.state.failed || !compatible} className={'cmdr-select l cap'} onChange={this.cmdrChangeHandler} defaultValue={this.state.cmdrName}>
|
||||
{this.state.cmdrs.map(e => <option key={e}>{e}</option>)}
|
||||
</select>
|
||||
<br/>
|
||||
<button className={'l cb dismiss cap'} hidden={!this.state.failed} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
|
||||
<button className={'l cb dismiss cap'} disabled={!!this.state.failed || !compatible} onClick={this.sendToEDEng}>{translate('Send to EDEngineer')}</button>
|
||||
</div>
|
||||
<div id='edomh'>
|
||||
<hr />
|
||||
<h3>ED Odyssey Materials Helper</h3>
|
||||
<p>{translate('PHRASE_ENSURE_EDOMH')}</p>
|
||||
<button style={{marginTop: 5}} className={'l cb dismiss cap'} onClick={this.sendToEDOMH}>{translate('Send to EDOMH')}</button>
|
||||
</div>
|
||||
<hr />
|
||||
|
||||
<button className={'r dismiss cap'} onClick={this.context.hideModal}>{translate('close')}</button>
|
||||
</div>;
|
||||
|
||||
@@ -82,7 +82,6 @@
|
||||
"TT_SUMMARY_UNLADEN_TOTAL_JUMP": "Farthest possible range with no cargo, a full fuel tank, and jumping as far as possible each time",
|
||||
"TT_SUMMARY_LADEN_TOTAL_JUMP": "Farthest possible range with full cargo, a full fuel tank, and jumping as far as possible each time",
|
||||
"HELP_MODIFICATIONS_MENU": "Click on a number to enter a new value, or drag along the bar for small changes",
|
||||
"PHRASE_FAIL_EDENGINEER": "Failed to send to EDEngineer (Launch EDEngineer and make sure the API is started then refresh the page.)",
|
||||
"PHRASE_ENSURE_EDOMH": "Ensure EDO Material Helper is installed and registered to handle edomh:// urls, else this button will do nothing!",
|
||||
"PHRASE_FIREFOX_EDENGINEER": "Sending to EDEngineer is not compatible with Firefox's security settings. Please try again with Chrome.",
|
||||
"PHRASE_FAILED_TO_FIND_EDENGINEER": "Failed to find ED Engineer API. Please ensure it is running and try again.",
|
||||
|
||||
@@ -42,13 +42,41 @@
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
h4 {
|
||||
text-transform: uppercase;
|
||||
font-family: @fStandard;
|
||||
font-weight: normal;
|
||||
font-size: 1em;
|
||||
margin: 1em;
|
||||
color: @warning;
|
||||
}
|
||||
|
||||
p {
|
||||
clear: left;
|
||||
padding: 30, 0, 0, 0;
|
||||
padding: 30, 0, 10, 0;
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 100px, 0;
|
||||
clear: bottom;
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
hr {
|
||||
clear: both;
|
||||
margin: 15px, 10px, 15px, 10px;
|
||||
padding: top, 5;
|
||||
}
|
||||
|
||||
select {
|
||||
clear: bottom;
|
||||
margin: 10px;
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
label {
|
||||
clear: bottom;
|
||||
margin: 20px;
|
||||
color: @primary;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +92,7 @@ textarea {
|
||||
min-height: 10em;
|
||||
resize: vertical;
|
||||
user-select: text;
|
||||
margin:2em 0;
|
||||
margin:1em 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user