diff --git a/.eslintrc.js b/.eslintrc.js index 6e9b42255..465c04bcf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -194,7 +194,7 @@ module.exports = { { devDependencies: [ 'webpack/**', - 'app/gabsocial/test_setup.js', + 'app/soapbox/test_setup.js', 'app/**/__tests__/**', ], }, diff --git a/.sass-lint.yml b/.sass-lint.yml index d731b8d17..98ad8f22b 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -4,7 +4,7 @@ files: include: app/styles/**/*.scss ignore: - - app/styles/gabsocial/reset.scss + - app/styles/soapbox/reset.scss rules: # Disallows diff --git a/app/index.ejs b/app/index.ejs index b244739b7..307172b59 100644 --- a/app/index.ejs +++ b/app/index.ejs @@ -22,6 +22,6 @@ -
+
diff --git a/app/packs/about.js b/app/packs/about.js index 7a16b0ded..eac00b942 100644 --- a/app/packs/about.js +++ b/app/packs/about.js @@ -1,15 +1,15 @@ 'use strict'; -import loadPolyfills from '../gabsocial/load_polyfills'; -import { start } from '../gabsocial/common'; +import loadPolyfills from '../soapbox/load_polyfills'; +import { start } from '../soapbox/common'; start(); function loaded() { - const TimelineContainer = require('../gabsocial/containers/timeline_container').default; + const TimelineContainer = require('../soapbox/containers/timeline_container').default; const React = require('react'); const ReactDOM = require('react-dom'); - const mountNode = document.getElementById('gabsocial-timeline'); + const mountNode = document.getElementById('soapbox-timeline'); if (mountNode !== null) { const props = JSON.parse(mountNode.getAttribute('data-props')); @@ -18,7 +18,7 @@ function loaded() { } function main() { - const ready = require('../gabsocial/ready').default; + const ready = require('../soapbox/ready').default; ready(loaded); } diff --git a/app/packs/application.js b/app/packs/application.js index 5d498bad2..f43e4d05e 100644 --- a/app/packs/application.js +++ b/app/packs/application.js @@ -1,10 +1,10 @@ -import loadPolyfills from '../gabsocial/load_polyfills'; -import { start } from '../gabsocial/common'; +import loadPolyfills from '../soapbox/load_polyfills'; +import { start } from '../soapbox/common'; start(); loadPolyfills().then(() => { - require('../gabsocial/main').default(); + require('../soapbox/main').default(); }).catch(e => { console.error(e); }); diff --git a/app/packs/public.js b/app/packs/public.js index 71061084d..172ef22bf 100644 --- a/app/packs/public.js +++ b/app/packs/public.js @@ -1,9 +1,9 @@ 'use strict'; import escapeTextContentForBrowser from 'escape-html'; -import loadPolyfills from '../gabsocial/load_polyfills'; -import ready from '../gabsocial/ready'; -import { start } from '../gabsocial/common'; +import loadPolyfills from '../soapbox/load_polyfills'; +import ready from '../soapbox/ready'; +import { start } from '../soapbox/common'; start(); @@ -26,10 +26,10 @@ window.addEventListener('message', e => { function main() { const IntlMessageFormat = require('intl-messageformat').default; import('intl-pluralrules'); // eslint-disable-line - const { timeAgoString } = require('../gabsocial/components/relative_timestamp'); + const { timeAgoString } = require('../soapbox/components/relative_timestamp'); const { delegate } = require('rails-ujs'); - const emojify = require('../gabsocial/features/emoji/emoji').default; - const { getLocale } = require('../gabsocial/locales'); + const emojify = require('../soapbox/features/emoji/emoji').default; + const { getLocale } = require('../soapbox/locales'); const { messages } = getLocale(); //(Rjc) 2019-05-24 defined but never used // const React = require('react'); @@ -85,7 +85,7 @@ function main() { const reactComponents = document.querySelectorAll('[data-component]'); if (reactComponents.length > 0) { - import(/* webpackChunkName: "containers/media_container" */ '../gabsocial/containers/media_container') + import(/* webpackChunkName: "containers/media_container" */ '../soapbox/containers/media_container') .then(({ default: MediaContainer }) => { [].forEach.call(reactComponents, (component) => { [].forEach.call(component.children, (child) => { @@ -155,7 +155,7 @@ function main() { href = e.target.href; } - window.open(href, 'gabsocial-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes'); + window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes'); }); delegate(document, '#account_display_name', 'input', ({ target }) => { diff --git a/app/packs/share.js b/app/packs/share.js index a8ab43d21..e5f046f1b 100644 --- a/app/packs/share.js +++ b/app/packs/share.js @@ -1,15 +1,15 @@ 'use strict'; -import loadPolyfills from '../gabsocial/load_polyfills'; -import { start } from '../gabsocial/common'; +import loadPolyfills from '../soapbox/load_polyfills'; +import { start } from '../soapbox/common'; start(); function loaded() { - const ComposeContainer = require('../gabsocial/containers/compose_container').default; + const ComposeContainer = require('../soapbox/containers/compose_container').default; const React = require('react'); const ReactDOM = require('react-dom'); - const mountNode = document.getElementById('gabsocial-compose'); + const mountNode = document.getElementById('soapbox-compose'); if (mountNode !== null) { const props = JSON.parse(mountNode.getAttribute('data-props')); @@ -18,7 +18,7 @@ function loaded() { } function main() { - const ready = require('../gabsocial/ready').default; + const ready = require('../soapbox/ready').default; ready(loaded); } diff --git a/app/gabsocial/actions/about.js b/app/soapbox/actions/about.js similarity index 100% rename from app/gabsocial/actions/about.js rename to app/soapbox/actions/about.js diff --git a/app/gabsocial/actions/accounts.js b/app/soapbox/actions/accounts.js similarity index 100% rename from app/gabsocial/actions/accounts.js rename to app/soapbox/actions/accounts.js diff --git a/app/gabsocial/actions/alerts.js b/app/soapbox/actions/alerts.js similarity index 100% rename from app/gabsocial/actions/alerts.js rename to app/soapbox/actions/alerts.js diff --git a/app/gabsocial/actions/auth.js b/app/soapbox/actions/auth.js similarity index 97% rename from app/gabsocial/actions/auth.js rename to app/soapbox/actions/auth.js index 32088edf7..edce3a29a 100644 --- a/app/gabsocial/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -1,6 +1,6 @@ import api from '../api'; -import { showAlert, showAlertForError } from 'gabsocial/actions/alerts'; -import { fetchMe } from 'gabsocial/actions/me'; +import { showAlert, showAlertForError } from 'soapbox/actions/alerts'; +import { fetchMe } from 'soapbox/actions/me'; export const AUTH_APP_CREATED = 'AUTH_APP_CREATED'; export const AUTH_APP_AUTHORIZED = 'AUTH_APP_AUTHORIZED'; diff --git a/app/gabsocial/actions/blocks.js b/app/soapbox/actions/blocks.js similarity index 100% rename from app/gabsocial/actions/blocks.js rename to app/soapbox/actions/blocks.js diff --git a/app/gabsocial/actions/bundles.js b/app/soapbox/actions/bundles.js similarity index 100% rename from app/gabsocial/actions/bundles.js rename to app/soapbox/actions/bundles.js diff --git a/app/gabsocial/actions/compose.js b/app/soapbox/actions/compose.js similarity index 100% rename from app/gabsocial/actions/compose.js rename to app/soapbox/actions/compose.js diff --git a/app/gabsocial/actions/conversations.js b/app/soapbox/actions/conversations.js similarity index 100% rename from app/gabsocial/actions/conversations.js rename to app/soapbox/actions/conversations.js diff --git a/app/gabsocial/actions/custom_emojis.js b/app/soapbox/actions/custom_emojis.js similarity index 100% rename from app/gabsocial/actions/custom_emojis.js rename to app/soapbox/actions/custom_emojis.js diff --git a/app/gabsocial/actions/domain_blocks.js b/app/soapbox/actions/domain_blocks.js similarity index 100% rename from app/gabsocial/actions/domain_blocks.js rename to app/soapbox/actions/domain_blocks.js diff --git a/app/gabsocial/actions/dropdown_menu.js b/app/soapbox/actions/dropdown_menu.js similarity index 100% rename from app/gabsocial/actions/dropdown_menu.js rename to app/soapbox/actions/dropdown_menu.js diff --git a/app/gabsocial/actions/emoji_reacts.js b/app/soapbox/actions/emoji_reacts.js similarity index 100% rename from app/gabsocial/actions/emoji_reacts.js rename to app/soapbox/actions/emoji_reacts.js diff --git a/app/gabsocial/actions/emojis.js b/app/soapbox/actions/emojis.js similarity index 100% rename from app/gabsocial/actions/emojis.js rename to app/soapbox/actions/emojis.js diff --git a/app/gabsocial/actions/favourites.js b/app/soapbox/actions/favourites.js similarity index 100% rename from app/gabsocial/actions/favourites.js rename to app/soapbox/actions/favourites.js diff --git a/app/gabsocial/actions/filters.js b/app/soapbox/actions/filters.js similarity index 100% rename from app/gabsocial/actions/filters.js rename to app/soapbox/actions/filters.js diff --git a/app/gabsocial/actions/group_editor.js b/app/soapbox/actions/group_editor.js similarity index 100% rename from app/gabsocial/actions/group_editor.js rename to app/soapbox/actions/group_editor.js diff --git a/app/gabsocial/actions/groups.js b/app/soapbox/actions/groups.js similarity index 100% rename from app/gabsocial/actions/groups.js rename to app/soapbox/actions/groups.js diff --git a/app/gabsocial/actions/height_cache.js b/app/soapbox/actions/height_cache.js similarity index 100% rename from app/gabsocial/actions/height_cache.js rename to app/soapbox/actions/height_cache.js diff --git a/app/gabsocial/actions/identity_proofs.js b/app/soapbox/actions/identity_proofs.js similarity index 100% rename from app/gabsocial/actions/identity_proofs.js rename to app/soapbox/actions/identity_proofs.js diff --git a/app/gabsocial/actions/importer/index.js b/app/soapbox/actions/importer/index.js similarity index 100% rename from app/gabsocial/actions/importer/index.js rename to app/soapbox/actions/importer/index.js diff --git a/app/gabsocial/actions/importer/normalizer.js b/app/soapbox/actions/importer/normalizer.js similarity index 100% rename from app/gabsocial/actions/importer/normalizer.js rename to app/soapbox/actions/importer/normalizer.js diff --git a/app/gabsocial/actions/instance.js b/app/soapbox/actions/instance.js similarity index 100% rename from app/gabsocial/actions/instance.js rename to app/soapbox/actions/instance.js diff --git a/app/gabsocial/actions/interactions.js b/app/soapbox/actions/interactions.js similarity index 100% rename from app/gabsocial/actions/interactions.js rename to app/soapbox/actions/interactions.js diff --git a/app/gabsocial/actions/lists.js b/app/soapbox/actions/lists.js similarity index 100% rename from app/gabsocial/actions/lists.js rename to app/soapbox/actions/lists.js diff --git a/app/gabsocial/actions/markers.js b/app/soapbox/actions/markers.js similarity index 100% rename from app/gabsocial/actions/markers.js rename to app/soapbox/actions/markers.js diff --git a/app/gabsocial/actions/me.js b/app/soapbox/actions/me.js similarity index 100% rename from app/gabsocial/actions/me.js rename to app/soapbox/actions/me.js diff --git a/app/gabsocial/actions/modal.js b/app/soapbox/actions/modal.js similarity index 100% rename from app/gabsocial/actions/modal.js rename to app/soapbox/actions/modal.js diff --git a/app/gabsocial/actions/mutes.js b/app/soapbox/actions/mutes.js similarity index 100% rename from app/gabsocial/actions/mutes.js rename to app/soapbox/actions/mutes.js diff --git a/app/gabsocial/actions/notifications.js b/app/soapbox/actions/notifications.js similarity index 100% rename from app/gabsocial/actions/notifications.js rename to app/soapbox/actions/notifications.js diff --git a/app/gabsocial/actions/onboarding.js b/app/soapbox/actions/onboarding.js similarity index 100% rename from app/gabsocial/actions/onboarding.js rename to app/soapbox/actions/onboarding.js diff --git a/app/gabsocial/actions/patron.js b/app/soapbox/actions/patron.js similarity index 100% rename from app/gabsocial/actions/patron.js rename to app/soapbox/actions/patron.js diff --git a/app/gabsocial/actions/pin_statuses.js b/app/soapbox/actions/pin_statuses.js similarity index 100% rename from app/gabsocial/actions/pin_statuses.js rename to app/soapbox/actions/pin_statuses.js diff --git a/app/gabsocial/actions/polls.js b/app/soapbox/actions/polls.js similarity index 100% rename from app/gabsocial/actions/polls.js rename to app/soapbox/actions/polls.js diff --git a/app/gabsocial/actions/push_notifications/index.js b/app/soapbox/actions/push_notifications/index.js similarity index 100% rename from app/gabsocial/actions/push_notifications/index.js rename to app/soapbox/actions/push_notifications/index.js diff --git a/app/gabsocial/actions/push_notifications/registerer.js b/app/soapbox/actions/push_notifications/registerer.js similarity index 100% rename from app/gabsocial/actions/push_notifications/registerer.js rename to app/soapbox/actions/push_notifications/registerer.js diff --git a/app/gabsocial/actions/push_notifications/setter.js b/app/soapbox/actions/push_notifications/setter.js similarity index 100% rename from app/gabsocial/actions/push_notifications/setter.js rename to app/soapbox/actions/push_notifications/setter.js diff --git a/app/gabsocial/actions/reports.js b/app/soapbox/actions/reports.js similarity index 100% rename from app/gabsocial/actions/reports.js rename to app/soapbox/actions/reports.js diff --git a/app/gabsocial/actions/search.js b/app/soapbox/actions/search.js similarity index 100% rename from app/gabsocial/actions/search.js rename to app/soapbox/actions/search.js diff --git a/app/gabsocial/actions/settings.js b/app/soapbox/actions/settings.js similarity index 98% rename from app/gabsocial/actions/settings.js rename to app/soapbox/actions/settings.js index 5c4519fb3..f78e7bdd0 100644 --- a/app/gabsocial/actions/settings.js +++ b/app/soapbox/actions/settings.js @@ -1,6 +1,6 @@ import { debounce } from 'lodash'; import { showAlertForError } from './alerts'; -import { patchMe } from 'gabsocial/actions/me'; +import { patchMe } from 'soapbox/actions/me'; import { Map as ImmutableMap } from 'immutable'; export const SETTING_CHANGE = 'SETTING_CHANGE'; diff --git a/app/gabsocial/actions/sidebar.js b/app/soapbox/actions/sidebar.js similarity index 100% rename from app/gabsocial/actions/sidebar.js rename to app/soapbox/actions/sidebar.js diff --git a/app/gabsocial/actions/soapbox.js b/app/soapbox/actions/soapbox.js similarity index 100% rename from app/gabsocial/actions/soapbox.js rename to app/soapbox/actions/soapbox.js diff --git a/app/gabsocial/actions/statuses.js b/app/soapbox/actions/statuses.js similarity index 100% rename from app/gabsocial/actions/statuses.js rename to app/soapbox/actions/statuses.js diff --git a/app/gabsocial/actions/store.js b/app/soapbox/actions/store.js similarity index 100% rename from app/gabsocial/actions/store.js rename to app/soapbox/actions/store.js diff --git a/app/gabsocial/actions/streaming.js b/app/soapbox/actions/streaming.js similarity index 100% rename from app/gabsocial/actions/streaming.js rename to app/soapbox/actions/streaming.js diff --git a/app/gabsocial/actions/suggestions.js b/app/soapbox/actions/suggestions.js similarity index 100% rename from app/gabsocial/actions/suggestions.js rename to app/soapbox/actions/suggestions.js diff --git a/app/gabsocial/actions/timelines.js b/app/soapbox/actions/timelines.js similarity index 100% rename from app/gabsocial/actions/timelines.js rename to app/soapbox/actions/timelines.js diff --git a/app/gabsocial/actions/trends.js b/app/soapbox/actions/trends.js similarity index 100% rename from app/gabsocial/actions/trends.js rename to app/soapbox/actions/trends.js diff --git a/app/gabsocial/api.js b/app/soapbox/api.js similarity index 100% rename from app/gabsocial/api.js rename to app/soapbox/api.js diff --git a/app/gabsocial/base_polyfills.js b/app/soapbox/base_polyfills.js similarity index 100% rename from app/gabsocial/base_polyfills.js rename to app/soapbox/base_polyfills.js diff --git a/app/gabsocial/common.js b/app/soapbox/common.js similarity index 100% rename from app/gabsocial/common.js rename to app/soapbox/common.js diff --git a/app/gabsocial/compare_id.js b/app/soapbox/compare_id.js similarity index 100% rename from app/gabsocial/compare_id.js rename to app/soapbox/compare_id.js diff --git a/app/gabsocial/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap similarity index 100% rename from app/gabsocial/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap rename to app/soapbox/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap diff --git a/app/gabsocial/components/__tests__/__snapshots__/avatar-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/avatar-test.js.snap similarity index 100% rename from app/gabsocial/components/__tests__/__snapshots__/avatar-test.js.snap rename to app/soapbox/components/__tests__/__snapshots__/avatar-test.js.snap diff --git a/app/gabsocial/components/__tests__/__snapshots__/avatar_overlay-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/avatar_overlay-test.js.snap similarity index 100% rename from app/gabsocial/components/__tests__/__snapshots__/avatar_overlay-test.js.snap rename to app/soapbox/components/__tests__/__snapshots__/avatar_overlay-test.js.snap diff --git a/app/gabsocial/components/__tests__/__snapshots__/button-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/button-test.js.snap similarity index 100% rename from app/gabsocial/components/__tests__/__snapshots__/button-test.js.snap rename to app/soapbox/components/__tests__/__snapshots__/button-test.js.snap diff --git a/app/gabsocial/components/__tests__/__snapshots__/display_name-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap similarity index 100% rename from app/gabsocial/components/__tests__/__snapshots__/display_name-test.js.snap rename to app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap diff --git a/app/gabsocial/components/__tests__/autosuggest_emoji-test.js b/app/soapbox/components/__tests__/autosuggest_emoji-test.js similarity index 100% rename from app/gabsocial/components/__tests__/autosuggest_emoji-test.js rename to app/soapbox/components/__tests__/autosuggest_emoji-test.js diff --git a/app/gabsocial/components/__tests__/avatar-test.js b/app/soapbox/components/__tests__/avatar-test.js similarity index 100% rename from app/gabsocial/components/__tests__/avatar-test.js rename to app/soapbox/components/__tests__/avatar-test.js diff --git a/app/gabsocial/components/__tests__/avatar_overlay-test.js b/app/soapbox/components/__tests__/avatar_overlay-test.js similarity index 100% rename from app/gabsocial/components/__tests__/avatar_overlay-test.js rename to app/soapbox/components/__tests__/avatar_overlay-test.js diff --git a/app/gabsocial/components/__tests__/button-test.js b/app/soapbox/components/__tests__/button-test.js similarity index 100% rename from app/gabsocial/components/__tests__/button-test.js rename to app/soapbox/components/__tests__/button-test.js diff --git a/app/gabsocial/components/__tests__/display_name-test.js b/app/soapbox/components/__tests__/display_name-test.js similarity index 100% rename from app/gabsocial/components/__tests__/display_name-test.js rename to app/soapbox/components/__tests__/display_name-test.js diff --git a/app/gabsocial/components/account.js b/app/soapbox/components/account.js similarity index 100% rename from app/gabsocial/components/account.js rename to app/soapbox/components/account.js diff --git a/app/gabsocial/components/attachment_list.js b/app/soapbox/components/attachment_list.js similarity index 97% rename from app/gabsocial/components/attachment_list.js rename to app/soapbox/components/attachment_list.js index cd401f26a..d7875a62c 100644 --- a/app/gabsocial/components/attachment_list.js +++ b/app/soapbox/components/attachment_list.js @@ -2,7 +2,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const filename = url => url.split('/').pop().split('#')[0].split('?')[0]; diff --git a/app/gabsocial/components/autosuggest_emoji.js b/app/soapbox/components/autosuggest_emoji.js similarity index 100% rename from app/gabsocial/components/autosuggest_emoji.js rename to app/soapbox/components/autosuggest_emoji.js diff --git a/app/gabsocial/components/autosuggest_input.js b/app/soapbox/components/autosuggest_input.js similarity index 100% rename from app/gabsocial/components/autosuggest_input.js rename to app/soapbox/components/autosuggest_input.js diff --git a/app/gabsocial/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js similarity index 100% rename from app/gabsocial/components/autosuggest_textarea.js rename to app/soapbox/components/autosuggest_textarea.js diff --git a/app/gabsocial/components/avatar.js b/app/soapbox/components/avatar.js similarity index 96% rename from app/gabsocial/components/avatar.js rename to app/soapbox/components/avatar.js index 786bef61d..f3e1cb678 100644 --- a/app/gabsocial/components/avatar.js +++ b/app/soapbox/components/avatar.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const mapStateToProps = state => ({ animate: getSettings(state).get('autoPlayGif'), diff --git a/app/gabsocial/components/avatar_composite.js b/app/soapbox/components/avatar_composite.js similarity index 97% rename from app/gabsocial/components/avatar_composite.js rename to app/soapbox/components/avatar_composite.js index 6e0045704..06607cacd 100644 --- a/app/gabsocial/components/avatar_composite.js +++ b/app/soapbox/components/avatar_composite.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const mapStateToProps = state => ({ animate: getSettings(state).get('autoPlayGif'), diff --git a/app/gabsocial/components/avatar_overlay.js b/app/soapbox/components/avatar_overlay.js similarity index 94% rename from app/gabsocial/components/avatar_overlay.js rename to app/soapbox/components/avatar_overlay.js index 13144df40..1e095b899 100644 --- a/app/gabsocial/components/avatar_overlay.js +++ b/app/soapbox/components/avatar_overlay.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const mapStateToProps = state => ({ animate: getSettings(state).get('autoPlayGif'), diff --git a/app/gabsocial/components/badge.js b/app/soapbox/components/badge.js similarity index 100% rename from app/gabsocial/components/badge.js rename to app/soapbox/components/badge.js diff --git a/app/gabsocial/components/button.js b/app/soapbox/components/button.js similarity index 100% rename from app/gabsocial/components/button.js rename to app/soapbox/components/button.js diff --git a/app/gabsocial/components/column.js b/app/soapbox/components/column.js similarity index 100% rename from app/gabsocial/components/column.js rename to app/soapbox/components/column.js diff --git a/app/gabsocial/components/column_back_button.js b/app/soapbox/components/column_back_button.js similarity index 94% rename from app/gabsocial/components/column_back_button.js rename to app/soapbox/components/column_back_button.js index 4fa6a6ab8..34e0daeff 100644 --- a/app/gabsocial/components/column_back_button.js +++ b/app/soapbox/components/column_back_button.js @@ -1,7 +1,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; export default class ColumnBackButton extends React.PureComponent { diff --git a/app/gabsocial/components/column_back_button_slim.js b/app/soapbox/components/column_back_button_slim.js similarity index 93% rename from app/gabsocial/components/column_back_button_slim.js rename to app/soapbox/components/column_back_button_slim.js index 2e744d55c..0edec7de4 100644 --- a/app/gabsocial/components/column_back_button_slim.js +++ b/app/soapbox/components/column_back_button_slim.js @@ -1,7 +1,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import ColumnBackButton from './column_back_button'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; export default class ColumnBackButtonSlim extends ColumnBackButton { diff --git a/app/gabsocial/components/column_header.js b/app/soapbox/components/column_header.js similarity index 98% rename from app/gabsocial/components/column_header.js rename to app/soapbox/components/column_header.js index c344bdc76..9a70e16cb 100644 --- a/app/gabsocial/components/column_header.js +++ b/app/soapbox/components/column_header.js @@ -4,7 +4,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import { injectIntl, defineMessages } from 'react-intl'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' }, diff --git a/app/gabsocial/components/display_name.js b/app/soapbox/components/display_name.js similarity index 100% rename from app/gabsocial/components/display_name.js rename to app/soapbox/components/display_name.js diff --git a/app/gabsocial/components/domain.js b/app/soapbox/components/domain.js similarity index 100% rename from app/gabsocial/components/domain.js rename to app/soapbox/components/domain.js diff --git a/app/gabsocial/components/donor_badge.js b/app/soapbox/components/donor_badge.js similarity index 100% rename from app/gabsocial/components/donor_badge.js rename to app/soapbox/components/donor_badge.js diff --git a/app/gabsocial/components/dropdown_menu.js b/app/soapbox/components/dropdown_menu.js similarity index 100% rename from app/gabsocial/components/dropdown_menu.js rename to app/soapbox/components/dropdown_menu.js diff --git a/app/gabsocial/components/emoji_selector.js b/app/soapbox/components/emoji_selector.js similarity index 87% rename from app/gabsocial/components/emoji_selector.js rename to app/soapbox/components/emoji_selector.js index fcaccdbed..7ef0e2b0a 100644 --- a/app/gabsocial/components/emoji_selector.js +++ b/app/soapbox/components/emoji_selector.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { ALLOWED_EMOJI } from 'gabsocial/utils/emoji_reacts'; -import emojify from 'gabsocial/features/emoji/emoji'; +import { ALLOWED_EMOJI } from 'soapbox/utils/emoji_reacts'; +import emojify from 'soapbox/features/emoji/emoji'; import classNames from 'classnames'; export default class EmojiSelector extends React.Component { diff --git a/app/gabsocial/components/error_boundary.js b/app/soapbox/components/error_boundary.js similarity index 100% rename from app/gabsocial/components/error_boundary.js rename to app/soapbox/components/error_boundary.js diff --git a/app/gabsocial/components/extended_video_player.js b/app/soapbox/components/extended_video_player.js similarity index 97% rename from app/gabsocial/components/extended_video_player.js rename to app/soapbox/components/extended_video_player.js index ee199b93d..b214a5988 100644 --- a/app/gabsocial/components/extended_video_player.js +++ b/app/soapbox/components/extended_video_player.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { isIOS } from 'gabsocial/is_mobile'; +import { isIOS } from 'soapbox/is_mobile'; export default class ExtendedVideoPlayer extends React.PureComponent { diff --git a/app/gabsocial/components/hashtag.js b/app/soapbox/components/hashtag.js similarity index 100% rename from app/gabsocial/components/hashtag.js rename to app/soapbox/components/hashtag.js diff --git a/app/gabsocial/components/helmet.js b/app/soapbox/components/helmet.js similarity index 100% rename from app/gabsocial/components/helmet.js rename to app/soapbox/components/helmet.js diff --git a/app/gabsocial/components/home_column_header.js b/app/soapbox/components/home_column_header.js similarity index 98% rename from app/gabsocial/components/home_column_header.js rename to app/soapbox/components/home_column_header.js index 47387c9d1..aca89888a 100644 --- a/app/gabsocial/components/home_column_header.js +++ b/app/soapbox/components/home_column_header.js @@ -7,8 +7,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import classNames from 'classnames'; import { injectIntl, defineMessages } from 'react-intl'; import { Link } from 'react-router-dom'; -import Icon from 'gabsocial/components/icon'; -import { fetchLists } from 'gabsocial/actions/lists'; +import Icon from 'soapbox/components/icon'; +import { fetchLists } from 'soapbox/actions/lists'; import { createSelector } from 'reselect'; const messages = defineMessages({ diff --git a/app/gabsocial/components/icon.js b/app/soapbox/components/icon.js similarity index 100% rename from app/gabsocial/components/icon.js rename to app/soapbox/components/icon.js diff --git a/app/gabsocial/components/icon_button.js b/app/soapbox/components/icon_button.js similarity index 97% rename from app/gabsocial/components/icon_button.js rename to app/soapbox/components/icon_button.js index 2c12626ce..949f4e5b4 100644 --- a/app/gabsocial/components/icon_button.js +++ b/app/soapbox/components/icon_button.js @@ -3,8 +3,8 @@ import Motion from '../features/ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; -import emojify from 'gabsocial/features/emoji/emoji'; +import Icon from 'soapbox/components/icon'; +import emojify from 'soapbox/features/emoji/emoji'; export default class IconButton extends React.PureComponent { diff --git a/app/gabsocial/components/icon_with_badge.js b/app/soapbox/components/icon_with_badge.js similarity index 88% rename from app/gabsocial/components/icon_with_badge.js rename to app/soapbox/components/icon_with_badge.js index 7b2657f13..741401982 100644 --- a/app/gabsocial/components/icon_with_badge.js +++ b/app/soapbox/components/icon_with_badge.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { shortNumberFormat } from 'gabsocial/utils/numbers'; +import { shortNumberFormat } from 'soapbox/utils/numbers'; const IconWithBadge = ({ id, count, className }) => { if (count < 1) return null; diff --git a/app/gabsocial/components/intersection_observer_article.js b/app/soapbox/components/intersection_observer_article.js similarity index 100% rename from app/gabsocial/components/intersection_observer_article.js rename to app/soapbox/components/intersection_observer_article.js diff --git a/app/gabsocial/components/investor_badge.js b/app/soapbox/components/investor_badge.js similarity index 100% rename from app/gabsocial/components/investor_badge.js rename to app/soapbox/components/investor_badge.js diff --git a/app/gabsocial/components/load_gap.js b/app/soapbox/components/load_gap.js similarity index 94% rename from app/gabsocial/components/load_gap.js rename to app/soapbox/components/load_gap.js index f0064604a..3381b61bd 100644 --- a/app/gabsocial/components/load_gap.js +++ b/app/soapbox/components/load_gap.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { injectIntl, defineMessages } from 'react-intl'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ load_more: { id: 'status.load_more', defaultMessage: 'Load more' }, diff --git a/app/gabsocial/components/load_more.js b/app/soapbox/components/load_more.js similarity index 100% rename from app/gabsocial/components/load_more.js rename to app/soapbox/components/load_more.js diff --git a/app/gabsocial/components/loading_indicator.js b/app/soapbox/components/loading_indicator.js similarity index 100% rename from app/gabsocial/components/loading_indicator.js rename to app/soapbox/components/loading_indicator.js diff --git a/app/gabsocial/components/media_gallery.js b/app/soapbox/components/media_gallery.js similarity index 99% rename from app/gabsocial/components/media_gallery.js rename to app/soapbox/components/media_gallery.js index 50a3bf38b..7fc254f61 100644 --- a/app/gabsocial/components/media_gallery.js +++ b/app/soapbox/components/media_gallery.js @@ -11,7 +11,7 @@ import { displayMedia } from '../initial_state'; import { decode } from 'blurhash'; import { isPanoramic, isPortrait, isNonConformingRatio, minimumAspectRatio, maximumAspectRatio } from '../utils/media_aspect_ratio'; import { Map as ImmutableMap } from 'immutable'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' }, diff --git a/app/gabsocial/components/missing_indicator.js b/app/soapbox/components/missing_indicator.js similarity index 100% rename from app/gabsocial/components/missing_indicator.js rename to app/soapbox/components/missing_indicator.js diff --git a/app/gabsocial/components/modal_root.js b/app/soapbox/components/modal_root.js similarity index 100% rename from app/gabsocial/components/modal_root.js rename to app/soapbox/components/modal_root.js diff --git a/app/gabsocial/components/more_follows.js b/app/soapbox/components/more_follows.js similarity index 100% rename from app/gabsocial/components/more_follows.js rename to app/soapbox/components/more_follows.js diff --git a/app/gabsocial/components/permalink.js b/app/soapbox/components/permalink.js similarity index 100% rename from app/gabsocial/components/permalink.js rename to app/soapbox/components/permalink.js diff --git a/app/gabsocial/components/poll.js b/app/soapbox/components/poll.js similarity index 96% rename from app/gabsocial/components/poll.js rename to app/soapbox/components/poll.js index 246a80e7d..ae66ba18f 100644 --- a/app/gabsocial/components/poll.js +++ b/app/soapbox/components/poll.js @@ -4,11 +4,11 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import { vote, fetchPoll } from 'gabsocial/actions/polls'; -import Motion from 'gabsocial/features/ui/util/optional_motion'; +import { vote, fetchPoll } from 'soapbox/actions/polls'; +import Motion from 'soapbox/features/ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import escapeTextContentForBrowser from 'escape-html'; -import emojify from 'gabsocial/features/emoji/emoji'; +import emojify from 'soapbox/features/emoji/emoji'; import RelativeTimestamp from './relative_timestamp'; const messages = defineMessages({ diff --git a/app/gabsocial/components/pro_badge.js b/app/soapbox/components/pro_badge.js similarity index 100% rename from app/gabsocial/components/pro_badge.js rename to app/soapbox/components/pro_badge.js diff --git a/app/gabsocial/components/progress_bar.js b/app/soapbox/components/progress_bar.js similarity index 100% rename from app/gabsocial/components/progress_bar.js rename to app/soapbox/components/progress_bar.js diff --git a/app/gabsocial/components/relative_timestamp.js b/app/soapbox/components/relative_timestamp.js similarity index 100% rename from app/gabsocial/components/relative_timestamp.js rename to app/soapbox/components/relative_timestamp.js diff --git a/app/gabsocial/components/scrollable_list.js b/app/soapbox/components/scrollable_list.js similarity index 100% rename from app/gabsocial/components/scrollable_list.js rename to app/soapbox/components/scrollable_list.js diff --git a/app/gabsocial/components/setting_text.js b/app/soapbox/components/setting_text.js similarity index 100% rename from app/gabsocial/components/setting_text.js rename to app/soapbox/components/setting_text.js diff --git a/app/gabsocial/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js similarity index 99% rename from app/gabsocial/components/sidebar_menu.js rename to app/soapbox/components/sidebar_menu.js index 00c7ec0c6..e660ddb19 100644 --- a/app/gabsocial/components/sidebar_menu.js +++ b/app/soapbox/components/sidebar_menu.js @@ -14,7 +14,7 @@ import { closeSidebar } from '../actions/sidebar'; import { shortNumberFormat } from '../utils/numbers'; import { isStaff } from '../utils/accounts'; import { makeGetAccount } from '../selectors'; -import { logOut } from 'gabsocial/actions/auth'; +import { logOut } from 'soapbox/actions/auth'; const messages = defineMessages({ followers: { id: 'account.followers', defaultMessage: 'Followers' }, diff --git a/app/gabsocial/components/status.js b/app/soapbox/components/status.js similarity index 99% rename from app/gabsocial/components/status.js rename to app/soapbox/components/status.js index c05b7e253..8abaf7ee1 100644 --- a/app/gabsocial/components/status.js +++ b/app/soapbox/components/status.js @@ -15,8 +15,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { MediaGallery, Video } from '../features/ui/util/async-components'; import { HotKeys } from 'react-hotkeys'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; -import PollContainer from 'gabsocial/containers/poll_container'; +import Icon from 'soapbox/components/icon'; +import PollContainer from 'soapbox/containers/poll_container'; import { displayMedia } from '../initial_state'; import { NavLink } from 'react-router-dom'; diff --git a/app/gabsocial/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js similarity index 97% rename from app/gabsocial/components/status_action_bar.js rename to app/soapbox/components/status_action_bar.js index a271d6634..39d09d91b 100644 --- a/app/gabsocial/components/status_action_bar.js +++ b/app/soapbox/components/status_action_bar.js @@ -3,17 +3,17 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import IconButton from './icon_button'; import DropdownMenuContainer from '../containers/dropdown_menu_container'; import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { isStaff } from 'gabsocial/utils/accounts'; +import { isStaff } from 'soapbox/utils/accounts'; import { openModal } from '../actions/modal'; import { Link } from 'react-router-dom'; -import EmojiSelector from 'gabsocial/components/emoji_selector'; -import { getReactForStatus, reduceEmoji } from 'gabsocial/utils/emoji_reacts'; -import { simpleEmojiReact } from 'gabsocial/actions/emoji_reacts'; +import EmojiSelector from 'soapbox/components/emoji_selector'; +import { getReactForStatus, reduceEmoji } from 'soapbox/utils/emoji_reacts'; +import { simpleEmojiReact } from 'soapbox/actions/emoji_reacts'; const messages = defineMessages({ delete: { id: 'status.delete', defaultMessage: 'Delete' }, diff --git a/app/gabsocial/components/status_content.js b/app/soapbox/components/status_content.js similarity index 99% rename from app/gabsocial/components/status_content.js rename to app/soapbox/components/status_content.js index cba7a816d..de85781c8 100644 --- a/app/gabsocial/components/status_content.js +++ b/app/soapbox/components/status_content.js @@ -5,7 +5,7 @@ import { isRtl } from '../rtl'; import { FormattedMessage } from 'react-intl'; import Permalink from './permalink'; import classnames from 'classnames'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top) diff --git a/app/gabsocial/components/status_list.js b/app/soapbox/components/status_list.js similarity index 100% rename from app/gabsocial/components/status_list.js rename to app/soapbox/components/status_list.js diff --git a/app/gabsocial/components/timeline_queue_button_header.js b/app/soapbox/components/timeline_queue_button_header.js similarity index 100% rename from app/gabsocial/components/timeline_queue_button_header.js rename to app/soapbox/components/timeline_queue_button_header.js diff --git a/app/gabsocial/components/verification_badge.js b/app/soapbox/components/verification_badge.js similarity index 100% rename from app/gabsocial/components/verification_badge.js rename to app/soapbox/components/verification_badge.js diff --git a/app/gabsocial/containers/account_container.js b/app/soapbox/containers/account_container.js similarity index 100% rename from app/gabsocial/containers/account_container.js rename to app/soapbox/containers/account_container.js diff --git a/app/gabsocial/containers/compose_container.js b/app/soapbox/containers/compose_container.js similarity index 100% rename from app/gabsocial/containers/compose_container.js rename to app/soapbox/containers/compose_container.js diff --git a/app/gabsocial/containers/domain_container.js b/app/soapbox/containers/domain_container.js similarity index 100% rename from app/gabsocial/containers/domain_container.js rename to app/soapbox/containers/domain_container.js diff --git a/app/gabsocial/containers/dropdown_menu_container.js b/app/soapbox/containers/dropdown_menu_container.js similarity index 100% rename from app/gabsocial/containers/dropdown_menu_container.js rename to app/soapbox/containers/dropdown_menu_container.js diff --git a/app/gabsocial/containers/intersection_observer_article_container.js b/app/soapbox/containers/intersection_observer_article_container.js similarity index 100% rename from app/gabsocial/containers/intersection_observer_article_container.js rename to app/soapbox/containers/intersection_observer_article_container.js diff --git a/app/gabsocial/containers/media_container.js b/app/soapbox/containers/media_container.js similarity index 98% rename from app/gabsocial/containers/media_container.js rename to app/soapbox/containers/media_container.js index c8703c1cc..5c6c248b1 100644 --- a/app/gabsocial/containers/media_container.js +++ b/app/soapbox/containers/media_container.js @@ -6,7 +6,7 @@ import { getLocale } from '../locales'; import MediaGallery from '../components/media_gallery'; import Video from '../features/video'; import Card from '../features/status/components/card'; -import Poll from 'gabsocial/components/poll'; +import Poll from 'soapbox/components/poll'; import ModalRoot from '../components/modal_root'; import MediaModal from '../features/ui/components/media_modal'; import { List as ImmutableList, fromJS } from 'immutable'; diff --git a/app/gabsocial/containers/poll_container.js b/app/soapbox/containers/poll_container.js similarity index 79% rename from app/gabsocial/containers/poll_container.js rename to app/soapbox/containers/poll_container.js index e094a03ff..a4a0a6247 100644 --- a/app/gabsocial/containers/poll_container.js +++ b/app/soapbox/containers/poll_container.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import Poll from 'gabsocial/components/poll'; +import Poll from 'soapbox/components/poll'; const mapStateToProps = (state, { pollId }) => ({ poll: state.getIn(['polls', pollId]), diff --git a/app/gabsocial/containers/gabsocial.js b/app/soapbox/containers/soapbox.js similarity index 86% rename from app/gabsocial/containers/gabsocial.js rename to app/soapbox/containers/soapbox.js index c36cdc636..63c732509 100644 --- a/app/gabsocial/containers/gabsocial.js +++ b/app/soapbox/containers/soapbox.js @@ -3,8 +3,8 @@ import React from 'react'; import { Provider, connect } from 'react-redux'; import PropTypes from 'prop-types'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; -import Helmet from 'gabsocial/components/helmet'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; +import Helmet from 'soapbox/components/helmet'; import classNames from 'classnames'; import configureStore from '../store/configureStore'; import { INTRODUCTION_VERSION } from '../actions/onboarding'; @@ -18,11 +18,11 @@ import { IntlProvider, addLocaleData } from 'react-intl'; import { getLocale } from '../locales'; import initialState from '../initial_state'; import ErrorBoundary from '../components/error_boundary'; -import { fetchInstance } from 'gabsocial/actions/instance'; -import { fetchSoapboxConfig } from 'gabsocial/actions/soapbox'; -import { fetchMe } from 'gabsocial/actions/me'; -import PublicLayout from 'gabsocial/features/public_layout'; -import { getSettings } from 'gabsocial/actions/settings'; +import { fetchInstance } from 'soapbox/actions/instance'; +import { fetchSoapboxConfig } from 'soapbox/actions/soapbox'; +import { fetchMe } from 'soapbox/actions/me'; +import PublicLayout from 'soapbox/features/public_layout'; +import { getSettings } from 'soapbox/actions/settings'; export const store = configureStore(); const hydrateAction = hydrateStore(initialState); @@ -52,7 +52,7 @@ const mapStateToProps = (state) => { }; @connect(mapStateToProps) -class GabSocialMount extends React.PureComponent { +class SoapboxMount extends React.PureComponent { static propTypes = { showIntroduction: PropTypes.bool, @@ -115,13 +115,13 @@ class GabSocialMount extends React.PureComponent { } -export default class GabSocial extends React.PureComponent { +export default class Soapbox extends React.PureComponent { render() { return ( - + ); diff --git a/app/gabsocial/containers/status_container.js b/app/soapbox/containers/status_container.js similarity index 100% rename from app/gabsocial/containers/status_container.js rename to app/soapbox/containers/status_container.js diff --git a/app/gabsocial/containers/timeline_container.js b/app/soapbox/containers/timeline_container.js similarity index 100% rename from app/gabsocial/containers/timeline_container.js rename to app/soapbox/containers/timeline_container.js diff --git a/app/gabsocial/extra_polyfills.js b/app/soapbox/extra_polyfills.js similarity index 100% rename from app/gabsocial/extra_polyfills.js rename to app/soapbox/extra_polyfills.js diff --git a/app/gabsocial/features/about/index.js b/app/soapbox/features/about/index.js similarity index 95% rename from app/gabsocial/features/about/index.js rename to app/soapbox/features/about/index.js index 9a43108bb..89d952f72 100644 --- a/app/gabsocial/features/about/index.js +++ b/app/soapbox/features/about/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { fetchAboutPage } from 'gabsocial/actions/about'; +import { fetchAboutPage } from 'soapbox/actions/about'; class AboutPage extends ImmutablePureComponent { diff --git a/app/gabsocial/features/account/components/header.js b/app/soapbox/features/account/components/header.js similarity index 97% rename from app/gabsocial/features/account/components/header.js rename to app/soapbox/features/account/components/header.js index 14c53fb92..9b0ca8e2a 100644 --- a/app/gabsocial/features/account/components/header.js +++ b/app/soapbox/features/account/components/header.js @@ -5,18 +5,18 @@ import { connect } from 'react-redux'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; -import Button from 'gabsocial/components/button'; +import Button from 'soapbox/components/button'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { isStaff } from 'gabsocial/utils/accounts'; -import { parseVersion } from 'gabsocial/utils/features'; +import { isStaff } from 'soapbox/utils/accounts'; +import { parseVersion } from 'soapbox/utils/features'; import classNames from 'classnames'; -import Avatar from 'gabsocial/components/avatar'; -import { shortNumberFormat } from 'gabsocial/utils/numbers'; +import Avatar from 'soapbox/components/avatar'; +import { shortNumberFormat } from 'soapbox/utils/numbers'; import { NavLink } from 'react-router-dom'; -import DropdownMenuContainer from 'gabsocial/containers/dropdown_menu_container'; +import DropdownMenuContainer from 'soapbox/containers/dropdown_menu_container'; import ProfileInfoPanel from '../../ui/components/profile_info_panel'; import { debounce } from 'lodash'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, diff --git a/app/gabsocial/features/account_gallery/components/media_item.js b/app/soapbox/features/account_gallery/components/media_item.js similarity index 95% rename from app/gabsocial/features/account_gallery/components/media_item.js rename to app/soapbox/features/account_gallery/components/media_item.js index 7667073c6..e119ba8b9 100644 --- a/app/gabsocial/features/account_gallery/components/media_item.js +++ b/app/soapbox/features/account_gallery/components/media_item.js @@ -3,12 +3,12 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Icon from 'gabsocial/components/icon'; -import { displayMedia } from 'gabsocial/initial_state'; +import Icon from 'soapbox/components/icon'; +import { displayMedia } from 'soapbox/initial_state'; import classNames from 'classnames'; import { decode } from 'blurhash'; -import { isIOS } from 'gabsocial/is_mobile'; -import { getSettings } from 'gabsocial/actions/settings'; +import { isIOS } from 'soapbox/is_mobile'; +import { getSettings } from 'soapbox/actions/settings'; const mapStateToProps = state => ({ autoPlayGif: getSettings(state).get('autoPlayGif'), diff --git a/app/gabsocial/features/account_gallery/index.js b/app/soapbox/features/account_gallery/index.js similarity index 95% rename from app/gabsocial/features/account_gallery/index.js rename to app/soapbox/features/account_gallery/index.js index f03e872bb..c1205c92c 100644 --- a/app/gabsocial/features/account_gallery/index.js +++ b/app/soapbox/features/account_gallery/index.js @@ -5,16 +5,16 @@ import PropTypes from 'prop-types'; import { fetchAccount, fetchAccountByUsername, -} from 'gabsocial/actions/accounts'; +} from 'soapbox/actions/accounts'; import { expandAccountMediaTimeline } from '../../actions/timelines'; -import LoadingIndicator from 'gabsocial/components/loading_indicator'; +import LoadingIndicator from 'soapbox/components/loading_indicator'; import Column from '../ui/components/column'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { getAccountGallery } from 'gabsocial/selectors'; +import { getAccountGallery } from 'soapbox/selectors'; import MediaItem from './components/media_item'; -import LoadMore from 'gabsocial/components/load_more'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; -import { openModal } from 'gabsocial/actions/modal'; +import LoadMore from 'soapbox/components/load_more'; +import MissingIndicator from 'soapbox/components/missing_indicator'; +import { openModal } from 'soapbox/actions/modal'; import { NavLink } from 'react-router-dom'; import { FormattedMessage } from 'react-intl'; diff --git a/app/gabsocial/features/account_timeline/components/header.js b/app/soapbox/features/account_timeline/components/header.js similarity index 100% rename from app/gabsocial/features/account_timeline/components/header.js rename to app/soapbox/features/account_timeline/components/header.js diff --git a/app/gabsocial/features/account_timeline/components/moved_note.js b/app/soapbox/features/account_timeline/components/moved_note.js similarity index 97% rename from app/gabsocial/features/account_timeline/components/moved_note.js rename to app/soapbox/features/account_timeline/components/moved_note.js index 540cd5b9f..b3c2cae13 100644 --- a/app/gabsocial/features/account_timeline/components/moved_note.js +++ b/app/soapbox/features/account_timeline/components/moved_note.js @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import AvatarOverlay from '../../../components/avatar_overlay'; import DisplayName from '../../../components/display_name'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import { NavLink } from 'react-router-dom'; export default class MovedNote extends ImmutablePureComponent { diff --git a/app/gabsocial/features/account_timeline/containers/header_container.js b/app/soapbox/features/account_timeline/containers/header_container.js similarity index 98% rename from app/gabsocial/features/account_timeline/containers/header_container.js rename to app/soapbox/features/account_timeline/containers/header_container.js index 64491d26c..950505c0b 100644 --- a/app/gabsocial/features/account_timeline/containers/header_container.js +++ b/app/soapbox/features/account_timeline/containers/header_container.js @@ -21,7 +21,7 @@ import { openModal } from '../../../actions/modal'; import { blockDomain, unblockDomain } from '../../../actions/domain_blocks'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { List as ImmutableList } from 'immutable'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' }, diff --git a/app/gabsocial/features/account_timeline/index.js b/app/soapbox/features/account_timeline/index.js similarity index 98% rename from app/gabsocial/features/account_timeline/index.js rename to app/soapbox/features/account_timeline/index.js index 1f77889c5..9f7be480c 100644 --- a/app/gabsocial/features/account_timeline/index.js +++ b/app/soapbox/features/account_timeline/index.js @@ -11,7 +11,7 @@ import { List as ImmutableList } from 'immutable'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { FormattedMessage } from 'react-intl'; import { fetchAccountIdentityProofs } from '../../actions/identity_proofs'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing_indicator'; import { NavLink } from 'react-router-dom'; const emptyList = ImmutableList(); diff --git a/app/gabsocial/features/auth_login/components/captcha.js b/app/soapbox/features/auth_login/components/captcha.js similarity index 95% rename from app/gabsocial/features/auth_login/components/captcha.js rename to app/soapbox/features/auth_login/components/captcha.js index 5334ddc5e..0746461d6 100644 --- a/app/gabsocial/features/auth_login/components/captcha.js +++ b/app/soapbox/features/auth_login/components/captcha.js @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { connect } from 'react-redux'; import { Map as ImmutableMap } from 'immutable'; -import { fetchCaptcha } from 'gabsocial/actions/auth'; -import { TextInput } from 'gabsocial/features/forms'; +import { fetchCaptcha } from 'soapbox/actions/auth'; +import { TextInput } from 'soapbox/features/forms'; const noOp = () => {}; diff --git a/app/gabsocial/features/auth_login/components/login_form.js b/app/soapbox/features/auth_login/components/login_form.js similarity index 94% rename from app/gabsocial/features/auth_login/components/login_form.js rename to app/soapbox/features/auth_login/components/login_form.js index b33254fe1..3758bb36d 100644 --- a/app/gabsocial/features/auth_login/components/login_form.js +++ b/app/soapbox/features/auth_login/components/login_form.js @@ -2,8 +2,8 @@ import React from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router-dom'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { logIn } from 'gabsocial/actions/auth'; -import { fetchMe } from 'gabsocial/actions/me'; +import { logIn } from 'soapbox/actions/auth'; +import { fetchMe } from 'soapbox/actions/me'; export default @connect() class LoginForm extends ImmutablePureComponent { diff --git a/app/gabsocial/features/auth_login/components/login_page.js b/app/soapbox/features/auth_login/components/login_page.js similarity index 100% rename from app/gabsocial/features/auth_login/components/login_page.js rename to app/soapbox/features/auth_login/components/login_page.js diff --git a/app/gabsocial/features/auth_login/components/password_reset.js b/app/soapbox/features/auth_login/components/password_reset.js similarity index 87% rename from app/gabsocial/features/auth_login/components/password_reset.js rename to app/soapbox/features/auth_login/components/password_reset.js index 11e5ec443..efc1c816c 100644 --- a/app/gabsocial/features/auth_login/components/password_reset.js +++ b/app/soapbox/features/auth_login/components/password_reset.js @@ -1,10 +1,10 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { resetPassword } from 'gabsocial/actions/auth'; -import { SimpleForm, FieldsGroup, TextInput } from 'gabsocial/features/forms'; +import { resetPassword } from 'soapbox/actions/auth'; +import { SimpleForm, FieldsGroup, TextInput } from 'soapbox/features/forms'; import { Redirect } from 'react-router-dom'; -import { showAlert } from 'gabsocial/actions/alerts'; +import { showAlert } from 'soapbox/actions/alerts'; export default @connect() class PasswordReset extends ImmutablePureComponent { diff --git a/app/gabsocial/features/blocks/index.js b/app/soapbox/features/blocks/index.js similarity index 100% rename from app/gabsocial/features/blocks/index.js rename to app/soapbox/features/blocks/index.js diff --git a/app/gabsocial/features/community_timeline/components/column_settings.js b/app/soapbox/features/community_timeline/components/column_settings.js similarity index 100% rename from app/gabsocial/features/community_timeline/components/column_settings.js rename to app/soapbox/features/community_timeline/components/column_settings.js diff --git a/app/gabsocial/features/community_timeline/containers/column_settings_container.js b/app/soapbox/features/community_timeline/containers/column_settings_container.js similarity index 100% rename from app/gabsocial/features/community_timeline/containers/column_settings_container.js rename to app/soapbox/features/community_timeline/containers/column_settings_container.js diff --git a/app/gabsocial/features/community_timeline/index.js b/app/soapbox/features/community_timeline/index.js similarity index 97% rename from app/gabsocial/features/community_timeline/index.js rename to app/soapbox/features/community_timeline/index.js index 35dae7056..c9def62ec 100644 --- a/app/gabsocial/features/community_timeline/index.js +++ b/app/soapbox/features/community_timeline/index.js @@ -8,7 +8,7 @@ import ColumnSettingsContainer from './containers/column_settings_container'; import HomeColumnHeader from '../../components/home_column_header'; import { expandCommunityTimeline } from '../../actions/timelines'; import { connectCommunityStream } from '../../actions/streaming'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ title: { id: 'column.community', defaultMessage: 'Local timeline' }, diff --git a/app/gabsocial/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js similarity index 97% rename from app/gabsocial/features/compose/components/action_bar.js rename to app/soapbox/features/compose/components/action_bar.js index 236c0dca9..47b774850 100644 --- a/app/gabsocial/features/compose/components/action_bar.js +++ b/app/soapbox/features/compose/components/action_bar.js @@ -3,9 +3,9 @@ import { connect } from 'react-redux'; import { openModal } from '../../../actions/modal'; import PropTypes from 'prop-types'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; -import { isStaff } from 'gabsocial/utils/accounts'; +import { isStaff } from 'soapbox/utils/accounts'; import { defineMessages, injectIntl } from 'react-intl'; -import { logOut } from 'gabsocial/actions/auth'; +import { logOut } from 'soapbox/actions/auth'; const messages = defineMessages({ profile: { id: 'account.profile', defaultMessage: 'Profile' }, diff --git a/app/gabsocial/features/compose/components/autosuggest_account.js b/app/soapbox/features/compose/components/autosuggest_account.js similarity index 100% rename from app/gabsocial/features/compose/components/autosuggest_account.js rename to app/soapbox/features/compose/components/autosuggest_account.js diff --git a/app/gabsocial/features/compose/components/character_counter.js b/app/soapbox/features/compose/components/character_counter.js similarity index 100% rename from app/gabsocial/features/compose/components/character_counter.js rename to app/soapbox/features/compose/components/character_counter.js diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js similarity index 99% rename from app/gabsocial/features/compose/components/compose_form.js rename to app/soapbox/features/compose/components/compose_form.js index 4c6e165a8..ae3500022 100644 --- a/app/gabsocial/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -20,7 +20,7 @@ import { isMobile } from '../../../is_mobile'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { length } from 'stringz'; import { countableText } from '../util/counter'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import { get } from 'lodash'; const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d'; diff --git a/app/gabsocial/features/compose/components/emoji_picker_dropdown.js b/app/soapbox/features/compose/components/emoji_picker_dropdown.js similarity index 100% rename from app/gabsocial/features/compose/components/emoji_picker_dropdown.js rename to app/soapbox/features/compose/components/emoji_picker_dropdown.js diff --git a/app/gabsocial/features/compose/components/navigation_bar.js b/app/soapbox/features/compose/components/navigation_bar.js similarity index 100% rename from app/gabsocial/features/compose/components/navigation_bar.js rename to app/soapbox/features/compose/components/navigation_bar.js diff --git a/app/gabsocial/features/compose/components/poll_button.js b/app/soapbox/features/compose/components/poll_button.js similarity index 100% rename from app/gabsocial/features/compose/components/poll_button.js rename to app/soapbox/features/compose/components/poll_button.js diff --git a/app/gabsocial/features/compose/components/poll_form.js b/app/soapbox/features/compose/components/poll_form.js similarity index 97% rename from app/gabsocial/features/compose/components/poll_form.js rename to app/soapbox/features/compose/components/poll_form.js index b00751aac..022f87330 100644 --- a/app/gabsocial/features/compose/components/poll_form.js +++ b/app/soapbox/features/compose/components/poll_form.js @@ -6,9 +6,9 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; -import IconButton from 'gabsocial/components/icon_button'; -import Icon from 'gabsocial/components/icon'; -import AutosuggestInput from 'gabsocial/components/autosuggest_input'; +import IconButton from 'soapbox/components/icon_button'; +import Icon from 'soapbox/components/icon'; +import AutosuggestInput from 'soapbox/components/autosuggest_input'; import classNames from 'classnames'; const messages = defineMessages({ diff --git a/app/gabsocial/features/compose/components/privacy_dropdown.js b/app/soapbox/features/compose/components/privacy_dropdown.js similarity index 99% rename from app/gabsocial/features/compose/components/privacy_dropdown.js rename to app/soapbox/features/compose/components/privacy_dropdown.js index 505877d12..dd13033c9 100644 --- a/app/gabsocial/features/compose/components/privacy_dropdown.js +++ b/app/soapbox/features/compose/components/privacy_dropdown.js @@ -7,7 +7,7 @@ import Motion from '../../ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import detectPassiveEvents from 'detect-passive-events'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ public_short: { id: 'privacy.public.short', defaultMessage: 'Public' }, diff --git a/app/gabsocial/features/compose/components/reply_indicator.js b/app/soapbox/features/compose/components/reply_indicator.js similarity index 100% rename from app/gabsocial/features/compose/components/reply_indicator.js rename to app/soapbox/features/compose/components/reply_indicator.js diff --git a/app/gabsocial/features/compose/components/search.js b/app/soapbox/features/compose/components/search.js similarity index 99% rename from app/gabsocial/features/compose/components/search.js rename to app/soapbox/features/compose/components/search.js index f43859968..fb66c9d58 100644 --- a/app/gabsocial/features/compose/components/search.js +++ b/app/soapbox/features/compose/components/search.js @@ -5,7 +5,7 @@ import Overlay from 'react-overlays/lib/Overlay'; import Motion from '../../ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import { searchEnabled } from '../../../initial_state'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ placeholder: { id: 'search.placeholder', defaultMessage: 'Search' }, diff --git a/app/gabsocial/features/compose/components/search_results.js b/app/soapbox/features/compose/components/search_results.js similarity index 96% rename from app/gabsocial/features/compose/components/search_results.js rename to app/soapbox/features/compose/components/search_results.js index f14cbe447..a5e243ade 100644 --- a/app/gabsocial/features/compose/components/search_results.js +++ b/app/soapbox/features/compose/components/search_results.js @@ -7,9 +7,9 @@ import AccountContainer from '../../../containers/account_container'; import StatusContainer from '../../../containers/status_container'; import ImmutablePureComponent from 'react-immutable-pure-component'; import Hashtag from '../../../components/hashtag'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import WhoToFollowPanel from '../../ui/components/who_to_follow_panel'; -import { getFeatures } from 'gabsocial/utils/features'; +import { getFeatures } from 'soapbox/utils/features'; const mapStateToProps = state => ({ features: getFeatures(state.get('instance')), diff --git a/app/gabsocial/features/compose/components/text_icon_button.js b/app/soapbox/features/compose/components/text_icon_button.js similarity index 100% rename from app/gabsocial/features/compose/components/text_icon_button.js rename to app/soapbox/features/compose/components/text_icon_button.js diff --git a/app/gabsocial/features/compose/components/upload.js b/app/soapbox/features/compose/components/upload.js similarity index 98% rename from app/gabsocial/features/compose/components/upload.js rename to app/soapbox/features/compose/components/upload.js index 482e905da..c0c798890 100644 --- a/app/gabsocial/features/compose/components/upload.js +++ b/app/soapbox/features/compose/components/upload.js @@ -6,7 +6,7 @@ import spring from 'react-motion/lib/spring'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ description: { id: 'upload_form.description', defaultMessage: 'Describe for the visually impaired' }, diff --git a/app/gabsocial/features/compose/components/upload_button.js b/app/soapbox/features/compose/components/upload_button.js similarity index 100% rename from app/gabsocial/features/compose/components/upload_button.js rename to app/soapbox/features/compose/components/upload_button.js diff --git a/app/gabsocial/features/compose/components/upload_form.js b/app/soapbox/features/compose/components/upload_form.js similarity index 100% rename from app/gabsocial/features/compose/components/upload_form.js rename to app/soapbox/features/compose/components/upload_form.js diff --git a/app/gabsocial/features/compose/components/upload_progress.js b/app/soapbox/features/compose/components/upload_progress.js similarity index 96% rename from app/gabsocial/features/compose/components/upload_progress.js rename to app/soapbox/features/compose/components/upload_progress.js index 540a2a19d..9f446734f 100644 --- a/app/gabsocial/features/compose/components/upload_progress.js +++ b/app/soapbox/features/compose/components/upload_progress.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import Motion from '../../ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import { FormattedMessage } from 'react-intl'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; export default class UploadProgress extends React.PureComponent { diff --git a/app/gabsocial/features/compose/components/warning.js b/app/soapbox/features/compose/components/warning.js similarity index 100% rename from app/gabsocial/features/compose/components/warning.js rename to app/soapbox/features/compose/components/warning.js diff --git a/app/gabsocial/features/compose/containers/autosuggest_account_container.js b/app/soapbox/features/compose/containers/autosuggest_account_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/autosuggest_account_container.js rename to app/soapbox/features/compose/containers/autosuggest_account_container.js diff --git a/app/gabsocial/features/compose/containers/compose_form_container.js b/app/soapbox/features/compose/containers/compose_form_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/compose_form_container.js rename to app/soapbox/features/compose/containers/compose_form_container.js diff --git a/app/gabsocial/features/compose/containers/emoji_picker_dropdown_container.js b/app/soapbox/features/compose/containers/emoji_picker_dropdown_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/emoji_picker_dropdown_container.js rename to app/soapbox/features/compose/containers/emoji_picker_dropdown_container.js diff --git a/app/gabsocial/features/compose/containers/navigation_container.js b/app/soapbox/features/compose/containers/navigation_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/navigation_container.js rename to app/soapbox/features/compose/containers/navigation_container.js diff --git a/app/gabsocial/features/compose/containers/poll_button_container.js b/app/soapbox/features/compose/containers/poll_button_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/poll_button_container.js rename to app/soapbox/features/compose/containers/poll_button_container.js diff --git a/app/gabsocial/features/compose/containers/poll_form_container.js b/app/soapbox/features/compose/containers/poll_form_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/poll_form_container.js rename to app/soapbox/features/compose/containers/poll_form_container.js diff --git a/app/gabsocial/features/compose/containers/privacy_dropdown_container.js b/app/soapbox/features/compose/containers/privacy_dropdown_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/privacy_dropdown_container.js rename to app/soapbox/features/compose/containers/privacy_dropdown_container.js diff --git a/app/gabsocial/features/compose/containers/reply_indicator_container.js b/app/soapbox/features/compose/containers/reply_indicator_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/reply_indicator_container.js rename to app/soapbox/features/compose/containers/reply_indicator_container.js diff --git a/app/gabsocial/features/compose/containers/search_container.js b/app/soapbox/features/compose/containers/search_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/search_container.js rename to app/soapbox/features/compose/containers/search_container.js diff --git a/app/gabsocial/features/compose/containers/search_results_container.js b/app/soapbox/features/compose/containers/search_results_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/search_results_container.js rename to app/soapbox/features/compose/containers/search_results_container.js diff --git a/app/gabsocial/features/compose/containers/sensitive_button_container.js b/app/soapbox/features/compose/containers/sensitive_button_container.js similarity index 96% rename from app/gabsocial/features/compose/containers/sensitive_button_container.js rename to app/soapbox/features/compose/containers/sensitive_button_container.js index ccc21b27e..3497c0009 100644 --- a/app/gabsocial/features/compose/containers/sensitive_button_container.js +++ b/app/soapbox/features/compose/containers/sensitive_button_container.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { changeComposeSensitivity } from 'gabsocial/actions/compose'; +import { changeComposeSensitivity } from 'soapbox/actions/compose'; import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; const messages = defineMessages({ diff --git a/app/gabsocial/features/compose/containers/spoiler_button_container.js b/app/soapbox/features/compose/containers/spoiler_button_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/spoiler_button_container.js rename to app/soapbox/features/compose/containers/spoiler_button_container.js diff --git a/app/gabsocial/features/compose/containers/upload_button_container.js b/app/soapbox/features/compose/containers/upload_button_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/upload_button_container.js rename to app/soapbox/features/compose/containers/upload_button_container.js diff --git a/app/gabsocial/features/compose/containers/upload_container.js b/app/soapbox/features/compose/containers/upload_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/upload_container.js rename to app/soapbox/features/compose/containers/upload_container.js diff --git a/app/gabsocial/features/compose/containers/upload_form_container.js b/app/soapbox/features/compose/containers/upload_form_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/upload_form_container.js rename to app/soapbox/features/compose/containers/upload_form_container.js diff --git a/app/gabsocial/features/compose/containers/upload_progress_container.js b/app/soapbox/features/compose/containers/upload_progress_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/upload_progress_container.js rename to app/soapbox/features/compose/containers/upload_progress_container.js diff --git a/app/gabsocial/features/compose/containers/warning_container.js b/app/soapbox/features/compose/containers/warning_container.js similarity index 100% rename from app/gabsocial/features/compose/containers/warning_container.js rename to app/soapbox/features/compose/containers/warning_container.js diff --git a/app/gabsocial/features/compose/index.js b/app/soapbox/features/compose/index.js similarity index 98% rename from app/gabsocial/features/compose/index.js rename to app/soapbox/features/compose/index.js index e7b7cfa06..a7e177d2a 100644 --- a/app/gabsocial/features/compose/index.js +++ b/app/soapbox/features/compose/index.js @@ -12,8 +12,8 @@ import Motion from '../ui/util/optional_motion'; import spring from 'react-motion/lib/spring'; import SearchResultsContainer from './containers/search_results_container'; import { changeComposing } from '../../actions/compose'; -import Icon from 'gabsocial/components/icon'; -import { getSettings } from 'gabsocial/actions/settings'; +import Icon from 'soapbox/components/icon'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ start: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, diff --git a/app/gabsocial/features/compose/util/counter.js b/app/soapbox/features/compose/util/counter.js similarity index 100% rename from app/gabsocial/features/compose/util/counter.js rename to app/soapbox/features/compose/util/counter.js diff --git a/app/gabsocial/features/compose/util/url_regex.js b/app/soapbox/features/compose/util/url_regex.js similarity index 100% rename from app/gabsocial/features/compose/util/url_regex.js rename to app/soapbox/features/compose/util/url_regex.js diff --git a/app/gabsocial/features/direct_timeline/components/conversation.js b/app/soapbox/features/direct_timeline/components/conversation.js similarity index 100% rename from app/gabsocial/features/direct_timeline/components/conversation.js rename to app/soapbox/features/direct_timeline/components/conversation.js diff --git a/app/gabsocial/features/direct_timeline/components/conversations_list.js b/app/soapbox/features/direct_timeline/components/conversations_list.js similarity index 100% rename from app/gabsocial/features/direct_timeline/components/conversations_list.js rename to app/soapbox/features/direct_timeline/components/conversations_list.js diff --git a/app/gabsocial/features/direct_timeline/containers/conversation_container.js b/app/soapbox/features/direct_timeline/containers/conversation_container.js similarity index 100% rename from app/gabsocial/features/direct_timeline/containers/conversation_container.js rename to app/soapbox/features/direct_timeline/containers/conversation_container.js diff --git a/app/gabsocial/features/direct_timeline/containers/conversations_list_container.js b/app/soapbox/features/direct_timeline/containers/conversations_list_container.js similarity index 100% rename from app/gabsocial/features/direct_timeline/containers/conversations_list_container.js rename to app/soapbox/features/direct_timeline/containers/conversations_list_container.js diff --git a/app/gabsocial/features/direct_timeline/index.js b/app/soapbox/features/direct_timeline/index.js similarity index 100% rename from app/gabsocial/features/direct_timeline/index.js rename to app/soapbox/features/direct_timeline/index.js diff --git a/app/gabsocial/features/domain_blocks/index.js b/app/soapbox/features/domain_blocks/index.js similarity index 100% rename from app/gabsocial/features/domain_blocks/index.js rename to app/soapbox/features/domain_blocks/index.js diff --git a/app/gabsocial/features/edit_profile/components/profile_preview.js b/app/soapbox/features/edit_profile/components/profile_preview.js similarity index 94% rename from app/gabsocial/features/edit_profile/components/profile_preview.js rename to app/soapbox/features/edit_profile/components/profile_preview.js index 3179f4193..0e8923207 100644 --- a/app/gabsocial/features/edit_profile/components/profile_preview.js +++ b/app/soapbox/features/edit_profile/components/profile_preview.js @@ -1,6 +1,6 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { acctFull } from 'gabsocial/utils/accounts'; +import { acctFull } from 'soapbox/utils/accounts'; const ProfilePreview = ({ account }) => (
diff --git a/app/gabsocial/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js similarity index 98% rename from app/gabsocial/features/edit_profile/index.js rename to app/soapbox/features/edit_profile/index.js index d990abbb4..759098edb 100644 --- a/app/gabsocial/features/edit_profile/index.js +++ b/app/soapbox/features/edit_profile/index.js @@ -11,13 +11,13 @@ import { TextInput, Checkbox, FileChooser, -} from 'gabsocial/features/forms'; +} from 'soapbox/features/forms'; import ProfilePreview from './components/profile_preview'; import { Map as ImmutableMap, List as ImmutableList, } from 'immutable'; -import { patchMe } from 'gabsocial/actions/me'; +import { patchMe } from 'soapbox/actions/me'; import { unescape } from 'lodash'; const MAX_FIELDS = 4; // TODO: Make this dynamic by the instance diff --git a/app/gabsocial/features/emoji/__tests__/emoji-test.js b/app/soapbox/features/emoji/__tests__/emoji-test.js similarity index 100% rename from app/gabsocial/features/emoji/__tests__/emoji-test.js rename to app/soapbox/features/emoji/__tests__/emoji-test.js diff --git a/app/gabsocial/features/emoji/__tests__/emoji_index-test.js b/app/soapbox/features/emoji/__tests__/emoji_index-test.js similarity index 84% rename from app/gabsocial/features/emoji/__tests__/emoji_index-test.js rename to app/soapbox/features/emoji/__tests__/emoji_index-test.js index 5e1f7f172..ffb5a701c 100644 --- a/app/gabsocial/features/emoji/__tests__/emoji_index-test.js +++ b/app/soapbox/features/emoji/__tests__/emoji_index-test.js @@ -52,12 +52,12 @@ describe('emoji_index', () => { it('(different behavior from emoji-mart) do not erases custom emoji if not passed again', () => { const custom = [ { - id: 'gabsocial', - name: 'gabsocial', - short_names: ['gabsocial'], + id: 'soapbox', + name: 'soapbox', + short_names: ['soapbox'], text: '', emoticons: [], - keywords: ['gabsocial'], + keywords: ['soapbox'], imageUrl: 'http://example.com', custom: true, }, @@ -67,23 +67,23 @@ describe('emoji_index', () => { const expected = []; const lightExpected = [ { - id: 'gabsocial', + id: 'soapbox', custom: true, }, ]; - expect(search('gabs').map(trimEmojis)).toEqual(lightExpected); - expect(emojiIndex.search('gabs').map(trimEmojis)).toEqual(expected); + expect(search('soap').map(trimEmojis)).toEqual(lightExpected); + expect(emojiIndex.search('soap').map(trimEmojis)).toEqual(expected); }); it('(different behavior from emoji-mart) erases custom emoji if another is passed', () => { const custom = [ { - id: 'gabsocial', - name: 'gabsocial', - short_names: ['gabsocial'], + id: 'soapbox', + name: 'soapbox', + short_names: ['soapbox'], text: '', emoticons: [], - keywords: ['gabsocial'], + keywords: ['soapbox'], imageUrl: 'http://example.com', custom: true, }, @@ -91,19 +91,19 @@ describe('emoji_index', () => { search('', { custom }); emojiIndex.search('', { custom }); const expected = []; - expect(search('gabs', { custom: [] }).map(trimEmojis)).toEqual(expected); - expect(emojiIndex.search('gabs').map(trimEmojis)).toEqual(expected); + expect(search('soap', { custom: [] }).map(trimEmojis)).toEqual(expected); + expect(emojiIndex.search('soap').map(trimEmojis)).toEqual(expected); }); it('handles custom emoji', () => { const custom = [ { - id: 'gabsocial', - name: 'gabsocial', - short_names: ['gabsocial'], + id: 'soapbox', + name: 'soapbox', + short_names: ['soapbox'], text: '', emoticons: [], - keywords: ['gabsocial'], + keywords: ['soapbox'], imageUrl: 'http://example.com', custom: true, }, @@ -112,12 +112,12 @@ describe('emoji_index', () => { emojiIndex.search('', { custom }); const expected = [ { - id: 'gabsocial', + id: 'soapbox', custom: true, }, ]; - expect(search('gabs', { custom }).map(trimEmojis)).toEqual(expected); - expect(emojiIndex.search('gabs', { custom }).map(trimEmojis)).toEqual(expected); + expect(search('soap', { custom }).map(trimEmojis)).toEqual(expected); + expect(emojiIndex.search('soap', { custom }).map(trimEmojis)).toEqual(expected); }); it('should filter only emojis we care about, exclude pineapple', () => { diff --git a/app/gabsocial/features/emoji/emoji.js b/app/soapbox/features/emoji/emoji.js similarity index 100% rename from app/gabsocial/features/emoji/emoji.js rename to app/soapbox/features/emoji/emoji.js diff --git a/app/gabsocial/features/emoji/emoji_compressed.js b/app/soapbox/features/emoji/emoji_compressed.js similarity index 100% rename from app/gabsocial/features/emoji/emoji_compressed.js rename to app/soapbox/features/emoji/emoji_compressed.js diff --git a/app/gabsocial/features/emoji/emoji_map.json b/app/soapbox/features/emoji/emoji_map.json similarity index 100% rename from app/gabsocial/features/emoji/emoji_map.json rename to app/soapbox/features/emoji/emoji_map.json diff --git a/app/gabsocial/features/emoji/emoji_mart_data_light.js b/app/soapbox/features/emoji/emoji_mart_data_light.js similarity index 100% rename from app/gabsocial/features/emoji/emoji_mart_data_light.js rename to app/soapbox/features/emoji/emoji_mart_data_light.js diff --git a/app/gabsocial/features/emoji/emoji_mart_search_light.js b/app/soapbox/features/emoji/emoji_mart_search_light.js similarity index 100% rename from app/gabsocial/features/emoji/emoji_mart_search_light.js rename to app/soapbox/features/emoji/emoji_mart_search_light.js diff --git a/app/gabsocial/features/emoji/emoji_picker.js b/app/soapbox/features/emoji/emoji_picker.js similarity index 100% rename from app/gabsocial/features/emoji/emoji_picker.js rename to app/soapbox/features/emoji/emoji_picker.js diff --git a/app/gabsocial/features/emoji/emoji_unicode_mapping_light.js b/app/soapbox/features/emoji/emoji_unicode_mapping_light.js similarity index 100% rename from app/gabsocial/features/emoji/emoji_unicode_mapping_light.js rename to app/soapbox/features/emoji/emoji_unicode_mapping_light.js diff --git a/app/gabsocial/features/emoji/emoji_utils.js b/app/soapbox/features/emoji/emoji_utils.js similarity index 100% rename from app/gabsocial/features/emoji/emoji_utils.js rename to app/soapbox/features/emoji/emoji_utils.js diff --git a/app/gabsocial/features/emoji/unicode_to_filename.js b/app/soapbox/features/emoji/unicode_to_filename.js similarity index 100% rename from app/gabsocial/features/emoji/unicode_to_filename.js rename to app/soapbox/features/emoji/unicode_to_filename.js diff --git a/app/gabsocial/features/emoji/unicode_to_unified_name.js b/app/soapbox/features/emoji/unicode_to_unified_name.js similarity index 100% rename from app/gabsocial/features/emoji/unicode_to_unified_name.js rename to app/soapbox/features/emoji/unicode_to_unified_name.js diff --git a/app/gabsocial/features/explore/index.js b/app/soapbox/features/explore/index.js similarity index 100% rename from app/gabsocial/features/explore/index.js rename to app/soapbox/features/explore/index.js diff --git a/app/gabsocial/features/favourited_statuses/index.js b/app/soapbox/features/favourited_statuses/index.js similarity index 96% rename from app/gabsocial/features/favourited_statuses/index.js rename to app/soapbox/features/favourited_statuses/index.js index d613df21e..b70f40d85 100644 --- a/app/gabsocial/features/favourited_statuses/index.js +++ b/app/soapbox/features/favourited_statuses/index.js @@ -8,7 +8,7 @@ import StatusList from '../../components/status_list'; import { injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { debounce } from 'lodash'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing_indicator'; const mapStateToProps = (state, { params: { username } }) => { const me = state.get('me'); diff --git a/app/gabsocial/features/favourites/index.js b/app/soapbox/features/favourites/index.js similarity index 100% rename from app/gabsocial/features/favourites/index.js rename to app/soapbox/features/favourites/index.js diff --git a/app/gabsocial/features/filters/index.js b/app/soapbox/features/filters/index.js similarity index 100% rename from app/gabsocial/features/filters/index.js rename to app/soapbox/features/filters/index.js diff --git a/app/gabsocial/features/follow_requests/components/account_authorize.js b/app/soapbox/features/follow_requests/components/account_authorize.js similarity index 100% rename from app/gabsocial/features/follow_requests/components/account_authorize.js rename to app/soapbox/features/follow_requests/components/account_authorize.js diff --git a/app/gabsocial/features/follow_requests/containers/account_authorize_container.js b/app/soapbox/features/follow_requests/containers/account_authorize_container.js similarity index 100% rename from app/gabsocial/features/follow_requests/containers/account_authorize_container.js rename to app/soapbox/features/follow_requests/containers/account_authorize_container.js diff --git a/app/gabsocial/features/follow_requests/index.js b/app/soapbox/features/follow_requests/index.js similarity index 100% rename from app/gabsocial/features/follow_requests/index.js rename to app/soapbox/features/follow_requests/index.js diff --git a/app/gabsocial/features/followers/index.js b/app/soapbox/features/followers/index.js similarity index 96% rename from app/gabsocial/features/followers/index.js rename to app/soapbox/features/followers/index.js index d50676453..a9c36b686 100644 --- a/app/gabsocial/features/followers/index.js +++ b/app/soapbox/features/followers/index.js @@ -15,8 +15,8 @@ import { FormattedMessage } from 'react-intl'; import AccountContainer from '../../containers/account_container'; import Column from '../ui/components/column'; import ScrollableList from '../../components/scrollable_list'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; -import { getFollowDifference } from 'gabsocial/utils/accounts'; +import MissingIndicator from 'soapbox/components/missing_indicator'; +import { getFollowDifference } from 'soapbox/utils/accounts'; const mapStateToProps = (state, { params: { username }, withReplies = false }) => { const me = state.get('me'); diff --git a/app/gabsocial/features/following/index.js b/app/soapbox/features/following/index.js similarity index 96% rename from app/gabsocial/features/following/index.js rename to app/soapbox/features/following/index.js index faeb3708a..6b00aca63 100644 --- a/app/gabsocial/features/following/index.js +++ b/app/soapbox/features/following/index.js @@ -15,8 +15,8 @@ import { FormattedMessage } from 'react-intl'; import AccountContainer from '../../containers/account_container'; import Column from '../ui/components/column'; import ScrollableList from '../../components/scrollable_list'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; -import { getFollowDifference } from 'gabsocial/utils/accounts'; +import MissingIndicator from 'soapbox/components/missing_indicator'; +import { getFollowDifference } from 'soapbox/utils/accounts'; const mapStateToProps = (state, { params: { username }, withReplies = false }) => { const me = state.get('me'); diff --git a/app/gabsocial/features/forms/index.js b/app/soapbox/features/forms/index.js similarity index 100% rename from app/gabsocial/features/forms/index.js rename to app/soapbox/features/forms/index.js diff --git a/app/gabsocial/features/generic_not_found/index.js b/app/soapbox/features/generic_not_found/index.js similarity index 100% rename from app/gabsocial/features/generic_not_found/index.js rename to app/soapbox/features/generic_not_found/index.js diff --git a/app/gabsocial/features/getting_started/index.js b/app/soapbox/features/getting_started/index.js similarity index 97% rename from app/gabsocial/features/getting_started/index.js rename to app/soapbox/features/getting_started/index.js index af30b268f..86f9717d2 100644 --- a/app/gabsocial/features/getting_started/index.js +++ b/app/soapbox/features/getting_started/index.js @@ -8,11 +8,11 @@ import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { profile_directory } from '../../initial_state'; -import { fetchFollowRequests } from 'gabsocial/actions/accounts'; +import { fetchFollowRequests } from 'soapbox/actions/accounts'; import { List as ImmutableList } from 'immutable'; import NavigationBar from '../compose/components/navigation_bar'; -import Icon from 'gabsocial/components/icon'; -import LinkFooter from 'gabsocial/features/ui/components/link_footer'; +import Icon from 'soapbox/components/icon'; +import LinkFooter from 'soapbox/features/ui/components/link_footer'; const messages = defineMessages({ home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' }, diff --git a/app/gabsocial/features/groups/create/index.js b/app/soapbox/features/groups/create/index.js similarity index 100% rename from app/gabsocial/features/groups/create/index.js rename to app/soapbox/features/groups/create/index.js diff --git a/app/gabsocial/features/groups/edit/index.js b/app/soapbox/features/groups/edit/index.js similarity index 98% rename from app/gabsocial/features/groups/edit/index.js rename to app/soapbox/features/groups/edit/index.js index a86b9c358..f63447b2f 100644 --- a/app/gabsocial/features/groups/edit/index.js +++ b/app/soapbox/features/groups/edit/index.js @@ -5,7 +5,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import { changeValue, submit, setUp } from '../../../actions/group_editor'; import { defineMessages, injectIntl } from 'react-intl'; import LoadingIndicator from '../../../components/loading_indicator'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing_indicator'; import Column from '../../../components/column'; import classNames from 'classnames'; diff --git a/app/gabsocial/features/groups/index/card.js b/app/soapbox/features/groups/index/card.js similarity index 100% rename from app/gabsocial/features/groups/index/card.js rename to app/soapbox/features/groups/index/card.js diff --git a/app/gabsocial/features/groups/index/index.js b/app/soapbox/features/groups/index/index.js similarity index 100% rename from app/gabsocial/features/groups/index/index.js rename to app/soapbox/features/groups/index/index.js diff --git a/app/gabsocial/features/groups/members/index.js b/app/soapbox/features/groups/members/index.js similarity index 100% rename from app/gabsocial/features/groups/members/index.js rename to app/soapbox/features/groups/members/index.js diff --git a/app/gabsocial/features/groups/removed_accounts/index.js b/app/soapbox/features/groups/removed_accounts/index.js similarity index 100% rename from app/gabsocial/features/groups/removed_accounts/index.js rename to app/soapbox/features/groups/removed_accounts/index.js diff --git a/app/gabsocial/features/groups/sidebar_panel/index.js b/app/soapbox/features/groups/sidebar_panel/index.js similarity index 97% rename from app/gabsocial/features/groups/sidebar_panel/index.js rename to app/soapbox/features/groups/sidebar_panel/index.js index d8160d191..a091d876f 100644 --- a/app/gabsocial/features/groups/sidebar_panel/index.js +++ b/app/soapbox/features/groups/sidebar_panel/index.js @@ -4,7 +4,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { defineMessages, injectIntl } from 'react-intl'; import { connect } from 'react-redux'; import Item from './item'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import { Link } from 'react-router-dom'; const messages = defineMessages({ diff --git a/app/gabsocial/features/groups/sidebar_panel/item.js b/app/soapbox/features/groups/sidebar_panel/item.js similarity index 100% rename from app/gabsocial/features/groups/sidebar_panel/item.js rename to app/soapbox/features/groups/sidebar_panel/item.js diff --git a/app/gabsocial/features/groups/timeline/components/header.js b/app/soapbox/features/groups/timeline/components/header.js similarity index 98% rename from app/gabsocial/features/groups/timeline/components/header.js rename to app/soapbox/features/groups/timeline/components/header.js index 4a5dd62a1..34d0bb2c5 100644 --- a/app/gabsocial/features/groups/timeline/components/header.js +++ b/app/soapbox/features/groups/timeline/components/header.js @@ -1,7 +1,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; -import Button from 'gabsocial/components/button'; +import Button from 'soapbox/components/button'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { defineMessages, injectIntl } from 'react-intl'; import { NavLink } from 'react-router-dom'; diff --git a/app/gabsocial/features/groups/timeline/components/panel.js b/app/soapbox/features/groups/timeline/components/panel.js similarity index 96% rename from app/gabsocial/features/groups/timeline/components/panel.js rename to app/soapbox/features/groups/timeline/components/panel.js index 6f13c080b..3f431f559 100644 --- a/app/gabsocial/features/groups/timeline/components/panel.js +++ b/app/soapbox/features/groups/timeline/components/panel.js @@ -2,7 +2,7 @@ import React from 'react'; import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { injectIntl, defineMessages } from 'react-intl'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ group_archived: { id: 'group.detail.archived_group', defaultMessage: 'Archived group' }, diff --git a/app/gabsocial/features/groups/timeline/containers/header_container.js b/app/soapbox/features/groups/timeline/containers/header_container.js similarity index 100% rename from app/gabsocial/features/groups/timeline/containers/header_container.js rename to app/soapbox/features/groups/timeline/containers/header_container.js diff --git a/app/gabsocial/features/groups/timeline/index.js b/app/soapbox/features/groups/timeline/index.js similarity index 96% rename from app/gabsocial/features/groups/timeline/index.js rename to app/soapbox/features/groups/timeline/index.js index 5534017e5..a2895f26f 100644 --- a/app/gabsocial/features/groups/timeline/index.js +++ b/app/soapbox/features/groups/timeline/index.js @@ -9,7 +9,7 @@ import { connectGroupStream } from '../../../actions/streaming'; import { expandGroupTimeline } from '../../../actions/timelines'; import MissingIndicator from '../../../components/missing_indicator'; import LoadingIndicator from '../../../components/loading_indicator'; -import ComposeFormContainer from '../../../../gabsocial/features/compose/containers/compose_form_container'; +import ComposeFormContainer from '../../../../soapbox/features/compose/containers/compose_form_container'; import Avatar from '../../../components/avatar'; const mapStateToProps = (state, props) => { diff --git a/app/gabsocial/features/hashtag_timeline/index.js b/app/soapbox/features/hashtag_timeline/index.js similarity index 100% rename from app/gabsocial/features/hashtag_timeline/index.js rename to app/soapbox/features/hashtag_timeline/index.js diff --git a/app/gabsocial/features/home_timeline/components/column_settings.js b/app/soapbox/features/home_timeline/components/column_settings.js similarity index 100% rename from app/gabsocial/features/home_timeline/components/column_settings.js rename to app/soapbox/features/home_timeline/components/column_settings.js diff --git a/app/gabsocial/features/home_timeline/containers/column_settings_container.js b/app/soapbox/features/home_timeline/containers/column_settings_container.js similarity index 100% rename from app/gabsocial/features/home_timeline/containers/column_settings_container.js rename to app/soapbox/features/home_timeline/containers/column_settings_container.js diff --git a/app/gabsocial/features/home_timeline/index.js b/app/soapbox/features/home_timeline/index.js similarity index 100% rename from app/gabsocial/features/home_timeline/index.js rename to app/soapbox/features/home_timeline/index.js diff --git a/app/gabsocial/features/introduction/index.js b/app/soapbox/features/introduction/index.js similarity index 100% rename from app/gabsocial/features/introduction/index.js rename to app/soapbox/features/introduction/index.js diff --git a/app/gabsocial/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js similarity index 96% rename from app/gabsocial/features/landing_page/components/registration_form.js rename to app/soapbox/features/landing_page/components/registration_form.js index 5acd1462c..76febc41b 100644 --- a/app/gabsocial/features/landing_page/components/registration_form.js +++ b/app/soapbox/features/landing_page/components/registration_form.js @@ -8,9 +8,9 @@ import { SimpleInput, TextInput, Checkbox, -} from 'gabsocial/features/forms'; -import { register } from 'gabsocial/actions/auth'; -import CaptchaField from 'gabsocial/features/auth_login/components/captcha'; +} from 'soapbox/features/forms'; +import { register } from 'soapbox/actions/auth'; +import CaptchaField from 'soapbox/features/auth_login/components/captcha'; import { Map as ImmutableMap } from 'immutable'; const mapStateToProps = (state, props) => ({ diff --git a/app/gabsocial/features/landing_page/index.js b/app/soapbox/features/landing_page/index.js similarity index 100% rename from app/gabsocial/features/landing_page/index.js rename to app/soapbox/features/landing_page/index.js diff --git a/app/gabsocial/features/list_adder/components/account.js b/app/soapbox/features/list_adder/components/account.js similarity index 100% rename from app/gabsocial/features/list_adder/components/account.js rename to app/soapbox/features/list_adder/components/account.js diff --git a/app/gabsocial/features/list_adder/components/list.js b/app/soapbox/features/list_adder/components/list.js similarity index 97% rename from app/gabsocial/features/list_adder/components/list.js rename to app/soapbox/features/list_adder/components/list.js index 603f6304f..9d5957f06 100644 --- a/app/gabsocial/features/list_adder/components/list.js +++ b/app/soapbox/features/list_adder/components/list.js @@ -6,7 +6,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import IconButton from '../../../components/icon_button'; import { defineMessages, injectIntl } from 'react-intl'; import { removeFromListAdder, addToListAdder } from '../../../actions/lists'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' }, diff --git a/app/gabsocial/features/list_adder/index.js b/app/soapbox/features/list_adder/index.js similarity index 98% rename from app/gabsocial/features/list_adder/index.js rename to app/soapbox/features/list_adder/index.js index 457ade5ba..af15b4485 100644 --- a/app/gabsocial/features/list_adder/index.js +++ b/app/soapbox/features/list_adder/index.js @@ -8,7 +8,7 @@ import { setupListAdder, resetListAdder } from '../../actions/lists'; import { createSelector } from 'reselect'; import List from './components/list'; import Account from './components/account'; -import IconButton from 'gabsocial/components/icon_button'; +import IconButton from 'soapbox/components/icon_button'; import NewListForm from '../lists/components/new_list_form'; import ColumnSubheading from '../ui/components/column_subheading'; // hack diff --git a/app/gabsocial/features/list_editor/components/account.js b/app/soapbox/features/list_editor/components/account.js similarity index 100% rename from app/gabsocial/features/list_editor/components/account.js rename to app/soapbox/features/list_editor/components/account.js diff --git a/app/gabsocial/features/list_editor/components/edit_list_form.js b/app/soapbox/features/list_editor/components/edit_list_form.js similarity index 100% rename from app/gabsocial/features/list_editor/components/edit_list_form.js rename to app/soapbox/features/list_editor/components/edit_list_form.js diff --git a/app/gabsocial/features/list_editor/components/search.js b/app/soapbox/features/list_editor/components/search.js similarity index 96% rename from app/gabsocial/features/list_editor/components/search.js rename to app/soapbox/features/list_editor/components/search.js index f3eb86a9d..0f300a6e3 100644 --- a/app/gabsocial/features/list_editor/components/search.js +++ b/app/soapbox/features/list_editor/components/search.js @@ -4,8 +4,8 @@ import { connect } from 'react-redux'; import { defineMessages, injectIntl } from 'react-intl'; import { fetchListSuggestions, clearListSuggestions, changeListSuggestions } from '../../../actions/lists'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; -import Button from 'gabsocial/components/button'; +import Icon from 'soapbox/components/icon'; +import Button from 'soapbox/components/button'; const messages = defineMessages({ search: { id: 'lists.search', defaultMessage: 'Search among people you follow' }, diff --git a/app/gabsocial/features/list_editor/index.js b/app/soapbox/features/list_editor/index.js similarity index 98% rename from app/gabsocial/features/list_editor/index.js rename to app/soapbox/features/list_editor/index.js index 1bed6d22a..004f41d59 100644 --- a/app/gabsocial/features/list_editor/index.js +++ b/app/soapbox/features/list_editor/index.js @@ -9,7 +9,7 @@ import Account from './components/account'; import Search from './components/search'; import EditListForm from './components/edit_list_form'; import ColumnSubheading from '../ui/components/column_subheading'; -import IconButton from 'gabsocial/components/icon_button'; +import IconButton from 'soapbox/components/icon_button'; const mapStateToProps = state => ({ accountIds: state.getIn(['listEditor', 'accounts', 'items']), diff --git a/app/gabsocial/features/list_timeline/index.js b/app/soapbox/features/list_timeline/index.js similarity index 98% rename from app/gabsocial/features/list_timeline/index.js rename to app/soapbox/features/list_timeline/index.js index 6ff02107b..349052ab3 100644 --- a/app/gabsocial/features/list_timeline/index.js +++ b/app/soapbox/features/list_timeline/index.js @@ -11,10 +11,10 @@ import { fetchList, deleteList } from '../../actions/lists'; import { openModal } from '../../actions/modal'; import MissingIndicator from '../../components/missing_indicator'; import LoadingIndicator from '../../components/loading_indicator'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import HomeColumnHeader from '../../components/home_column_header'; import { Link } from 'react-router-dom'; -import Button from 'gabsocial/components/button'; +import Button from 'soapbox/components/button'; const messages = defineMessages({ deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' }, diff --git a/app/gabsocial/features/lists/components/new_list_form.js b/app/soapbox/features/lists/components/new_list_form.js similarity index 100% rename from app/gabsocial/features/lists/components/new_list_form.js rename to app/soapbox/features/lists/components/new_list_form.js diff --git a/app/gabsocial/features/lists/index.js b/app/soapbox/features/lists/index.js similarity index 100% rename from app/gabsocial/features/lists/index.js rename to app/soapbox/features/lists/index.js diff --git a/app/gabsocial/features/mutes/index.js b/app/soapbox/features/mutes/index.js similarity index 100% rename from app/gabsocial/features/mutes/index.js rename to app/soapbox/features/mutes/index.js diff --git a/app/gabsocial/features/notifications/components/clear_column_button.js b/app/soapbox/features/notifications/components/clear_column_button.js similarity index 91% rename from app/gabsocial/features/notifications/components/clear_column_button.js rename to app/soapbox/features/notifications/components/clear_column_button.js index 6d43af656..4218f662d 100644 --- a/app/gabsocial/features/notifications/components/clear_column_button.js +++ b/app/soapbox/features/notifications/components/clear_column_button.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; export default class ClearColumnButton extends React.PureComponent { diff --git a/app/gabsocial/features/notifications/components/column_settings.js b/app/soapbox/features/notifications/components/column_settings.js similarity index 100% rename from app/gabsocial/features/notifications/components/column_settings.js rename to app/soapbox/features/notifications/components/column_settings.js diff --git a/app/gabsocial/features/notifications/components/filter_bar.js b/app/soapbox/features/notifications/components/filter_bar.js similarity index 98% rename from app/gabsocial/features/notifications/components/filter_bar.js rename to app/soapbox/features/notifications/components/filter_bar.js index 5fa131fd7..208654c6d 100644 --- a/app/gabsocial/features/notifications/components/filter_bar.js +++ b/app/soapbox/features/notifications/components/filter_bar.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const tooltips = defineMessages({ mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, diff --git a/app/gabsocial/features/notifications/components/notification.js b/app/soapbox/features/notifications/components/notification.js similarity index 99% rename from app/gabsocial/features/notifications/components/notification.js rename to app/soapbox/features/notifications/components/notification.js index 5fda69cfe..d6ba86ced 100644 --- a/app/gabsocial/features/notifications/components/notification.js +++ b/app/soapbox/features/notifications/components/notification.js @@ -7,8 +7,8 @@ import { injectIntl, FormattedMessage } from 'react-intl'; import Permalink from '../../../components/permalink'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { HotKeys } from 'react-hotkeys'; -import Icon from 'gabsocial/components/icon'; -import emojify from 'gabsocial/features/emoji/emoji'; +import Icon from 'soapbox/components/icon'; +import emojify from 'soapbox/features/emoji/emoji'; const notificationForScreenReader = (intl, message, timestamp) => { const output = [message]; diff --git a/app/gabsocial/features/notifications/components/setting_toggle.js b/app/soapbox/features/notifications/components/setting_toggle.js similarity index 100% rename from app/gabsocial/features/notifications/components/setting_toggle.js rename to app/soapbox/features/notifications/components/setting_toggle.js diff --git a/app/gabsocial/features/notifications/containers/column_settings_container.js b/app/soapbox/features/notifications/containers/column_settings_container.js similarity index 100% rename from app/gabsocial/features/notifications/containers/column_settings_container.js rename to app/soapbox/features/notifications/containers/column_settings_container.js diff --git a/app/gabsocial/features/notifications/containers/filter_bar_container.js b/app/soapbox/features/notifications/containers/filter_bar_container.js similarity index 91% rename from app/gabsocial/features/notifications/containers/filter_bar_container.js rename to app/soapbox/features/notifications/containers/filter_bar_container.js index c35ee004e..52c004c47 100644 --- a/app/gabsocial/features/notifications/containers/filter_bar_container.js +++ b/app/soapbox/features/notifications/containers/filter_bar_container.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; import FilterBar from '../components/filter_bar'; import { setFilter } from '../../../actions/notifications'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const makeMapStateToProps = state => { const settings = getSettings(state); diff --git a/app/gabsocial/features/notifications/containers/notification_container.js b/app/soapbox/features/notifications/containers/notification_container.js similarity index 97% rename from app/gabsocial/features/notifications/containers/notification_container.js rename to app/soapbox/features/notifications/containers/notification_container.js index d1003ec18..367631193 100644 --- a/app/gabsocial/features/notifications/containers/notification_container.js +++ b/app/soapbox/features/notifications/containers/notification_container.js @@ -13,7 +13,7 @@ import { hideStatus, revealStatus, } from '../../../actions/statuses'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const makeMapStateToProps = () => { const getNotification = makeGetNotification(); diff --git a/app/gabsocial/features/notifications/index.js b/app/soapbox/features/notifications/index.js similarity index 99% rename from app/gabsocial/features/notifications/index.js rename to app/soapbox/features/notifications/index.js index 607708f2f..34fe4a700 100644 --- a/app/gabsocial/features/notifications/index.js +++ b/app/soapbox/features/notifications/index.js @@ -19,7 +19,7 @@ import { debounce } from 'lodash'; import ScrollableList from '../../components/scrollable_list'; import LoadGap from '../../components/load_gap'; import TimelineQueueButtonHeader from '../../components/timeline_queue_button_header'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ title: { id: 'column.notifications', defaultMessage: 'Notifications' }, diff --git a/app/gabsocial/features/pinned_statuses/index.js b/app/soapbox/features/pinned_statuses/index.js similarity index 96% rename from app/gabsocial/features/pinned_statuses/index.js rename to app/soapbox/features/pinned_statuses/index.js index 689191b6c..0a6bab195 100644 --- a/app/gabsocial/features/pinned_statuses/index.js +++ b/app/soapbox/features/pinned_statuses/index.js @@ -7,7 +7,7 @@ import Column from '../ui/components/column'; import StatusList from '../../components/status_list'; import { injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import MissingIndicator from 'gabsocial/components/missing_indicator'; +import MissingIndicator from 'soapbox/components/missing_indicator'; const mapStateToProps = (state, { params: { username } }) => { const me = state.get('me'); diff --git a/app/gabsocial/features/preferences/components/settings_checkbox.js b/app/soapbox/features/preferences/components/settings_checkbox.js similarity index 93% rename from app/gabsocial/features/preferences/components/settings_checkbox.js rename to app/soapbox/features/preferences/components/settings_checkbox.js index ec43537bb..99132e21a 100644 --- a/app/gabsocial/features/preferences/components/settings_checkbox.js +++ b/app/soapbox/features/preferences/components/settings_checkbox.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import ImmutablePureComponent from 'react-immutable-pure-component'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { changeSetting } from 'gabsocial/actions/settings'; +import { changeSetting } from 'soapbox/actions/settings'; import { Checkbox } from '../../forms'; const mapStateToProps = state => ({ diff --git a/app/gabsocial/features/preferences/index.js b/app/soapbox/features/preferences/index.js similarity index 97% rename from app/gabsocial/features/preferences/index.js rename to app/soapbox/features/preferences/index.js index 5f48d2866..cc87f8680 100644 --- a/app/gabsocial/features/preferences/index.js +++ b/app/soapbox/features/preferences/index.js @@ -4,7 +4,7 @@ import { defineMessages, injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { changeSetting } from 'gabsocial/actions/settings'; +import { changeSetting } from 'soapbox/actions/settings'; import Column from '../ui/components/column'; import { SimpleForm, @@ -12,7 +12,7 @@ import { RadioGroup, RadioItem, SelectDropdown, -} from 'gabsocial/features/forms'; +} from 'soapbox/features/forms'; import SettingsCheckbox from './components/settings_checkbox'; const messages = defineMessages({ diff --git a/app/gabsocial/features/public_layout/components/footer.js b/app/soapbox/features/public_layout/components/footer.js similarity index 100% rename from app/gabsocial/features/public_layout/components/footer.js rename to app/soapbox/features/public_layout/components/footer.js diff --git a/app/gabsocial/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js similarity index 92% rename from app/gabsocial/features/public_layout/components/header.js rename to app/soapbox/features/public_layout/components/header.js index 16f367a13..51d3499ed 100644 --- a/app/gabsocial/features/public_layout/components/header.js +++ b/app/soapbox/features/public_layout/components/header.js @@ -1,7 +1,7 @@ import React from 'react'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { Link } from 'react-router-dom'; -import LoginForm from 'gabsocial/features/auth_login/components/login_form'; +import LoginForm from 'soapbox/features/auth_login/components/login_form'; import SiteLogo from './site_logo'; export default class Header extends ImmutablePureComponent { diff --git a/app/gabsocial/features/public_layout/components/site_banner.js b/app/soapbox/features/public_layout/components/site_banner.js similarity index 100% rename from app/gabsocial/features/public_layout/components/site_banner.js rename to app/soapbox/features/public_layout/components/site_banner.js diff --git a/app/gabsocial/features/public_layout/components/site_logo.js b/app/soapbox/features/public_layout/components/site_logo.js similarity index 100% rename from app/gabsocial/features/public_layout/components/site_logo.js rename to app/soapbox/features/public_layout/components/site_logo.js diff --git a/app/gabsocial/features/public_layout/index.js b/app/soapbox/features/public_layout/index.js similarity index 91% rename from app/gabsocial/features/public_layout/index.js rename to app/soapbox/features/public_layout/index.js index 857b0a56a..737220c47 100644 --- a/app/gabsocial/features/public_layout/index.js +++ b/app/soapbox/features/public_layout/index.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { Switch, Route } from 'react-router-dom'; -import NotificationsContainer from 'gabsocial/features/ui/containers/notifications_container'; +import NotificationsContainer from 'soapbox/features/ui/containers/notifications_container'; import Header from './components/header'; import Footer from './components/footer'; import LandingPage from '../landing_page'; diff --git a/app/gabsocial/features/public_timeline/components/column_settings.js b/app/soapbox/features/public_timeline/components/column_settings.js similarity index 100% rename from app/gabsocial/features/public_timeline/components/column_settings.js rename to app/soapbox/features/public_timeline/components/column_settings.js diff --git a/app/gabsocial/features/public_timeline/containers/column_settings_container.js b/app/soapbox/features/public_timeline/containers/column_settings_container.js similarity index 100% rename from app/gabsocial/features/public_timeline/containers/column_settings_container.js rename to app/soapbox/features/public_timeline/containers/column_settings_container.js diff --git a/app/gabsocial/features/public_timeline/index.js b/app/soapbox/features/public_timeline/index.js similarity index 98% rename from app/gabsocial/features/public_timeline/index.js rename to app/soapbox/features/public_timeline/index.js index 68ce0878a..1cf8f5ce1 100644 --- a/app/gabsocial/features/public_timeline/index.js +++ b/app/soapbox/features/public_timeline/index.js @@ -10,7 +10,7 @@ import ExplanationBox from '../ui/components/explanation_box'; import { expandPublicTimeline } from '../../actions/timelines'; import { connectPublicStream } from '../../actions/streaming'; import { Link } from 'react-router-dom'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ title: { id: 'column.public', defaultMessage: 'Federated timeline' }, diff --git a/app/gabsocial/features/reblogs/index.js b/app/soapbox/features/reblogs/index.js similarity index 100% rename from app/gabsocial/features/reblogs/index.js rename to app/soapbox/features/reblogs/index.js diff --git a/app/gabsocial/features/report/components/status_check_box.js b/app/soapbox/features/report/components/status_check_box.js similarity index 100% rename from app/gabsocial/features/report/components/status_check_box.js rename to app/soapbox/features/report/components/status_check_box.js diff --git a/app/gabsocial/features/report/containers/status_check_box_container.js b/app/soapbox/features/report/containers/status_check_box_container.js similarity index 100% rename from app/gabsocial/features/report/containers/status_check_box_container.js rename to app/soapbox/features/report/containers/status_check_box_container.js diff --git a/app/gabsocial/features/search/components/header.js b/app/soapbox/features/search/components/header.js similarity index 100% rename from app/gabsocial/features/search/components/header.js rename to app/soapbox/features/search/components/header.js diff --git a/app/gabsocial/features/search/index.js b/app/soapbox/features/search/index.js similarity index 60% rename from app/gabsocial/features/search/index.js rename to app/soapbox/features/search/index.js index d1941cec4..63ea292a3 100644 --- a/app/gabsocial/features/search/index.js +++ b/app/soapbox/features/search/index.js @@ -1,6 +1,6 @@ import React from 'react'; -import SearchContainer from 'gabsocial/features/compose/containers/search_container'; -import SearchResultsContainer from 'gabsocial/features/compose/containers/search_results_container'; +import SearchContainer from 'soapbox/features/compose/containers/search_container'; +import SearchResultsContainer from 'soapbox/features/compose/containers/search_results_container'; const Search = () => (
diff --git a/app/gabsocial/features/standalone/compose/index.js b/app/soapbox/features/standalone/compose/index.js similarity index 100% rename from app/gabsocial/features/standalone/compose/index.js rename to app/soapbox/features/standalone/compose/index.js diff --git a/app/gabsocial/features/standalone/hashtag_timeline/index.js b/app/soapbox/features/standalone/hashtag_timeline/index.js similarity index 90% rename from app/gabsocial/features/standalone/hashtag_timeline/index.js rename to app/soapbox/features/standalone/hashtag_timeline/index.js index bc0280fde..6bb162b6c 100644 --- a/app/gabsocial/features/standalone/hashtag_timeline/index.js +++ b/app/soapbox/features/standalone/hashtag_timeline/index.js @@ -2,12 +2,12 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { expandHashtagTimeline } from 'gabsocial/actions/timelines'; +import { expandHashtagTimeline } from 'soapbox/actions/timelines'; import Masonry from 'react-masonry-infinite'; import { List as ImmutableList } from 'immutable'; -import DetailedStatusContainer from 'gabsocial/features/status/containers/detailed_status_container'; +import DetailedStatusContainer from 'soapbox/features/status/containers/detailed_status_container'; import { debounce } from 'lodash'; -import LoadingIndicator from 'gabsocial/components/loading_indicator'; +import LoadingIndicator from 'soapbox/components/loading_indicator'; const mapStateToProps = (state, { hashtag }) => ({ statusIds: state.getIn(['timelines', `hashtag:${hashtag}`, 'items'], ImmutableList()), diff --git a/app/gabsocial/features/standalone/public_timeline/index.js b/app/soapbox/features/standalone/public_timeline/index.js similarity index 90% rename from app/gabsocial/features/standalone/public_timeline/index.js rename to app/soapbox/features/standalone/public_timeline/index.js index f700efe31..a509c2e04 100644 --- a/app/gabsocial/features/standalone/public_timeline/index.js +++ b/app/soapbox/features/standalone/public_timeline/index.js @@ -2,12 +2,12 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { expandPublicTimeline, expandCommunityTimeline } from 'gabsocial/actions/timelines'; +import { expandPublicTimeline, expandCommunityTimeline } from 'soapbox/actions/timelines'; import Masonry from 'react-masonry-infinite'; import { List as ImmutableList, Map as ImmutableMap } from 'immutable'; -import DetailedStatusContainer from 'gabsocial/features/status/containers/detailed_status_container'; +import DetailedStatusContainer from 'soapbox/features/status/containers/detailed_status_container'; import { debounce } from 'lodash'; -import LoadingIndicator from 'gabsocial/components/loading_indicator'; +import LoadingIndicator from 'soapbox/components/loading_indicator'; const mapStateToProps = (state, { local }) => { const timeline = state.getIn(['timelines', local ? 'community' : 'public'], ImmutableMap()); diff --git a/app/gabsocial/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js similarity index 97% rename from app/gabsocial/features/status/components/action_bar.js rename to app/soapbox/features/status/components/action_bar.js index a173aa62c..b3e6b3520 100644 --- a/app/gabsocial/features/status/components/action_bar.js +++ b/app/soapbox/features/status/components/action_bar.js @@ -2,14 +2,14 @@ import React from 'react'; import { connect } from 'react-redux'; import { openModal } from '../../../actions/modal'; import PropTypes from 'prop-types'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import IconButton from '../../../components/icon_button'; import ImmutablePropTypes from 'react-immutable-proptypes'; import DropdownMenuContainer from '../../../containers/dropdown_menu_container'; import { defineMessages, injectIntl } from 'react-intl'; -import { isStaff } from 'gabsocial/utils/accounts'; -import EmojiSelector from 'gabsocial/components/emoji_selector'; -import { getReactForStatus } from 'gabsocial/utils/emoji_reacts'; +import { isStaff } from 'soapbox/utils/accounts'; +import EmojiSelector from 'soapbox/components/emoji_selector'; +import { getReactForStatus } from 'soapbox/utils/emoji_reacts'; const messages = defineMessages({ delete: { id: 'status.delete', defaultMessage: 'Delete' }, diff --git a/app/gabsocial/features/status/components/card.js b/app/soapbox/features/status/components/card.js similarity index 99% rename from app/gabsocial/features/status/components/card.js rename to app/soapbox/features/status/components/card.js index fe02a9bf4..af2308461 100644 --- a/app/gabsocial/features/status/components/card.js +++ b/app/soapbox/features/status/components/card.js @@ -4,7 +4,7 @@ import Immutable from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import punycode from 'punycode'; import classnames from 'classnames'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const IDNA_PREFIX = 'xn--'; diff --git a/app/gabsocial/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js similarity index 96% rename from app/gabsocial/features/status/components/detailed_status.js rename to app/soapbox/features/status/components/detailed_status.js index b18ad11e0..558c6d9b7 100644 --- a/app/gabsocial/features/status/components/detailed_status.js +++ b/app/soapbox/features/status/components/detailed_status.js @@ -12,8 +12,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import Video from '../../video'; import scheduleIdleTask from '../../ui/util/schedule_idle_task'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; -import PollContainer from 'gabsocial/containers/poll_container'; +import Icon from 'soapbox/components/icon'; +import PollContainer from 'soapbox/containers/poll_container'; import { StatusInteractionBar } from './status_interaction_bar'; export default class DetailedStatus extends ImmutablePureComponent { @@ -77,7 +77,7 @@ export default class DetailedStatus extends ImmutablePureComponent { href = e.target.href; } - window.open(href, 'gabsocial-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes'); + window.open(href, 'soapbox-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes'); } render() { diff --git a/app/gabsocial/features/status/components/status_interaction_bar.js b/app/soapbox/features/status/components/status_interaction_bar.js similarity index 88% rename from app/gabsocial/features/status/components/status_interaction_bar.js rename to app/soapbox/features/status/components/status_interaction_bar.js index 4746dd692..1ee5de211 100644 --- a/app/gabsocial/features/status/components/status_interaction_bar.js +++ b/app/soapbox/features/status/components/status_interaction_bar.js @@ -1,8 +1,8 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import emojify from 'gabsocial/features/emoji/emoji'; -import { reduceEmoji } from 'gabsocial/utils/emoji_reacts'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; +import emojify from 'soapbox/features/emoji/emoji'; +import { reduceEmoji } from 'soapbox/utils/emoji_reacts'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; export class StatusInteractionBar extends React.Component { diff --git a/app/gabsocial/features/status/containers/detailed_status_container.js b/app/soapbox/features/status/containers/detailed_status_container.js similarity index 99% rename from app/gabsocial/features/status/containers/detailed_status_container.js rename to app/soapbox/features/status/containers/detailed_status_container.js index 572eca926..7c78a2e4e 100644 --- a/app/gabsocial/features/status/containers/detailed_status_container.js +++ b/app/soapbox/features/status/containers/detailed_status_container.js @@ -28,7 +28,7 @@ import { initReport } from '../../../actions/reports'; import { openModal } from '../../../actions/modal'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { showAlertForError } from '../../../actions/alerts'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, diff --git a/app/gabsocial/features/status/index.js b/app/soapbox/features/status/index.js similarity index 99% rename from app/gabsocial/features/status/index.js rename to app/soapbox/features/status/index.js index 12527613b..be2227311 100644 --- a/app/gabsocial/features/status/index.js +++ b/app/soapbox/features/status/index.js @@ -42,8 +42,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { HotKeys } from 'react-hotkeys'; import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen'; import { textForScreenReader, defaultMediaVisibility } from '../../components/status'; -import Icon from 'gabsocial/components/icon'; -import { getSettings } from 'gabsocial/actions/settings'; +import Icon from 'soapbox/components/icon'; +import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' }, diff --git a/app/gabsocial/features/ui/components/actions_modal.js b/app/soapbox/features/ui/components/actions_modal.js similarity index 100% rename from app/gabsocial/features/ui/components/actions_modal.js rename to app/soapbox/features/ui/components/actions_modal.js diff --git a/app/gabsocial/features/ui/components/boost_modal.js b/app/soapbox/features/ui/components/boost_modal.js similarity index 98% rename from app/gabsocial/features/ui/components/boost_modal.js rename to app/soapbox/features/ui/components/boost_modal.js index 8b5618f86..46dc1ab42 100644 --- a/app/gabsocial/features/ui/components/boost_modal.js +++ b/app/soapbox/features/ui/components/boost_modal.js @@ -8,7 +8,7 @@ import Avatar from '../../../components/avatar'; import RelativeTimestamp from '../../../components/relative_timestamp'; import DisplayName from '../../../components/display_name'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ cancel_reblog: { id: 'status.cancel_reblog_private', defaultMessage: 'Un-repost' }, diff --git a/app/gabsocial/features/ui/components/bundle.js b/app/soapbox/features/ui/components/bundle.js similarity index 100% rename from app/gabsocial/features/ui/components/bundle.js rename to app/soapbox/features/ui/components/bundle.js diff --git a/app/gabsocial/features/ui/components/bundle_column_error.js b/app/soapbox/features/ui/components/bundle_column_error.js similarity index 100% rename from app/gabsocial/features/ui/components/bundle_column_error.js rename to app/soapbox/features/ui/components/bundle_column_error.js diff --git a/app/gabsocial/features/ui/components/bundle_modal_error.js b/app/soapbox/features/ui/components/bundle_modal_error.js similarity index 100% rename from app/gabsocial/features/ui/components/bundle_modal_error.js rename to app/soapbox/features/ui/components/bundle_modal_error.js diff --git a/app/gabsocial/features/ui/components/column.js b/app/soapbox/features/ui/components/column.js similarity index 100% rename from app/gabsocial/features/ui/components/column.js rename to app/soapbox/features/ui/components/column.js diff --git a/app/gabsocial/features/ui/components/column_header.js b/app/soapbox/features/ui/components/column_header.js similarity index 94% rename from app/gabsocial/features/ui/components/column_header.js rename to app/soapbox/features/ui/components/column_header.js index 03c73bc3c..6ff52e44f 100644 --- a/app/gabsocial/features/ui/components/column_header.js +++ b/app/soapbox/features/ui/components/column_header.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; export default class ColumnHeader extends React.PureComponent { diff --git a/app/gabsocial/features/ui/components/column_link.js b/app/soapbox/features/ui/components/column_link.js similarity index 95% rename from app/gabsocial/features/ui/components/column_link.js rename to app/soapbox/features/ui/components/column_link.js index e384c3fd4..3522dbfaf 100644 --- a/app/gabsocial/features/ui/components/column_link.js +++ b/app/soapbox/features/ui/components/column_link.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Link } from 'react-router-dom'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const ColumnLink = ({ icon, text, to, href, method, badge }) => { const badgeElement = typeof badge !== 'undefined' ? {badge} : null; diff --git a/app/gabsocial/features/ui/components/column_loading.js b/app/soapbox/features/ui/components/column_loading.js similarity index 100% rename from app/gabsocial/features/ui/components/column_loading.js rename to app/soapbox/features/ui/components/column_loading.js diff --git a/app/gabsocial/features/ui/components/column_subheading.js b/app/soapbox/features/ui/components/column_subheading.js similarity index 100% rename from app/gabsocial/features/ui/components/column_subheading.js rename to app/soapbox/features/ui/components/column_subheading.js diff --git a/app/gabsocial/features/ui/components/columns_area.js b/app/soapbox/features/ui/components/columns_area.js similarity index 100% rename from app/gabsocial/features/ui/components/columns_area.js rename to app/soapbox/features/ui/components/columns_area.js diff --git a/app/gabsocial/features/ui/components/compose_modal.js b/app/soapbox/features/ui/components/compose_modal.js similarity index 97% rename from app/gabsocial/features/ui/components/compose_modal.js rename to app/soapbox/features/ui/components/compose_modal.js index 9cd41a9a0..1a3aae011 100644 --- a/app/gabsocial/features/ui/components/compose_modal.js +++ b/app/soapbox/features/ui/components/compose_modal.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import ComposeFormContainer from '../../compose/containers/compose_form_container'; -import IconButton from 'gabsocial/components/icon_button'; +import IconButton from 'soapbox/components/icon_button'; import { openModal } from '../../../actions/modal'; import { cancelReplyCompose } from '../../../actions/compose'; diff --git a/app/gabsocial/features/ui/components/confirmation_modal.js b/app/soapbox/features/ui/components/confirmation_modal.js similarity index 100% rename from app/gabsocial/features/ui/components/confirmation_modal.js rename to app/soapbox/features/ui/components/confirmation_modal.js diff --git a/app/gabsocial/features/ui/components/drawer_loading.js b/app/soapbox/features/ui/components/drawer_loading.js similarity index 100% rename from app/gabsocial/features/ui/components/drawer_loading.js rename to app/soapbox/features/ui/components/drawer_loading.js diff --git a/app/gabsocial/features/ui/components/embed_modal.js b/app/soapbox/features/ui/components/embed_modal.js similarity index 100% rename from app/gabsocial/features/ui/components/embed_modal.js rename to app/soapbox/features/ui/components/embed_modal.js diff --git a/app/gabsocial/features/ui/components/explanation_box.js b/app/soapbox/features/ui/components/explanation_box.js similarity index 100% rename from app/gabsocial/features/ui/components/explanation_box.js rename to app/soapbox/features/ui/components/explanation_box.js diff --git a/app/gabsocial/features/ui/components/focal_point_modal.js b/app/soapbox/features/ui/components/focal_point_modal.js similarity index 100% rename from app/gabsocial/features/ui/components/focal_point_modal.js rename to app/soapbox/features/ui/components/focal_point_modal.js diff --git a/app/gabsocial/features/ui/components/follow_requests_nav_link.js b/app/soapbox/features/ui/components/follow_requests_nav_link.js similarity index 90% rename from app/gabsocial/features/ui/components/follow_requests_nav_link.js rename to app/soapbox/features/ui/components/follow_requests_nav_link.js index 1fb45c594..132637fa0 100644 --- a/app/gabsocial/features/ui/components/follow_requests_nav_link.js +++ b/app/soapbox/features/ui/components/follow_requests_nav_link.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { fetchFollowRequests } from 'gabsocial/actions/accounts'; +import { fetchFollowRequests } from 'soapbox/actions/accounts'; import { connect } from 'react-redux'; import { NavLink, withRouter } from 'react-router-dom'; -import IconWithBadge from 'gabsocial/components/icon_with_badge'; +import IconWithBadge from 'soapbox/components/icon_with_badge'; import { List as ImmutableList } from 'immutable'; import { FormattedMessage } from 'react-intl'; diff --git a/app/gabsocial/features/ui/components/funding_panel.js b/app/soapbox/features/ui/components/funding_panel.js similarity index 97% rename from app/gabsocial/features/ui/components/funding_panel.js rename to app/soapbox/features/ui/components/funding_panel.js index 9720129ea..7650c8cdf 100644 --- a/app/gabsocial/features/ui/components/funding_panel.js +++ b/app/soapbox/features/ui/components/funding_panel.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import { injectIntl } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import ProgressBar from '../../../components/progress_bar'; -import { fetchFunding } from 'gabsocial/actions/patron'; +import { fetchFunding } from 'soapbox/actions/patron'; class FundingPanel extends ImmutablePureComponent { diff --git a/app/gabsocial/features/ui/components/hotkeys_modal.js b/app/soapbox/features/ui/components/hotkeys_modal.js similarity index 99% rename from app/gabsocial/features/ui/components/hotkeys_modal.js rename to app/soapbox/features/ui/components/hotkeys_modal.js index a402ce396..7768fae77 100644 --- a/app/gabsocial/features/ui/components/hotkeys_modal.js +++ b/app/soapbox/features/ui/components/hotkeys_modal.js @@ -2,7 +2,7 @@ import React from 'react'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import IconButton from 'gabsocial/components/icon_button'; +import IconButton from 'soapbox/components/icon_button'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/gabsocial/features/ui/components/image_loader.js b/app/soapbox/features/ui/components/image_loader.js similarity index 100% rename from app/gabsocial/features/ui/components/image_loader.js rename to app/soapbox/features/ui/components/image_loader.js diff --git a/app/gabsocial/features/ui/components/link_footer.js b/app/soapbox/features/ui/components/link_footer.js similarity index 95% rename from app/gabsocial/features/ui/components/link_footer.js rename to app/soapbox/features/ui/components/link_footer.js index d8b59a27a..cd7d35478 100644 --- a/app/gabsocial/features/ui/components/link_footer.js +++ b/app/soapbox/features/ui/components/link_footer.js @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import { FormattedMessage, injectIntl } from 'react-intl'; import { Link } from 'react-router-dom'; -import { invitesEnabled } from 'gabsocial/initial_state'; +import { invitesEnabled } from 'soapbox/initial_state'; import { connect } from 'react-redux'; import { openModal } from '../../../actions/modal'; -import { logOut } from 'gabsocial/actions/auth'; +import { logOut } from 'soapbox/actions/auth'; // FIXME: Let this be configured const sourceCode = { diff --git a/app/gabsocial/features/ui/components/list_panel.js b/app/soapbox/features/ui/components/list_panel.js similarity index 93% rename from app/gabsocial/features/ui/components/list_panel.js rename to app/soapbox/features/ui/components/list_panel.js index d0af67c0c..74ce8a889 100644 --- a/app/gabsocial/features/ui/components/list_panel.js +++ b/app/soapbox/features/ui/components/list_panel.js @@ -2,11 +2,11 @@ import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import { fetchLists } from 'gabsocial/actions/lists'; +import { fetchLists } from 'soapbox/actions/lists'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import { NavLink, withRouter } from 'react-router-dom'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const getOrderedLists = createSelector([state => state.get('lists')], lists => { if (!lists) { diff --git a/app/gabsocial/features/ui/components/media_modal.js b/app/soapbox/features/ui/components/media_modal.js similarity index 96% rename from app/gabsocial/features/ui/components/media_modal.js rename to app/soapbox/features/ui/components/media_modal.js index a95033d90..e0cdc39c4 100644 --- a/app/gabsocial/features/ui/components/media_modal.js +++ b/app/soapbox/features/ui/components/media_modal.js @@ -2,14 +2,14 @@ import React from 'react'; import ReactSwipeableViews from 'react-swipeable-views'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; -import Video from 'gabsocial/features/video'; -import ExtendedVideoPlayer from 'gabsocial/components/extended_video_player'; +import Video from 'soapbox/features/video'; +import ExtendedVideoPlayer from 'soapbox/components/extended_video_player'; import classNames from 'classnames'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; -import IconButton from 'gabsocial/components/icon_button'; +import IconButton from 'soapbox/components/icon_button'; import ImmutablePureComponent from 'react-immutable-pure-component'; import ImageLoader from './image_loader'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/gabsocial/features/ui/components/modal_loading.js b/app/soapbox/features/ui/components/modal_loading.js similarity index 100% rename from app/gabsocial/features/ui/components/modal_loading.js rename to app/soapbox/features/ui/components/modal_loading.js diff --git a/app/gabsocial/features/ui/components/modal_root.js b/app/soapbox/features/ui/components/modal_root.js similarity index 100% rename from app/gabsocial/features/ui/components/modal_root.js rename to app/soapbox/features/ui/components/modal_root.js diff --git a/app/gabsocial/features/ui/components/mute_modal.js b/app/soapbox/features/ui/components/mute_modal.js similarity index 100% rename from app/gabsocial/features/ui/components/mute_modal.js rename to app/soapbox/features/ui/components/mute_modal.js diff --git a/app/gabsocial/features/ui/components/notifications_counter_icon.js b/app/soapbox/features/ui/components/notifications_counter_icon.js similarity index 75% rename from app/gabsocial/features/ui/components/notifications_counter_icon.js rename to app/soapbox/features/ui/components/notifications_counter_icon.js index af4e0e8f5..a2c3039cb 100644 --- a/app/gabsocial/features/ui/components/notifications_counter_icon.js +++ b/app/soapbox/features/ui/components/notifications_counter_icon.js @@ -1,5 +1,5 @@ import { connect } from 'react-redux'; -import IconWithBadge from 'gabsocial/components/icon_with_badge'; +import IconWithBadge from 'soapbox/components/icon_with_badge'; const mapStateToProps = state => ({ count: state.getIn(['notifications', 'unread']), diff --git a/app/gabsocial/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js similarity index 93% rename from app/gabsocial/features/ui/components/profile_info_panel.js rename to app/soapbox/features/ui/components/profile_info_panel.js index 00554f93a..a3a4587a0 100644 --- a/app/gabsocial/features/ui/components/profile_info_panel.js +++ b/app/soapbox/features/ui/components/profile_info_panel.js @@ -6,14 +6,14 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Icon from 'gabsocial/components/icon'; -import VerificationBadge from 'gabsocial/components/verification_badge'; -import Badge from 'gabsocial/components/badge'; -import ProBadge from 'gabsocial/components/pro_badge'; -import DonorBadge from 'gabsocial/components/donor_badge'; -import InvestorBadge from 'gabsocial/components/investor_badge'; +import Icon from 'soapbox/components/icon'; +import VerificationBadge from 'soapbox/components/verification_badge'; +import Badge from 'soapbox/components/badge'; +import ProBadge from 'soapbox/components/pro_badge'; +import DonorBadge from 'soapbox/components/donor_badge'; +import InvestorBadge from 'soapbox/components/investor_badge'; import { List as ImmutableList } from 'immutable'; -import { acctFull, isAdmin, isModerator } from 'gabsocial/utils/accounts'; +import { acctFull, isAdmin, isModerator } from 'soapbox/utils/accounts'; const messages = defineMessages({ linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' }, diff --git a/app/gabsocial/features/ui/components/promo_panel.js b/app/soapbox/features/ui/components/promo_panel.js similarity index 95% rename from app/gabsocial/features/ui/components/promo_panel.js rename to app/soapbox/features/ui/components/promo_panel.js index e434a5843..06f686f2f 100644 --- a/app/gabsocial/features/ui/components/promo_panel.js +++ b/app/soapbox/features/ui/components/promo_panel.js @@ -1,6 +1,6 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import { connect } from 'react-redux'; const mapStateToProps = state => ({ diff --git a/app/gabsocial/features/ui/components/report_modal.js b/app/soapbox/features/ui/components/report_modal.js similarity index 100% rename from app/gabsocial/features/ui/components/report_modal.js rename to app/soapbox/features/ui/components/report_modal.js diff --git a/app/gabsocial/features/ui/components/sign_up_panel.js b/app/soapbox/features/ui/components/sign_up_panel.js similarity index 94% rename from app/gabsocial/features/ui/components/sign_up_panel.js rename to app/soapbox/features/ui/components/sign_up_panel.js index 1a229ae06..8ebd43fd0 100644 --- a/app/gabsocial/features/ui/components/sign_up_panel.js +++ b/app/soapbox/features/ui/components/sign_up_panel.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import { connect } from 'react-redux'; import { FormattedMessage, injectIntl } from 'react-intl'; diff --git a/app/gabsocial/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js similarity index 97% rename from app/gabsocial/features/ui/components/tabs_bar.js rename to app/soapbox/features/ui/components/tabs_bar.js index 87e7126d1..9f6d2b35b 100644 --- a/app/gabsocial/features/ui/components/tabs_bar.js +++ b/app/soapbox/features/ui/components/tabs_bar.js @@ -7,9 +7,9 @@ import { throttle } from 'lodash'; import { connect } from 'react-redux'; import classNames from 'classnames'; import NotificationsCounterIcon from './notifications_counter_icon'; -import SearchContainer from 'gabsocial/features/compose/containers/search_container'; +import SearchContainer from 'soapbox/features/compose/containers/search_container'; import Avatar from '../../../components/avatar'; -import ActionBar from 'gabsocial/features/compose/components/action_bar'; +import ActionBar from 'soapbox/features/compose/components/action_bar'; import { openModal } from '../../../actions/modal'; import { openSidebar } from '../../../actions/sidebar'; import Icon from '../../../components/icon'; diff --git a/app/gabsocial/features/ui/components/trends_panel.js b/app/soapbox/features/ui/components/trends_panel.js similarity index 97% rename from app/gabsocial/features/ui/components/trends_panel.js rename to app/soapbox/features/ui/components/trends_panel.js index 704d35f45..f47390a00 100644 --- a/app/gabsocial/features/ui/components/trends_panel.js +++ b/app/soapbox/features/ui/components/trends_panel.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { fetchTrends } from '../../../actions/trends'; import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import Hashtag from '../../../components/hashtag'; class TrendsPanel extends ImmutablePureComponent { diff --git a/app/gabsocial/features/ui/components/unauthorized_modal.js b/app/soapbox/features/ui/components/unauthorized_modal.js similarity index 97% rename from app/gabsocial/features/ui/components/unauthorized_modal.js rename to app/soapbox/features/ui/components/unauthorized_modal.js index 9273a6f63..f369568b2 100644 --- a/app/gabsocial/features/ui/components/unauthorized_modal.js +++ b/app/soapbox/features/ui/components/unauthorized_modal.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import IconButton from 'gabsocial/components/icon_button'; +import IconButton from 'soapbox/components/icon_button'; const messages = defineMessages({ close: { id: 'lightbox.close', defaultMessage: 'Close' }, diff --git a/app/gabsocial/features/ui/components/upload_area.js b/app/soapbox/features/ui/components/upload_area.js similarity index 100% rename from app/gabsocial/features/ui/components/upload_area.js rename to app/soapbox/features/ui/components/upload_area.js diff --git a/app/gabsocial/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js similarity index 94% rename from app/gabsocial/features/ui/components/user_panel.js rename to app/soapbox/features/ui/components/user_panel.js index 8b86107ad..d434ff4cc 100644 --- a/app/gabsocial/features/ui/components/user_panel.js +++ b/app/soapbox/features/ui/components/user_panel.js @@ -6,10 +6,10 @@ import { injectIntl, FormattedMessage } from 'react-intl'; import { makeGetAccount } from '../../../selectors'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Avatar from 'gabsocial/components/avatar'; -import { shortNumberFormat } from 'gabsocial/utils/numbers'; -import { acctFull } from 'gabsocial/utils/accounts'; -import { getSettings } from 'gabsocial/actions/settings'; +import Avatar from 'soapbox/components/avatar'; +import { shortNumberFormat } from 'soapbox/utils/numbers'; +import { acctFull } from 'soapbox/utils/accounts'; +import { getSettings } from 'soapbox/actions/settings'; class UserPanel extends ImmutablePureComponent { diff --git a/app/gabsocial/features/ui/components/video_modal.js b/app/soapbox/features/ui/components/video_modal.js similarity index 97% rename from app/gabsocial/features/ui/components/video_modal.js rename to app/soapbox/features/ui/components/video_modal.js index 9f4c2e9b8..e0aecb669 100644 --- a/app/gabsocial/features/ui/components/video_modal.js +++ b/app/soapbox/features/ui/components/video_modal.js @@ -1,7 +1,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; -import Video from 'gabsocial/features/video'; +import Video from 'soapbox/features/video'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { FormattedMessage } from 'react-intl'; diff --git a/app/gabsocial/features/ui/components/who_to_follow_panel.js b/app/soapbox/features/ui/components/who_to_follow_panel.js similarity index 98% rename from app/gabsocial/features/ui/components/who_to_follow_panel.js rename to app/soapbox/features/ui/components/who_to_follow_panel.js index 5ffb8d126..1ca18a6a3 100644 --- a/app/gabsocial/features/ui/components/who_to_follow_panel.js +++ b/app/soapbox/features/ui/components/who_to_follow_panel.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { fetchSuggestions, dismissSuggestion } from '../../../actions/suggestions'; import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import AccountContainer from '../../../containers/account_container'; const messages = defineMessages({ diff --git a/app/gabsocial/features/ui/components/zoomable_image.js b/app/soapbox/features/ui/components/zoomable_image.js similarity index 100% rename from app/gabsocial/features/ui/components/zoomable_image.js rename to app/soapbox/features/ui/components/zoomable_image.js diff --git a/app/gabsocial/features/ui/containers/bundle_container.js b/app/soapbox/features/ui/containers/bundle_container.js similarity index 100% rename from app/gabsocial/features/ui/containers/bundle_container.js rename to app/soapbox/features/ui/containers/bundle_container.js diff --git a/app/gabsocial/features/ui/containers/columns_area_container.js b/app/soapbox/features/ui/containers/columns_area_container.js similarity index 82% rename from app/gabsocial/features/ui/containers/columns_area_container.js rename to app/soapbox/features/ui/containers/columns_area_container.js index 5a9922b4c..05f99cc75 100644 --- a/app/gabsocial/features/ui/containers/columns_area_container.js +++ b/app/soapbox/features/ui/containers/columns_area_container.js @@ -1,6 +1,6 @@ import { connect } from 'react-redux'; import ColumnsArea from '../components/columns_area'; -import { getSettings } from 'gabsocial/actions/settings'; +import { getSettings } from 'soapbox/actions/settings'; const mapStateToProps = state => ({ columns: getSettings(state).get('columns'), diff --git a/app/gabsocial/features/ui/containers/loading_bar_container.js b/app/soapbox/features/ui/containers/loading_bar_container.js similarity index 100% rename from app/gabsocial/features/ui/containers/loading_bar_container.js rename to app/soapbox/features/ui/containers/loading_bar_container.js diff --git a/app/gabsocial/features/ui/containers/modal_container.js b/app/soapbox/features/ui/containers/modal_container.js similarity index 100% rename from app/gabsocial/features/ui/containers/modal_container.js rename to app/soapbox/features/ui/containers/modal_container.js diff --git a/app/gabsocial/features/ui/containers/notifications_container.js b/app/soapbox/features/ui/containers/notifications_container.js similarity index 100% rename from app/gabsocial/features/ui/containers/notifications_container.js rename to app/soapbox/features/ui/containers/notifications_container.js diff --git a/app/gabsocial/features/ui/containers/status_list_container.js b/app/soapbox/features/ui/containers/status_list_container.js similarity index 97% rename from app/gabsocial/features/ui/containers/status_list_container.js rename to app/soapbox/features/ui/containers/status_list_container.js index d73cc9881..307dff09d 100644 --- a/app/gabsocial/features/ui/containers/status_list_container.js +++ b/app/soapbox/features/ui/containers/status_list_container.js @@ -3,7 +3,7 @@ import StatusList from '../../../components/status_list'; import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; import { createSelector } from 'reselect'; import { debounce } from 'lodash'; -import { dequeueTimeline } from 'gabsocial/actions/timelines'; +import { dequeueTimeline } from 'soapbox/actions/timelines'; import { scrollTopTimeline } from '../../../actions/timelines'; const makeGetStatusIds = () => createSelector([ diff --git a/app/gabsocial/features/ui/index.js b/app/soapbox/features/ui/index.js similarity index 98% rename from app/gabsocial/features/ui/index.js rename to app/soapbox/features/ui/index.js index 98c53204f..1a510a4e6 100644 --- a/app/gabsocial/features/ui/index.js +++ b/app/soapbox/features/ui/index.js @@ -7,7 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl'; import { connect } from 'react-redux'; import { Switch, withRouter } from 'react-router-dom'; import PropTypes from 'prop-types'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import NotificationsContainer from './containers/notifications_container'; import LoadingBarContainer from './containers/loading_bar_container'; import ModalContainer from './containers/modal_container'; @@ -24,16 +24,16 @@ import UploadArea from './components/upload_area'; import TabsBar from './components/tabs_bar'; import WhoToFollowPanel from './components/who_to_follow_panel'; import LinkFooter from './components/link_footer'; -import ProfilePage from 'gabsocial/pages/profile_page'; -// import GroupsPage from 'gabsocial/pages/groups_page'; -// import GroupPage from 'gabsocial/pages/group_page'; +import ProfilePage from 'soapbox/pages/profile_page'; +// import GroupsPage from 'soapbox/pages/groups_page'; +// import GroupPage from 'soapbox/pages/group_page'; // import GroupSidebarPanel from '../groups/sidebar_panel'; -import SearchPage from 'gabsocial/pages/search_page'; -import HomePage from 'gabsocial/pages/home_page'; +import SearchPage from 'soapbox/pages/search_page'; +import HomePage from 'soapbox/pages/home_page'; import SidebarMenu from '../../components/sidebar_menu'; import { connectUserStream } from '../../actions/streaming'; import { Redirect } from 'react-router-dom'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import { Status, diff --git a/app/gabsocial/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js similarity index 100% rename from app/gabsocial/features/ui/util/async-components.js rename to app/soapbox/features/ui/util/async-components.js diff --git a/app/gabsocial/features/ui/util/fullscreen.js b/app/soapbox/features/ui/util/fullscreen.js similarity index 100% rename from app/gabsocial/features/ui/util/fullscreen.js rename to app/soapbox/features/ui/util/fullscreen.js diff --git a/app/gabsocial/features/ui/util/get_rect_from_entry.js b/app/soapbox/features/ui/util/get_rect_from_entry.js similarity index 100% rename from app/gabsocial/features/ui/util/get_rect_from_entry.js rename to app/soapbox/features/ui/util/get_rect_from_entry.js diff --git a/app/gabsocial/features/ui/util/intersection_observer_wrapper.js b/app/soapbox/features/ui/util/intersection_observer_wrapper.js similarity index 100% rename from app/gabsocial/features/ui/util/intersection_observer_wrapper.js rename to app/soapbox/features/ui/util/intersection_observer_wrapper.js diff --git a/app/gabsocial/features/ui/util/optional_motion.js b/app/soapbox/features/ui/util/optional_motion.js similarity index 100% rename from app/gabsocial/features/ui/util/optional_motion.js rename to app/soapbox/features/ui/util/optional_motion.js diff --git a/app/gabsocial/features/ui/util/react_router_helpers.js b/app/soapbox/features/ui/util/react_router_helpers.js similarity index 97% rename from app/gabsocial/features/ui/util/react_router_helpers.js rename to app/soapbox/features/ui/util/react_router_helpers.js index fb855ddcb..ceffd0daa 100644 --- a/app/gabsocial/features/ui/util/react_router_helpers.js +++ b/app/soapbox/features/ui/util/react_router_helpers.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; -import SoapboxPropTypes from 'gabsocial/utils/soapbox_prop_types'; +import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import { Redirect, Route } from 'react-router-dom'; import ColumnsAreaContainer from '../containers/columns_area_container'; import ColumnLoading from '../components/column_loading'; diff --git a/app/gabsocial/features/ui/util/reduced_motion.js b/app/soapbox/features/ui/util/reduced_motion.js similarity index 100% rename from app/gabsocial/features/ui/util/reduced_motion.js rename to app/soapbox/features/ui/util/reduced_motion.js diff --git a/app/gabsocial/features/ui/util/schedule_idle_task.js b/app/soapbox/features/ui/util/schedule_idle_task.js similarity index 100% rename from app/gabsocial/features/ui/util/schedule_idle_task.js rename to app/soapbox/features/ui/util/schedule_idle_task.js diff --git a/app/gabsocial/features/video/index.js b/app/soapbox/features/video/index.js similarity index 99% rename from app/gabsocial/features/video/index.js rename to app/soapbox/features/video/index.js index 6a04d778d..68e4fdc66 100644 --- a/app/gabsocial/features/video/index.js +++ b/app/soapbox/features/video/index.js @@ -6,7 +6,7 @@ import { throttle } from 'lodash'; import classNames from 'classnames'; import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen'; import { displayMedia } from '../../initial_state'; -import Icon from 'gabsocial/components/icon'; +import Icon from 'soapbox/components/icon'; import { decode } from 'blurhash'; import { isPanoramic, isPortrait, minimumAspectRatio, maximumAspectRatio } from '../../utils/media_aspect_ratio'; diff --git a/app/gabsocial/initial_state.js b/app/soapbox/initial_state.js similarity index 100% rename from app/gabsocial/initial_state.js rename to app/soapbox/initial_state.js diff --git a/app/gabsocial/is_mobile.js b/app/soapbox/is_mobile.js similarity index 100% rename from app/gabsocial/is_mobile.js rename to app/soapbox/is_mobile.js diff --git a/app/gabsocial/load_polyfills.js b/app/soapbox/load_polyfills.js similarity index 100% rename from app/gabsocial/load_polyfills.js rename to app/soapbox/load_polyfills.js diff --git a/app/gabsocial/locales/ar.json b/app/soapbox/locales/ar.json similarity index 100% rename from app/gabsocial/locales/ar.json rename to app/soapbox/locales/ar.json diff --git a/app/gabsocial/locales/ast.json b/app/soapbox/locales/ast.json similarity index 100% rename from app/gabsocial/locales/ast.json rename to app/soapbox/locales/ast.json diff --git a/app/gabsocial/locales/bg.json b/app/soapbox/locales/bg.json similarity index 100% rename from app/gabsocial/locales/bg.json rename to app/soapbox/locales/bg.json diff --git a/app/gabsocial/locales/bn.json b/app/soapbox/locales/bn.json similarity index 100% rename from app/gabsocial/locales/bn.json rename to app/soapbox/locales/bn.json diff --git a/app/gabsocial/locales/br.json b/app/soapbox/locales/br.json similarity index 100% rename from app/gabsocial/locales/br.json rename to app/soapbox/locales/br.json diff --git a/app/gabsocial/locales/ca.json b/app/soapbox/locales/ca.json similarity index 100% rename from app/gabsocial/locales/ca.json rename to app/soapbox/locales/ca.json diff --git a/app/gabsocial/locales/co.json b/app/soapbox/locales/co.json similarity index 100% rename from app/gabsocial/locales/co.json rename to app/soapbox/locales/co.json diff --git a/app/gabsocial/locales/cs.json b/app/soapbox/locales/cs.json similarity index 100% rename from app/gabsocial/locales/cs.json rename to app/soapbox/locales/cs.json diff --git a/app/gabsocial/locales/cy.json b/app/soapbox/locales/cy.json similarity index 100% rename from app/gabsocial/locales/cy.json rename to app/soapbox/locales/cy.json diff --git a/app/gabsocial/locales/da.json b/app/soapbox/locales/da.json similarity index 100% rename from app/gabsocial/locales/da.json rename to app/soapbox/locales/da.json diff --git a/app/gabsocial/locales/de.json b/app/soapbox/locales/de.json similarity index 100% rename from app/gabsocial/locales/de.json rename to app/soapbox/locales/de.json diff --git a/app/gabsocial/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json similarity index 89% rename from app/gabsocial/locales/defaultMessages.json rename to app/soapbox/locales/defaultMessages.json index 11875e3b8..5def1219d 100644 --- a/app/gabsocial/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -10,7 +10,7 @@ "id": "alert.unexpected.message" } ], - "path": "app/gabsocial/actions/alerts.json" + "path": "app/soapbox/actions/alerts.json" }, { "descriptors": [ @@ -23,7 +23,7 @@ "id": "upload_error.poll" } ], - "path": "app/gabsocial/actions/compose.json" + "path": "app/soapbox/actions/compose.json" }, { "descriptors": [ @@ -36,7 +36,7 @@ "id": "notifications.group" } ], - "path": "app/gabsocial/actions/notifications.json" + "path": "app/soapbox/actions/notifications.json" }, { "descriptors": [ @@ -73,7 +73,7 @@ "id": "account.follows_you" } ], - "path": "app/gabsocial/components/account.json" + "path": "app/soapbox/components/account.json" }, { "descriptors": [ @@ -82,7 +82,7 @@ "id": "column_back_button.label" } ], - "path": "app/gabsocial/components/column_back_button_slim.json" + "path": "app/soapbox/components/column_back_button_slim.json" }, { "descriptors": [ @@ -91,7 +91,7 @@ "id": "column_back_button.label" } ], - "path": "app/gabsocial/components/column_back_button.json" + "path": "app/soapbox/components/column_back_button.json" }, { "descriptors": [ @@ -104,7 +104,7 @@ "id": "column_header.hide_settings" } ], - "path": "app/gabsocial/components/column_header.json" + "path": "app/soapbox/components/column_header.json" }, { "descriptors": [ @@ -113,7 +113,7 @@ "id": "account.unblock_domain" } ], - "path": "app/gabsocial/components/domain.json" + "path": "app/soapbox/components/domain.json" }, { "descriptors": [ @@ -122,7 +122,7 @@ "id": "alert.unexpected.message" } ], - "path": "app/gabsocial/components/error_boundary.json" + "path": "app/soapbox/components/error_boundary.json" }, { "descriptors": [ @@ -131,7 +131,7 @@ "id": "trends.count_by_accounts" } ], - "path": "app/gabsocial/components/hashtag.json" + "path": "app/soapbox/components/hashtag.json" }, { "descriptors": [ @@ -156,7 +156,7 @@ "id": "home_column.lists" } ], - "path": "app/gabsocial/components/home_column_header.json" + "path": "app/soapbox/components/home_column_header.json" }, { "descriptors": [ @@ -165,7 +165,7 @@ "id": "status.load_more" } ], - "path": "app/gabsocial/components/load_gap.json" + "path": "app/soapbox/components/load_gap.json" }, { "descriptors": [ @@ -174,7 +174,7 @@ "id": "status.load_more" } ], - "path": "app/gabsocial/components/load_more.json" + "path": "app/soapbox/components/load_more.json" }, { "descriptors": [ @@ -183,7 +183,7 @@ "id": "loading_indicator.label" } ], - "path": "app/gabsocial/components/loading_indicator.json" + "path": "app/soapbox/components/loading_indicator.json" }, { "descriptors": [ @@ -200,7 +200,7 @@ "id": "status.media_hidden" } ], - "path": "app/gabsocial/components/media_gallery.json" + "path": "app/soapbox/components/media_gallery.json" }, { "descriptors": [ @@ -213,7 +213,7 @@ "id": "missing_indicator.sublabel" } ], - "path": "app/gabsocial/components/missing_indicator.json" + "path": "app/soapbox/components/missing_indicator.json" }, { "descriptors": [ @@ -226,7 +226,7 @@ "id": "confirmations.delete.message" } ], - "path": "app/gabsocial/components/modal_root.json" + "path": "app/soapbox/components/modal_root.json" }, { "descriptors": [ @@ -247,7 +247,7 @@ "id": "poll.total_votes" } ], - "path": "app/gabsocial/components/poll.json" + "path": "app/soapbox/components/poll.json" }, { "descriptors": [ @@ -292,7 +292,7 @@ "id": "time_remaining.days" } ], - "path": "app/gabsocial/components/relative_timestamp.json" + "path": "app/soapbox/components/relative_timestamp.json" }, { "descriptors": [ @@ -357,7 +357,7 @@ "id": "donate" } ], - "path": "app/gabsocial/components/sidebar_menu.json" + "path": "app/soapbox/components/sidebar_menu.json" }, { "descriptors": [ @@ -470,7 +470,7 @@ "id": "status.remove_post_from_group" } ], - "path": "app/gabsocial/components/status_action_bar.json" + "path": "app/soapbox/components/status_action_bar.json" }, { "descriptors": [ @@ -487,7 +487,7 @@ "id": "status.show_less" } ], - "path": "app/gabsocial/components/status_content.json" + "path": "app/soapbox/components/status_content.json" }, { "descriptors": [ @@ -500,7 +500,7 @@ "id": "regeneration_indicator.sublabel" } ], - "path": "app/gabsocial/components/status_list.json" + "path": "app/soapbox/components/status_list.json" }, { "descriptors": [ @@ -521,7 +521,7 @@ "id": "status.show_thread" } ], - "path": "app/gabsocial/components/status.json" + "path": "app/soapbox/components/status.json" }, { "descriptors": [ @@ -530,7 +530,7 @@ "id": "timeline_queue.label" } ], - "path": "app/gabsocial/components/timeline_queue_button_header.json" + "path": "app/soapbox/components/timeline_queue_button_header.json" }, { "descriptors": [ @@ -543,7 +543,7 @@ "id": "confirmations.unfollow.message" } ], - "path": "app/gabsocial/containers/account_container.json" + "path": "app/soapbox/containers/account_container.json" }, { "descriptors": [ @@ -556,7 +556,7 @@ "id": "confirmations.domain_block.message" } ], - "path": "app/gabsocial/containers/domain_container.json" + "path": "app/soapbox/containers/domain_container.json" }, { "descriptors": [ @@ -597,7 +597,7 @@ "id": "confirmations.block.message" } ], - "path": "app/gabsocial/containers/status_container.json" + "path": "app/soapbox/containers/status_container.json" }, { "descriptors": [ @@ -622,7 +622,7 @@ "id": "account_gallery.none" } ], - "path": "app/gabsocial/features/account_gallery/index.json" + "path": "app/soapbox/features/account_gallery/index.json" }, { "descriptors": [ @@ -631,7 +631,7 @@ "id": "account.moved_to" } ], - "path": "app/gabsocial/features/account_timeline/components/moved_note.json" + "path": "app/soapbox/features/account_timeline/components/moved_note.json" }, { "descriptors": [ @@ -664,7 +664,7 @@ "id": "confirmations.domain_block.message" } ], - "path": "app/gabsocial/features/account_timeline/containers/header_container.json" + "path": "app/soapbox/features/account_timeline/containers/header_container.json" }, { "descriptors": [ @@ -689,7 +689,7 @@ "id": "empty_column.account_timeline" } ], - "path": "app/gabsocial/features/account_timeline/index.json" + "path": "app/soapbox/features/account_timeline/index.json" }, { "descriptors": [ @@ -846,7 +846,7 @@ "id": "account.message" } ], - "path": "app/gabsocial/features/account/components/header.json" + "path": "app/soapbox/features/account/components/header.json" }, { "descriptors": [ @@ -859,7 +859,7 @@ "id": "empty_column.blocks" } ], - "path": "app/gabsocial/features/blocks/index.json" + "path": "app/soapbox/features/blocks/index.json" }, { "descriptors": [ @@ -868,7 +868,7 @@ "id": "community.column_settings.media_only" } ], - "path": "app/gabsocial/features/community_timeline/components/column_settings.json" + "path": "app/soapbox/features/community_timeline/components/column_settings.json" }, { "descriptors": [ @@ -881,7 +881,7 @@ "id": "empty_column.community" } ], - "path": "app/gabsocial/features/community_timeline/index.json" + "path": "app/soapbox/features/community_timeline/index.json" }, { "descriptors": [ @@ -926,7 +926,7 @@ "id": "navigation_bar.keyboard_shortcuts" } ], - "path": "app/gabsocial/features/compose/components/action_bar.json" + "path": "app/soapbox/features/compose/components/action_bar.json" }, { "descriptors": [ @@ -947,7 +947,7 @@ "id": "compose_form.publish_loud" } ], - "path": "app/gabsocial/features/compose/components/compose_form.json" + "path": "app/soapbox/features/compose/components/compose_form.json" }, { "descriptors": [ @@ -1008,7 +1008,7 @@ "id": "emoji_button.flags" } ], - "path": "app/gabsocial/features/compose/components/emoji_picker_dropdown.json" + "path": "app/soapbox/features/compose/components/emoji_picker_dropdown.json" }, { "descriptors": [ @@ -1017,7 +1017,7 @@ "id": "navigation_bar.edit_profile" } ], - "path": "app/gabsocial/features/compose/components/navigation_bar.json" + "path": "app/soapbox/features/compose/components/navigation_bar.json" }, { "descriptors": [ @@ -1030,7 +1030,7 @@ "id": "poll_button.remove_poll" } ], - "path": "app/gabsocial/features/compose/components/poll_button.json" + "path": "app/soapbox/features/compose/components/poll_button.json" }, { "descriptors": [ @@ -1063,7 +1063,7 @@ "id": "intervals.full.days" } ], - "path": "app/gabsocial/features/compose/components/poll_form.json" + "path": "app/soapbox/features/compose/components/poll_form.json" }, { "descriptors": [ @@ -1104,7 +1104,7 @@ "id": "privacy.change" } ], - "path": "app/gabsocial/features/compose/components/privacy_dropdown.json" + "path": "app/soapbox/features/compose/components/privacy_dropdown.json" }, { "descriptors": [ @@ -1113,7 +1113,7 @@ "id": "reply_indicator.cancel" } ], - "path": "app/gabsocial/features/compose/components/reply_indicator.json" + "path": "app/soapbox/features/compose/components/reply_indicator.json" }, { "descriptors": [ @@ -1134,7 +1134,7 @@ "id": "search_results.total" } ], - "path": "app/gabsocial/features/compose/components/search_results.json" + "path": "app/soapbox/features/compose/components/search_results.json" }, { "descriptors": [ @@ -1167,7 +1167,7 @@ "id": "search_popout.tips.status" } ], - "path": "app/gabsocial/features/compose/components/search.json" + "path": "app/soapbox/features/compose/components/search.json" }, { "descriptors": [ @@ -1176,7 +1176,7 @@ "id": "upload_button.label" } ], - "path": "app/gabsocial/features/compose/components/upload_button.json" + "path": "app/soapbox/features/compose/components/upload_button.json" }, { "descriptors": [ @@ -1185,7 +1185,7 @@ "id": "upload_progress.label" } ], - "path": "app/gabsocial/features/compose/components/upload_progress.json" + "path": "app/soapbox/features/compose/components/upload_progress.json" }, { "descriptors": [ @@ -1202,7 +1202,7 @@ "id": "upload_form.focus" } ], - "path": "app/gabsocial/features/compose/components/upload.json" + "path": "app/soapbox/features/compose/components/upload.json" }, { "descriptors": [ @@ -1219,7 +1219,7 @@ "id": "compose_form.sensitive.hide" } ], - "path": "app/gabsocial/features/compose/containers/sensitive_button_container.json" + "path": "app/soapbox/features/compose/containers/sensitive_button_container.json" }, { "descriptors": [ @@ -1232,7 +1232,7 @@ "id": "compose_form.spoiler.unmarked" } ], - "path": "app/gabsocial/features/compose/containers/spoiler_button_container.json" + "path": "app/soapbox/features/compose/containers/spoiler_button_container.json" }, { "descriptors": [ @@ -1257,7 +1257,7 @@ "id": "compose_form.direct_message_warning_learn_more" } ], - "path": "app/gabsocial/features/compose/containers/warning_container.json" + "path": "app/soapbox/features/compose/containers/warning_container.json" }, { "descriptors": [ @@ -1294,7 +1294,7 @@ "id": "navigation_bar.compose" } ], - "path": "app/gabsocial/features/compose/index.json" + "path": "app/soapbox/features/compose/index.json" }, { "descriptors": [ @@ -1307,7 +1307,7 @@ "id": "empty_column.direct" } ], - "path": "app/gabsocial/features/direct_timeline/index.json" + "path": "app/soapbox/features/direct_timeline/index.json" }, { "descriptors": [ @@ -1324,7 +1324,7 @@ "id": "empty_column.domain_blocks" } ], - "path": "app/gabsocial/features/domain_blocks/index.json" + "path": "app/soapbox/features/domain_blocks/index.json" }, { "descriptors": [ @@ -1333,7 +1333,7 @@ "id": "empty_column.favourited_statuses" } ], - "path": "app/gabsocial/features/favourited_statuses/index.json" + "path": "app/soapbox/features/favourited_statuses/index.json" }, { "descriptors": [ @@ -1342,7 +1342,7 @@ "id": "empty_column.favourites" } ], - "path": "app/gabsocial/features/favourites/index.json" + "path": "app/soapbox/features/favourites/index.json" }, { "descriptors": [ @@ -1355,7 +1355,7 @@ "id": "follow_request.reject" } ], - "path": "app/gabsocial/features/follow_requests/components/account_authorize.json" + "path": "app/soapbox/features/follow_requests/components/account_authorize.json" }, { "descriptors": [ @@ -1368,7 +1368,7 @@ "id": "empty_column.follow_requests" } ], - "path": "app/gabsocial/features/follow_requests/index.json" + "path": "app/soapbox/features/follow_requests/index.json" }, { "descriptors": [ @@ -1381,7 +1381,7 @@ "id": "account.followers.empty" } ], - "path": "app/gabsocial/features/followers/index.json" + "path": "app/soapbox/features/followers/index.json" }, { "descriptors": [ @@ -1394,7 +1394,7 @@ "id": "account.follows.empty" } ], - "path": "app/gabsocial/features/following/index.json" + "path": "app/soapbox/features/following/index.json" }, { "descriptors": [ @@ -1467,7 +1467,7 @@ "id": "getting_started.directory" } ], - "path": "app/gabsocial/features/getting_started/index.json" + "path": "app/soapbox/features/getting_started/index.json" }, { "descriptors": [ @@ -1492,7 +1492,7 @@ "id": "groups.form.create" } ], - "path": "app/gabsocial/features/groups/create/index.json" + "path": "app/soapbox/features/groups/create/index.json" }, { "descriptors": [ @@ -1517,7 +1517,7 @@ "id": "groups.form.update" } ], - "path": "app/gabsocial/features/groups/edit/index.json" + "path": "app/soapbox/features/groups/edit/index.json" }, { "descriptors": [ @@ -1542,7 +1542,7 @@ "id": "groups.card.roles.admin" } ], - "path": "app/gabsocial/features/groups/index/card.json" + "path": "app/soapbox/features/groups/index/card.json" }, { "descriptors": [ @@ -1567,7 +1567,7 @@ "id": "groups.tab_admin" } ], - "path": "app/gabsocial/features/groups/index/index.json" + "path": "app/soapbox/features/groups/index/index.json" }, { "descriptors": [ @@ -1576,7 +1576,7 @@ "id": "group.members.empty" } ], - "path": "app/gabsocial/features/groups/members/index.json" + "path": "app/soapbox/features/groups/members/index.json" }, { "descriptors": [ @@ -1589,7 +1589,7 @@ "id": "group.removed_accounts.empty" } ], - "path": "app/gabsocial/features/groups/removed_accounts/index.json" + "path": "app/soapbox/features/groups/removed_accounts/index.json" }, { "descriptors": [ @@ -1602,7 +1602,7 @@ "id": "groups.sidebar-panel.show_all" } ], - "path": "app/gabsocial/features/groups/sidebar_panel/index.json" + "path": "app/soapbox/features/groups/sidebar_panel/index.json" }, { "descriptors": [ @@ -1615,7 +1615,7 @@ "id": "groups.sidebar-panel.item.no_recent_activity" } ], - "path": "app/gabsocial/features/groups/sidebar_panel/item.json" + "path": "app/soapbox/features/groups/sidebar_panel/item.json" }, { "descriptors": [ @@ -1636,7 +1636,7 @@ "id": "groups.edit" } ], - "path": "app/gabsocial/features/groups/timeline/components/header.json" + "path": "app/soapbox/features/groups/timeline/components/header.json" }, { "descriptors": [ @@ -1649,7 +1649,7 @@ "id": "groups.detail.role_admin" } ], - "path": "app/gabsocial/features/groups/timeline/components/panel.json" + "path": "app/soapbox/features/groups/timeline/components/panel.json" }, { "descriptors": [ @@ -1658,7 +1658,7 @@ "id": "empty_column.group" } ], - "path": "app/gabsocial/features/groups/timeline/index.json" + "path": "app/soapbox/features/groups/timeline/index.json" }, { "descriptors": [ @@ -1679,7 +1679,7 @@ "id": "empty_column.hashtag" } ], - "path": "app/gabsocial/features/hashtag_timeline/index.json" + "path": "app/soapbox/features/hashtag_timeline/index.json" }, { "descriptors": [ @@ -1696,7 +1696,7 @@ "id": "home.column_settings.show_replies" } ], - "path": "app/gabsocial/features/home_timeline/components/column_settings.json" + "path": "app/soapbox/features/home_timeline/components/column_settings.json" }, { "descriptors": [ @@ -1713,7 +1713,7 @@ "id": "empty_column.home.local_tab" } ], - "path": "app/gabsocial/features/home_timeline/index.json" + "path": "app/soapbox/features/home_timeline/index.json" }, { "descriptors": [ @@ -1770,7 +1770,7 @@ "id": "introduction.interactions.action" } ], - "path": "app/gabsocial/features/introduction/index.json" + "path": "app/soapbox/features/introduction/index.json" }, { "descriptors": [ @@ -1783,7 +1783,7 @@ "id": "lists.account.add" } ], - "path": "app/gabsocial/features/list_adder/components/list.json" + "path": "app/soapbox/features/list_adder/components/list.json" }, { "descriptors": [ @@ -1804,7 +1804,7 @@ "id": "list_adder.header_title" } ], - "path": "app/gabsocial/features/list_adder/index.json" + "path": "app/soapbox/features/list_adder/index.json" }, { "descriptors": [ @@ -1817,7 +1817,7 @@ "id": "lists.account.add" } ], - "path": "app/gabsocial/features/list_editor/components/account.json" + "path": "app/soapbox/features/list_editor/components/account.json" }, { "descriptors": [ @@ -1830,7 +1830,7 @@ "id": "lists.new.save_title" } ], - "path": "app/gabsocial/features/list_editor/components/edit_list_form.json" + "path": "app/soapbox/features/list_editor/components/edit_list_form.json" }, { "descriptors": [ @@ -1843,7 +1843,7 @@ "id": "tabs_bar.search" } ], - "path": "app/gabsocial/features/list_editor/components/search.json" + "path": "app/soapbox/features/list_editor/components/search.json" }, { "descriptors": [ @@ -1868,7 +1868,7 @@ "id": "lists.edit" } ], - "path": "app/gabsocial/features/list_editor/index.json" + "path": "app/soapbox/features/list_editor/index.json" }, { "descriptors": [ @@ -1901,7 +1901,7 @@ "id": "lists.view_all" } ], - "path": "app/gabsocial/features/list_timeline/index.json" + "path": "app/soapbox/features/list_timeline/index.json" }, { "descriptors": [ @@ -1918,7 +1918,7 @@ "id": "lists.new.create_title" } ], - "path": "app/gabsocial/features/lists/components/new_list_form.json" + "path": "app/soapbox/features/lists/components/new_list_form.json" }, { "descriptors": [ @@ -1939,7 +1939,7 @@ "id": "empty_column.lists" } ], - "path": "app/gabsocial/features/lists/index.json" + "path": "app/soapbox/features/lists/index.json" }, { "descriptors": [ @@ -1952,7 +1952,7 @@ "id": "empty_column.mutes" } ], - "path": "app/gabsocial/features/mutes/index.json" + "path": "app/soapbox/features/mutes/index.json" }, { "descriptors": [ @@ -1961,7 +1961,7 @@ "id": "notifications.clear" } ], - "path": "app/gabsocial/features/notifications/components/clear_column_button.json" + "path": "app/soapbox/features/notifications/components/clear_column_button.json" }, { "descriptors": [ @@ -2014,7 +2014,7 @@ "id": "notifications.column_settings.poll" } ], - "path": "app/gabsocial/features/notifications/components/column_settings.json" + "path": "app/soapbox/features/notifications/components/column_settings.json" }, { "descriptors": [ @@ -2043,7 +2043,7 @@ "id": "notifications.filter.all" } ], - "path": "app/gabsocial/features/notifications/components/filter_bar.json" + "path": "app/soapbox/features/notifications/components/filter_bar.json" }, { "descriptors": [ @@ -2064,7 +2064,7 @@ "id": "notification.poll" } ], - "path": "app/gabsocial/features/notifications/components/notification.json" + "path": "app/soapbox/features/notifications/components/notification.json" }, { "descriptors": [ @@ -2077,7 +2077,7 @@ "id": "notifications.clear" } ], - "path": "app/gabsocial/features/notifications/containers/column_settings_container.json" + "path": "app/soapbox/features/notifications/containers/column_settings_container.json" }, { "descriptors": [ @@ -2090,7 +2090,7 @@ "id": "empty_column.notifications" } ], - "path": "app/gabsocial/features/notifications/index.json" + "path": "app/soapbox/features/notifications/index.json" }, { "descriptors": [ @@ -2099,7 +2099,7 @@ "id": "pinned_statuses.none" } ], - "path": "app/gabsocial/features/pinned_statuses/index.json" + "path": "app/soapbox/features/pinned_statuses/index.json" }, { "descriptors": [ @@ -2108,7 +2108,7 @@ "id": "community.column_settings.media_only" } ], - "path": "app/gabsocial/features/public_timeline/components/column_settings.json" + "path": "app/soapbox/features/public_timeline/components/column_settings.json" }, { "descriptors": [ @@ -2133,7 +2133,7 @@ "id": "empty_column.public" } ], - "path": "app/gabsocial/features/public_timeline/index.json" + "path": "app/soapbox/features/public_timeline/index.json" }, { "descriptors": [ @@ -2142,7 +2142,7 @@ "id": "status.reblogs.empty" } ], - "path": "app/gabsocial/features/reblogs/index.json" + "path": "app/soapbox/features/reblogs/index.json" }, { "descriptors": [ @@ -2151,7 +2151,7 @@ "id": "search_results.top" } ], - "path": "app/gabsocial/features/search/components/header.json" + "path": "app/soapbox/features/search/components/header.json" }, { "descriptors": [ @@ -2244,7 +2244,7 @@ "id": "status.copy" } ], - "path": "app/gabsocial/features/status/components/action_bar.json" + "path": "app/soapbox/features/status/components/action_bar.json" }, { "descriptors": [ @@ -2285,7 +2285,7 @@ "id": "confirmations.block.message" } ], - "path": "app/gabsocial/features/status/containers/detailed_status_container.json" + "path": "app/soapbox/features/status/containers/detailed_status_container.json" }, { "descriptors": [ @@ -2338,7 +2338,7 @@ "id": "confirmations.block.message" } ], - "path": "app/gabsocial/features/status/index.json" + "path": "app/soapbox/features/status/index.json" }, { "descriptors": [ @@ -2355,7 +2355,7 @@ "id": "boost_modal.combo" } ], - "path": "app/gabsocial/features/ui/components/boost_modal.json" + "path": "app/soapbox/features/ui/components/boost_modal.json" }, { "descriptors": [ @@ -2372,7 +2372,7 @@ "id": "bundle_column_error.retry" } ], - "path": "app/gabsocial/features/ui/components/bundle_column_error.json" + "path": "app/soapbox/features/ui/components/bundle_column_error.json" }, { "descriptors": [ @@ -2389,7 +2389,7 @@ "id": "bundle_modal_error.close" } ], - "path": "app/gabsocial/features/ui/components/bundle_modal_error.json" + "path": "app/soapbox/features/ui/components/bundle_modal_error.json" }, { "descriptors": [ @@ -2410,7 +2410,7 @@ "id": "navigation_bar.compose" } ], - "path": "app/gabsocial/features/ui/components/compose_modal.json" + "path": "app/soapbox/features/ui/components/compose_modal.json" }, { "descriptors": [ @@ -2419,7 +2419,7 @@ "id": "confirmation_modal.cancel" } ], - "path": "app/gabsocial/features/ui/components/confirmation_modal.json" + "path": "app/soapbox/features/ui/components/confirmation_modal.json" }, { "descriptors": [ @@ -2436,7 +2436,7 @@ "id": "embed.preview" } ], - "path": "app/gabsocial/features/ui/components/embed_modal.json" + "path": "app/soapbox/features/ui/components/embed_modal.json" }, { "descriptors": [ @@ -2561,7 +2561,7 @@ "id": "keyboard_shortcuts.legend" } ], - "path": "app/gabsocial/features/ui/components/hotkeys_modal.json" + "path": "app/soapbox/features/ui/components/hotkeys_modal.json" }, { "descriptors": [ @@ -2606,7 +2606,7 @@ "id": "getting_started.open_source_notice" } ], - "path": "app/gabsocial/features/ui/components/link_footer.json" + "path": "app/soapbox/features/ui/components/link_footer.json" }, { "descriptors": [ @@ -2627,7 +2627,7 @@ "id": "lightbox.view_context" } ], - "path": "app/gabsocial/features/ui/components/media_modal.json" + "path": "app/soapbox/features/ui/components/media_modal.json" }, { "descriptors": [ @@ -2648,7 +2648,7 @@ "id": "confirmations.mute.confirm" } ], - "path": "app/gabsocial/features/ui/components/mute_modal.json" + "path": "app/soapbox/features/ui/components/mute_modal.json" }, { "descriptors": [ @@ -2669,7 +2669,7 @@ "id": "account.member_since" } ], - "path": "app/gabsocial/features/ui/components/profile_info_panel.json" + "path": "app/soapbox/features/ui/components/profile_info_panel.json" }, { "descriptors": [ @@ -2702,7 +2702,7 @@ "id": "report.forward" } ], - "path": "app/gabsocial/features/ui/components/report_modal.json" + "path": "app/soapbox/features/ui/components/report_modal.json" }, { "descriptors": [ @@ -2719,7 +2719,7 @@ "id": "account.register" } ], - "path": "app/gabsocial/features/ui/components/sign_up_panel.json" + "path": "app/soapbox/features/ui/components/sign_up_panel.json" }, { "descriptors": [ @@ -2744,7 +2744,7 @@ "id": "account.register" } ], - "path": "app/gabsocial/features/ui/components/tabs_bar.json" + "path": "app/soapbox/features/ui/components/tabs_bar.json" }, { "descriptors": [ @@ -2753,7 +2753,7 @@ "id": "trends.title" } ], - "path": "app/gabsocial/features/ui/components/trends_panel.json" + "path": "app/soapbox/features/ui/components/trends_panel.json" }, { "descriptors": [ @@ -2782,7 +2782,7 @@ "id": "account.login" } ], - "path": "app/gabsocial/features/ui/components/unauthorized_modal.json" + "path": "app/soapbox/features/ui/components/unauthorized_modal.json" }, { "descriptors": [ @@ -2791,7 +2791,7 @@ "id": "upload_area.title" } ], - "path": "app/gabsocial/features/ui/components/upload_area.json" + "path": "app/soapbox/features/ui/components/upload_area.json" }, { "descriptors": [ @@ -2808,7 +2808,7 @@ "id": "account.follows" } ], - "path": "app/gabsocial/features/ui/components/user_panel.json" + "path": "app/soapbox/features/ui/components/user_panel.json" }, { "descriptors": [ @@ -2817,7 +2817,7 @@ "id": "lightbox.view_context" } ], - "path": "app/gabsocial/features/ui/components/video_modal.json" + "path": "app/soapbox/features/ui/components/video_modal.json" }, { "descriptors": [ @@ -2830,7 +2830,7 @@ "id": "who_to_follow.title" } ], - "path": "app/gabsocial/features/ui/components/who_to_follow_panel.json" + "path": "app/soapbox/features/ui/components/who_to_follow_panel.json" }, { "descriptors": [ @@ -2843,7 +2843,7 @@ "id": "compose_form.publish" } ], - "path": "app/gabsocial/features/ui/index.json" + "path": "app/soapbox/features/ui/index.json" }, { "descriptors": [ @@ -2892,6 +2892,6 @@ "id": "status.media_hidden" } ], - "path": "app/gabsocial/features/video/index.json" + "path": "app/soapbox/features/video/index.json" } ] \ No newline at end of file diff --git a/app/gabsocial/locales/el.json b/app/soapbox/locales/el.json similarity index 100% rename from app/gabsocial/locales/el.json rename to app/soapbox/locales/el.json diff --git a/app/gabsocial/locales/en.json b/app/soapbox/locales/en.json similarity index 100% rename from app/gabsocial/locales/en.json rename to app/soapbox/locales/en.json diff --git a/app/gabsocial/locales/eo.json b/app/soapbox/locales/eo.json similarity index 100% rename from app/gabsocial/locales/eo.json rename to app/soapbox/locales/eo.json diff --git a/app/gabsocial/locales/es-AR.json b/app/soapbox/locales/es-AR.json similarity index 100% rename from app/gabsocial/locales/es-AR.json rename to app/soapbox/locales/es-AR.json diff --git a/app/gabsocial/locales/es.json b/app/soapbox/locales/es.json similarity index 100% rename from app/gabsocial/locales/es.json rename to app/soapbox/locales/es.json diff --git a/app/gabsocial/locales/et.json b/app/soapbox/locales/et.json similarity index 100% rename from app/gabsocial/locales/et.json rename to app/soapbox/locales/et.json diff --git a/app/gabsocial/locales/eu.json b/app/soapbox/locales/eu.json similarity index 100% rename from app/gabsocial/locales/eu.json rename to app/soapbox/locales/eu.json diff --git a/app/gabsocial/locales/fa.json b/app/soapbox/locales/fa.json similarity index 100% rename from app/gabsocial/locales/fa.json rename to app/soapbox/locales/fa.json diff --git a/app/gabsocial/locales/fi.json b/app/soapbox/locales/fi.json similarity index 100% rename from app/gabsocial/locales/fi.json rename to app/soapbox/locales/fi.json diff --git a/app/gabsocial/locales/fr.json b/app/soapbox/locales/fr.json similarity index 100% rename from app/gabsocial/locales/fr.json rename to app/soapbox/locales/fr.json diff --git a/app/gabsocial/locales/ga.json b/app/soapbox/locales/ga.json similarity index 100% rename from app/gabsocial/locales/ga.json rename to app/soapbox/locales/ga.json diff --git a/app/gabsocial/locales/gl.json b/app/soapbox/locales/gl.json similarity index 100% rename from app/gabsocial/locales/gl.json rename to app/soapbox/locales/gl.json diff --git a/app/gabsocial/locales/he.json b/app/soapbox/locales/he.json similarity index 100% rename from app/gabsocial/locales/he.json rename to app/soapbox/locales/he.json diff --git a/app/gabsocial/locales/hi.json b/app/soapbox/locales/hi.json similarity index 100% rename from app/gabsocial/locales/hi.json rename to app/soapbox/locales/hi.json diff --git a/app/gabsocial/locales/hr.json b/app/soapbox/locales/hr.json similarity index 100% rename from app/gabsocial/locales/hr.json rename to app/soapbox/locales/hr.json diff --git a/app/gabsocial/locales/hu.json b/app/soapbox/locales/hu.json similarity index 100% rename from app/gabsocial/locales/hu.json rename to app/soapbox/locales/hu.json diff --git a/app/gabsocial/locales/hy.json b/app/soapbox/locales/hy.json similarity index 100% rename from app/gabsocial/locales/hy.json rename to app/soapbox/locales/hy.json diff --git a/app/gabsocial/locales/id.json b/app/soapbox/locales/id.json similarity index 100% rename from app/gabsocial/locales/id.json rename to app/soapbox/locales/id.json diff --git a/app/gabsocial/locales/index.js b/app/soapbox/locales/index.js similarity index 100% rename from app/gabsocial/locales/index.js rename to app/soapbox/locales/index.js diff --git a/app/gabsocial/locales/io.json b/app/soapbox/locales/io.json similarity index 100% rename from app/gabsocial/locales/io.json rename to app/soapbox/locales/io.json diff --git a/app/gabsocial/locales/it.json b/app/soapbox/locales/it.json similarity index 100% rename from app/gabsocial/locales/it.json rename to app/soapbox/locales/it.json diff --git a/app/gabsocial/locales/ja.json b/app/soapbox/locales/ja.json similarity index 100% rename from app/gabsocial/locales/ja.json rename to app/soapbox/locales/ja.json diff --git a/app/gabsocial/locales/ka.json b/app/soapbox/locales/ka.json similarity index 100% rename from app/gabsocial/locales/ka.json rename to app/soapbox/locales/ka.json diff --git a/app/gabsocial/locales/kk.json b/app/soapbox/locales/kk.json similarity index 100% rename from app/gabsocial/locales/kk.json rename to app/soapbox/locales/kk.json diff --git a/app/gabsocial/locales/ko.json b/app/soapbox/locales/ko.json similarity index 100% rename from app/gabsocial/locales/ko.json rename to app/soapbox/locales/ko.json diff --git a/app/gabsocial/locales/locale-data/README.md b/app/soapbox/locales/locale-data/README.md similarity index 100% rename from app/gabsocial/locales/locale-data/README.md rename to app/soapbox/locales/locale-data/README.md diff --git a/app/gabsocial/locales/locale-data/co.js b/app/soapbox/locales/locale-data/co.js similarity index 100% rename from app/gabsocial/locales/locale-data/co.js rename to app/soapbox/locales/locale-data/co.js diff --git a/app/gabsocial/locales/locale-data/oc.js b/app/soapbox/locales/locale-data/oc.js similarity index 100% rename from app/gabsocial/locales/locale-data/oc.js rename to app/soapbox/locales/locale-data/oc.js diff --git a/app/gabsocial/locales/lt.json b/app/soapbox/locales/lt.json similarity index 100% rename from app/gabsocial/locales/lt.json rename to app/soapbox/locales/lt.json diff --git a/app/gabsocial/locales/lv.json b/app/soapbox/locales/lv.json similarity index 100% rename from app/gabsocial/locales/lv.json rename to app/soapbox/locales/lv.json diff --git a/app/gabsocial/locales/mk.json b/app/soapbox/locales/mk.json similarity index 100% rename from app/gabsocial/locales/mk.json rename to app/soapbox/locales/mk.json diff --git a/app/gabsocial/locales/ms.json b/app/soapbox/locales/ms.json similarity index 100% rename from app/gabsocial/locales/ms.json rename to app/soapbox/locales/ms.json diff --git a/app/gabsocial/locales/nl.json b/app/soapbox/locales/nl.json similarity index 100% rename from app/gabsocial/locales/nl.json rename to app/soapbox/locales/nl.json diff --git a/app/gabsocial/locales/nn.json b/app/soapbox/locales/nn.json similarity index 100% rename from app/gabsocial/locales/nn.json rename to app/soapbox/locales/nn.json diff --git a/app/gabsocial/locales/no.json b/app/soapbox/locales/no.json similarity index 100% rename from app/gabsocial/locales/no.json rename to app/soapbox/locales/no.json diff --git a/app/gabsocial/locales/oc.json b/app/soapbox/locales/oc.json similarity index 100% rename from app/gabsocial/locales/oc.json rename to app/soapbox/locales/oc.json diff --git a/app/gabsocial/locales/pl.json b/app/soapbox/locales/pl.json similarity index 100% rename from app/gabsocial/locales/pl.json rename to app/soapbox/locales/pl.json diff --git a/app/gabsocial/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json similarity index 100% rename from app/gabsocial/locales/pt-BR.json rename to app/soapbox/locales/pt-BR.json diff --git a/app/gabsocial/locales/pt.json b/app/soapbox/locales/pt.json similarity index 100% rename from app/gabsocial/locales/pt.json rename to app/soapbox/locales/pt.json diff --git a/app/gabsocial/locales/ro.json b/app/soapbox/locales/ro.json similarity index 100% rename from app/gabsocial/locales/ro.json rename to app/soapbox/locales/ro.json diff --git a/app/gabsocial/locales/ru.json b/app/soapbox/locales/ru.json similarity index 100% rename from app/gabsocial/locales/ru.json rename to app/soapbox/locales/ru.json diff --git a/app/gabsocial/locales/sk.json b/app/soapbox/locales/sk.json similarity index 100% rename from app/gabsocial/locales/sk.json rename to app/soapbox/locales/sk.json diff --git a/app/gabsocial/locales/sl.json b/app/soapbox/locales/sl.json similarity index 100% rename from app/gabsocial/locales/sl.json rename to app/soapbox/locales/sl.json diff --git a/app/gabsocial/locales/sq.json b/app/soapbox/locales/sq.json similarity index 100% rename from app/gabsocial/locales/sq.json rename to app/soapbox/locales/sq.json diff --git a/app/gabsocial/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json similarity index 100% rename from app/gabsocial/locales/sr-Latn.json rename to app/soapbox/locales/sr-Latn.json diff --git a/app/gabsocial/locales/sr.json b/app/soapbox/locales/sr.json similarity index 100% rename from app/gabsocial/locales/sr.json rename to app/soapbox/locales/sr.json diff --git a/app/gabsocial/locales/sv.json b/app/soapbox/locales/sv.json similarity index 100% rename from app/gabsocial/locales/sv.json rename to app/soapbox/locales/sv.json diff --git a/app/gabsocial/locales/ta.json b/app/soapbox/locales/ta.json similarity index 100% rename from app/gabsocial/locales/ta.json rename to app/soapbox/locales/ta.json diff --git a/app/gabsocial/locales/te.json b/app/soapbox/locales/te.json similarity index 100% rename from app/gabsocial/locales/te.json rename to app/soapbox/locales/te.json diff --git a/app/gabsocial/locales/th.json b/app/soapbox/locales/th.json similarity index 100% rename from app/gabsocial/locales/th.json rename to app/soapbox/locales/th.json diff --git a/app/gabsocial/locales/tr.json b/app/soapbox/locales/tr.json similarity index 100% rename from app/gabsocial/locales/tr.json rename to app/soapbox/locales/tr.json diff --git a/app/gabsocial/locales/uk.json b/app/soapbox/locales/uk.json similarity index 100% rename from app/gabsocial/locales/uk.json rename to app/soapbox/locales/uk.json diff --git a/app/gabsocial/locales/whitelist_ar.json b/app/soapbox/locales/whitelist_ar.json similarity index 100% rename from app/gabsocial/locales/whitelist_ar.json rename to app/soapbox/locales/whitelist_ar.json diff --git a/app/gabsocial/locales/whitelist_ast.json b/app/soapbox/locales/whitelist_ast.json similarity index 100% rename from app/gabsocial/locales/whitelist_ast.json rename to app/soapbox/locales/whitelist_ast.json diff --git a/app/gabsocial/locales/whitelist_bg.json b/app/soapbox/locales/whitelist_bg.json similarity index 100% rename from app/gabsocial/locales/whitelist_bg.json rename to app/soapbox/locales/whitelist_bg.json diff --git a/app/gabsocial/locales/whitelist_bn.json b/app/soapbox/locales/whitelist_bn.json similarity index 100% rename from app/gabsocial/locales/whitelist_bn.json rename to app/soapbox/locales/whitelist_bn.json diff --git a/app/gabsocial/locales/whitelist_br.json b/app/soapbox/locales/whitelist_br.json similarity index 100% rename from app/gabsocial/locales/whitelist_br.json rename to app/soapbox/locales/whitelist_br.json diff --git a/app/gabsocial/locales/whitelist_ca.json b/app/soapbox/locales/whitelist_ca.json similarity index 100% rename from app/gabsocial/locales/whitelist_ca.json rename to app/soapbox/locales/whitelist_ca.json diff --git a/app/gabsocial/locales/whitelist_co.json b/app/soapbox/locales/whitelist_co.json similarity index 100% rename from app/gabsocial/locales/whitelist_co.json rename to app/soapbox/locales/whitelist_co.json diff --git a/app/gabsocial/locales/whitelist_cs.json b/app/soapbox/locales/whitelist_cs.json similarity index 100% rename from app/gabsocial/locales/whitelist_cs.json rename to app/soapbox/locales/whitelist_cs.json diff --git a/app/gabsocial/locales/whitelist_cy.json b/app/soapbox/locales/whitelist_cy.json similarity index 100% rename from app/gabsocial/locales/whitelist_cy.json rename to app/soapbox/locales/whitelist_cy.json diff --git a/app/gabsocial/locales/whitelist_da.json b/app/soapbox/locales/whitelist_da.json similarity index 100% rename from app/gabsocial/locales/whitelist_da.json rename to app/soapbox/locales/whitelist_da.json diff --git a/app/gabsocial/locales/whitelist_de.json b/app/soapbox/locales/whitelist_de.json similarity index 100% rename from app/gabsocial/locales/whitelist_de.json rename to app/soapbox/locales/whitelist_de.json diff --git a/app/gabsocial/locales/whitelist_el.json b/app/soapbox/locales/whitelist_el.json similarity index 100% rename from app/gabsocial/locales/whitelist_el.json rename to app/soapbox/locales/whitelist_el.json diff --git a/app/gabsocial/locales/whitelist_en.json b/app/soapbox/locales/whitelist_en.json similarity index 100% rename from app/gabsocial/locales/whitelist_en.json rename to app/soapbox/locales/whitelist_en.json diff --git a/app/gabsocial/locales/whitelist_eo.json b/app/soapbox/locales/whitelist_eo.json similarity index 100% rename from app/gabsocial/locales/whitelist_eo.json rename to app/soapbox/locales/whitelist_eo.json diff --git a/app/gabsocial/locales/whitelist_es-AR.json b/app/soapbox/locales/whitelist_es-AR.json similarity index 100% rename from app/gabsocial/locales/whitelist_es-AR.json rename to app/soapbox/locales/whitelist_es-AR.json diff --git a/app/gabsocial/locales/whitelist_es.json b/app/soapbox/locales/whitelist_es.json similarity index 100% rename from app/gabsocial/locales/whitelist_es.json rename to app/soapbox/locales/whitelist_es.json diff --git a/app/gabsocial/locales/whitelist_et.json b/app/soapbox/locales/whitelist_et.json similarity index 100% rename from app/gabsocial/locales/whitelist_et.json rename to app/soapbox/locales/whitelist_et.json diff --git a/app/gabsocial/locales/whitelist_eu.json b/app/soapbox/locales/whitelist_eu.json similarity index 100% rename from app/gabsocial/locales/whitelist_eu.json rename to app/soapbox/locales/whitelist_eu.json diff --git a/app/gabsocial/locales/whitelist_fa.json b/app/soapbox/locales/whitelist_fa.json similarity index 100% rename from app/gabsocial/locales/whitelist_fa.json rename to app/soapbox/locales/whitelist_fa.json diff --git a/app/gabsocial/locales/whitelist_fi.json b/app/soapbox/locales/whitelist_fi.json similarity index 100% rename from app/gabsocial/locales/whitelist_fi.json rename to app/soapbox/locales/whitelist_fi.json diff --git a/app/gabsocial/locales/whitelist_fr.json b/app/soapbox/locales/whitelist_fr.json similarity index 100% rename from app/gabsocial/locales/whitelist_fr.json rename to app/soapbox/locales/whitelist_fr.json diff --git a/app/gabsocial/locales/whitelist_ga.json b/app/soapbox/locales/whitelist_ga.json similarity index 100% rename from app/gabsocial/locales/whitelist_ga.json rename to app/soapbox/locales/whitelist_ga.json diff --git a/app/gabsocial/locales/whitelist_gl.json b/app/soapbox/locales/whitelist_gl.json similarity index 100% rename from app/gabsocial/locales/whitelist_gl.json rename to app/soapbox/locales/whitelist_gl.json diff --git a/app/gabsocial/locales/whitelist_he.json b/app/soapbox/locales/whitelist_he.json similarity index 100% rename from app/gabsocial/locales/whitelist_he.json rename to app/soapbox/locales/whitelist_he.json diff --git a/app/gabsocial/locales/whitelist_hi.json b/app/soapbox/locales/whitelist_hi.json similarity index 100% rename from app/gabsocial/locales/whitelist_hi.json rename to app/soapbox/locales/whitelist_hi.json diff --git a/app/gabsocial/locales/whitelist_hr.json b/app/soapbox/locales/whitelist_hr.json similarity index 100% rename from app/gabsocial/locales/whitelist_hr.json rename to app/soapbox/locales/whitelist_hr.json diff --git a/app/gabsocial/locales/whitelist_hu.json b/app/soapbox/locales/whitelist_hu.json similarity index 100% rename from app/gabsocial/locales/whitelist_hu.json rename to app/soapbox/locales/whitelist_hu.json diff --git a/app/gabsocial/locales/whitelist_hy.json b/app/soapbox/locales/whitelist_hy.json similarity index 100% rename from app/gabsocial/locales/whitelist_hy.json rename to app/soapbox/locales/whitelist_hy.json diff --git a/app/gabsocial/locales/whitelist_id.json b/app/soapbox/locales/whitelist_id.json similarity index 100% rename from app/gabsocial/locales/whitelist_id.json rename to app/soapbox/locales/whitelist_id.json diff --git a/app/gabsocial/locales/whitelist_io.json b/app/soapbox/locales/whitelist_io.json similarity index 100% rename from app/gabsocial/locales/whitelist_io.json rename to app/soapbox/locales/whitelist_io.json diff --git a/app/gabsocial/locales/whitelist_it.json b/app/soapbox/locales/whitelist_it.json similarity index 100% rename from app/gabsocial/locales/whitelist_it.json rename to app/soapbox/locales/whitelist_it.json diff --git a/app/gabsocial/locales/whitelist_ja.json b/app/soapbox/locales/whitelist_ja.json similarity index 100% rename from app/gabsocial/locales/whitelist_ja.json rename to app/soapbox/locales/whitelist_ja.json diff --git a/app/gabsocial/locales/whitelist_ka.json b/app/soapbox/locales/whitelist_ka.json similarity index 100% rename from app/gabsocial/locales/whitelist_ka.json rename to app/soapbox/locales/whitelist_ka.json diff --git a/app/gabsocial/locales/whitelist_kk.json b/app/soapbox/locales/whitelist_kk.json similarity index 100% rename from app/gabsocial/locales/whitelist_kk.json rename to app/soapbox/locales/whitelist_kk.json diff --git a/app/gabsocial/locales/whitelist_ko.json b/app/soapbox/locales/whitelist_ko.json similarity index 100% rename from app/gabsocial/locales/whitelist_ko.json rename to app/soapbox/locales/whitelist_ko.json diff --git a/app/gabsocial/locales/whitelist_lt.json b/app/soapbox/locales/whitelist_lt.json similarity index 100% rename from app/gabsocial/locales/whitelist_lt.json rename to app/soapbox/locales/whitelist_lt.json diff --git a/app/gabsocial/locales/whitelist_lv.json b/app/soapbox/locales/whitelist_lv.json similarity index 100% rename from app/gabsocial/locales/whitelist_lv.json rename to app/soapbox/locales/whitelist_lv.json diff --git a/app/gabsocial/locales/whitelist_mk.json b/app/soapbox/locales/whitelist_mk.json similarity index 100% rename from app/gabsocial/locales/whitelist_mk.json rename to app/soapbox/locales/whitelist_mk.json diff --git a/app/gabsocial/locales/whitelist_ms.json b/app/soapbox/locales/whitelist_ms.json similarity index 100% rename from app/gabsocial/locales/whitelist_ms.json rename to app/soapbox/locales/whitelist_ms.json diff --git a/app/gabsocial/locales/whitelist_nl.json b/app/soapbox/locales/whitelist_nl.json similarity index 100% rename from app/gabsocial/locales/whitelist_nl.json rename to app/soapbox/locales/whitelist_nl.json diff --git a/app/gabsocial/locales/whitelist_nn.json b/app/soapbox/locales/whitelist_nn.json similarity index 100% rename from app/gabsocial/locales/whitelist_nn.json rename to app/soapbox/locales/whitelist_nn.json diff --git a/app/gabsocial/locales/whitelist_no.json b/app/soapbox/locales/whitelist_no.json similarity index 100% rename from app/gabsocial/locales/whitelist_no.json rename to app/soapbox/locales/whitelist_no.json diff --git a/app/gabsocial/locales/whitelist_oc.json b/app/soapbox/locales/whitelist_oc.json similarity index 100% rename from app/gabsocial/locales/whitelist_oc.json rename to app/soapbox/locales/whitelist_oc.json diff --git a/app/gabsocial/locales/whitelist_pl.json b/app/soapbox/locales/whitelist_pl.json similarity index 100% rename from app/gabsocial/locales/whitelist_pl.json rename to app/soapbox/locales/whitelist_pl.json diff --git a/app/gabsocial/locales/whitelist_pt-BR.json b/app/soapbox/locales/whitelist_pt-BR.json similarity index 100% rename from app/gabsocial/locales/whitelist_pt-BR.json rename to app/soapbox/locales/whitelist_pt-BR.json diff --git a/app/gabsocial/locales/whitelist_pt.json b/app/soapbox/locales/whitelist_pt.json similarity index 100% rename from app/gabsocial/locales/whitelist_pt.json rename to app/soapbox/locales/whitelist_pt.json diff --git a/app/gabsocial/locales/whitelist_ro.json b/app/soapbox/locales/whitelist_ro.json similarity index 100% rename from app/gabsocial/locales/whitelist_ro.json rename to app/soapbox/locales/whitelist_ro.json diff --git a/app/gabsocial/locales/whitelist_ru.json b/app/soapbox/locales/whitelist_ru.json similarity index 100% rename from app/gabsocial/locales/whitelist_ru.json rename to app/soapbox/locales/whitelist_ru.json diff --git a/app/gabsocial/locales/whitelist_sk.json b/app/soapbox/locales/whitelist_sk.json similarity index 100% rename from app/gabsocial/locales/whitelist_sk.json rename to app/soapbox/locales/whitelist_sk.json diff --git a/app/gabsocial/locales/whitelist_sl.json b/app/soapbox/locales/whitelist_sl.json similarity index 100% rename from app/gabsocial/locales/whitelist_sl.json rename to app/soapbox/locales/whitelist_sl.json diff --git a/app/gabsocial/locales/whitelist_sq.json b/app/soapbox/locales/whitelist_sq.json similarity index 100% rename from app/gabsocial/locales/whitelist_sq.json rename to app/soapbox/locales/whitelist_sq.json diff --git a/app/gabsocial/locales/whitelist_sr-Latn.json b/app/soapbox/locales/whitelist_sr-Latn.json similarity index 100% rename from app/gabsocial/locales/whitelist_sr-Latn.json rename to app/soapbox/locales/whitelist_sr-Latn.json diff --git a/app/gabsocial/locales/whitelist_sr.json b/app/soapbox/locales/whitelist_sr.json similarity index 100% rename from app/gabsocial/locales/whitelist_sr.json rename to app/soapbox/locales/whitelist_sr.json diff --git a/app/gabsocial/locales/whitelist_sv.json b/app/soapbox/locales/whitelist_sv.json similarity index 100% rename from app/gabsocial/locales/whitelist_sv.json rename to app/soapbox/locales/whitelist_sv.json diff --git a/app/gabsocial/locales/whitelist_ta.json b/app/soapbox/locales/whitelist_ta.json similarity index 100% rename from app/gabsocial/locales/whitelist_ta.json rename to app/soapbox/locales/whitelist_ta.json diff --git a/app/gabsocial/locales/whitelist_te.json b/app/soapbox/locales/whitelist_te.json similarity index 100% rename from app/gabsocial/locales/whitelist_te.json rename to app/soapbox/locales/whitelist_te.json diff --git a/app/gabsocial/locales/whitelist_th.json b/app/soapbox/locales/whitelist_th.json similarity index 100% rename from app/gabsocial/locales/whitelist_th.json rename to app/soapbox/locales/whitelist_th.json diff --git a/app/gabsocial/locales/whitelist_tr.json b/app/soapbox/locales/whitelist_tr.json similarity index 100% rename from app/gabsocial/locales/whitelist_tr.json rename to app/soapbox/locales/whitelist_tr.json diff --git a/app/gabsocial/locales/whitelist_uk.json b/app/soapbox/locales/whitelist_uk.json similarity index 100% rename from app/gabsocial/locales/whitelist_uk.json rename to app/soapbox/locales/whitelist_uk.json diff --git a/app/gabsocial/locales/whitelist_zh-CN.json b/app/soapbox/locales/whitelist_zh-CN.json similarity index 100% rename from app/gabsocial/locales/whitelist_zh-CN.json rename to app/soapbox/locales/whitelist_zh-CN.json diff --git a/app/gabsocial/locales/whitelist_zh-HK.json b/app/soapbox/locales/whitelist_zh-HK.json similarity index 100% rename from app/gabsocial/locales/whitelist_zh-HK.json rename to app/soapbox/locales/whitelist_zh-HK.json diff --git a/app/gabsocial/locales/whitelist_zh-TW.json b/app/soapbox/locales/whitelist_zh-TW.json similarity index 100% rename from app/gabsocial/locales/whitelist_zh-TW.json rename to app/soapbox/locales/whitelist_zh-TW.json diff --git a/app/gabsocial/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json similarity index 100% rename from app/gabsocial/locales/zh-CN.json rename to app/soapbox/locales/zh-CN.json diff --git a/app/gabsocial/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json similarity index 100% rename from app/gabsocial/locales/zh-HK.json rename to app/soapbox/locales/zh-HK.json diff --git a/app/gabsocial/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json similarity index 100% rename from app/gabsocial/locales/zh-TW.json rename to app/soapbox/locales/zh-TW.json diff --git a/app/gabsocial/main.js b/app/soapbox/main.js similarity index 83% rename from app/gabsocial/main.js rename to app/soapbox/main.js index d52ddab5b..9480a1ea4 100644 --- a/app/gabsocial/main.js +++ b/app/soapbox/main.js @@ -1,7 +1,7 @@ 'use strict'; import * as registerPushNotifications from './actions/push_notifications'; -import { default as GabSocial, store } from './containers/gabsocial'; +import { default as Soapbox, store } from './containers/soapbox'; import React from 'react'; import ReactDOM from 'react-dom'; import ready from './ready'; @@ -21,9 +21,9 @@ function main() { // } ready(() => { - const mountNode = document.getElementById('gabsocial'); + const mountNode = document.getElementById('soapbox'); - ReactDOM.render(, mountNode); + ReactDOM.render(, mountNode); if (process.env.NODE_ENV === 'production') { // avoid offline in dev mode because it's harder to debug require('offline-plugin/runtime').install(); diff --git a/app/gabsocial/middleware/errors.js b/app/soapbox/middleware/errors.js similarity index 100% rename from app/gabsocial/middleware/errors.js rename to app/soapbox/middleware/errors.js diff --git a/app/gabsocial/middleware/loading_bar.js b/app/soapbox/middleware/loading_bar.js similarity index 100% rename from app/gabsocial/middleware/loading_bar.js rename to app/soapbox/middleware/loading_bar.js diff --git a/app/gabsocial/middleware/sounds.js b/app/soapbox/middleware/sounds.js similarity index 100% rename from app/gabsocial/middleware/sounds.js rename to app/soapbox/middleware/sounds.js diff --git a/app/gabsocial/pages/group_page.js b/app/soapbox/pages/group_page.js similarity index 100% rename from app/gabsocial/pages/group_page.js rename to app/soapbox/pages/group_page.js diff --git a/app/gabsocial/pages/groups_page.js b/app/soapbox/pages/groups_page.js similarity index 100% rename from app/gabsocial/pages/groups_page.js rename to app/soapbox/pages/groups_page.js diff --git a/app/gabsocial/pages/home_page.js b/app/soapbox/pages/home_page.js similarity index 98% rename from app/gabsocial/pages/home_page.js rename to app/soapbox/pages/home_page.js index b1dace597..6a6a7f6fe 100644 --- a/app/gabsocial/pages/home_page.js +++ b/app/soapbox/pages/home_page.js @@ -9,7 +9,7 @@ import UserPanel from '../features/ui/components/user_panel'; import FundingPanel from '../features/ui/components/funding_panel'; import ComposeFormContainer from '../features/compose/containers/compose_form_container'; import Avatar from '../components/avatar'; -import { getFeatures } from 'gabsocial/utils/features'; +import { getFeatures } from 'soapbox/utils/features'; // import GroupSidebarPanel from '../features/groups/sidebar_panel'; const mapStateToProps = state => { diff --git a/app/gabsocial/pages/profile_page.js b/app/soapbox/pages/profile_page.js similarity index 95% rename from app/gabsocial/pages/profile_page.js rename to app/soapbox/pages/profile_page.js index a06316574..5f23ebf7b 100644 --- a/app/gabsocial/pages/profile_page.js +++ b/app/soapbox/pages/profile_page.js @@ -3,14 +3,14 @@ import { connect } from 'react-redux'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; import ImmutablePureComponent from 'react-immutable-pure-component'; -import Helmet from 'gabsocial/components/helmet'; +import Helmet from 'soapbox/components/helmet'; import HeaderContainer from '../features/account_timeline/containers/header_container'; import WhoToFollowPanel from '../features/ui/components/who_to_follow_panel'; import LinkFooter from '../features/ui/components/link_footer'; import SignUpPanel from '../features/ui/components/sign_up_panel'; import ProfileInfoPanel from '../features/ui/components/profile_info_panel'; -import { acctFull } from 'gabsocial/utils/accounts'; -import { getFeatures } from 'gabsocial/utils/features'; +import { acctFull } from 'soapbox/utils/accounts'; +import { getFeatures } from 'soapbox/utils/features'; const mapStateToProps = (state, { params: { username }, withReplies = false }) => { const accounts = state.getIn(['accounts']); diff --git a/app/gabsocial/pages/search_page.js b/app/soapbox/pages/search_page.js similarity index 96% rename from app/gabsocial/pages/search_page.js rename to app/soapbox/pages/search_page.js index 07415612b..e00ad19cf 100644 --- a/app/gabsocial/pages/search_page.js +++ b/app/soapbox/pages/search_page.js @@ -5,7 +5,7 @@ import Header from '../features/search/components/header'; import WhoToFollowPanel from '../features/ui/components/who_to_follow_panel'; import LinkFooter from '../features/ui/components/link_footer'; import SignUpPanel from '../features/ui/components/sign_up_panel'; -import { getFeatures } from 'gabsocial/utils/features'; +import { getFeatures } from 'soapbox/utils/features'; const mapStateToProps = state => ({ features: getFeatures(state.get('instance')), diff --git a/app/gabsocial/performance.js b/app/soapbox/performance.js similarity index 100% rename from app/gabsocial/performance.js rename to app/soapbox/performance.js diff --git a/app/gabsocial/ready.js b/app/soapbox/ready.js similarity index 100% rename from app/gabsocial/ready.js rename to app/soapbox/ready.js diff --git a/app/gabsocial/reducers/accounts.js b/app/soapbox/reducers/accounts.js similarity index 100% rename from app/gabsocial/reducers/accounts.js rename to app/soapbox/reducers/accounts.js diff --git a/app/gabsocial/reducers/accounts_counters.js b/app/soapbox/reducers/accounts_counters.js similarity index 100% rename from app/gabsocial/reducers/accounts_counters.js rename to app/soapbox/reducers/accounts_counters.js diff --git a/app/gabsocial/reducers/alerts.js b/app/soapbox/reducers/alerts.js similarity index 100% rename from app/gabsocial/reducers/alerts.js rename to app/soapbox/reducers/alerts.js diff --git a/app/gabsocial/reducers/auth.js b/app/soapbox/reducers/auth.js similarity index 100% rename from app/gabsocial/reducers/auth.js rename to app/soapbox/reducers/auth.js diff --git a/app/gabsocial/reducers/compose.js b/app/soapbox/reducers/compose.js similarity index 100% rename from app/gabsocial/reducers/compose.js rename to app/soapbox/reducers/compose.js diff --git a/app/gabsocial/reducers/contexts.js b/app/soapbox/reducers/contexts.js similarity index 100% rename from app/gabsocial/reducers/contexts.js rename to app/soapbox/reducers/contexts.js diff --git a/app/gabsocial/reducers/conversations.js b/app/soapbox/reducers/conversations.js similarity index 100% rename from app/gabsocial/reducers/conversations.js rename to app/soapbox/reducers/conversations.js diff --git a/app/gabsocial/reducers/custom_emojis.js b/app/soapbox/reducers/custom_emojis.js similarity index 100% rename from app/gabsocial/reducers/custom_emojis.js rename to app/soapbox/reducers/custom_emojis.js diff --git a/app/gabsocial/reducers/domain_lists.js b/app/soapbox/reducers/domain_lists.js similarity index 100% rename from app/gabsocial/reducers/domain_lists.js rename to app/soapbox/reducers/domain_lists.js diff --git a/app/gabsocial/reducers/dropdown_menu.js b/app/soapbox/reducers/dropdown_menu.js similarity index 100% rename from app/gabsocial/reducers/dropdown_menu.js rename to app/soapbox/reducers/dropdown_menu.js diff --git a/app/gabsocial/reducers/filters.js b/app/soapbox/reducers/filters.js similarity index 100% rename from app/gabsocial/reducers/filters.js rename to app/soapbox/reducers/filters.js diff --git a/app/gabsocial/reducers/group_editor.js b/app/soapbox/reducers/group_editor.js similarity index 100% rename from app/gabsocial/reducers/group_editor.js rename to app/soapbox/reducers/group_editor.js diff --git a/app/gabsocial/reducers/group_lists.js b/app/soapbox/reducers/group_lists.js similarity index 100% rename from app/gabsocial/reducers/group_lists.js rename to app/soapbox/reducers/group_lists.js diff --git a/app/gabsocial/reducers/group_relationships.js b/app/soapbox/reducers/group_relationships.js similarity index 100% rename from app/gabsocial/reducers/group_relationships.js rename to app/soapbox/reducers/group_relationships.js diff --git a/app/gabsocial/reducers/groups.js b/app/soapbox/reducers/groups.js similarity index 100% rename from app/gabsocial/reducers/groups.js rename to app/soapbox/reducers/groups.js diff --git a/app/gabsocial/reducers/height_cache.js b/app/soapbox/reducers/height_cache.js similarity index 100% rename from app/gabsocial/reducers/height_cache.js rename to app/soapbox/reducers/height_cache.js diff --git a/app/gabsocial/reducers/identity_proofs.js b/app/soapbox/reducers/identity_proofs.js similarity index 100% rename from app/gabsocial/reducers/identity_proofs.js rename to app/soapbox/reducers/identity_proofs.js diff --git a/app/gabsocial/reducers/index.js b/app/soapbox/reducers/index.js similarity index 100% rename from app/gabsocial/reducers/index.js rename to app/soapbox/reducers/index.js diff --git a/app/gabsocial/reducers/instance.js b/app/soapbox/reducers/instance.js similarity index 100% rename from app/gabsocial/reducers/instance.js rename to app/soapbox/reducers/instance.js diff --git a/app/gabsocial/reducers/list_adder.js b/app/soapbox/reducers/list_adder.js similarity index 100% rename from app/gabsocial/reducers/list_adder.js rename to app/soapbox/reducers/list_adder.js diff --git a/app/gabsocial/reducers/list_editor.js b/app/soapbox/reducers/list_editor.js similarity index 100% rename from app/gabsocial/reducers/list_editor.js rename to app/soapbox/reducers/list_editor.js diff --git a/app/gabsocial/reducers/lists.js b/app/soapbox/reducers/lists.js similarity index 100% rename from app/gabsocial/reducers/lists.js rename to app/soapbox/reducers/lists.js diff --git a/app/gabsocial/reducers/me.js b/app/soapbox/reducers/me.js similarity index 100% rename from app/gabsocial/reducers/me.js rename to app/soapbox/reducers/me.js diff --git a/app/gabsocial/reducers/media_attachments.js b/app/soapbox/reducers/media_attachments.js similarity index 100% rename from app/gabsocial/reducers/media_attachments.js rename to app/soapbox/reducers/media_attachments.js diff --git a/app/gabsocial/reducers/meta.js b/app/soapbox/reducers/meta.js similarity index 91% rename from app/gabsocial/reducers/meta.js rename to app/soapbox/reducers/meta.js index 024103d23..9d4462c77 100644 --- a/app/gabsocial/reducers/meta.js +++ b/app/soapbox/reducers/meta.js @@ -1,7 +1,7 @@ 'use strict'; import { STORE_HYDRATE } from '../actions/store'; -import { ME_FETCH_SUCCESS } from 'gabsocial/actions/me'; +import { ME_FETCH_SUCCESS } from 'soapbox/actions/me'; import { Map as ImmutableMap, fromJS } from 'immutable'; const initialState = ImmutableMap(); diff --git a/app/gabsocial/reducers/modal.js b/app/soapbox/reducers/modal.js similarity index 100% rename from app/gabsocial/reducers/modal.js rename to app/soapbox/reducers/modal.js diff --git a/app/gabsocial/reducers/mutes.js b/app/soapbox/reducers/mutes.js similarity index 100% rename from app/gabsocial/reducers/mutes.js rename to app/soapbox/reducers/mutes.js diff --git a/app/gabsocial/reducers/notifications.js b/app/soapbox/reducers/notifications.js similarity index 100% rename from app/gabsocial/reducers/notifications.js rename to app/soapbox/reducers/notifications.js diff --git a/app/gabsocial/reducers/patron.js b/app/soapbox/reducers/patron.js similarity index 100% rename from app/gabsocial/reducers/patron.js rename to app/soapbox/reducers/patron.js diff --git a/app/gabsocial/reducers/polls.js b/app/soapbox/reducers/polls.js similarity index 87% rename from app/gabsocial/reducers/polls.js rename to app/soapbox/reducers/polls.js index 31cd3a95d..44b7b5308 100644 --- a/app/gabsocial/reducers/polls.js +++ b/app/soapbox/reducers/polls.js @@ -1,4 +1,4 @@ -import { POLLS_IMPORT } from 'gabsocial/actions/importer'; +import { POLLS_IMPORT } from 'soapbox/actions/importer'; import { Map as ImmutableMap, fromJS } from 'immutable'; const importPolls = (state, polls) => state.withMutations(map => polls.forEach(poll => map.set(poll.id, fromJS(poll)))); diff --git a/app/gabsocial/reducers/push_notifications.js b/app/soapbox/reducers/push_notifications.js similarity index 100% rename from app/gabsocial/reducers/push_notifications.js rename to app/soapbox/reducers/push_notifications.js diff --git a/app/gabsocial/reducers/relationships.js b/app/soapbox/reducers/relationships.js similarity index 100% rename from app/gabsocial/reducers/relationships.js rename to app/soapbox/reducers/relationships.js diff --git a/app/gabsocial/reducers/reports.js b/app/soapbox/reducers/reports.js similarity index 100% rename from app/gabsocial/reducers/reports.js rename to app/soapbox/reducers/reports.js diff --git a/app/gabsocial/reducers/search.js b/app/soapbox/reducers/search.js similarity index 100% rename from app/gabsocial/reducers/search.js rename to app/soapbox/reducers/search.js diff --git a/app/gabsocial/reducers/settings.js b/app/soapbox/reducers/settings.js similarity index 97% rename from app/gabsocial/reducers/settings.js rename to app/soapbox/reducers/settings.js index 65b785091..15456430e 100644 --- a/app/gabsocial/reducers/settings.js +++ b/app/soapbox/reducers/settings.js @@ -3,7 +3,7 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications'; import { STORE_HYDRATE } from '../actions/store'; import { EMOJI_USE } from '../actions/emojis'; import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists'; -import { ME_FETCH_SUCCESS } from 'gabsocial/actions/me'; +import { ME_FETCH_SUCCESS } from 'soapbox/actions/me'; import { Map as ImmutableMap, fromJS } from 'immutable'; import uuid from '../uuid'; diff --git a/app/gabsocial/reducers/sidebar.js b/app/soapbox/reducers/sidebar.js similarity index 100% rename from app/gabsocial/reducers/sidebar.js rename to app/soapbox/reducers/sidebar.js diff --git a/app/gabsocial/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js similarity index 100% rename from app/gabsocial/reducers/soapbox.js rename to app/soapbox/reducers/soapbox.js diff --git a/app/gabsocial/reducers/status_lists.js b/app/soapbox/reducers/status_lists.js similarity index 100% rename from app/gabsocial/reducers/status_lists.js rename to app/soapbox/reducers/status_lists.js diff --git a/app/gabsocial/reducers/statuses.js b/app/soapbox/reducers/statuses.js similarity index 97% rename from app/gabsocial/reducers/statuses.js rename to app/soapbox/reducers/statuses.js index d41fc3834..8cccd4a09 100644 --- a/app/gabsocial/reducers/statuses.js +++ b/app/soapbox/reducers/statuses.js @@ -16,7 +16,7 @@ import { import { TIMELINE_DELETE } from '../actions/timelines'; import { STATUS_IMPORT, STATUSES_IMPORT } from '../actions/importer'; import { Map as ImmutableMap, fromJS } from 'immutable'; -import { simulateEmojiReact } from 'gabsocial/utils/emoji_reacts'; +import { simulateEmojiReact } from 'soapbox/utils/emoji_reacts'; const importStatus = (state, status) => state.set(status.id, fromJS(status)); diff --git a/app/gabsocial/reducers/suggestions.js b/app/soapbox/reducers/suggestions.js similarity index 100% rename from app/gabsocial/reducers/suggestions.js rename to app/soapbox/reducers/suggestions.js diff --git a/app/gabsocial/reducers/timelines.js b/app/soapbox/reducers/timelines.js similarity index 100% rename from app/gabsocial/reducers/timelines.js rename to app/soapbox/reducers/timelines.js diff --git a/app/gabsocial/reducers/trends.js b/app/soapbox/reducers/trends.js similarity index 100% rename from app/gabsocial/reducers/trends.js rename to app/soapbox/reducers/trends.js diff --git a/app/gabsocial/reducers/user_lists.js b/app/soapbox/reducers/user_lists.js similarity index 100% rename from app/gabsocial/reducers/user_lists.js rename to app/soapbox/reducers/user_lists.js diff --git a/app/gabsocial/rtl.js b/app/soapbox/rtl.js similarity index 100% rename from app/gabsocial/rtl.js rename to app/soapbox/rtl.js diff --git a/app/gabsocial/selectors/index.js b/app/soapbox/selectors/index.js similarity index 100% rename from app/gabsocial/selectors/index.js rename to app/soapbox/selectors/index.js diff --git a/app/gabsocial/service_worker/entry.js b/app/soapbox/service_worker/entry.js similarity index 96% rename from app/gabsocial/service_worker/entry.js rename to app/soapbox/service_worker/entry.js index e14128883..0cb11095c 100644 --- a/app/gabsocial/service_worker/entry.js +++ b/app/soapbox/service_worker/entry.js @@ -2,11 +2,11 @@ import './web_push_notifications'; // function openSystemCache() { -// return caches.open('gabsocial-system'); +// return caches.open('soapbox-system'); // } function openWebCache() { - return caches.open('gabsocial-web'); + return caches.open('soapbox-web'); } function fetchRoot() { @@ -35,7 +35,7 @@ self.addEventListener('fetch', function(event) { if (response.ok || response.type === 'opaqueredirect') { return Promise.all([ asyncCache.then(cache => cache.delete('/')), - indexedDB.deleteDatabase('gabsocial'), + indexedDB.deleteDatabase('soapbox'), ]).then(() => response); } diff --git a/app/gabsocial/service_worker/web_push_locales.js b/app/soapbox/service_worker/web_push_locales.js similarity index 100% rename from app/gabsocial/service_worker/web_push_locales.js rename to app/soapbox/service_worker/web_push_locales.js diff --git a/app/gabsocial/service_worker/web_push_notifications.js b/app/soapbox/service_worker/web_push_notifications.js similarity index 100% rename from app/gabsocial/service_worker/web_push_notifications.js rename to app/soapbox/service_worker/web_push_notifications.js diff --git a/app/gabsocial/settings.js b/app/soapbox/settings.js similarity index 84% rename from app/gabsocial/settings.js rename to app/soapbox/settings.js index 27b84a26f..e3f809435 100644 --- a/app/gabsocial/settings.js +++ b/app/soapbox/settings.js @@ -45,5 +45,5 @@ export default class Settings { } -export const pushNotificationsSetting = new Settings('gabsocial_push_notification_data'); -export const tagHistory = new Settings('gabsocial_tag_history'); +export const pushNotificationsSetting = new Settings('soapbox_push_notification_data'); +export const tagHistory = new Settings('soapbox_tag_history'); diff --git a/app/gabsocial/storage/db.js b/app/soapbox/storage/db.js similarity index 95% rename from app/gabsocial/storage/db.js rename to app/soapbox/storage/db.js index 95bee5a91..0620a0b3a 100644 --- a/app/gabsocial/storage/db.js +++ b/app/soapbox/storage/db.js @@ -8,7 +8,7 @@ export default () => new Promise((resolve, reject) => { return; } - const request = indexedDB.open('gabsocial'); + const request = indexedDB.open('soapbox'); request.onerror = reject; request.onsuccess = ({ target }) => resolve(target.result); diff --git a/app/gabsocial/storage/modifier.js b/app/soapbox/storage/modifier.js similarity index 97% rename from app/gabsocial/storage/modifier.js rename to app/soapbox/storage/modifier.js index 574802ea8..74bf3cb5b 100644 --- a/app/gabsocial/storage/modifier.js +++ b/app/soapbox/storage/modifier.js @@ -12,7 +12,7 @@ export const storageFreeable = 'storage' in navigator && 'estimate' in navigator function openCache() { // ServiceWorker and Cache API is not available on iOS 11 // https://webkit.org/status/#specification-service-workers - return self.caches ? caches.open('gabsocial-system') : Promise.reject(); + return self.caches ? caches.open('soapbox-system') : Promise.reject(); } function printErrorIfAvailable(error) { @@ -199,7 +199,7 @@ export function freeStorage() { if (retrieval.result.length > 0) { resolve(evictAccountsByRecords(retrieval.result).then(freeStorage)); } else { - resolve(caches.delete('gabsocial-system')); + resolve(caches.delete('soapbox-system')); } }; diff --git a/app/gabsocial/store/configureStore.js b/app/soapbox/store/configureStore.js similarity index 100% rename from app/gabsocial/store/configureStore.js rename to app/soapbox/store/configureStore.js diff --git a/app/gabsocial/stream.js b/app/soapbox/stream.js similarity index 100% rename from app/gabsocial/stream.js rename to app/soapbox/stream.js diff --git a/app/gabsocial/test_setup.js b/app/soapbox/test_setup.js similarity index 100% rename from app/gabsocial/test_setup.js rename to app/soapbox/test_setup.js diff --git a/app/gabsocial/utils/__tests__/accounts-test.js b/app/soapbox/utils/__tests__/accounts-test.js similarity index 100% rename from app/gabsocial/utils/__tests__/accounts-test.js rename to app/soapbox/utils/__tests__/accounts-test.js diff --git a/app/gabsocial/utils/__tests__/base64-test.js b/app/soapbox/utils/__tests__/base64-test.js similarity index 100% rename from app/gabsocial/utils/__tests__/base64-test.js rename to app/soapbox/utils/__tests__/base64-test.js diff --git a/app/gabsocial/utils/__tests__/emoji_reacts-test.js b/app/soapbox/utils/__tests__/emoji_reacts-test.js similarity index 100% rename from app/gabsocial/utils/__tests__/emoji_reacts-test.js rename to app/soapbox/utils/__tests__/emoji_reacts-test.js diff --git a/app/gabsocial/utils/__tests__/features-test.js b/app/soapbox/utils/__tests__/features-test.js similarity index 100% rename from app/gabsocial/utils/__tests__/features-test.js rename to app/soapbox/utils/__tests__/features-test.js diff --git a/app/gabsocial/utils/__tests__/html-test.js b/app/soapbox/utils/__tests__/html-test.js similarity index 100% rename from app/gabsocial/utils/__tests__/html-test.js rename to app/soapbox/utils/__tests__/html-test.js diff --git a/app/gabsocial/utils/accounts.js b/app/soapbox/utils/accounts.js similarity index 100% rename from app/gabsocial/utils/accounts.js rename to app/soapbox/utils/accounts.js diff --git a/app/gabsocial/utils/base64.js b/app/soapbox/utils/base64.js similarity index 100% rename from app/gabsocial/utils/base64.js rename to app/soapbox/utils/base64.js diff --git a/app/gabsocial/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js similarity index 100% rename from app/gabsocial/utils/emoji_reacts.js rename to app/soapbox/utils/emoji_reacts.js diff --git a/app/gabsocial/utils/features.js b/app/soapbox/utils/features.js similarity index 100% rename from app/gabsocial/utils/features.js rename to app/soapbox/utils/features.js diff --git a/app/gabsocial/utils/html.js b/app/soapbox/utils/html.js similarity index 100% rename from app/gabsocial/utils/html.js rename to app/soapbox/utils/html.js diff --git a/app/gabsocial/utils/media_aspect_ratio.js b/app/soapbox/utils/media_aspect_ratio.js similarity index 100% rename from app/gabsocial/utils/media_aspect_ratio.js rename to app/soapbox/utils/media_aspect_ratio.js diff --git a/app/gabsocial/utils/numbers.js b/app/soapbox/utils/numbers.js similarity index 100% rename from app/gabsocial/utils/numbers.js rename to app/soapbox/utils/numbers.js diff --git a/app/gabsocial/utils/resize_image.js b/app/soapbox/utils/resize_image.js similarity index 100% rename from app/gabsocial/utils/resize_image.js rename to app/soapbox/utils/resize_image.js diff --git a/app/gabsocial/utils/soapbox_prop_types.js b/app/soapbox/utils/soapbox_prop_types.js similarity index 100% rename from app/gabsocial/utils/soapbox_prop_types.js rename to app/soapbox/utils/soapbox_prop_types.js diff --git a/app/gabsocial/uuid.js b/app/soapbox/uuid.js similarity index 100% rename from app/gabsocial/uuid.js rename to app/soapbox/uuid.js diff --git a/app/styles/application.scss b/app/styles/application.scss index 69ab8cccd..3c3b00226 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -1,50 +1,50 @@ -@import 'gabsocial/mixins'; -@import 'gabsocial/variables'; -@import 'gabsocial/fonts'; -@import 'gabsocial/reset'; -// @import 'gabsocial/scrollbars'; -@import 'gabsocial/basics'; -@import 'gabsocial/containers'; -@import 'gabsocial/lists'; -@import 'gabsocial/footer'; -@import 'gabsocial/compact_header'; -@import 'gabsocial/widgets'; -@import 'gabsocial/forms'; -@import 'gabsocial/accounts'; -@import 'gabsocial/stream_entries'; -@import 'gabsocial/boost'; +@import 'soapbox/mixins'; +@import 'soapbox/variables'; +@import 'soapbox/fonts'; +@import 'soapbox/reset'; +// @import 'soapbox/scrollbars'; +@import 'soapbox/basics'; +@import 'soapbox/containers'; +@import 'soapbox/lists'; +@import 'soapbox/footer'; +@import 'soapbox/compact_header'; +@import 'soapbox/widgets'; +@import 'soapbox/forms'; +@import 'soapbox/accounts'; +@import 'soapbox/stream_entries'; +@import 'soapbox/boost'; // NOTE - In the process of stripping this giant file into individual components (below) -@import 'gabsocial/components'; +@import 'soapbox/components'; // COMPONENTS -@import 'gabsocial/components/buttons'; -@import 'gabsocial/components/inputs'; -@import 'gabsocial/components/tabs-bar'; -@import 'gabsocial/components/dropdown-menu'; -@import 'gabsocial/components/modal'; -@import 'gabsocial/components/account-header'; -@import 'gabsocial/components/user-panel'; -@import 'gabsocial/components/compose-form'; -@import 'gabsocial/components/group-card'; -@import 'gabsocial/components/group-detail'; -@import 'gabsocial/components/group-form'; -@import 'gabsocial/components/group-sidebar-panel'; -@import 'gabsocial/components/sidebar-menu'; -@import 'gabsocial/components/hotkeys-modal'; -@import 'gabsocial/components/emoji-reacts'; -@import 'gabsocial/components/detailed-status'; +@import 'soapbox/components/buttons'; +@import 'soapbox/components/inputs'; +@import 'soapbox/components/tabs-bar'; +@import 'soapbox/components/dropdown-menu'; +@import 'soapbox/components/modal'; +@import 'soapbox/components/account-header'; +@import 'soapbox/components/user-panel'; +@import 'soapbox/components/compose-form'; +@import 'soapbox/components/group-card'; +@import 'soapbox/components/group-detail'; +@import 'soapbox/components/group-form'; +@import 'soapbox/components/group-sidebar-panel'; +@import 'soapbox/components/sidebar-menu'; +@import 'soapbox/components/hotkeys-modal'; +@import 'soapbox/components/emoji-reacts'; +@import 'soapbox/components/detailed-status'; -@import 'gabsocial/polls'; -@import 'gabsocial/introduction'; -@import 'gabsocial/emoji_picker'; -@import 'gabsocial/about'; -@import 'gabsocial/tables'; -@import 'gabsocial/admin'; -@import 'gabsocial/dashboard'; -@import 'gabsocial/rtl'; -@import 'gabsocial/accessibility'; -@import 'gabsocial/donations'; -@import 'gabsocial/dyslexic'; -@import 'gabsocial/demetricator'; -@import 'gabsocial/pro'; +@import 'soapbox/polls'; +@import 'soapbox/introduction'; +@import 'soapbox/emoji_picker'; +@import 'soapbox/about'; +@import 'soapbox/tables'; +@import 'soapbox/admin'; +@import 'soapbox/dashboard'; +@import 'soapbox/rtl'; +@import 'soapbox/accessibility'; +@import 'soapbox/donations'; +@import 'soapbox/dyslexic'; +@import 'soapbox/demetricator'; +@import 'soapbox/pro'; diff --git a/app/styles/azure.scss b/app/styles/azure.scss index c7c0b1763..501adb5a1 100644 --- a/app/styles/azure.scss +++ b/app/styles/azure.scss @@ -1,4 +1,4 @@ -@import 'gabsocial-light/variables'; +@import 'soapbox-light/variables'; // $gab-brand-default: lighten(#149dfb, 10%); $gab-brand-default: #0482d8; @@ -11,7 +11,7 @@ $nav-ui-highlight-color: #149dfb; $ui-base-lighter-color: #b0c0cf; @import 'application'; -@import 'gabsocial-light/diff'; +@import 'soapbox-light/diff'; .tabs-bar__link { font-weight: bold; diff --git a/app/styles/gabsocial-light.scss b/app/styles/gabsocial-light.scss deleted file mode 100644 index 12cfce8b2..000000000 --- a/app/styles/gabsocial-light.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import 'gabsocial-light/variables'; -@import 'application'; -@import 'gabsocial-light/diff'; diff --git a/app/styles/glinner.scss b/app/styles/glinner.scss index c53408833..966dfa203 100644 --- a/app/styles/glinner.scss +++ b/app/styles/glinner.scss @@ -1,4 +1,4 @@ -@import 'gabsocial-light/variables'; +@import 'soapbox-light/variables'; $glinner-yellow: #fff360; $glinner-orange: #ffa254; @@ -23,7 +23,7 @@ $ui-base-lighter-color: darken($glinner-orange, 35%); $bg-size: 720px; @import 'application'; -@import 'gabsocial-light/diff'; +@import 'soapbox-light/diff'; body { background-color: #bcbb65; diff --git a/app/styles/halloween/diff.scss b/app/styles/halloween/diff.scss index 4dbaf10ee..3cdef86d6 100644 --- a/app/styles/halloween/diff.scss +++ b/app/styles/halloween/diff.scss @@ -10,8 +10,8 @@ body::before, body.app-body::after, -#gabsocial::before, -#gabsocial::after { +#soapbox::before, +#soapbox::after { content: ''; display: block; position: fixed; @@ -41,7 +41,7 @@ body.app-body::after { animation: twinkle 200s linear infinite; } -#gabsocial::before { +#soapbox::before { background-image: radial-gradient( circle, transparent 0%, @@ -50,7 +50,7 @@ body.app-body::after { ); } -#gabsocial::after { +#soapbox::after { background: transparent url("../images/clouds.png") repeat top center; animation: clouds 200s linear infinite; } diff --git a/app/styles/lime.scss b/app/styles/lime.scss index 3ff6de7b1..a9ee3d159 100644 --- a/app/styles/lime.scss +++ b/app/styles/lime.scss @@ -1,4 +1,4 @@ -@import 'gabsocial-light/variables'; +@import 'soapbox-light/variables'; $gab-brand-default: #1ca82b; $gab-background-base-light: #fafff9; @@ -9,7 +9,7 @@ $nav-ui-highlight-color: #69f31f; $ui-base-lighter-color: darken(#69f31f, 35%); @import 'application'; -@import 'gabsocial-light/diff'; +@import 'soapbox-light/diff'; .public-layout .footer ul li a { color: lighten($gab-brand-default, 10%); diff --git a/app/styles/mailer.scss b/app/styles/mailer.scss index 53cd33de2..281806115 100644 --- a/app/styles/mailer.scss +++ b/app/styles/mailer.scss @@ -1,6 +1,6 @@ -@import 'gabsocial/variables'; +@import 'soapbox/variables'; -//Check this out later - replace with 'gabsocial/fonts' +//Check this out later - replace with 'soapbox/fonts' //@import 'fonts/roboto'; table, diff --git a/app/styles/neenster.scss b/app/styles/neenster.scss index 47f302019..09208e083 100644 --- a/app/styles/neenster.scss +++ b/app/styles/neenster.scss @@ -1,4 +1,4 @@ -@import 'gabsocial-light/variables'; +@import 'soapbox-light/variables'; $gab-brand-default: #34565c; $gab-background-base-light: #f6fbfb; @@ -9,7 +9,7 @@ $nav-ui-highlight-color: #2da8be; $ui-base-lighter-color: darken(#2da8be, 35%); @import 'application'; -@import 'gabsocial-light/diff'; +@import 'soapbox-light/diff'; .public-layout { background: $gab-brand-default url("../images/neenster/fish.gif"); diff --git a/app/styles/soapbox-light.scss b/app/styles/soapbox-light.scss new file mode 100644 index 000000000..cda61a4c0 --- /dev/null +++ b/app/styles/soapbox-light.scss @@ -0,0 +1,3 @@ +@import 'soapbox-light/variables'; +@import 'application'; +@import 'soapbox-light/diff'; diff --git a/app/styles/gabsocial-light/diff.scss b/app/styles/soapbox-light/diff.scss similarity index 99% rename from app/styles/gabsocial-light/diff.scss rename to app/styles/soapbox-light/diff.scss index e446d3ab0..7299db95e 100644 --- a/app/styles/gabsocial-light/diff.scss +++ b/app/styles/soapbox-light/diff.scss @@ -26,7 +26,7 @@ body { background: $ui-base-color; } -.drawer__inner__gabsocial { +.drawer__inner__soapbox { background: $ui-base-color url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto; } diff --git a/app/styles/gabsocial-light/variables.scss b/app/styles/soapbox-light/variables.scss similarity index 100% rename from app/styles/gabsocial-light/variables.scss rename to app/styles/soapbox-light/variables.scss diff --git a/app/styles/gabsocial/_mixins.scss b/app/styles/soapbox/_mixins.scss similarity index 100% rename from app/styles/gabsocial/_mixins.scss rename to app/styles/soapbox/_mixins.scss diff --git a/app/styles/gabsocial/about.scss b/app/styles/soapbox/about.scss similarity index 99% rename from app/styles/gabsocial/about.scss rename to app/styles/soapbox/about.scss index ac435ea46..42f59774f 100644 --- a/app/styles/gabsocial/about.scss +++ b/app/styles/soapbox/about.scss @@ -537,7 +537,7 @@ $small-breakpoint: 960px; &__information, &__forms, - #gabsocial-timeline { + #soapbox-timeline { box-sizing: border-box; background: $ui-base-color; border-radius: 4px; diff --git a/app/styles/gabsocial/accessibility.scss b/app/styles/soapbox/accessibility.scss similarity index 100% rename from app/styles/gabsocial/accessibility.scss rename to app/styles/soapbox/accessibility.scss diff --git a/app/styles/gabsocial/accounts.scss b/app/styles/soapbox/accounts.scss similarity index 100% rename from app/styles/gabsocial/accounts.scss rename to app/styles/soapbox/accounts.scss diff --git a/app/styles/gabsocial/admin.scss b/app/styles/soapbox/admin.scss similarity index 100% rename from app/styles/gabsocial/admin.scss rename to app/styles/soapbox/admin.scss diff --git a/app/styles/gabsocial/basics.scss b/app/styles/soapbox/basics.scss similarity index 100% rename from app/styles/gabsocial/basics.scss rename to app/styles/soapbox/basics.scss diff --git a/app/styles/gabsocial/boost.scss b/app/styles/soapbox/boost.scss similarity index 100% rename from app/styles/gabsocial/boost.scss rename to app/styles/soapbox/boost.scss diff --git a/app/styles/gabsocial/compact_header.scss b/app/styles/soapbox/compact_header.scss similarity index 100% rename from app/styles/gabsocial/compact_header.scss rename to app/styles/soapbox/compact_header.scss diff --git a/app/styles/gabsocial/components.scss b/app/styles/soapbox/components.scss similarity index 99% rename from app/styles/gabsocial/components.scss rename to app/styles/soapbox/components.scss index 1886b8adf..bb54c1ad9 100644 --- a/app/styles/gabsocial/components.scss +++ b/app/styles/soapbox/components.scss @@ -1694,7 +1694,7 @@ a.account__display-name { } } -.drawer__inner__gabsocial { +.drawer__inner__soapbox { background: lighten($ui-base-color, 13%) url('data:image/svg+xml;utf8,') no-repeat bottom / 100% auto; flex: 1; min-height: 47px; diff --git a/app/styles/gabsocial/components/account-header.scss b/app/styles/soapbox/components/account-header.scss similarity index 100% rename from app/styles/gabsocial/components/account-header.scss rename to app/styles/soapbox/components/account-header.scss diff --git a/app/styles/gabsocial/components/buttons.scss b/app/styles/soapbox/components/buttons.scss similarity index 100% rename from app/styles/gabsocial/components/buttons.scss rename to app/styles/soapbox/components/buttons.scss diff --git a/app/styles/gabsocial/components/compose-form.scss b/app/styles/soapbox/components/compose-form.scss similarity index 100% rename from app/styles/gabsocial/components/compose-form.scss rename to app/styles/soapbox/components/compose-form.scss diff --git a/app/styles/gabsocial/components/detailed-status.scss b/app/styles/soapbox/components/detailed-status.scss similarity index 100% rename from app/styles/gabsocial/components/detailed-status.scss rename to app/styles/soapbox/components/detailed-status.scss diff --git a/app/styles/gabsocial/components/dropdown-menu.scss b/app/styles/soapbox/components/dropdown-menu.scss similarity index 100% rename from app/styles/gabsocial/components/dropdown-menu.scss rename to app/styles/soapbox/components/dropdown-menu.scss diff --git a/app/styles/gabsocial/components/emoji-reacts.scss b/app/styles/soapbox/components/emoji-reacts.scss similarity index 100% rename from app/styles/gabsocial/components/emoji-reacts.scss rename to app/styles/soapbox/components/emoji-reacts.scss diff --git a/app/styles/gabsocial/components/group-card.scss b/app/styles/soapbox/components/group-card.scss similarity index 100% rename from app/styles/gabsocial/components/group-card.scss rename to app/styles/soapbox/components/group-card.scss diff --git a/app/styles/gabsocial/components/group-detail.scss b/app/styles/soapbox/components/group-detail.scss similarity index 100% rename from app/styles/gabsocial/components/group-detail.scss rename to app/styles/soapbox/components/group-detail.scss diff --git a/app/styles/gabsocial/components/group-form.scss b/app/styles/soapbox/components/group-form.scss similarity index 100% rename from app/styles/gabsocial/components/group-form.scss rename to app/styles/soapbox/components/group-form.scss diff --git a/app/styles/gabsocial/components/group-sidebar-panel.scss b/app/styles/soapbox/components/group-sidebar-panel.scss similarity index 100% rename from app/styles/gabsocial/components/group-sidebar-panel.scss rename to app/styles/soapbox/components/group-sidebar-panel.scss diff --git a/app/styles/gabsocial/components/hotkeys-modal.scss b/app/styles/soapbox/components/hotkeys-modal.scss similarity index 100% rename from app/styles/gabsocial/components/hotkeys-modal.scss rename to app/styles/soapbox/components/hotkeys-modal.scss diff --git a/app/styles/gabsocial/components/inputs.scss b/app/styles/soapbox/components/inputs.scss similarity index 100% rename from app/styles/gabsocial/components/inputs.scss rename to app/styles/soapbox/components/inputs.scss diff --git a/app/styles/gabsocial/components/modal.scss b/app/styles/soapbox/components/modal.scss similarity index 100% rename from app/styles/gabsocial/components/modal.scss rename to app/styles/soapbox/components/modal.scss diff --git a/app/styles/gabsocial/components/sidebar-menu.scss b/app/styles/soapbox/components/sidebar-menu.scss similarity index 100% rename from app/styles/gabsocial/components/sidebar-menu.scss rename to app/styles/soapbox/components/sidebar-menu.scss diff --git a/app/styles/gabsocial/components/tabs-bar.scss b/app/styles/soapbox/components/tabs-bar.scss similarity index 100% rename from app/styles/gabsocial/components/tabs-bar.scss rename to app/styles/soapbox/components/tabs-bar.scss diff --git a/app/styles/gabsocial/components/user-panel.scss b/app/styles/soapbox/components/user-panel.scss similarity index 100% rename from app/styles/gabsocial/components/user-panel.scss rename to app/styles/soapbox/components/user-panel.scss diff --git a/app/styles/gabsocial/containers.scss b/app/styles/soapbox/containers.scss similarity index 100% rename from app/styles/gabsocial/containers.scss rename to app/styles/soapbox/containers.scss diff --git a/app/styles/gabsocial/dashboard.scss b/app/styles/soapbox/dashboard.scss similarity index 100% rename from app/styles/gabsocial/dashboard.scss rename to app/styles/soapbox/dashboard.scss diff --git a/app/styles/gabsocial/demetricator.scss b/app/styles/soapbox/demetricator.scss similarity index 100% rename from app/styles/gabsocial/demetricator.scss rename to app/styles/soapbox/demetricator.scss diff --git a/app/styles/gabsocial/donations.scss b/app/styles/soapbox/donations.scss similarity index 100% rename from app/styles/gabsocial/donations.scss rename to app/styles/soapbox/donations.scss diff --git a/app/styles/gabsocial/dyslexic.scss b/app/styles/soapbox/dyslexic.scss similarity index 100% rename from app/styles/gabsocial/dyslexic.scss rename to app/styles/soapbox/dyslexic.scss diff --git a/app/styles/gabsocial/emoji_picker.scss b/app/styles/soapbox/emoji_picker.scss similarity index 100% rename from app/styles/gabsocial/emoji_picker.scss rename to app/styles/soapbox/emoji_picker.scss diff --git a/app/styles/gabsocial/fonts.scss b/app/styles/soapbox/fonts.scss similarity index 100% rename from app/styles/gabsocial/fonts.scss rename to app/styles/soapbox/fonts.scss diff --git a/app/styles/gabsocial/footer.scss b/app/styles/soapbox/footer.scss similarity index 100% rename from app/styles/gabsocial/footer.scss rename to app/styles/soapbox/footer.scss diff --git a/app/styles/gabsocial/forms.scss b/app/styles/soapbox/forms.scss similarity index 100% rename from app/styles/gabsocial/forms.scss rename to app/styles/soapbox/forms.scss diff --git a/app/styles/gabsocial/introduction.scss b/app/styles/soapbox/introduction.scss similarity index 100% rename from app/styles/gabsocial/introduction.scss rename to app/styles/soapbox/introduction.scss diff --git a/app/styles/gabsocial/lists.scss b/app/styles/soapbox/lists.scss similarity index 100% rename from app/styles/gabsocial/lists.scss rename to app/styles/soapbox/lists.scss diff --git a/app/styles/gabsocial/modal.scss b/app/styles/soapbox/modal.scss similarity index 100% rename from app/styles/gabsocial/modal.scss rename to app/styles/soapbox/modal.scss diff --git a/app/styles/gabsocial/polls.scss b/app/styles/soapbox/polls.scss similarity index 100% rename from app/styles/gabsocial/polls.scss rename to app/styles/soapbox/polls.scss diff --git a/app/styles/gabsocial/pro.scss b/app/styles/soapbox/pro.scss similarity index 100% rename from app/styles/gabsocial/pro.scss rename to app/styles/soapbox/pro.scss diff --git a/app/styles/gabsocial/reset.scss b/app/styles/soapbox/reset.scss similarity index 100% rename from app/styles/gabsocial/reset.scss rename to app/styles/soapbox/reset.scss diff --git a/app/styles/gabsocial/rtl.scss b/app/styles/soapbox/rtl.scss similarity index 99% rename from app/styles/gabsocial/rtl.scss rename to app/styles/soapbox/rtl.scss index a1f9a3aff..300eb4dac 100644 --- a/app/styles/gabsocial/rtl.scss +++ b/app/styles/soapbox/rtl.scss @@ -299,7 +299,7 @@ body.rtl { padding-left: 0 !important; } - .landing-page .features #gabsocial-timeline { + .landing-page .features #soapbox-timeline { margin-right: 0; margin-left: 30px; } diff --git a/app/styles/gabsocial/scrollbars.scss b/app/styles/soapbox/scrollbars.scss similarity index 100% rename from app/styles/gabsocial/scrollbars.scss rename to app/styles/soapbox/scrollbars.scss diff --git a/app/styles/gabsocial/stream_entries.scss b/app/styles/soapbox/stream_entries.scss similarity index 100% rename from app/styles/gabsocial/stream_entries.scss rename to app/styles/soapbox/stream_entries.scss diff --git a/app/styles/gabsocial/tables.scss b/app/styles/soapbox/tables.scss similarity index 100% rename from app/styles/gabsocial/tables.scss rename to app/styles/soapbox/tables.scss diff --git a/app/styles/gabsocial/variables.scss b/app/styles/soapbox/variables.scss similarity index 95% rename from app/styles/gabsocial/variables.scss rename to app/styles/soapbox/variables.scss index 4017b2ce1..9a7ab1255 100644 --- a/app/styles/gabsocial/variables.scss +++ b/app/styles/soapbox/variables.scss @@ -110,6 +110,6 @@ $media-modal-media-max-height: 80%; $no-gap-breakpoint: 415px; -$font-sans-serif: 'gabsocial-font-sans-serif' !default; -$font-display: 'gabsocial-font-display' !default; -$font-monospace: 'gabsocial-font-monospace' !default; +$font-sans-serif: 'soapbox-font-sans-serif' !default; +$font-display: 'soapbox-font-display' !default; +$font-monospace: 'soapbox-font-monospace' !default; diff --git a/app/styles/gabsocial/widgets.scss b/app/styles/soapbox/widgets.scss similarity index 100% rename from app/styles/gabsocial/widgets.scss rename to app/styles/soapbox/widgets.scss diff --git a/jest.config.js b/jest.config.js index ea59252e0..ee9db2eae 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,6 +1,6 @@ module.exports = { 'projects': [ - '/app/gabsocial', + '/app/soapbox', ], 'testPathIgnorePatterns': [ '/node_modules/', @@ -13,21 +13,21 @@ module.exports = { // Temporarily disable these tests // https://gitlab.com/soapbox-pub/soapbox-fe/-/issues/34 - '/app/gabsocial/components/__tests__/avatar-test.js', - '/app/gabsocial/components/__tests__/avatar_overlay-test.js', + '/app/soapbox/components/__tests__/avatar-test.js', + '/app/soapbox/components/__tests__/avatar_overlay-test.js', ], 'setupFiles': [ 'raf/polyfill', ], 'setupFilesAfterEnv': [ - '/app/gabsocial/test_setup.js', + '/app/soapbox/test_setup.js', ], 'collectCoverageFrom': [ - 'app/gabsocial/**/*.js', - '!app/gabsocial/features/emoji/emoji_compressed.js', - '!app/gabsocial/locales/locale-data/*.js', - '!app/gabsocial/service_worker/entry.js', - '!app/gabsocial/test_setup.js', + 'app/soapbox/**/*.js', + '!app/soapbox/features/emoji/emoji_compressed.js', + '!app/soapbox/locales/locale-data/*.js', + '!app/soapbox/service_worker/entry.js', + '!app/soapbox/test_setup.js', ], 'coverageDirectory': '/coverage', 'moduleDirectories': [ diff --git a/webpack/config/themes.yml b/webpack/config/themes.yml index 3d4bb3ed6..4de35a710 100644 --- a/webpack/config/themes.yml +++ b/webpack/config/themes.yml @@ -1,5 +1,5 @@ azure: styles/azure.scss -purple: styles/gabsocial-light.scss +purple: styles/soapbox-light.scss purple-dark: styles/application.scss purple-contrast: styles/contrast.scss halloween: styles/halloween.scss diff --git a/webpack/generateLocalePacks.js b/webpack/generateLocalePacks.js index 49f2d5a6d..2a7f99b47 100644 --- a/webpack/generateLocalePacks.js +++ b/webpack/generateLocalePacks.js @@ -7,7 +7,7 @@ const path = require('path'); const rimraf = require('rimraf'); const mkdirp = require('mkdirp'); -const localesJsonPath = path.join(__dirname, '../app/gabsocial/locales'); +const localesJsonPath = path.join(__dirname, '../app/soapbox/locales'); const locales = fs.readdirSync(localesJsonPath).filter(filename => { return /\.json$/.test(filename) && !/defaultMessages/.test(filename) && @@ -28,7 +28,7 @@ locales.forEach(locale => { // first try react-intl `../../node_modules/react-intl/locale-data/${baseLocale}.js`, // then check locales/locale-data - `../../app/gabsocial/locales/locale-data/${baseLocale}.js`, + `../../app/soapbox/locales/locale-data/${baseLocale}.js`, // fall back to English (this is what react-intl does anyway) '../../node_modules/react-intl/locale-data/en.js', ].filter(filename => fs.existsSync(path.join(outPath, filename))) @@ -38,9 +38,9 @@ locales.forEach(locale => { // locale_${locale}.js // automatically generated by generateLocalePacks.js // -import messages from '../../app/gabsocial/locales/${locale}.json'; +import messages from '../../app/soapbox/locales/${locale}.json'; import localeData from ${JSON.stringify(localeDataPath)}; -import { setLocale } from '../../app/gabsocial/locales'; +import { setLocale } from '../../app/soapbox/locales'; setLocale({messages, localeData}); `; fs.writeFileSync(localePath, localeContent, 'utf8'); diff --git a/webpack/production.js b/webpack/production.js index 71d714cb7..a788e7884 100644 --- a/webpack/production.js +++ b/webpack/production.js @@ -97,8 +97,8 @@ module.exports = merge(sharedConfig, { '**/*.woff', ], // ServiceWorker: { - // entry: `imports-loader?ATTACHMENT_HOST=>${encodeURIComponent(JSON.stringify(attachmentHost))}!${encodeURI(path.join(__dirname, '../app/gabsocial/service_worker/entry.js'))}`, - // cacheName: 'gabsocial', + // entry: `imports-loader?ATTACHMENT_HOST=>${encodeURIComponent(JSON.stringify(attachmentHost))}!${encodeURI(path.join(__dirname, '../app/soapbox/service_worker/entry.js'))}`, + // cacheName: 'soapbox', // output: '../assets/sw.js', // publicPath: '/sw.js', // minify: true, diff --git a/webpack/translationRunner.js b/webpack/translationRunner.js index 89119ab9e..c6d28627a 100644 --- a/webpack/translationRunner.js +++ b/webpack/translationRunner.js @@ -6,7 +6,7 @@ const { default: manageTranslations, readMessageFiles } = require('react-intl-t const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/; const rootDirectory = path.resolve(__dirname, '..'); -const translationsDirectory = path.resolve(rootDirectory, 'app', 'gabsocial', 'locales'); +const translationsDirectory = path.resolve(rootDirectory, 'app', 'soapbox', 'locales'); const messagesDirectory = path.resolve(rootDirectory, 'build', 'messages'); const availableLanguages = fs.readdirSync(translationsDirectory).reduce((languages, filename) => { const basename = path.basename(filename, '.json');