From 2acb3aeb14e464d2173dca28ce009eadf35ecd12 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 20 Jun 2021 11:05:12 +0100 Subject: [PATCH] Re-organise assets to be closer to their respective uses. --- index.html | 3 ++- package.json | 2 +- public/assets/app_icon.png | Bin 11730 -> 0 bytes public/assets/favicon.ico | Bin 16446 -> 0 bytes public/assets/logo.svg | 1 - public/assets/{ => sounds}/inbound.mp3 | Bin public/assets/{ => sounds}/inbound.ogg | Bin public/assets/{ => sounds}/outbound.mp3 | Bin public/assets/{ => sounds}/outbound.ogg | Bin {public => src}/assets/emojis.ts | 0 src/assets/logo.svg | 3 +++ src/assets/logo_round.png | Bin 0 -> 7558 bytes {public => src}/assets/wide.svg | 0 src/components/common/ChannelIcon.tsx | 3 ++- src/components/common/UserIcon.tsx | 3 ++- .../components/common}/assets/group.png | Bin .../components/common}/assets/user.png | Bin .../navigation/items}/placeholder.svg | 0 .../navigation/left/ServerListSidebar.tsx | 22 ++++++++++-------- .../intermediate/modals/Onboarding.tsx | 4 +++- src/pages/home/Home.tsx | 4 +++- .../pages/settings/assets}/dark.svg | 0 .../pages/settings/assets}/light.svg | 0 .../pages/settings/assets}/mutant_emoji.svg | 0 .../pages/settings/assets}/noto_emoji.svg | 0 .../pages/settings/assets}/openmoji_emoji.svg | 0 .../pages/settings/assets}/twemoji_emoji.svg | 0 src/pages/settings/panes/Appearance.tsx | 20 +++++++++++----- 28 files changed, 42 insertions(+), 23 deletions(-) delete mode 100644 public/assets/app_icon.png delete mode 100644 public/assets/favicon.ico delete mode 100644 public/assets/logo.svg rename public/assets/{ => sounds}/inbound.mp3 (100%) rename public/assets/{ => sounds}/inbound.ogg (100%) rename public/assets/{ => sounds}/outbound.mp3 (100%) rename public/assets/{ => sounds}/outbound.ogg (100%) rename {public => src}/assets/emojis.ts (100%) create mode 100644 src/assets/logo.svg create mode 100644 src/assets/logo_round.png rename {public => src}/assets/wide.svg (100%) rename {public => src/components/common}/assets/group.png (100%) rename {public => src/components/common}/assets/user.png (100%) rename {public/assets/images => src/components/navigation/items}/placeholder.svg (100%) rename {public/assets/images => src/pages/settings/assets}/dark.svg (100%) rename {public/assets/images => src/pages/settings/assets}/light.svg (100%) rename {public/assets/images => src/pages/settings/assets}/mutant_emoji.svg (100%) rename {public/assets/images => src/pages/settings/assets}/noto_emoji.svg (100%) rename {public/assets/images => src/pages/settings/assets}/openmoji_emoji.svg (100%) rename {public/assets/images => src/pages/settings/assets}/twemoji_emoji.svg (100%) diff --git a/index.html b/index.html index 1885d9e4..20826661 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,8 @@ - + + REVOLT diff --git a/package.json b/package.json index c639394e..6cc36500 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "version": "0.0.0", "scripts": { "dev": "vite", - "build": "rimraf build && tsc && vite build", + "build": "rimraf build && tsc --noEmit && vite build", "preview": "vite preview", "lint": "eslint 'src/**/*.{js,jsx,ts,tsx}'", "fmt": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'", diff --git a/public/assets/app_icon.png b/public/assets/app_icon.png deleted file mode 100644 index 8cc3feb755a157092d4d11bbe6cd5d329756fe99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11730 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 TG=BJ?Fak(gN$Qt`QQ&_7Os#=Q diff --git a/public/assets/favicon.ico b/public/assets/favicon.ico deleted file mode 100644 index 8985022729dfbbaf565625e311d1231b3a081b3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16446 zcmd^`ZD<@t7{@0~X+%?6Xss=crc!DH`bmuzFUei*ZqG|DN$;)LS{0=r;tOJ{e$YrS z1QA6LKNKre@RLGNL@Gui*b^*bQK1U`)XIf6f;MelTQ7HeyZ)cK+xBwo<#u=WUbfvZ zd3NS@W}e?XGjq?(&N0@6za9_6|81-TauZ{$1EB{Yfk5fyuI-!GGb4eDi3im05KdSO zN#rwBm!3Ys?h7m?$p&6}G`IBt@fjG0Og86AZzH(_V?5`hp#J_kCm}OD!n3Ve|;#)A)=bnjj z?ghcRP1Q*@*z+jWt9&6?FYn_~X{ocEUCX8K3)P1^Dy3auRz$fmPCg2{PFietwWjut zN*Rpn-0z~y=r7X|-|WV6HeD$lb<@07Gw!Hw63m&$#F=R>lV9xb8aHigYL8lT@9w>L zOFWRfAkM9vzIzi}wUSL&`mC1Ry`5t$E-44anaS2mu9dhdeO62Eh;ROOJA4$(4WC8* zS1t8#tvzbRO?pCK8+;Tc9rgdWS<~ODtReRfd-`|wpjjV9uWf3<9ra%!fAkx1?%cV! zlwG68VK%K6-00tKac1s=2hH-8d%oJ-`{575*1w5zql~XHFAB|N#cfbc?t$(JFlV0- zWk&u?)Sup7theZWHMv7QXW*kK=S8_;>k(m<9#k`K6oi>al9Jb@WE*=J0fgrNlB`z^}V}d&eHp8aD#a# z`lrZ#9p%l!FY74P*RHtT+(W%nWb5OiwniBrM*WMn&Sk}IW(W66PpRyYd!KEl06)A> zlo@?xI^v%>=cYHy$UHJeS`dr=PUCshpaX%p~g$MEbW z1kp7c&mRjYLuPG`x@-Dgkn|h!OrcI?4ff2QNBuVJP2?uR-b<#&c|Eu_+XP)dW6ipB zAKG9>)b`k;zf&vMh^!|!=@*xBV9y3cxiNMQ7~$2PsW&(2ar7NN)=rDCgZr4qWJERs zH|dG_Zdi~z8FZa8JjNS^8|$rp5pKL!&tbp9aon)?HX-i(ccSCCarUGAX5_{hKH)i? z#;lP!jh>-r5k!3l!}XQZ3-j?CH=DhEou97)x8V1fd^YU8Y`FdFZEu=`;kQI>u=V&r z_xFzAmL48wIIp=2e(F_GZtT5|mK#HQ>GiNTtsx@5nO4~PE!3Y8Wk!Blhllj|%B77S z;`5r&xqF-u_23MKZ{;u-!We!TYsOa*zC^I$to^lh>;nC6q8wvsI-M7RE+aOyw=L^v zt9qafKYkqNXiE9?;_#2aycDB8Vzs_T$%j5}`0Pu>w|GDFwqtD7*VdB!NvQjbAzS0T z-&Qc=-Q~6MQCHoq>!Do6JMs;B{kb#^eVfifpR`_A7A~TI|@OGe& z+vz9Nejb!^Da=i7uoz;-`MI?i(|&CMW;w}ai=5!Hy&% \ No newline at end of file diff --git a/public/assets/inbound.mp3 b/public/assets/sounds/inbound.mp3 similarity index 100% rename from public/assets/inbound.mp3 rename to public/assets/sounds/inbound.mp3 diff --git a/public/assets/inbound.ogg b/public/assets/sounds/inbound.ogg similarity index 100% rename from public/assets/inbound.ogg rename to public/assets/sounds/inbound.ogg diff --git a/public/assets/outbound.mp3 b/public/assets/sounds/outbound.mp3 similarity index 100% rename from public/assets/outbound.mp3 rename to public/assets/sounds/outbound.mp3 diff --git a/public/assets/outbound.ogg b/public/assets/sounds/outbound.ogg similarity index 100% rename from public/assets/outbound.ogg rename to public/assets/sounds/outbound.ogg diff --git a/public/assets/emojis.ts b/src/assets/emojis.ts similarity index 100% rename from public/assets/emojis.ts rename to src/assets/emojis.ts diff --git a/src/assets/logo.svg b/src/assets/logo.svg new file mode 100644 index 00000000..336b23aa --- /dev/null +++ b/src/assets/logo.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/logo_round.png b/src/assets/logo_round.png new file mode 100644 index 0000000000000000000000000000000000000000..acc86aa3ff3ec989fc203533a6b4ec8650c386ed GIT binary patch literal 7558 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, keyof Props>) { const client = useContext(AppContext); diff --git a/src/components/common/UserIcon.tsx b/src/components/common/UserIcon.tsx index 7aa5e379..a78416d8 100644 --- a/src/components/common/UserIcon.tsx +++ b/src/components/common/UserIcon.tsx @@ -47,7 +47,8 @@ const VoiceIndicator = styled.div<{ status: VoiceStatus }>` ` } `; -const fallback = '/assets/user.png'; +import fallback from './assets/user.png'; + export default function UserIcon(props: Props & Omit, keyof Props>) { const client = useContext(AppContext); diff --git a/public/assets/group.png b/src/components/common/assets/group.png similarity index 100% rename from public/assets/group.png rename to src/components/common/assets/group.png diff --git a/public/assets/user.png b/src/components/common/assets/user.png similarity index 100% rename from public/assets/user.png rename to src/components/common/assets/user.png diff --git a/public/assets/images/placeholder.svg b/src/components/navigation/items/placeholder.svg similarity index 100% rename from public/assets/images/placeholder.svg rename to src/components/navigation/items/placeholder.svg diff --git a/src/components/navigation/left/ServerListSidebar.tsx b/src/components/navigation/left/ServerListSidebar.tsx index f64e4fef..798675c3 100644 --- a/src/components/navigation/left/ServerListSidebar.tsx +++ b/src/components/navigation/left/ServerListSidebar.tsx @@ -1,15 +1,17 @@ +import LineDivider from "../../ui/LineDivider"; +import { mapChannelWithUnread } from "./common"; +import styled, { css } from "styled-components"; +import ServerIcon from "../../common/ServerIcon"; +import { Children } from "../../../types/Preact"; +import PaintCounter from "../../../lib/PaintCounter"; +import { attachContextMenu } from 'preact-context-menu'; +import { connectState } from "../../../redux/connector"; +import { Unreads } from "../../../redux/reducers/unreads"; import { Channel, Servers } from "revolt.js/dist/api/objects"; import { Link, useLocation, useParams } from "react-router-dom"; import { useChannels, useForceUpdate, useServers } from "../../../context/revoltjs/hooks"; -import { mapChannelWithUnread } from "./common"; -import { Unreads } from "../../../redux/reducers/unreads"; -import { connectState } from "../../../redux/connector"; -import styled, { css } from "styled-components"; -import { Children } from "../../../types/Preact"; -import LineDivider from "../../ui/LineDivider"; -import ServerIcon from "../../common/ServerIcon"; -import PaintCounter from "../../../lib/PaintCounter"; -import { attachContextMenu } from 'preact-context-menu'; + +import logoSVG from '../../../assets/logo.svg'; function Icon({ children, unread, size }: { children: Children, unread?: 'mention' | 'unread', size: number }) { return ( @@ -146,7 +148,7 @@ export function ServerListSidebar({ unreads }: Props) { - + diff --git a/src/context/intermediate/modals/Onboarding.tsx b/src/context/intermediate/modals/Onboarding.tsx index 17fc0fd6..032aa5f3 100644 --- a/src/context/intermediate/modals/Onboarding.tsx +++ b/src/context/intermediate/modals/Onboarding.tsx @@ -7,6 +7,8 @@ import Button from "../../../components/ui/Button"; import FormField from "../../../pages/login/FormField"; import Preloader from "../../../components/ui/Preloader"; +import wideSVG from '../../../assets/wide.svg'; + interface Props { onClose: () => void; callback: (username: string, loginAfterSuccess?: true) => Promise; @@ -32,7 +34,7 @@ export function OnboardingModal({ onClose, callback }: Props) {

- +

diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx index 01371fc7..eaa763de 100644 --- a/src/pages/home/Home.tsx +++ b/src/pages/home/Home.tsx @@ -4,12 +4,14 @@ import { Link } from "react-router-dom"; import { Text } from "preact-i18n"; import Header from "../../components/ui/Header"; +import wideSVG from '../../assets/wide.svg'; + export default function Home() { return (

- +

  • diff --git a/public/assets/images/dark.svg b/src/pages/settings/assets/dark.svg similarity index 100% rename from public/assets/images/dark.svg rename to src/pages/settings/assets/dark.svg diff --git a/public/assets/images/light.svg b/src/pages/settings/assets/light.svg similarity index 100% rename from public/assets/images/light.svg rename to src/pages/settings/assets/light.svg diff --git a/public/assets/images/mutant_emoji.svg b/src/pages/settings/assets/mutant_emoji.svg similarity index 100% rename from public/assets/images/mutant_emoji.svg rename to src/pages/settings/assets/mutant_emoji.svg diff --git a/public/assets/images/noto_emoji.svg b/src/pages/settings/assets/noto_emoji.svg similarity index 100% rename from public/assets/images/noto_emoji.svg rename to src/pages/settings/assets/noto_emoji.svg diff --git a/public/assets/images/openmoji_emoji.svg b/src/pages/settings/assets/openmoji_emoji.svg similarity index 100% rename from public/assets/images/openmoji_emoji.svg rename to src/pages/settings/assets/openmoji_emoji.svg diff --git a/public/assets/images/twemoji_emoji.svg b/src/pages/settings/assets/twemoji_emoji.svg similarity index 100% rename from public/assets/images/twemoji_emoji.svg rename to src/pages/settings/assets/twemoji_emoji.svg diff --git a/src/pages/settings/panes/Appearance.tsx b/src/pages/settings/panes/Appearance.tsx index 867d6f0e..a7466143 100644 --- a/src/pages/settings/panes/Appearance.tsx +++ b/src/pages/settings/panes/Appearance.tsx @@ -15,6 +15,14 @@ import { useIntermediate } from "../../../context/intermediate/Intermediate"; // @ts-ignore import pSBC from 'shade-blend-color'; +import lightSVG from '../assets/light.svg'; +import darkSVG from '../assets/dark.svg'; + +import mutantSVG from '../assets/mutant_emoji.svg'; +import notoSVG from '../assets/noto_emoji.svg'; +import openmojiSVG from '../assets/openmoji_emoji.svg'; +import twemojiSVG from '../assets/twemoji_emoji.svg'; + interface Props { settings: Settings; } @@ -72,7 +80,7 @@ export function Component(props: Props & WithDispatcher) {
    selected !== "light" && @@ -84,7 +92,7 @@ export function Component(props: Props & WithDispatcher) {
    selected !== "dark" && setTheme({ preset: "dark" }) @@ -131,7 +139,7 @@ export function Component(props: Props & WithDispatcher) {
    setEmojiPack('mutant')} data-active={emojiPack === 'mutant'}> - +

    Mutant Remix (by Revolt)

    @@ -139,7 +147,7 @@ export function Component(props: Props & WithDispatcher) {
    setEmojiPack('twemoji')} data-active={emojiPack === 'twemoji'}> - +

    Twemoji

    @@ -149,7 +157,7 @@ export function Component(props: Props & WithDispatcher) {
    setEmojiPack('openmoji')} data-active={emojiPack === 'openmoji'}> - +

    Openmoji

@@ -157,7 +165,7 @@ export function Component(props: Props & WithDispatcher) {
setEmojiPack('noto')} data-active={emojiPack === 'noto'}> - +

Noto Emoji