iampeter/pixelplanet
1
Fork 0
forked from ppfun/pixelplanet
Code Pull Requests Activity

remove ASSET_SERVER config

Browse Source
This commit is contained in:
HF 2022-09-04 03:28:27 +02:00
parent cd195c9692
commit b4b82ea478
16 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -81,7 +81,6 @@ Configuration takes place in the environment variables that are defined in ecosy
| Variable | Description | Example |
|-------------------|:--------------------------------------|---------------------------|
| ASSET_SERVER | URL for assets | "http://localhost" |
| USE_PROXYCHECK | Check users for Proxies | 0 |
| PROXYCHECK_KEY | Key for proxycheck.io | "asfas-xcsc-ewef-sdfsd" |
| APISOCKET_KEY | Key for API Socket for SpecialAccess™ | "SDfasife3" |

6
src/components/ChatMessage.jsx
View File

@ -50,11 +50,7 @@ function ChatMessage({
className="chatflag"
alt=""
title={country}
src={`${window.ssv.assetserver}/cf/${country}.gif`}
onError={(e) => {
e.target.onerror = null;
e.target.src = './cf/xx.gif';
}}
src={`/cf/${country}.gif`}
/>
<span
className="chatname"

2
src/components/LanguageSelect.jsx
View File

@ -56,7 +56,7 @@ function LanguageSelect() {
<img
style={{ height: '1em', imageRendering: 'crisp-edges' }}
alt=""
src={`${window.ssv.assetserver}/cf/${ccSel}.gif`}
src={`/cf/${ccSel}.gif`}
/>
</span>
<button

10
src/components/LogInArea.jsx
View File

@ -32,7 +32,7 @@ const LogInArea = ({ windowId }) => {
<img
style={logoStyle}
width={32}
src={`${window.ssv.assetserver}/discordlogo.svg`}
src="/discordlogo.svg"
alt="Discord"
/>
</a>
@ -40,7 +40,7 @@ const LogInArea = ({ windowId }) => {
<img
style={logoStyle}
width={32}
src={`${window.ssv.assetserver}/googlelogo.svg`}
src="/googlelogo.svg"
alt="Google"
/>
</a>
@ -48,7 +48,7 @@ const LogInArea = ({ windowId }) => {
<img
style={logoStyle}
width={32}
src={`${window.ssv.assetserver}/facebooklogo.svg`}
src="/facebooklogo.svg"
alt="Facebook"
/>
</a>
@ -56,7 +56,7 @@ const LogInArea = ({ windowId }) => {
<img
style={logoStyle}
width={32}
src={`${window.ssv.assetserver}/vklogo.svg`}
src="/vklogo.svg"
alt="VK"
/>
</a>
@ -64,7 +64,7 @@ const LogInArea = ({ windowId }) => {
<img
style={logoStyle}
width={32}
src={`${window.ssv.assetserver}/redditlogo.svg`}
src="/redditlogo.svg"
alt="Reddit"
/>
</a>

2
src/components/ModWatchtools.jsx
View File

@ -339,7 +339,7 @@ function ModWatchtools() {
imageRendering: 'crisp-edges',
}}
alt={val}
src={`${window.ssv.assetserver}/cf/${flag}.gif`}
src={`/cf/${flag}.gif`}
/></td>
);
}

2
src/components/embeds/DirectLinkMedia.jsx
View File

@ -48,5 +48,5 @@ export default [
return (videoExts.includes(ext) || imageExts.includes(ext));
},
null,
`${window.ssv.assetserver}/embico/direct.png`,
'/embico/direct.png',
];

2
src/components/embeds/Matrix.jsx
View File

@ -29,5 +29,5 @@ export default [
React.memo(Matrix),
(url) => url.includes('?type=video') || url.includes('?type=image'),
null,
`${window.ssv.assetserver}/embico/matrix.png`,
'/embico/matrix.png',
];

2
src/components/embeds/Odysee.jsx
View File

@ -94,5 +94,5 @@ export default [
urlPart = stripCol(stripQuery(urlPart));
return urlPart;
},
`${window.ssv.assetserver}/embico/odysee.png`,
'/embico/odysee.png',
];

2
src/components/embeds/Telegram.jsx
View File

@ -71,5 +71,5 @@ export default [
title = title.substring(0, title.indexOf('/'));
return title;
},
`${window.ssv.assetserver}/embico/telegram.png`,
'/embico/telegram.png',
];

2
src/components/embeds/TikTok.jsx
View File

@ -56,5 +56,5 @@ export default [
React.memo(TikTok),
(url) => url.includes('/video/'),
(url) => getUserFromUrl(url),
`${window.ssv.assetserver}/embico/tiktok.png`,
'/embico/tiktok.png',
];

2
src/components/embeds/Twitter.jsx
View File

@ -70,5 +70,5 @@ export default [
title = title.substring(title.lastIndexOf('/') + 1);
return title;
},
`${window.ssv.assetserver}/embico/twitter.png`,
'/embico/twitter.png',
];

2
src/components/embeds/YouTube.jsx
View File

@ -45,5 +45,5 @@ export default [
React.memo(YouTube),
getIdFromURL,
(url) => getIdFromURL(url),
`${window.ssv.assetserver}/embico/youtube.png`,
'/embico/youtube.png',
];

2
src/core/config.js
View File

@ -20,8 +20,6 @@ export const MAIL_ADDRESS = process.env.MAIL_ADDRESS
const TILE_FOLDER_REL = process.env.TILE_FOLDER || 'tiles';
export const TILE_FOLDER = path.join(__dirname, `./${TILE_FOLDER_REL}`);
export const ASSET_SERVER = process.env.ASSET_SERVER || '.';
export const USE_XREALIP = process.env.USE_XREALIP || false;
export const BACKUP_URL = process.env.BACKUP_URL || null;

3
src/ssr/Globe.jsx
View File

@ -9,7 +9,6 @@ import { getTTag } from '../core/ttag';
/* this will be set by webpack */
import { assets } from '../core/assets';
import { ASSET_SERVER } from '../core/config';
import globeCss from '../styles/globe.css';
@ -46,7 +45,7 @@ function generateGlobePage(lang) {
<div id="coorbox">(0, 0)</div>
<div id="info">${t`Double click on globe to go back.`}</div>
<div id="loading">${t`Loading...`}</div>
${scripts.map((script) => `<script src="${ASSET_SERVER + script}"></script>`).join('')}
${scripts.map((script) => `<script src="${script}"></script>`).join('')}
</body>
</html>
`;

5
src/ssr/Main.jsx
View File

@ -9,7 +9,7 @@ import { langCodeToCC } from '../utils/location';
import ttags, { getTTag } from '../core/ttag';
import { styleassets, assets } from '../core/assets';
import { ASSET_SERVER, BACKUP_URL } from '../core/config';
import { BACKUP_URL } from '../core/config';
/*
* generate language list
@ -22,7 +22,6 @@ const langs = Object.keys(ttags)
* values that we pass to client scripts
*/
const ssv = {
assetserver: ASSET_SERVER,
availableStyles: styleassets,
langs,
};
@ -66,7 +65,7 @@ function generateMainPage(lang) {
<body>
<div id="app">
</div>
${scripts.map((script) => `<script src="${ASSET_SERVER + script}"></script>`).join('')}
${scripts.map((script) => `<script src="${script}"></script>`).join('')}
</body>
</html>
`;

5
src/ssr/PopUp.jsx
View File

@ -10,7 +10,7 @@ import ttags, { getTTag } from '../core/ttag';
/* this will be set by webpack */
import { styleassets, assets } from '../core/assets';
import { ASSET_SERVER, BACKUP_URL } from '../core/config';
import { BACKUP_URL } from '../core/config';
/*
* generate language list
@ -23,7 +23,6 @@ const langs = Object.keys(ttags)
* values that we pass to client scripts
*/
const ssv = {
assetserver: ASSET_SERVER,
availableStyles: styleassets,
langs,
};
@ -67,7 +66,7 @@ function generatePopUpPage(lang) {
<body>
<div id="app">
</div>
<script src="${ASSET_SERVER + script}"></script>
<script src="${script}"></script>
</body>
</html>
`;