/soapbox --> /instance

merge-requests/1/head
Alex Gleason 4 years ago
parent 6477bd3533
commit 24f448e679
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7

2
.gitignore vendored

@ -5,5 +5,5 @@
/coverage/ /coverage/
/.eslintcache /.eslintcache
/.env /.env
/public/soapbox /public/instance
/deploy.sh /deploy.sh

@ -105,7 +105,7 @@ For https, be sure to also set `PROXY_HTTPS_INSECURE=true`.
URL to the [Soapbox Patron](https://gitlab.com/soapbox-pub/soapbox-patron) server, if you have one. URL to the [Soapbox Patron](https://gitlab.com/soapbox-pub/soapbox-patron) server, if you have one.
This setting is not useful unless `"extensions": { "patron": true }` is also set in `public/soapbox/soapbox.json`. This setting is not useful unless `"extensions": { "patron": true }` is also set in `public/instance/soapbox.json`.
**Default:** `http://localhost:5000` **Default:** `http://localhost:5000`

@ -5,7 +5,7 @@ export const SOAPBOX_CONFIG_FAIL = 'SOAPBOX_CONFIG_FAIL';
export function fetchSoapboxConfig() { export function fetchSoapboxConfig() {
return (dispatch, getState) => { return (dispatch, getState) => {
api(getState).get('/soapbox/soapbox.json').then(response => { api(getState).get('/instance/soapbox.json').then(response => {
dispatch(importSoapboxConfig(response.data)); dispatch(importSoapboxConfig(response.data));
}).catch(error => { }).catch(error => {
dispatch(soapboxConfigFail(error)); dispatch(soapboxConfigFail(error));

@ -90,7 +90,7 @@ If it's not documented, it's because I inherited it from Mastodon and I don't kn
- `patron` - Data related to [soapbox-patron](https://gitlab.com/soapbox-pub/soapbox-patron) - `patron` - Data related to [soapbox-patron](https://gitlab.com/soapbox-pub/soapbox-patron)
- `soapbox` - Soapbox specific configuration pulled from `/soapbox/soapbox.json`. The configuration file isn't required and this map can be empty. - `soapbox` - Soapbox specific configuration pulled from `/instance/soapbox.json`. The configuration file isn't required and this map can be empty.
- `instance` - Instance data pulled from `/api/v1/instance` - `instance` - Instance data pulled from `/api/v1/instance`

@ -1,3 +0,0 @@
<h1>Hello world!</h1>
<p>You made it.</p>
Loading…
Cancel
Save