diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss
index 0f5cb941..bcac0b1d 100644
--- a/src/components/modals/main/scss/marketplace/_main.scss
+++ b/src/components/modals/main/scss/marketplace/_main.scss
@@ -155,7 +155,7 @@ p.description {
background: #2d3436;
}
-#item>img {
+#item>img, .updateimage, .updatechangelog>p>img {
border-radius: 24px;
height: 200px;
width: auto;
diff --git a/src/components/modals/main/scss/settings/_main.scss b/src/components/modals/main/scss/settings/_main.scss
index 59c7ed70..ddd6062b 100644
--- a/src/components/modals/main/scss/settings/_main.scss
+++ b/src/components/modals/main/scss/settings/_main.scss
@@ -161,3 +161,17 @@ input[type=color]::-moz-color-swatch {
color: var(--modal-text) !important;
cursor: move;
}
+
+.updatechangelog {
+ li {
+ cursor: initial;
+ font-size: 1rem;
+ list-style-type:disc;
+ padding: 0;
+ margin-left: 20px;
+ }
+}
+
+.aboutLink {
+ color: var(--modal-text) !important;
+}
\ No newline at end of file
diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx
index 6fc03988..55c0f73b 100644
--- a/src/components/modals/main/settings/sections/About.jsx
+++ b/src/components/modals/main/settings/sections/About.jsx
@@ -78,10 +78,7 @@ export default class About extends React.PureComponent {
GitHub Sponsors - • Ko-Fi - • Patreon -
+GitHub Sponsors • Ko-Fi • Patreon
Pexels ({this.language.resources_used.bg_images})
diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx index 19e28b8f..1d4b9965 100644 --- a/src/components/modals/main/settings/sections/Changelog.jsx +++ b/src/components/modals/main/settings/sections/Changelog.jsx @@ -1,56 +1,67 @@ import React from 'react'; +import WifiOffIcon from '@material-ui/icons/WifiOff'; + export default class Changelog extends React.PureComponent { constructor() { super(); this.state = { - title: window.language.modals.update.title, - date: null, - content: window.language.modals.update.title, - html: window.language.modals.main.loading, - image: null + title: null }; this.language = window.language.modals.update; } async getUpdate() { - const data = await (await fetch(window.constants.API_URL + '/getUpdate')).json(); - - if (data.statusCode === 500 || data.title === null) { - const supportText = `${this.language.contact_support}: https://muetab.com/contact
`; - return this.setState({ - title: this.language.error.title, - html: this.language.error.description + supportText - }); - } - + const data = await (await fetch(window.constants.BLOG_POST + '/index.json')).json(); + this.setState({ title: data.title, - date: data.published, - image: data.image || null, - author: data.author, - html: data.content + date: data.date.split(' ')[0], + image: data.featured_image || null, + author: 'By ' + data.author, + html: data.html }); } componentDidMount() { if (localStorage.getItem('offlineMode') === 'true') { - return this.setState({ - title: this.language.offline.title, - html: this.language.offline.description - }); + return; } this.getUpdate(); } render() { + const errorMessage = (msg) => { + return ( +{language.offline.description}
+ >); + } + + if (!this.state.title) { + return errorMessage(