From 24f448e679c9d6b6221f99ee0524eb783ed8d1c1 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 25 Apr 2020 23:27:02 -0500
Subject: [PATCH] /soapbox --> /instance

---
 .gitignore                                        | 2 +-
 README.md                                         | 2 +-
 app/gabsocial/actions/soapbox.js                  | 2 +-
 docs/store.md                                     | 2 +-
 public/{soapbox => instance}/soapbox.example.json | 0
 public/soapbox/about/index.html                   | 3 ---
 public/soapbox/about/tos.html                     | 0
 7 files changed, 4 insertions(+), 7 deletions(-)
 rename public/{soapbox => instance}/soapbox.example.json (100%)
 delete mode 100644 public/soapbox/about/index.html
 delete mode 100644 public/soapbox/about/tos.html

diff --git a/.gitignore b/.gitignore
index 02ceac5fe..69af18695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@
 /coverage/
 /.eslintcache
 /.env
-/public/soapbox
+/public/instance
 /deploy.sh
diff --git a/README.md b/README.md
index 43006dd04..a86801eb7 100644
--- a/README.md
+++ b/README.md
@@ -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.
 
-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`
 
diff --git a/app/gabsocial/actions/soapbox.js b/app/gabsocial/actions/soapbox.js
index 72a7d4d06..7da3be86d 100644
--- a/app/gabsocial/actions/soapbox.js
+++ b/app/gabsocial/actions/soapbox.js
@@ -5,7 +5,7 @@ export const SOAPBOX_CONFIG_FAIL    = 'SOAPBOX_CONFIG_FAIL';
 
 export function fetchSoapboxConfig() {
   return (dispatch, getState) => {
-    api(getState).get('/soapbox/soapbox.json').then(response => {
+    api(getState).get('/instance/soapbox.json').then(response => {
       dispatch(importSoapboxConfig(response.data));
     }).catch(error => {
       dispatch(soapboxConfigFail(error));
diff --git a/docs/store.md b/docs/store.md
index b9dc63e8a..3e3a60002 100644
--- a/docs/store.md
+++ b/docs/store.md
@@ -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)
 
-- `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`
 
diff --git a/public/soapbox/soapbox.example.json b/public/instance/soapbox.example.json
similarity index 100%
rename from public/soapbox/soapbox.example.json
rename to public/instance/soapbox.example.json
diff --git a/public/soapbox/about/index.html b/public/soapbox/about/index.html
deleted file mode 100644
index 5923cddf3..000000000
--- a/public/soapbox/about/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Hello world!</h1>
-
-<p>You made it.</p>
diff --git a/public/soapbox/about/tos.html b/public/soapbox/about/tos.html
deleted file mode 100644
index e69de29bb..000000000