From e9640bfe89b501a5384bda1c87dc127fd4900b69 Mon Sep 17 00:00:00 2001 From: HF Date: Fri, 30 Apr 2021 03:49:53 +0200 Subject: [PATCH] move buttons into subfolder --- i18n/template-ssr.pot | 30 +- i18n/template.pot | 478 +++++++++--------- src/components/App.jsx | 6 +- src/components/GridButton.jsx | 32 -- src/components/Menu.jsx | 8 +- src/components/MinecraftTPButton.jsx | 61 --- src/components/UI.jsx | 4 +- .../{ => buttons}/CanvasSwitchButton.jsx | 2 +- src/components/{ => buttons}/ChatButton.jsx | 2 +- .../{ => buttons}/DownloadButton.jsx | 4 +- .../{ => buttons}/ExpandMenuButton.jsx | 2 +- src/components/{ => buttons}/GlobeButton.jsx | 2 +- src/components/{ => buttons}/HelpButton.jsx | 2 +- src/components/{ => buttons}/LogInButton.jsx | 2 +- src/components/{ => buttons}/PalselButton.jsx | 2 +- .../{ => buttons}/SettingsButton.jsx | 2 +- 16 files changed, 273 insertions(+), 366 deletions(-) delete mode 100644 src/components/GridButton.jsx delete mode 100644 src/components/MinecraftTPButton.jsx rename src/components/{ => buttons}/CanvasSwitchButton.jsx (90%) rename src/components/{ => buttons}/ChatButton.jsx (99%) rename src/components/{ => buttons}/DownloadButton.jsx (91%) rename src/components/{ => buttons}/ExpandMenuButton.jsx (94%) rename src/components/{ => buttons}/GlobeButton.jsx (95%) rename src/components/{ => buttons}/HelpButton.jsx (91%) rename src/components/{ => buttons}/LogInButton.jsx (91%) rename src/components/{ => buttons}/PalselButton.jsx (95%) rename src/components/{ => buttons}/SettingsButton.jsx (91%) diff --git a/i18n/template-ssr.pot b/i18n/template-ssr.pot index 3957165..fcdd131 100644 --- a/i18n/template-ssr.pot +++ b/i18n/template-ssr.pot @@ -290,21 +290,6 @@ msgstr "" msgid "Server error occured" msgstr "" -#: src/routes/api/auth/verify.js:25 -#: src/routes/api/auth/verify.js:32 -msgid "Mail verification" -msgstr "" - -#: src/routes/api/auth/verify.js:26 -msgid "You are now verified :)" -msgstr "" - -#: src/routes/api/auth/verify.js:32 -msgid "" -"Your mail verification code is invalid or already expired :(, please " -"request a new one." -msgstr "" - #: src/routes/api/auth/register.js:31 msgid "E-Mail already in use." msgstr "" @@ -325,6 +310,21 @@ msgstr "" msgid "You are not even logged in." msgstr "" +#: src/routes/api/auth/verify.js:25 +#: src/routes/api/auth/verify.js:32 +msgid "Mail verification" +msgstr "" + +#: src/routes/api/auth/verify.js:26 +msgid "You are now verified :)" +msgstr "" + +#: src/routes/api/auth/verify.js:32 +msgid "" +"Your mail verification code is invalid or already expired :(, please " +"request a new one." +msgstr "" + #: src/routes/api/auth/change_mail.js:41 #: src/routes/api/auth/change_passwd.js:37 #: src/routes/api/auth/delete_account.js:38 diff --git a/i18n/template.pot b/i18n/template.pot index b66f351..e876f64 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -102,12 +102,12 @@ msgid "Error ${ retCode }" msgstr "" #: src/actions/index.js:599 -#: src/components/SettingsButton.jsx:20 +#: src/components/buttons/SettingsButton.jsx:20 msgid "Settings" msgstr "" #: src/actions/index.js:606 -#: src/components/LogInButton.jsx:20 +#: src/components/buttons/LogInButton.jsx:20 msgid "User Area" msgstr "" @@ -128,11 +128,11 @@ msgid "Canvas Archive" msgstr "" #: src/actions/index.js:640 -#: src/components/CanvasSwitchButton.jsx:20 +#: src/components/buttons/CanvasSwitchButton.jsx:20 msgid "Canvas Selection" msgstr "" -#: src/actions/index.js:827 +#: src/actions/index.js:826 msgid "Chat" msgstr "" @@ -141,14 +141,6 @@ msgstr "" msgid "Copy to Clipboard" msgstr "" -#: src/components/ChatButton.jsx:90 -msgid "Close Chat" -msgstr "" - -#: src/components/ChatButton.jsx:90 -msgid "Open Chat" -msgstr "" - #: src/components/OnlineBox.jsx:22 msgid "User online" msgstr "" @@ -157,18 +149,10 @@ msgstr "" msgid "Pixels placed" msgstr "" -#: src/components/ExpandMenuButton.jsx:19 -msgid "Close Menu" -msgstr "" - -#: src/components/ExpandMenuButton.jsx:19 -msgid "Open Menu" -msgstr "" - #: src/components/Admintools.jsx:219 -#: src/components/ChannelContextMenu.jsx:82 +#: src/components/ChannelContextMenu.jsx:85 #: src/components/ModalRoot.jsx:69 -#: src/components/Window.jsx:126 +#: src/components/Window.jsx:136 msgid "Close" msgstr "" @@ -176,6 +160,22 @@ msgstr "" msgid "Restore" msgstr "" +#: src/components/buttons/ChatButton.jsx:92 +msgid "Close Chat" +msgstr "" + +#: src/components/buttons/ChatButton.jsx:92 +msgid "Open Chat" +msgstr "" + +#: src/components/buttons/ExpandMenuButton.jsx:19 +msgid "Close Menu" +msgstr "" + +#: src/components/buttons/ExpandMenuButton.jsx:19 +msgid "Open Menu" +msgstr "" + #: src/actions/fetch.js:38 msgid "You made too many requests" msgstr "" @@ -205,58 +205,58 @@ msgstr "" msgid "Server answered with gibberish :(" msgstr "" -#: src/components/HelpButton.jsx:20 -msgid "Help" -msgstr "" - -#: src/components/DownloadButton.jsx:37 -msgid "Make Screenshot" -msgstr "" - -#: src/components/GlobeButton.jsx:31 -msgid "Globe View" -msgstr "" - -#: src/components/PalselButton.jsx:25 -msgid "Close Palette" -msgstr "" - -#: src/components/PalselButton.jsx:25 -msgid "Open Palette" -msgstr "" - -#: src/components/UserContextMenu.jsx:64 +#: src/components/UserContextMenu.jsx:67 msgid "Ping" msgstr "" -#: src/components/UserContextMenu.jsx:89 +#: src/components/UserContextMenu.jsx:92 msgid "DM" msgstr "" -#: src/components/UserContextMenu.jsx:99 +#: src/components/UserContextMenu.jsx:102 msgid "Block" msgstr "" -#: src/components/ChannelContextMenu.jsx:70 +#: src/components/ChannelContextMenu.jsx:73 msgid "Mute" msgstr "" -#: src/components/Window.jsx:105 +#: src/components/Window.jsx:115 msgid "Clone" msgstr "" -#: src/components/Window.jsx:112 +#: src/components/Window.jsx:122 msgid "Move" msgstr "" -#: src/components/Window.jsx:119 +#: src/components/Window.jsx:129 msgid "Maximize" msgstr "" -#: src/components/Window.jsx:133 +#: src/components/Window.jsx:143 msgid "Resize" msgstr "" +#: src/components/buttons/HelpButton.jsx:20 +msgid "Help" +msgstr "" + +#: src/components/buttons/DownloadButton.jsx:37 +msgid "Make Screenshot" +msgstr "" + +#: src/components/buttons/GlobeButton.jsx:31 +msgid "Globe View" +msgstr "" + +#: src/components/buttons/PalselButton.jsx:25 +msgid "Close Palette" +msgstr "" + +#: src/components/buttons/PalselButton.jsx:25 +msgid "Open Palette" +msgstr "" + #: src/components/Captcha.jsx:41 #: src/components/ChangeMail.jsx:88 #: src/components/ChangeName.jsx:67 @@ -472,60 +472,6 @@ msgstr "" msgid "Partners:" msgstr "" -#: src/components/windows/UserArea.jsx:33 -msgid "Login to access more features and stats." -msgstr "" - -#: src/components/windows/UserArea.jsx:35 -msgid "Login with Name or Mail:" -msgstr "" - -#: src/components/windows/UserArea.jsx:42 -msgid "I forgot my Password." -msgstr "" - -#: src/components/windows/UserArea.jsx:43 -msgid "or login with:" -msgstr "" - -#: src/components/windows/UserArea.jsx:84 -msgid "or register here:" -msgstr "" - -#: src/components/windows/UserArea.jsx:85 -msgid "Register" -msgstr "" - -#: src/components/windows/UserArea.jsx:107 -msgid "Profile" -msgstr "" - -#: src/components/windows/UserArea.jsx:113 -msgid "Ranking" -msgstr "" - -#: src/components/windows/UserArea.jsx:116 -msgid "Converter" -msgstr "" - -#: src/components/windows/UserArea.jsx:122 -msgid "Admintools" -msgstr "" - -#: src/components/windows/UserArea.jsx:122 -msgid "Modtools" -msgstr "" - -#: src/components/windows/UserArea.jsx:123 -msgid "Loading..." -msgstr "" - -#: src/components/windows/ForgotPassword.jsx:20 -#: src/components/windows/Register.jsx:21 -#: src/components/windows/UserArea.jsx:130 -msgid "Consider joining us on Guilded:" -msgstr "" - #: src/components/windows/Settings.jsx:125 msgid "Show Grid" msgstr "" @@ -613,6 +559,60 @@ msgstr "" msgid "Select Language" msgstr "" +#: src/components/windows/UserArea.jsx:33 +msgid "Login to access more features and stats." +msgstr "" + +#: src/components/windows/UserArea.jsx:35 +msgid "Login with Name or Mail:" +msgstr "" + +#: src/components/windows/UserArea.jsx:42 +msgid "I forgot my Password." +msgstr "" + +#: src/components/windows/UserArea.jsx:43 +msgid "or login with:" +msgstr "" + +#: src/components/windows/UserArea.jsx:84 +msgid "or register here:" +msgstr "" + +#: src/components/windows/UserArea.jsx:85 +msgid "Register" +msgstr "" + +#: src/components/windows/UserArea.jsx:107 +msgid "Profile" +msgstr "" + +#: src/components/windows/UserArea.jsx:113 +msgid "Ranking" +msgstr "" + +#: src/components/windows/UserArea.jsx:116 +msgid "Converter" +msgstr "" + +#: src/components/windows/UserArea.jsx:122 +msgid "Admintools" +msgstr "" + +#: src/components/windows/UserArea.jsx:122 +msgid "Modtools" +msgstr "" + +#: src/components/windows/UserArea.jsx:123 +msgid "Loading..." +msgstr "" + +#: src/components/windows/ForgotPassword.jsx:20 +#: src/components/windows/Register.jsx:21 +#: src/components/windows/UserArea.jsx:130 +msgid "Consider joining us on Guilded:" +msgstr "" + #: src/components/windows/Register.jsx:18 msgid "Register new account here" msgstr "" @@ -661,19 +661,19 @@ msgid "" "how the canvas was at that time." msgstr "" -#: src/components/windows/Chat.jsx:137 +#: src/components/windows/Chat.jsx:138 msgid "Channel settings" msgstr "" -#: src/components/windows/Chat.jsx:152 +#: src/components/windows/Chat.jsx:153 msgid "Start chatting here" msgstr "" -#: src/components/windows/Chat.jsx:189 +#: src/components/windows/Chat.jsx:190 msgid "Chat here" msgstr "" -#: src/components/windows/Chat.jsx:212 +#: src/components/windows/Chat.jsx:213 msgid "You must be logged in to chat" msgstr "" @@ -681,6 +681,28 @@ msgstr "" msgid "Enter your mail address and we will send you a new password:" msgstr "" +#: src/components/ChangeMail.jsx:107 +#: src/components/ChangeName.jsx:77 +#: src/components/ChangePassword.jsx:103 +#: src/components/LanguageSelect.jsx:73 +msgid "Save" +msgstr "" + +#: src/components/LogInForm.jsx:89 +msgid "Name or Email" +msgstr "" + +#: src/components/ChangeMail.jsx:96 +#: src/components/DeleteAccount.jsx:74 +#: src/components/LogInForm.jsx:96 +#: src/components/SignUpForm.jsx:125 +msgid "Password" +msgstr "" + +#: src/components/LogInForm.jsx:100 +msgid "LogIn" +msgstr "" + #: src/components/UserArea.jsx:57 msgid "Todays Placed Pixels" msgstr "" @@ -726,21 +748,6 @@ msgstr "" msgid "Social Settings" msgstr "" -#: src/components/LogInForm.jsx:89 -msgid "Name or Email" -msgstr "" - -#: src/components/ChangeMail.jsx:96 -#: src/components/DeleteAccount.jsx:74 -#: src/components/LogInForm.jsx:96 -#: src/components/SignUpForm.jsx:125 -msgid "Password" -msgstr "" - -#: src/components/LogInForm.jsx:100 -msgid "LogIn" -msgstr "" - #: src/components/Rankings.jsx:37 msgid "Total" msgstr "" @@ -753,13 +760,6 @@ msgstr "" msgid "Ranking updates every 5 min. Daily rankings get reset at midnight UTC." msgstr "" -#: src/components/ChangeMail.jsx:107 -#: src/components/ChangeName.jsx:77 -#: src/components/ChangePassword.jsx:103 -#: src/components/LanguageSelect.jsx:73 -msgid "Save" -msgstr "" - #: src/components/SignUpForm.jsx:109 msgid "Name" msgstr "" @@ -816,6 +816,77 @@ msgstr "" msgid "Sent you a mail with instructions to reset your password." msgstr "" +#: src/components/Converter.jsx:274 +msgid "Choose Canvas" +msgstr "" + +#: src/components/Converter.jsx:300 +msgid "Palette Download" +msgstr "" + +#: src/components/Converter.jsx:302 +#, javascript-format +msgid "Palette for ${ gimpLink }" +msgstr "" + +#: src/components/Converter.jsx:320 +#, javascript-format +msgid "Credit for the Palette of the Moon goes to ${ starhouseLink }." +msgstr "" + +#: src/components/Converter.jsx:323 +msgid "Image Converter" +msgstr "" + +#: src/components/Converter.jsx:324 +msgid "Convert an image to canvas colors" +msgstr "" + +#: src/components/Converter.jsx:335 +msgid "Choose Strategy" +msgstr "" + +#: src/components/Converter.jsx:362 +msgid "Choose Color Mode" +msgstr "" + +#: src/components/Converter.jsx:400 +msgid "Add Grid (uncheck if you need a 1:1 template)" +msgstr "" + +#: src/components/Converter.jsx:425 +#: src/components/Converter.jsx:441 +msgid "Offset" +msgstr "" + +#: src/components/Converter.jsx:471 +msgid "Scale Image" +msgstr "" + +#: src/components/Converter.jsx:483 +msgid "Width" +msgstr "" + +#: src/components/Converter.jsx:513 +msgid "Height" +msgstr "" + +#: src/components/Converter.jsx:551 +msgid "Keep Ratio" +msgstr "" + +#: src/components/Converter.jsx:564 +msgid "Anti Aliasing" +msgstr "" + +#: src/components/Converter.jsx:578 +msgid "Reset" +msgstr "" + +#: src/components/Converter.jsx:597 +msgid "Download Template" +msgstr "" + #: src/components/Admintools.jsx:179 msgid "Build image on canvas." msgstr "" @@ -894,77 +965,6 @@ msgstr "" msgid "User Name" msgstr "" -#: src/components/Converter.jsx:274 -msgid "Choose Canvas" -msgstr "" - -#: src/components/Converter.jsx:300 -msgid "Palette Download" -msgstr "" - -#: src/components/Converter.jsx:302 -#, javascript-format -msgid "Palette for ${ gimpLink }" -msgstr "" - -#: src/components/Converter.jsx:320 -#, javascript-format -msgid "Credit for the Palette of the Moon goes to ${ starhouseLink }." -msgstr "" - -#: src/components/Converter.jsx:323 -msgid "Image Converter" -msgstr "" - -#: src/components/Converter.jsx:324 -msgid "Convert an image to canvas colors" -msgstr "" - -#: src/components/Converter.jsx:335 -msgid "Choose Strategy" -msgstr "" - -#: src/components/Converter.jsx:362 -msgid "Choose Color Mode" -msgstr "" - -#: src/components/Converter.jsx:400 -msgid "Add Grid (uncheck if you need a 1:1 template)" -msgstr "" - -#: src/components/Converter.jsx:425 -#: src/components/Converter.jsx:441 -msgid "Offset" -msgstr "" - -#: src/components/Converter.jsx:471 -msgid "Scale Image" -msgstr "" - -#: src/components/Converter.jsx:483 -msgid "Width" -msgstr "" - -#: src/components/Converter.jsx:513 -msgid "Height" -msgstr "" - -#: src/components/Converter.jsx:551 -msgid "Keep Ratio" -msgstr "" - -#: src/components/Converter.jsx:564 -msgid "Anti Aliasing" -msgstr "" - -#: src/components/Converter.jsx:578 -msgid "Reset" -msgstr "" - -#: src/components/Converter.jsx:597 -msgid "Download Template" -msgstr "" - #: src/utils/validation.js:18 msgid "Email can't be empty." msgstr "" @@ -1013,6 +1013,44 @@ msgstr "" msgid "Password must be shorter than 60 characters." msgstr "" +#: src/components/ChangePassword.jsx:19 +msgid "Passwords do not match." +msgstr "" + +#: src/components/ChangePassword.jsx:39 +msgid "Changed Password successfully." +msgstr "" + +#: src/components/ChangePassword.jsx:82 +msgid "Old Password" +msgstr "" + +#: src/components/ChangePassword.jsx:90 +msgid "New Password" +msgstr "" + +#: src/components/ChangePassword.jsx:97 +msgid "Confirm New Password" +msgstr "" + +#: src/components/DeleteAccount.jsx:78 +msgid "Yes, Delete My Account!" +msgstr "" + +#: src/components/ChangeName.jsx:73 +msgid "New Username" +msgstr "" + +#: src/components/ChangeMail.jsx:73 +msgid "" +"Changed Mail successfully. We sent you a verification mail, " +"please verify your new mail address." +msgstr "" + +#: src/components/ChangeMail.jsx:103 +msgid "New Mail" +msgstr "" + #: src/components/UserMessages.jsx:38 msgid "A new verification mail is getting sent to you." msgstr "" @@ -1048,44 +1086,6 @@ msgstr "" msgid "Deny" msgstr "" -#: src/components/ChangePassword.jsx:19 -msgid "Passwords do not match." -msgstr "" - -#: src/components/ChangePassword.jsx:39 -msgid "Changed Password successfully." -msgstr "" - -#: src/components/ChangePassword.jsx:82 -msgid "Old Password" -msgstr "" - -#: src/components/ChangePassword.jsx:90 -msgid "New Password" -msgstr "" - -#: src/components/ChangePassword.jsx:97 -msgid "Confirm New Password" -msgstr "" - -#: src/components/ChangeMail.jsx:73 -msgid "" -"Changed Mail successfully. We sent you a verification mail, " -"please verify your new mail address." -msgstr "" - -#: src/components/ChangeMail.jsx:103 -msgid "New Mail" -msgstr "" - -#: src/components/DeleteAccount.jsx:78 -msgid "Yes, Delete My Account!" -msgstr "" - -#: src/components/ChangeName.jsx:73 -msgid "New Username" -msgstr "" - #: src/components/SocialSettings.jsx:39 msgid "Block all Private Messages" msgstr "" diff --git a/src/components/App.jsx b/src/components/App.jsx index a1c5b38..f9db81a 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -12,12 +12,12 @@ import store from '../ui/store'; import Style from './Style'; import CoordinatesBox from './CoordinatesBox'; -import CanvasSwitchButton from './CanvasSwitchButton'; +import CanvasSwitchButton from './buttons/CanvasSwitchButton'; import OnlineBox from './OnlineBox'; -import ChatButton from './ChatButton'; +import ChatButton from './buttons/ChatButton'; import Menu from './Menu'; import UI from './UI'; -import ExpandMenuButton from './ExpandMenuButton'; +import ExpandMenuButton from './buttons/ExpandMenuButton'; import ModalRoot from './ModalRoot'; import WindowManager from './WindowManager'; diff --git a/src/components/GridButton.jsx b/src/components/GridButton.jsx deleted file mode 100644 index 5238ac1..0000000 --- a/src/components/GridButton.jsx +++ /dev/null @@ -1,32 +0,0 @@ -/** - * - * @flow - */ - -import React from 'react'; -import { connect } from 'react-redux'; -import { FaTh } from 'react-icons/fa'; - -import { toggleGrid } from '../actions'; - - -const GridButton = ({ onToggleGrid }) => ( -
- -
-); - -function mapDispatchToProps(dispatch) { - return { - open() { - dispatch(toggleGrid()); - }, - }; -} - -export default connect(null, mapDispatchToProps)(GridButton); diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx index 3ad91e5..5b39f70 100644 --- a/src/components/Menu.jsx +++ b/src/components/Menu.jsx @@ -7,10 +7,10 @@ import React, { useState, useEffect } from 'react'; import { connect } from 'react-redux'; -import HelpButton from './HelpButton'; -import SettingsButton from './SettingsButton'; -import LogInButton from './LogInButton'; -import DownloadButton from './DownloadButton'; +import HelpButton from './buttons/HelpButton'; +import SettingsButton from './buttons/SettingsButton'; +import LogInButton from './buttons/LogInButton'; +import DownloadButton from './buttons/DownloadButton'; /* * removed MinecraftButton cause it didn't get used in over a year * also CSS rule got removed diff --git a/src/components/MinecraftTPButton.jsx b/src/components/MinecraftTPButton.jsx deleted file mode 100644 index fbcd44e..0000000 --- a/src/components/MinecraftTPButton.jsx +++ /dev/null @@ -1,61 +0,0 @@ -/** - * - * @flow - */ - -import React from 'react'; -import { connect } from 'react-redux'; -import { MdNearMe } from 'react-icons/md'; - -import type { State } from '../reducers'; - -async function submitMinecraftTp(view) { - const [x, y] = view.map(Math.round); - const body = JSON.stringify({ - x, - y, - }); - await fetch('./api/mctp', { - method: 'POST', - headers: { - 'Content-type': 'application/json', - }, - body, - credentials: 'include', - }); -} - - -function MinecraftTPButton({ - view, - canvasId, - minecraftname, - messages, -}) { - if (minecraftname - && !messages.includes('not_mc_verified') - && canvasId === 0) { - return ( -
submitMinecraftTp(view)} - > - -
- ); - } - return null; -} - -function mapStateToProps(state: State) { - const { view, canvasId } = state.canvas; - const { minecraftname, messages } = state.user; - return { - view, canvasId, minecraftname, messages, - }; -} - -export default connect(mapStateToProps)(MinecraftTPButton); diff --git a/src/components/UI.jsx b/src/components/UI.jsx index 140bf21..074d6ea 100644 --- a/src/components/UI.jsx +++ b/src/components/UI.jsx @@ -9,8 +9,8 @@ import { connect } from 'react-redux'; import type { State } from '../reducers'; import CoolDownBox from './CoolDownBox'; import NotifyBox from './NotifyBox'; -import GlobeButton from './GlobeButton'; -import PalselButton from './PalselButton'; +import GlobeButton from './buttons/GlobeButton'; +import PalselButton from './buttons/PalselButton'; import Palette from './Palette'; import Alert from './Alert'; import HistorySelect from './HistorySelect'; diff --git a/src/components/CanvasSwitchButton.jsx b/src/components/buttons/CanvasSwitchButton.jsx similarity index 90% rename from src/components/CanvasSwitchButton.jsx rename to src/components/buttons/CanvasSwitchButton.jsx index 800dacd..44d9e91 100644 --- a/src/components/CanvasSwitchButton.jsx +++ b/src/components/buttons/CanvasSwitchButton.jsx @@ -8,7 +8,7 @@ import { connect } from 'react-redux'; import { FaGlobe } from 'react-icons/fa'; import { t } from 'ttag'; -import { showCanvasSelectionModal } from '../actions'; +import { showCanvasSelectionModal } from '../../actions'; const CanvasSwitchButton = ({ open }) => ( diff --git a/src/components/ChatButton.jsx b/src/components/buttons/ChatButton.jsx similarity index 99% rename from src/components/ChatButton.jsx rename to src/components/buttons/ChatButton.jsx index 3644f71..13b3f89 100644 --- a/src/components/ChatButton.jsx +++ b/src/components/buttons/ChatButton.jsx @@ -13,7 +13,7 @@ import { t } from 'ttag'; import { hideAllWindowTypes, openChatWindow, -} from '../actions'; +} from '../../actions'; /* * return [ showWindows, chatOpen, chatHiden ] diff --git a/src/components/DownloadButton.jsx b/src/components/buttons/DownloadButton.jsx similarity index 91% rename from src/components/DownloadButton.jsx rename to src/components/buttons/DownloadButton.jsx index cb9b208..5ed4d08 100644 --- a/src/components/DownloadButton.jsx +++ b/src/components/buttons/DownloadButton.jsx @@ -9,9 +9,9 @@ import { MdFileDownload } from 'react-icons/md'; import fileDownload from 'js-file-download'; import { t } from 'ttag'; -import { getRenderer } from '../ui/renderer'; +import { getRenderer } from '../../ui/renderer'; -import type { State } from '../reducers'; +import type { State } from '../../reducers'; /** diff --git a/src/components/ExpandMenuButton.jsx b/src/components/buttons/ExpandMenuButton.jsx similarity index 94% rename from src/components/ExpandMenuButton.jsx rename to src/components/buttons/ExpandMenuButton.jsx index 5bbf80d..bcbfae8 100644 --- a/src/components/ExpandMenuButton.jsx +++ b/src/components/buttons/ExpandMenuButton.jsx @@ -9,7 +9,7 @@ import { connect } from 'react-redux'; import { MdExpandMore, MdExpandLess } from 'react-icons/md'; import { t } from 'ttag'; -import { toggleOpenMenu } from '../actions'; +import { toggleOpenMenu } from '../../actions'; const ExpandMenuButton = ({ menuOpen, expand }) => (
( diff --git a/src/components/LogInButton.jsx b/src/components/buttons/LogInButton.jsx similarity index 91% rename from src/components/LogInButton.jsx rename to src/components/buttons/LogInButton.jsx index b4054a4..3af5040 100644 --- a/src/components/LogInButton.jsx +++ b/src/components/buttons/LogInButton.jsx @@ -8,7 +8,7 @@ import { connect } from 'react-redux'; import { MdPerson } from 'react-icons/md'; import { t } from 'ttag'; -import { showUserAreaModal } from '../actions'; +import { showUserAreaModal } from '../../actions'; const LogInButton = ({ open }) => ( diff --git a/src/components/PalselButton.jsx b/src/components/buttons/PalselButton.jsx similarity index 95% rename from src/components/PalselButton.jsx rename to src/components/buttons/PalselButton.jsx index e28933e..2abccae 100644 --- a/src/components/PalselButton.jsx +++ b/src/components/buttons/PalselButton.jsx @@ -9,7 +9,7 @@ import { connect } from 'react-redux'; import { MdPalette } from 'react-icons/md'; import { t } from 'ttag'; -import { toggleOpenPalette } from '../actions'; +import { toggleOpenPalette } from '../../actions'; const PalselButton = ({ palette, onToggle, selectedColor, paletteOpen, diff --git a/src/components/SettingsButton.jsx b/src/components/buttons/SettingsButton.jsx similarity index 91% rename from src/components/SettingsButton.jsx rename to src/components/buttons/SettingsButton.jsx index c8498c0..e4a6f4c 100644 --- a/src/components/SettingsButton.jsx +++ b/src/components/buttons/SettingsButton.jsx @@ -8,7 +8,7 @@ import { connect } from 'react-redux'; import { FaCog } from 'react-icons/fa'; import { t } from 'ttag'; -import { showSettingsModal } from '../actions'; +import { showSettingsModal } from '../../actions'; const SettingsButton = ({ open }) => (