extras
/
mue
mirror of https://github.com/mue/mue.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: use constants, improve photoinformation ui

This commit is contained in:
David Ralph 2021-09-08 11:05:34 +01:00
parent 2984e162cc
commit 6bb461b8a2
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modals/main/marketplace/sections/Added.jsx
View File

@ -93,7 +93,7 @@ export default class Added extends PureComponent {
updateCheck() {
let updates = 0;
this.state.installed.forEach(async (item) => {
const data = await (await fetch('https://marketplace.muetab.com/item/' + item.name)).json();
const data = await (await fetch(window.constants.MARKETPLACE_URL + '/item/' + item.name)).json();
if (data.version !== item.version) {
updates++;
}

16
src/components/widgets/background/PhotoInformation.jsx
View File

@ -92,28 +92,30 @@ export default function PhotoInformation({ info, url, api }) {
};
const photoMap = () => {
if (localStorage.getItem('photoMap') !== 'true' || info.latitude === (null || undefined) || info.longitude === (null || undefined)) {
if (localStorage.getItem('photoMap') !== 'true' || !info.latitude || !info.longitude) {
return null;
}
const zoom = 12;
const lat = lat2tile(info.latitude, zoom);
const lon = lon2tile(info.longitude, zoom);
const tile = `https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/${zoom}/${lon}/${lat}?access_token=${info.maptoken}`;
const tile = `${window.constants.MAPBOX_URL}/styles/v1/mapbox/streets-v11/tiles/${zoom}/${lon}/${lat}?access_token=${info.maptoken}`;
let icon = 'https://res.cloudinary.com/mue/image/upload/mapbox/mapbox-logo-dark.png';
let icon = window.constants.CDN_URL + '/mapbox/mapbox-logo-dark.png';
if (document.body.classList.contains('dark')) {
icon = 'https://res.cloudinary.com/mue/image/upload/mapbox/mapbox-logo-white.png';
icon = window.constants.CDN_URL + '/mapbox/mapbox-logo-white.png';
}
return (
<Fragment key='test'>
<a href={`https://www.openstreetmap.org/?mlat=${info.latitude}&mlon=${info.longitude}`}>
<img className='locationMap' src={ddgProxy ? window.constants.DDG_IMAGE_PROXY + tile : tile} alt='location' draggable={false}/>
<a href={`https://www.openstreetmap.org/?mlat=${info.latitude}&mlon=${info.longitude}`} target='_blank' rel='noopener noreferrer'>
<img className='locationMap' src={tile} alt='location' draggable={false}/>
</a>
<br/>
<img className='mapboxLogo' src={icon} alt='mapbox logo' draggable={false}/>
<span className='mapCopyright'><a href='https://www.mapbox.com/about/maps/'> © Mapbox</a>, <a href='http://www.openstreetmap.org/about/'>© OpenStreetMap</a>. <a href='https://www.mapbox.com/map-feedback/'>Improve this map</a>.</span>
<span className='mapCopyright'>
<a href='https://www.mapbox.com/about/maps/' target='_blank' rel='noopener noreferrer'> © Mapbox</a>, <a href='https://www.openstreetmap.org/about/' target='_blank' rel='noopener noreferrer'>© OpenStreetMap</a>. <a href='https://www.mapbox.com/map-feedback/' target='_blank' rel='noopener noreferrer'>Improve this map</a>.
</span>
</Fragment>
);
}

2
src/modules/constants.js
View File

@ -5,6 +5,7 @@ export const MARKETPLACE_URL = 'https://marketplace.muetab.com';
export const SPONSORS_URL = 'https://sponsors.muetab.com';
export const GITHUB_URL = 'https://api.github.com';
export const DDG_IMAGE_PROXY = 'https://external-content.duckduckgo.com/iu/?u=';
export const MAPBOX_URL = 'https://api.mapbox.com';
// Mue URLs
export const WEBSITE_URL = 'https://muetab.com';
@ -12,6 +13,7 @@ export const PRIVACY_URL = 'https://muetab.com/privacy';
export const BLOG_POST = 'https://blog.muetab.com/posts/version-5-3';
export const FEEDBACK_FORM = 'https://api.formcake.com/api/form/349b56cb-7e2b-4004-b32b-e8964d217dd1/submission';
export const TRANSLATIONS_URL = 'https://docs.muetab.com/translations/';
export const CDN_URL = 'https://res.cloudinary.com/mue/image/upload';
// Mue Info
export const ORG_NAME = 'mue';