From 8b22ca5f27a200dfc6aa0d9aaf004ed0ccc19cc1 Mon Sep 17 00:00:00 2001 From: Chewbacca Date: Tue, 15 Nov 2022 08:23:36 -0500 Subject: [PATCH] Organize fonts,images,icon,sounds into 'assets' folder --- app/application.ts | 2 +- app/{ => assets}/fonts/OpenDyslexic/LICENSE | 0 .../OpenDyslexic-Bold-Italic.woff2 | Bin .../OpenDyslexic/OpenDyslexic-Bold.woff2 | Bin .../OpenDyslexic/OpenDyslexic-Italic.woff2 | Bin .../OpenDyslexic/OpenDyslexic-Regular.woff2 | Bin app/{ => assets}/fonts/soapbox/soapbox.eot | Bin app/{ => assets}/fonts/soapbox/soapbox.svg | 0 app/{ => assets}/fonts/soapbox/soapbox.ttf | Bin app/{ => assets}/fonts/soapbox/soapbox.woff | Bin app/{ => assets}/icons/COPYING.md | 0 app/{ => assets}/icons/fediverse.svg | 0 app/{ => assets}/icons/verified.svg | 0 app/{ => assets}/images/audio-placeholder.png | Bin app/{ => assets}/images/avatar-missing.png | Bin app/{ => assets}/images/avatar-missing.svg | 0 app/{ => assets}/images/header-missing.png | Bin .../images/soapbox-logo-white.svg | 0 app/{ => assets}/images/soapbox-logo.svg | 0 app/{ => assets}/images/video-placeholder.png | Bin app/{ => assets}/images/void.png | Bin .../images/web-push/web-push-icon_expand.png | Bin .../web-push/web-push-icon_favourite.png | Bin .../images/web-push/web-push-icon_reblog.png | Bin app/{ => assets}/sounds/boop.mp3 | Bin app/{ => assets}/sounds/boop.ogg | Bin app/{ => assets}/sounds/chat.mp3 | Bin app/{ => assets}/sounds/chat.oga | Bin app/images/sprite-post-functions.png | Bin 10420 -> 0 bytes app/soapbox/components/sidebar-navigation.tsx | 2 +- app/soapbox/components/sidebar_menu.tsx | 2 +- app/soapbox/components/site-logo.tsx | 4 ++-- app/soapbox/components/verification_badge.tsx | 2 +- app/soapbox/middleware/sounds.ts | 8 ++++---- .../normalizers/__tests__/account.test.ts | 4 ++-- app/soapbox/normalizers/account.ts | 4 ++-- .../service_worker/web_push_notifications.ts | 6 +++--- app/styles/components/compose-form.scss | 4 ++-- app/styles/fonts.scss | 18 +++++++++--------- app/styles/ui.scss | 2 +- webpack/rules/assets.ts | 8 ++++---- 41 files changed, 33 insertions(+), 33 deletions(-) rename app/{ => assets}/fonts/OpenDyslexic/LICENSE (100%) rename app/{ => assets}/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 (100%) rename app/{ => assets}/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 (100%) rename app/{ => assets}/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 (100%) rename app/{ => assets}/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 (100%) rename app/{ => assets}/fonts/soapbox/soapbox.eot (100%) rename app/{ => assets}/fonts/soapbox/soapbox.svg (100%) rename app/{ => assets}/fonts/soapbox/soapbox.ttf (100%) rename app/{ => assets}/fonts/soapbox/soapbox.woff (100%) rename app/{ => assets}/icons/COPYING.md (100%) rename app/{ => assets}/icons/fediverse.svg (100%) rename app/{ => assets}/icons/verified.svg (100%) rename app/{ => assets}/images/audio-placeholder.png (100%) rename app/{ => assets}/images/avatar-missing.png (100%) rename app/{ => assets}/images/avatar-missing.svg (100%) rename app/{ => assets}/images/header-missing.png (100%) rename app/{ => assets}/images/soapbox-logo-white.svg (100%) rename app/{ => assets}/images/soapbox-logo.svg (100%) rename app/{ => assets}/images/video-placeholder.png (100%) rename app/{ => assets}/images/void.png (100%) rename app/{ => assets}/images/web-push/web-push-icon_expand.png (100%) rename app/{ => assets}/images/web-push/web-push-icon_favourite.png (100%) rename app/{ => assets}/images/web-push/web-push-icon_reblog.png (100%) rename app/{ => assets}/sounds/boop.mp3 (100%) rename app/{ => assets}/sounds/boop.ogg (100%) rename app/{ => assets}/sounds/chat.mp3 (100%) rename app/{ => assets}/sounds/chat.oga (100%) delete mode 100644 app/images/sprite-post-functions.png diff --git a/app/application.ts b/app/application.ts index 38dc08993..111923abd 100644 --- a/app/application.ts +++ b/app/application.ts @@ -4,7 +4,7 @@ import loadPolyfills from './soapbox/load_polyfills'; require('./soapbox/iframe'); // @ts-ignore -require.context('./images/', true); +require.context('./assets/images/', true); // Load stylesheet require('react-datepicker/dist/react-datepicker.css'); diff --git a/app/fonts/OpenDyslexic/LICENSE b/app/assets/fonts/OpenDyslexic/LICENSE similarity index 100% rename from app/fonts/OpenDyslexic/LICENSE rename to app/assets/fonts/OpenDyslexic/LICENSE diff --git a/app/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 similarity index 100% rename from app/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 rename to app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2 diff --git a/app/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 similarity index 100% rename from app/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 rename to app/assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2 diff --git a/app/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 similarity index 100% rename from app/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 rename to app/assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2 diff --git a/app/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 b/app/assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 similarity index 100% rename from app/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 rename to app/assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2 diff --git a/app/fonts/soapbox/soapbox.eot b/app/assets/fonts/soapbox/soapbox.eot similarity index 100% rename from app/fonts/soapbox/soapbox.eot rename to app/assets/fonts/soapbox/soapbox.eot diff --git a/app/fonts/soapbox/soapbox.svg b/app/assets/fonts/soapbox/soapbox.svg similarity index 100% rename from app/fonts/soapbox/soapbox.svg rename to app/assets/fonts/soapbox/soapbox.svg diff --git a/app/fonts/soapbox/soapbox.ttf b/app/assets/fonts/soapbox/soapbox.ttf similarity index 100% rename from app/fonts/soapbox/soapbox.ttf rename to app/assets/fonts/soapbox/soapbox.ttf diff --git a/app/fonts/soapbox/soapbox.woff b/app/assets/fonts/soapbox/soapbox.woff similarity index 100% rename from app/fonts/soapbox/soapbox.woff rename to app/assets/fonts/soapbox/soapbox.woff diff --git a/app/icons/COPYING.md b/app/assets/icons/COPYING.md similarity index 100% rename from app/icons/COPYING.md rename to app/assets/icons/COPYING.md diff --git a/app/icons/fediverse.svg b/app/assets/icons/fediverse.svg similarity index 100% rename from app/icons/fediverse.svg rename to app/assets/icons/fediverse.svg diff --git a/app/icons/verified.svg b/app/assets/icons/verified.svg similarity index 100% rename from app/icons/verified.svg rename to app/assets/icons/verified.svg diff --git a/app/images/audio-placeholder.png b/app/assets/images/audio-placeholder.png similarity index 100% rename from app/images/audio-placeholder.png rename to app/assets/images/audio-placeholder.png diff --git a/app/images/avatar-missing.png b/app/assets/images/avatar-missing.png similarity index 100% rename from app/images/avatar-missing.png rename to app/assets/images/avatar-missing.png diff --git a/app/images/avatar-missing.svg b/app/assets/images/avatar-missing.svg similarity index 100% rename from app/images/avatar-missing.svg rename to app/assets/images/avatar-missing.svg diff --git a/app/images/header-missing.png b/app/assets/images/header-missing.png similarity index 100% rename from app/images/header-missing.png rename to app/assets/images/header-missing.png diff --git a/app/images/soapbox-logo-white.svg b/app/assets/images/soapbox-logo-white.svg similarity index 100% rename from app/images/soapbox-logo-white.svg rename to app/assets/images/soapbox-logo-white.svg diff --git a/app/images/soapbox-logo.svg b/app/assets/images/soapbox-logo.svg similarity index 100% rename from app/images/soapbox-logo.svg rename to app/assets/images/soapbox-logo.svg diff --git a/app/images/video-placeholder.png b/app/assets/images/video-placeholder.png similarity index 100% rename from app/images/video-placeholder.png rename to app/assets/images/video-placeholder.png diff --git a/app/images/void.png b/app/assets/images/void.png similarity index 100% rename from app/images/void.png rename to app/assets/images/void.png diff --git a/app/images/web-push/web-push-icon_expand.png b/app/assets/images/web-push/web-push-icon_expand.png similarity index 100% rename from app/images/web-push/web-push-icon_expand.png rename to app/assets/images/web-push/web-push-icon_expand.png diff --git a/app/images/web-push/web-push-icon_favourite.png b/app/assets/images/web-push/web-push-icon_favourite.png similarity index 100% rename from app/images/web-push/web-push-icon_favourite.png rename to app/assets/images/web-push/web-push-icon_favourite.png diff --git a/app/images/web-push/web-push-icon_reblog.png b/app/assets/images/web-push/web-push-icon_reblog.png similarity index 100% rename from app/images/web-push/web-push-icon_reblog.png rename to app/assets/images/web-push/web-push-icon_reblog.png diff --git a/app/sounds/boop.mp3 b/app/assets/sounds/boop.mp3 similarity index 100% rename from app/sounds/boop.mp3 rename to app/assets/sounds/boop.mp3 diff --git a/app/sounds/boop.ogg b/app/assets/sounds/boop.ogg similarity index 100% rename from app/sounds/boop.ogg rename to app/assets/sounds/boop.ogg diff --git a/app/sounds/chat.mp3 b/app/assets/sounds/chat.mp3 similarity index 100% rename from app/sounds/chat.mp3 rename to app/assets/sounds/chat.mp3 diff --git a/app/sounds/chat.oga b/app/assets/sounds/chat.oga similarity index 100% rename from app/sounds/chat.oga rename to app/assets/sounds/chat.oga diff --git a/app/images/sprite-post-functions.png b/app/images/sprite-post-functions.png deleted file mode 100644 index aea7f57ba90bdaa245663f41f237cb950b8414ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10420 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 E03@b(p#T5? diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx index 22ad8dfc9..4dd47efff 100644 --- a/app/soapbox/components/sidebar-navigation.tsx +++ b/app/soapbox/components/sidebar-navigation.tsx @@ -97,7 +97,7 @@ const SidebarNavigation = () => { if (features.publicTimeline && features.federating) { menu.push({ to: '/timeline/fediverse', - icon: require('icons/fediverse.svg'), + icon: require('assets/icons/fediverse.svg'), text: intl.formatMessage(messages.fediverse), }); } diff --git a/app/soapbox/components/sidebar_menu.tsx b/app/soapbox/components/sidebar_menu.tsx index 817e1f0d2..2c695e5a1 100644 --- a/app/soapbox/components/sidebar_menu.tsx +++ b/app/soapbox/components/sidebar_menu.tsx @@ -228,7 +228,7 @@ const SidebarMenu: React.FC = (): JSX.Element | null => { {features.federating && ( } onClick={onClose} /> diff --git a/app/soapbox/components/site-logo.tsx b/app/soapbox/components/site-logo.tsx index 56add1c19..90552d0bd 100644 --- a/app/soapbox/components/site-logo.tsx +++ b/app/soapbox/components/site-logo.tsx @@ -18,8 +18,8 @@ const SiteLogo: React.FC = ({ className, theme, ...rest }) => { /** Soapbox logo. */ const soapboxLogo = darkMode - ? require('images/soapbox-logo-white.svg') - : require('images/soapbox-logo.svg'); + ? require('assets/images/soapbox-logo-white.svg') + : require('assets/images/soapbox-logo.svg'); // Use the right logo if provided, then use fallbacks. const getSrc = () => { diff --git a/app/soapbox/components/verification_badge.tsx b/app/soapbox/components/verification_badge.tsx index ce1d3792a..766decb88 100644 --- a/app/soapbox/components/verification_badge.tsx +++ b/app/soapbox/components/verification_badge.tsx @@ -18,7 +18,7 @@ const VerificationBadge: React.FC = ({ className }) => { const soapboxConfig = useSoapboxConfig(); // Prefer a custom icon if found - const icon = soapboxConfig.verifiedIcon || require('icons/verified.svg'); + const icon = soapboxConfig.verifiedIcon || require('assets/icons/verified.svg'); // Render component based on file extension const Element = icon.endsWith('.svg') ? Icon : 'img'; diff --git a/app/soapbox/middleware/sounds.ts b/app/soapbox/middleware/sounds.ts index 94ba15313..1d600306f 100644 --- a/app/soapbox/middleware/sounds.ts +++ b/app/soapbox/middleware/sounds.ts @@ -39,21 +39,21 @@ export default function soundsMiddleware(): ThunkMiddleware { const soundCache: Record = { boop: createAudio([ { - src: require('../../sounds/boop.ogg'), + src: require('../../assets/sounds/boop.ogg'), type: 'audio/ogg', }, { - src: require('../../sounds/boop.mp3'), + src: require('../../assets/sounds/boop.mp3'), type: 'audio/mpeg', }, ]), chat: createAudio([ { - src: require('../../sounds/chat.oga'), + src: require('../../assets/sounds/chat.oga'), type: 'audio/ogg', }, { - src: require('../../sounds/chat.mp3'), + src: require('../../assets/sounds/chat.mp3'), type: 'audio/mpeg', }, ]), diff --git a/app/soapbox/normalizers/__tests__/account.test.ts b/app/soapbox/normalizers/__tests__/account.test.ts index b5f4f5a75..a0589da2c 100644 --- a/app/soapbox/normalizers/__tests__/account.test.ts +++ b/app/soapbox/normalizers/__tests__/account.test.ts @@ -2,8 +2,8 @@ import { Record as ImmutableRecord, fromJS } from 'immutable'; import { normalizeAccount } from '../account'; -const AVATAR_MISSING = require('images/avatar-missing.png'); -const HEADER_MISSING = require('images/header-missing.png'); +const AVATAR_MISSING = require('assets/images/avatar-missing.png'); +const HEADER_MISSING = require('assets/images/header-missing.png'); describe('normalizeAccount()', () => { it('adds base fields', () => { diff --git a/app/soapbox/normalizers/account.ts b/app/soapbox/normalizers/account.ts index 97c640886..07d3ec1e6 100644 --- a/app/soapbox/normalizers/account.ts +++ b/app/soapbox/normalizers/account.ts @@ -98,7 +98,7 @@ const normalizePleromaLegacyFields = (account: ImmutableMap) => { const normalizeAvatar = (account: ImmutableMap) => { const avatar = account.get('avatar'); const avatarStatic = account.get('avatar_static'); - const missing = require('images/avatar-missing.png'); + const missing = require('assets/images/avatar-missing.png'); return account.withMutations(account => { account.set('avatar', avatar || avatarStatic || missing); @@ -110,7 +110,7 @@ const normalizeAvatar = (account: ImmutableMap) => { const normalizeHeader = (account: ImmutableMap) => { const header = account.get('header'); const headerStatic = account.get('header_static'); - const missing = require('images/header-missing.png'); + const missing = require('assets/images/header-missing.png'); return account.withMutations(account => { account.set('header', header || headerStatic || missing); diff --git a/app/soapbox/service_worker/web_push_notifications.ts b/app/soapbox/service_worker/web_push_notifications.ts index fe3d8e652..787e60941 100644 --- a/app/soapbox/service_worker/web_push_notifications.ts +++ b/app/soapbox/service_worker/web_push_notifications.ts @@ -180,21 +180,21 @@ const handlePush = (event: PushEvent) => { /** Native action to open a status on the device. */ const actionExpand = (preferred_locale: string) => ({ action: 'expand', - icon: `/${require('../../images/web-push/web-push-icon_expand.png')}`, + icon: `/${require('../../assets/images/web-push/web-push-icon_expand.png')}`, title: formatMessage('status.show_more', preferred_locale), }); /** Native action to repost status. */ const actionReblog = (preferred_locale: string) => ({ action: 'reblog', - icon: `/${require('../../images/web-push/web-push-icon_reblog.png')}`, + icon: `/${require('../../assets/images/web-push/web-push-icon_reblog.png')}`, title: formatMessage('status.reblog', preferred_locale), }); /** Native action to like status. */ const actionFavourite = (preferred_locale: string) => ({ action: 'favourite', - icon: `/${require('../../images/web-push/web-push-icon_favourite.png')}`, + icon: `/${require('../../assets/images/web-push/web-push-icon_favourite.png')}`, title: formatMessage('status.favourite', preferred_locale), }); diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss index 0d76263d3..50ffbc2fe 100644 --- a/app/styles/components/compose-form.scss +++ b/app/styles/components/compose-form.scss @@ -135,12 +135,12 @@ position: relative; &.video { - background-image: url('../images/video-placeholder.png'); + background-image: url('../assets/images/video-placeholder.png'); background-size: cover; } &.audio { - background-image: url('../images/audio-placeholder.png'); + background-image: url('../assets/images/audio-placeholder.png'); background-size: cover; } } diff --git a/app/styles/fonts.scss b/app/styles/fonts.scss index bd8f1bec5..fbb21c381 100644 --- a/app/styles/fonts.scss +++ b/app/styles/fonts.scss @@ -3,26 +3,26 @@ // OpenDyslexic @font-face { font-family: 'OpenDyslexic'; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Regular.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Regular.woff2') format('woff2'); } @font-face { font-family: 'OpenDyslexic'; font-weight: bold; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Bold.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Bold.woff2') format('woff2'); } @font-face { font-family: 'OpenDyslexic'; font-weight: bold; font-style: italic; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Bold-Italic.woff2') format('woff2'); } @font-face { font-family: 'OpenDyslexic'; font-style: italic; - src: url('../fonts/OpenDyslexic/OpenDyslexic-Italic.woff2') format('woff2'); + src: url('../assets/fonts/OpenDyslexic/OpenDyslexic-Italic.woff2') format('woff2'); } // TYPEOGRAPHY MIXINS @@ -62,11 +62,11 @@ // Soapbox icon font @font-face { font-family: 'soapbox'; - src: url('../fonts/soapbox/soapbox.eot?pryg6i'); - src: url('../fonts/soapbox/soapbox.eot?pryg6i#iefix') format('embedded-opentype'), - url('../fonts/soapbox/soapbox.ttf?pryg6i') format('truetype'), - url('../fonts/soapbox/soapbox.woff?pryg6i') format('woff'), - url('../fonts/soapbox/soapbox.svg?pryg6i#soapbox') format('svg'); + src: url('../assets/fonts/soapbox/soapbox.eot?pryg6i'); + src: url('../assets/fonts/soapbox/soapbox.eot?pryg6i#iefix') format('embedded-opentype'), + url('../assets/fonts/soapbox/soapbox.ttf?pryg6i') format('truetype'), + url('../assets/fonts/soapbox/soapbox.woff?pryg6i') format('woff'), + url('../assets/fonts/soapbox/soapbox.svg?pryg6i#soapbox') format('svg'); font-weight: normal; font-style: normal; } diff --git a/app/styles/ui.scss b/app/styles/ui.scss index e11041089..b822b77f1 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -232,7 +232,7 @@ article:last-child > .domain { .image-loader__preview-canvas { max-width: $media-modal-media-max-width; max-height: $media-modal-media-max-height; - background: url('../images/void.png') repeat; + background: url('../assets/images/void.png') repeat; object-fit: contain; } diff --git a/webpack/rules/assets.ts b/webpack/rules/assets.ts index d8c8e3e18..e9dd0202a 100644 --- a/webpack/rules/assets.ts +++ b/webpack/rules/assets.ts @@ -11,7 +11,7 @@ const rules: RuleSetRule[] = [{ test: /\.(png|svg)/, type: 'asset/resource', include: [ - resolve('app', 'images'), + resolve('app', 'assets', 'images'), resolve('node_modules', 'emoji-datasource'), ], generator: { @@ -21,7 +21,7 @@ const rules: RuleSetRule[] = [{ test: /\.(ttf|eot|svg|woff|woff2)/, type: 'asset/resource', include: [ - resolve('app', 'fonts'), + resolve('app', 'assets', 'fonts'), resolve('node_modules', 'fork-awesome'), resolve('node_modules', 'line-awesome'), resolve('node_modules', '@fontsource'), @@ -32,7 +32,7 @@ const rules: RuleSetRule[] = [{ }, { test: /\.(ogg|oga|mp3)/, type: 'asset/resource', - include: resolve('app', 'sounds'), + include: resolve('app', 'assets', 'sounds'), generator: { filename: 'packs/sounds/[name]-[contenthash:8][ext]', }, @@ -46,7 +46,7 @@ const rules: RuleSetRule[] = [{ }, { test: /\.svg$/, type: 'asset/resource', - include: resolve('app', 'icons'), + include: resolve('app', 'assets', 'icons'), generator: { filename: 'packs/icons/[name]-[contenthash:8][ext]', },