refactor: small styling changes and 7.0.1 start

This commit is contained in:
David Ralph
2024-01-01 11:47:58 +00:00
parent de24d11463
commit d482deccb4
32 changed files with 134 additions and 125 deletions

View File

@@ -39,7 +39,7 @@ export default class AdvancedSettings extends PureComponent {
>
<Switch name="offlineMode" element=".other" />
</SettingsItem>
{localStorage.getItem('welcomePreview') !== 'true' ? (
{localStorage.getItem('welcomePreview') !== 'true' && (
<div className="settingsRow">
<div className="content">
<span className="title">
@@ -64,7 +64,7 @@ export default class AdvancedSettings extends PureComponent {
</button>
</div>
</div>
) : null}
)}
<SettingsItem
title={variables.getMessage('modals.main.settings.sections.advanced.timezone.title')}
subtitle={variables.getMessage(

View File

@@ -132,14 +132,14 @@ export default class Changelog extends PureComponent {
<h5>
{this.state.author} {this.state.date}
</h5>
{this.state.image ? (
{this.state.image && (
<img
draggable={false}
src={this.state.image}
alt={this.state.title}
className="updateImage"
/>
) : null}
)}
<div className="updateChangelog">{this.state.content}</div>
<Modal
closeTimeoutMS={100}

View File

@@ -112,7 +112,7 @@ export default class Message extends PureComponent {
</div>
))}
</div>
{this.state.messages.length === 0 ? (
{this.state.messages.length === 0 && (
<div className="photosEmpty">
<div className="emptyNewMessage">
<MdOutlineTextsms />
@@ -128,7 +128,7 @@ export default class Message extends PureComponent {
</button>
</div>
</div>
) : null}
)}
</>
);
}

View File

@@ -56,7 +56,7 @@ function Navbar() {
category="navbar"
/>
</SettingsItem>
{showRefreshOptions ? (
{showRefreshOptions && (
<SettingsItem
title={variables.getMessage('modals.main.settings.sections.appearance.navbar.refresh')}
subtitle={variables.getMessage(
@@ -82,7 +82,7 @@ function Navbar() {
</option>
</Dropdown>
</SettingsItem>
) : null}
)}
</>
);
}

View File

@@ -39,7 +39,7 @@ export default class QuickLinks extends PureComponent {
variables.stats.postEvent('feature', 'Quicklink delete');
}
addLink(name, url, icon) {
async addLink(name, url, icon) {
const data = JSON.parse(localStorage.getItem('quicklinks'));
// regex: https://ihateregex.io/expr/url/
@@ -63,7 +63,7 @@ export default class QuickLinks extends PureComponent {
}
data.push({
name: name || url,
name: name || await this.getTitle(url),
url,
icon: icon || '',
key: Math.random().toString(36).substring(7) + 1,
@@ -89,10 +89,10 @@ export default class QuickLinks extends PureComponent {
});
}
editLink(og, name, url, icon) {
async editLink(og, name, url, icon) {
const data = JSON.parse(localStorage.getItem('quicklinks'));
const dataobj = data.find((i) => i.key === og.key);
dataobj.name = name || url;
dataobj.name = name || await this.getTitle(url);
dataobj.url = url;
dataobj.icon = icon || '';
@@ -105,6 +105,24 @@ export default class QuickLinks extends PureComponent {
});
}
async getTitle(url) {
let title;
try {
let response = await fetch(url);
if (response.redirected) {
response = await fetch(response.url);
}
const html = await response.text();
const parser = new DOMParser();
const doc = parser.parseFromString(html, 'text/html');
title = doc.title;
} catch (e) {
title = url;
}
return title;
}
componentDidMount() {
EventBus.on('refresh', (data) => {
if (data === 'quicklinks') {
@@ -255,7 +273,7 @@ export default class QuickLinks extends PureComponent {
</button>
</SettingsItem>
{this.state.items.length === 0 ? (
{this.state.items.length === 0 && (
<div className="photosEmpty">
<div className="emptyNewMessage">
<MdLinkOff />
@@ -271,7 +289,7 @@ export default class QuickLinks extends PureComponent {
</button>
</div>
</div>
) : null}
)}
<div className="messagesContainer" ref={this.quicklinksContainer}>
{this.state.items.map((item) => quickLink(item))}

View File

@@ -220,7 +220,7 @@ export default class QuoteSettings extends PureComponent {
</Dropdown>
</div>
</div>
{!this.state.sourceSection ? (
{!this.state.sourceSection && (
<>
<SettingsItem
title={variables.getMessage('modals.main.settings.sections.quote.buttons.title')}
@@ -291,7 +291,7 @@ export default class QuoteSettings extends PureComponent {
/>
</SettingsItem>
</>
) : null}
)}
{customSettings}
</>
);

View File

@@ -67,7 +67,7 @@ export default class AdvancedSettings extends PureComponent {
>
<Switch name="offlineMode" element=".other" />
</SettingsItem>
{localStorage.getItem('welcomePreview') !== 'true' ? (
{localStorage.getItem('welcomePreview') !== 'true' && (
<div className="settingsRow">
<div className="content">
<span className="title">
@@ -92,7 +92,7 @@ export default class AdvancedSettings extends PureComponent {
</button>
</div>
</div>
) : null}
)}
<SettingsItem
title={variables.getMessage('modals.main.settings.sections.advanced.timezone.title')}
subtitle={variables.getMessage(

View File

@@ -287,11 +287,11 @@ export default class BackgroundSettings extends PureComponent {
onChange={(value) => this.setState({ backgroundType: value })}
category="background"
>
{this.state.marketplaceEnabled ? (
{this.state.marketplaceEnabled && (
<option value="photo_pack">
{variables.getMessage('modals.main.navbar.marketplace')}
</option>
) : null}
)}
<option value="api">
{variables.getMessage('modals.main.settings.sections.background.type.api')}
</option>
@@ -406,11 +406,11 @@ export default class BackgroundSettings extends PureComponent {
onChange={(value) => this.setState({ backgroundType: value })}
category="background"
>
{this.state.marketplaceEnabled ? (
{this.state.marketplaceEnabled && (
<option value="photo_pack">
{variables.getMessage('modals.main.navbar.marketplace')}
</option>
) : null}
)}
<option value="api">
{variables.getMessage('modals.main.settings.sections.background.type.api')}
</option>
@@ -520,7 +520,7 @@ export default class BackgroundSettings extends PureComponent {
)}
</option>
</Dropdown>
{this.state.backgroundFilter !== 'none' ? (
{this.state.backgroundFilter !== 'none' && (
<Slider
title={variables.getMessage(
'modals.main.settings.sections.background.effects.filters.amount',
@@ -534,7 +534,7 @@ export default class BackgroundSettings extends PureComponent {
category="background"
element="#backgroundImage"
/>
) : null}
)}
</SettingsItem>
) : null}
</>

View File

@@ -207,13 +207,13 @@ export default class ColourSettings extends PureComponent {
colourSettings = (
<>
<div className="colourInput">{gradientInputs}</div>
{!gradientHasMoreThanOneColour ? (
{!gradientHasMoreThanOneColour && (
<>
<button type="button" className="add" onClick={this.addColour}>
{variables.getMessage('modals.main.settings.sections.background.source.add_colour')}
</button>
</>
) : null}
)}
</>
);
}

View File

@@ -227,8 +227,8 @@ export default class CustomSettings extends PureComponent {
alt={'Custom background ' + (index || 0)}
src={`${!this.videoCheck(url) ? this.state.customBackground[index] : ''}`}
/>
{this.videoCheck(url) ? <MdPersonalVideo className="customvideoicon" /> : null}
{this.state.customBackground.length > 0 ? (
{this.videoCheck(url) && <MdPersonalVideo className="customvideoicon" />}
{this.state.customBackground.length > 0 && (
<Tooltip
title={variables.getMessage(
'modals.main.settings.sections.background.source.remove',
@@ -238,7 +238,7 @@ export default class CustomSettings extends PureComponent {
<MdCancel />
</button>
</Tooltip>
) : null}
)}
</div>
))}
</div>