Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-08 22:33:24 +00:00
Code Issues Projects Releases Wiki Activity

Disable announcements

Browse Source
This commit is contained in:
Felix Linker
2021-12-26 18:13:06 +01:00
parent 1e18d6e463
commit d2c3787165
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/Coriolis.jsx
View File

@@ -68,7 +68,8 @@ export default class Coriolis extends React.Component {
route: {},
sizeRatio: Persist.getSizeRatio()
};
this._getAnnouncements();
// TODO: New mechanism for announcements
// this._getAnnouncements();
Router('', (r) => this._setPage(ShipyardPage, r));
Router('/import?', (r) => this._importBuild(r));
Router('/import/:data', (r) => this._importBuild(r));
@@ -98,15 +99,15 @@ export default class Coriolis extends React.Component {
}
}
async _getAnnouncements() {
try {
const announces = await request.get('https://orbis.zone/api/announcement')
.query({ showInCoriolis: true });
this.setState({ announcements: announces.body });
} catch (err) {
console.error(err)
}
}
// async _getAnnouncements() {
// try {
// const announces = await request.get('https://orbis.zone/api/announcement')
// .query({ showInCoriolis: true });
// this.setState({ announcements: announces.body });
// } catch (err) {
// console.error(err)
// }
// }
/**
* Updates / Sets the page and route context
@@ -383,11 +384,12 @@ export default class Coriolis extends React.Component {
let currentMenu = this.state.currentMenu;
return <div style={{ minHeight: '100%' }} onClick={this._closeMenu}
className={this.state.noTouch ? 'no-touch' : null}>
className={this.state.noTouch ? 'no-touch' : null}
>
<Header announcements={this.state.announcements} appCacheUpdate={this.state.appCacheUpdate}
currentMenu={currentMenu}/>
<div className="announcement-container">{this.state.announcements.map(a => <Announcement
text={a.message}/>)}</div>
currentMenu={currentMenu}/>
{/* <div className="announcement-container">{this.state.announcements.map(a => <Announcement
text={a.message}/>)}</div> */}
{this.state.error ? this.state.error : this.state.page ? React.createElement(this.state.page, { currentMenu }) :
<NotFoundPage/>}
{this.state.modal}
@@ -395,7 +397,7 @@ export default class Coriolis extends React.Component {
<footer>
<div className="right cap">
<a href="https://github.com/EDCD/coriolis" target="_blank" rel="noopener noreferrer"
title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
title="Coriolis Github Project">{window.CORIOLIS_VERSION} - {window.CORIOLIS_DATE}</a>
<br/>
<a
href={'https://github.com/EDCD/coriolis/compare/edcd:develop@{' + window.CORIOLIS_DATE + '}...edcd:develop'}

5
src/app/components/Header.jsx
View File

@@ -556,12 +556,13 @@ export default class Header extends TranslatedComponent {
{openedMenu == 'comp' ? this._getComparisonsMenu() : null}
</div>
<div className='l menu'>
{/* TODO: Enable */}
{/* <div className='l menu'>
<div className={cn('menu-header', { selected: openedMenu == 'announce', disabled: this.props.announcements.length === 0 })} onClick={this.props.announcements.length !== 0 && this._openAnnounce}>
<span className='menu-item-label'>{translate('announcements')}</span>
</div>
{openedMenu == 'announce' ? this._getAnnouncementsMenu() : null}
</div>
</div> */}
{window.location.origin.search('.edcd.io') >= 0 ?
<div className='l menu'>