diff --git a/deployment/README.md b/deployment/README.md index f1284a34..345cf633 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -1,6 +1,9 @@ # Utils and informations of current deployment Files here might be very specific to the setup of pixelplanet.fun and might not be relevant for everyone +## exalple-ecosystem-x.yml and captchaFonts +Examples of configurations, will be copied into ./dist on build + ## updtmsg Basic nodejs script to print a message and a youtube video, used as a message while updating diff --git a/captchaFonts/Comismsh.ttf b/deployment/captchaFonts/Comismsh.ttf similarity index 100% rename from captchaFonts/Comismsh.ttf rename to deployment/captchaFonts/Comismsh.ttf diff --git a/captchaFonts/LICENSE.md b/deployment/captchaFonts/LICENSE.md similarity index 100% rename from captchaFonts/LICENSE.md rename to deployment/captchaFonts/LICENSE.md diff --git a/captchaFonts/PenicMasturbata.ttf b/deployment/captchaFonts/PenicMasturbata.ttf similarity index 100% rename from captchaFonts/PenicMasturbata.ttf rename to deployment/captchaFonts/PenicMasturbata.ttf diff --git a/ecosystem.yml b/ecosystem.yml deleted file mode 100644 index aa67bca6..00000000 --- a/ecosystem.yml +++ /dev/null @@ -1,15 +0,0 @@ -apps: - - script : ./build/web.js - name : 'web' - node_args: --nouse-idle-notification --expose-gc - env: - HOSTURL: "http://localhost" - ASSET_SERVER: "http://localhost" - PORT: 80 - REDIS_URL: 'redis://localhost:6379' - MYSQL_HOST: "localhost" - MYSQL_USER: "pixelplanet" - MYSQL_DATABASE: "pixelplanet" - LOG_MYSQL: 1 - MYSQL_PW: "sqlpassword" - SESSION_SECRET: "ayyylmao" diff --git a/i18n/template-ssr.pot b/i18n/template-ssr.pot index ae6858d7..8dd48290 100644 --- a/i18n/template-ssr.pot +++ b/i18n/template-ssr.pot @@ -53,14 +53,6 @@ msgstr "" msgid "Stop flooding." msgstr "" -#: src/ssr-components/Main.jsx:70 -msgid "PixelPlanet.fun" -msgstr "" - -#: src/ssr-components/Main.jsx:72 -msgid "Place color pixels on an map styled canvas with other players online" -msgstr "" - #: src/ssr-components/Globe.jsx:44 msgid "Double click on globe to go back." msgstr "" @@ -77,6 +69,14 @@ msgstr "" msgid "A 3D globe of our whole map" msgstr "" +#: src/ssr-components/Main.jsx:70 +msgid "PixelPlanet.fun" +msgstr "" + +#: src/ssr-components/Main.jsx:72 +msgid "Place color pixels on an map styled canvas with other players online" +msgstr "" + #: src/routes/reset_password.js:41 msgid "You sent an empty password or invalid data :(" msgstr "" @@ -327,6 +327,10 @@ msgstr "" msgid "PixelPlanet.fun Accounts" msgstr "" +#: src/routes/api/auth/logout.js:13 +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" @@ -342,10 +346,6 @@ msgid "" "request a new one." msgstr "" -#: src/routes/api/auth/logout.js:13 -msgid "You are not even logged in." -msgstr "" - #: src/canvasesDesc.js:18 msgid "Earth" msgstr "" diff --git a/i18n/template.pot b/i18n/template.pot index 654f0782..6a62348e 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -3,6 +3,64 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +#: src/controls/keypress.js:41 +#, javascript-format +msgid "Switched to ${ canvasName }" +msgstr "" + +#: src/controls/keypress.js:64 +msgid "Grid ON" +msgstr "" + +#: src/controls/keypress.js:65 +msgid "Grid OFF" +msgstr "" + +#: src/controls/keypress.js:75 +msgid "Pixel Notify ON" +msgstr "" + +#: src/controls/keypress.js:76 +msgid "Pixel Notify OFF" +msgstr "" + +#: src/controls/keypress.js:81 +msgid "Muted Sound" +msgstr "" + +#: src/controls/keypress.js:82 +msgid "Unmuted Sound" +msgstr "" + +#: src/components/CoordinatesBox.jsx:29 +#: src/controls/keypress.js:88 +msgid "Copied!" +msgstr "" + +#: src/controls/keypress.js:94 +msgid "Show Hidden Canvases" +msgstr "" + +#: src/controls/keypress.js:95 +msgid "Hide Hidden Canvases" +msgstr "" + +#: src/actions/index.js:632 +msgid "Register New Account" +msgstr "" + +#: src/actions/index.js:639 +msgid "Restore my Password" +msgstr "" + +#: src/actions/index.js:646 +msgid "Welcome to PixelPlanet.fun" +msgstr "" + +#: src/actions/index.js:652 +msgid "Look at past Canvases" +msgstr "" + #: src/ui/placePixel.js:53 msgid "Error :(" msgstr "" @@ -104,48 +162,6 @@ msgstr "" msgid "Error ${ retCode }" msgstr "" -#: src/controls/keypress.js:41 -#, javascript-format -msgid "Switched to ${ canvasName }" -msgstr "" - -#: src/controls/keypress.js:64 -msgid "Grid ON" -msgstr "" - -#: src/controls/keypress.js:65 -msgid "Grid OFF" -msgstr "" - -#: src/controls/keypress.js:75 -msgid "Pixel Notify ON" -msgstr "" - -#: src/controls/keypress.js:76 -msgid "Pixel Notify OFF" -msgstr "" - -#: src/controls/keypress.js:81 -msgid "Muted Sound" -msgstr "" - -#: src/controls/keypress.js:82 -msgid "Unmuted Sound" -msgstr "" - -#: src/components/CoordinatesBox.jsx:29 -#: src/controls/keypress.js:88 -msgid "Copied!" -msgstr "" - -#: src/controls/keypress.js:94 -msgid "Show Hidden Canvases" -msgstr "" - -#: src/controls/keypress.js:95 -msgid "Hide Hidden Canvases" -msgstr "" - #: src/ui/renderer.js:36 msgid "Canvas Error" msgstr "" @@ -154,20 +170,9 @@ msgstr "" msgid "Can't render 3D canvas, do you have WebGL2 disabled?" msgstr "" -#: src/actions/index.js:632 -msgid "Register New Account" -msgstr "" - -#: src/actions/index.js:639 -msgid "Restore my Password" -msgstr "" - -#: src/actions/index.js:646 -msgid "Welcome to PixelPlanet.fun" -msgstr "" - -#: src/actions/index.js:652 -msgid "Look at past Canvases" +#: src/components/Converter.jsx:559 +#: src/components/CoordinatesBox.jsx:32 +msgid "Copy to Clipboard" msgstr "" #: src/components/OnlineBox.jsx:41 @@ -193,9 +198,25 @@ msgstr "" msgid "Restore" msgstr "" -#: src/components/Converter.jsx:559 -#: src/components/CoordinatesBox.jsx:32 -msgid "Copy to Clipboard" +#: src/components/buttons/CanvasSwitchButton.jsx:22 +#: src/components/windows/index.js:22 +msgid "Canvas Selection" +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:23 +msgid "Close Menu" +msgstr "" + +#: src/components/buttons/ExpandMenuButton.jsx:23 +msgid "Open Menu" msgstr "" #: src/actions/fetch.js:39 @@ -227,32 +248,6 @@ msgstr "" msgid "Server answered with gibberish :(" msgstr "" -#: src/components/buttons/CanvasSwitchButton.jsx:22 -#: src/components/windows/index.js:22 -msgid "Canvas Selection" -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:23 -msgid "Close Menu" -msgstr "" - -#: src/components/buttons/ExpandMenuButton.jsx:23 -msgid "Open Menu" -msgstr "" - -#: src/components/buttons/HelpButton.jsx:23 -#: src/components/windows/index.js:16 -msgid "Help" -msgstr "" - #: src/components/HistorySelect.jsx:144 msgid "Loading" msgstr "" @@ -261,32 +256,6 @@ msgstr "" msgid "Select Date above" msgstr "" -#: src/components/buttons/SettingsButton.jsx:23 -#: src/components/windows/index.js:17 -msgid "Settings" -msgstr "" - -#: src/components/buttons/DownloadButton.jsx:37 -msgid "Make Screenshot" -msgstr "" - -#: src/components/buttons/GlobeButton.jsx:35 -msgid "Globe View" -msgstr "" - -#: src/components/buttons/PalselButton.jsx:31 -msgid "Close Palette" -msgstr "" - -#: src/components/buttons/PalselButton.jsx:31 -msgid "Open Palette" -msgstr "" - -#: src/components/buttons/LogInButton.jsx:23 -#: src/components/windows/index.js:18 -msgid "User Area" -msgstr "" - #: src/components/Window.jsx:117 msgid "Clone" msgstr "" @@ -303,6 +272,41 @@ msgstr "" msgid "Resize" msgstr "" +#: src/components/buttons/HelpButton.jsx:23 +#: src/components/windows/index.js:16 +msgid "Help" +msgstr "" + +#: src/components/buttons/LogInButton.jsx:23 +#: src/components/windows/index.js:18 +msgid "User Area" +msgstr "" + +#: src/components/buttons/SettingsButton.jsx:23 +#: src/components/windows/index.js:17 +msgid "Settings" +msgstr "" + +#: src/components/buttons/GlobeButton.jsx:35 +msgid "Globe View" +msgstr "" + +#: src/components/buttons/DownloadButton.jsx:37 +msgid "Make Screenshot" +msgstr "" + +#: src/components/buttons/PalselButton.jsx:31 +msgid "Close Palette" +msgstr "" + +#: src/components/buttons/PalselButton.jsx:31 +msgid "Open Palette" +msgstr "" + +#: src/components/contextmenus/ChannelContextMenu.jsx:55 +msgid "Mute" +msgstr "" + #: src/components/contextmenus/UserContextMenu.jsx:53 msgid "Ping" msgstr "" @@ -315,10 +319,6 @@ msgstr "" msgid "Block" msgstr "" -#: src/components/contextmenus/ChannelContextMenu.jsx:55 -msgid "Mute" -msgstr "" - #: src/components/windows/index.js:19 msgid "Registration" msgstr "" @@ -384,34 +384,6 @@ msgstr "" msgid "Send" msgstr "" -#: src/components/windows/UserArea.jsx:27 -msgid "Profile" -msgstr "" - -#: src/components/windows/UserArea.jsx:30 -msgid "Ranking" -msgstr "" - -#: src/components/windows/UserArea.jsx:33 -msgid "Converter" -msgstr "" - -#: src/components/windows/UserArea.jsx:39 -msgid "Admintools" -msgstr "" - -#: src/components/windows/UserArea.jsx:39 -msgid "Modtools" -msgstr "" - -#: src/components/windows/UserArea.jsx:40 -msgid "Loading..." -msgstr "" - -#: src/components/windows/UserArea.jsx:47 -msgid "Consider joining us on Guilded:" -msgstr "" - #: src/components/windows/Help.jsx:36 msgid "your IP" msgstr "" @@ -589,6 +561,40 @@ msgstr "" msgid "Credit for the Palette of the Top10 canvas goes to ${ vinikLink }." msgstr "" +#: src/components/windows/Register.jsx:81 +msgid "Register new account here" +msgstr "" + +#: src/components/windows/Register.jsx:92 +msgid "Name" +msgstr "" + +#: src/components/windows/ForgotPassword.jsx:82 +#: src/components/windows/Register.jsx:100 +msgid "Email" +msgstr "" + +#: src/components/ChangeMail.jsx:80 +#: src/components/DeleteAccount.jsx:62 +#: src/components/LogInForm.jsx:83 +#: src/components/windows/Register.jsx:108 +msgid "Password" +msgstr "" + +#: src/components/windows/Register.jsx:116 +msgid "Confirm Password" +msgstr "" + +#: src/components/Admintools.jsx:311 +#: src/components/Admintools.jsx:392 +#: src/components/Admintools.jsx:467 +#: src/components/Admintools.jsx:512 +#: src/components/Admintools.jsx:595 +#: src/components/windows/ForgotPassword.jsx:86 +#: src/components/windows/Register.jsx:119 +msgid "Submit" +msgstr "" + #: src/components/windows/CanvasSelect.jsx:33 msgid "" "Select the canvas you want to use. Every canvas is unique and has " @@ -657,21 +663,6 @@ msgstr "" msgid "Enter your mail address and we will send you a new password:" msgstr "" -#: src/components/windows/ForgotPassword.jsx:82 -#: src/components/windows/Register.jsx:100 -msgid "Email" -msgstr "" - -#: src/components/Admintools.jsx:311 -#: src/components/Admintools.jsx:392 -#: src/components/Admintools.jsx:467 -#: src/components/Admintools.jsx:512 -#: src/components/Admintools.jsx:595 -#: src/components/windows/ForgotPassword.jsx:86 -#: src/components/windows/Register.jsx:119 -msgid "Submit" -msgstr "" - #: src/components/windows/Settings.jsx:133 msgid "Show Grid" msgstr "" @@ -765,23 +756,32 @@ msgstr "" msgid "Select Language" msgstr "" -#: src/components/windows/Register.jsx:81 -msgid "Register new account here" +#: src/components/windows/UserArea.jsx:27 +msgid "Profile" msgstr "" -#: src/components/windows/Register.jsx:92 -msgid "Name" +#: src/components/windows/UserArea.jsx:30 +msgid "Ranking" msgstr "" -#: src/components/ChangeMail.jsx:80 -#: src/components/DeleteAccount.jsx:62 -#: src/components/LogInForm.jsx:83 -#: src/components/windows/Register.jsx:108 -msgid "Password" +#: src/components/windows/UserArea.jsx:33 +msgid "Converter" msgstr "" -#: src/components/windows/Register.jsx:116 -msgid "Confirm Password" +#: src/components/windows/UserArea.jsx:39 +msgid "Admintools" +msgstr "" + +#: src/components/windows/UserArea.jsx:39 +msgid "Modtools" +msgstr "" + +#: src/components/windows/UserArea.jsx:40 +msgid "Loading..." +msgstr "" + +#: src/components/windows/UserArea.jsx:47 +msgid "Consider joining us on Guilded:" msgstr "" #: src/utils/validation.js:18 @@ -832,6 +832,75 @@ msgstr "" msgid "Password must be shorter than 60 characters." msgstr "" +#: src/components/CanvasItem.jsx:30 +msgid "Online Users" +msgstr "" + +#: src/components/CanvasItem.jsx:35 +msgid "Cooldown" +msgstr "" + +#: src/components/CanvasItem.jsx:41 +msgid "Stacking till" +msgstr "" + +#: src/components/CanvasItem.jsx:43 +msgid "Ranked" +msgstr "" + +#: src/components/CanvasItem.jsx:45 +msgid "Yes" +msgstr "" + +#: src/components/CanvasItem.jsx:45 +msgid "No" +msgstr "" + +#: src/components/CanvasItem.jsx:51 +msgid "Requirements" +msgstr "" + +#: src/components/CanvasItem.jsx:54 +msgid "User Account" +msgstr "" + +#: src/components/CanvasItem.jsx:56 +#, javascript-format +msgid "and ${ canvas.req } Pixels set" +msgstr "" + +#: src/components/CanvasItem.jsx:59 +msgid "Top 10 Daily Ranking" +msgstr "" + +#: src/components/CanvasItem.jsx:65 +msgid "Dimensions" +msgstr "" + +#: src/components/LogInArea.jsx:21 +msgid "Login to access more features and stats." +msgstr "" + +#: src/components/LogInArea.jsx:23 +msgid "Login with Name or Mail:" +msgstr "" + +#: src/components/LogInArea.jsx:30 +msgid "I forgot my Password." +msgstr "" + +#: src/components/LogInArea.jsx:31 +msgid "or login with:" +msgstr "" + +#: src/components/LogInArea.jsx:72 +msgid "or register here:" +msgstr "" + +#: src/components/LogInArea.jsx:79 +msgid "Register" +msgstr "" + #: src/components/UserAreaContent.jsx:63 msgid "Todays Placed Pixels" msgstr "" @@ -967,51 +1036,6 @@ msgstr "" msgid "User Name" msgstr "" -#: src/components/CanvasItem.jsx:30 -msgid "Online Users" -msgstr "" - -#: src/components/CanvasItem.jsx:35 -msgid "Cooldown" -msgstr "" - -#: src/components/CanvasItem.jsx:41 -msgid "Stacking till" -msgstr "" - -#: src/components/CanvasItem.jsx:43 -msgid "Ranked" -msgstr "" - -#: src/components/CanvasItem.jsx:45 -msgid "Yes" -msgstr "" - -#: src/components/CanvasItem.jsx:45 -msgid "No" -msgstr "" - -#: src/components/CanvasItem.jsx:51 -msgid "Requirements" -msgstr "" - -#: src/components/CanvasItem.jsx:54 -msgid "User Account" -msgstr "" - -#: src/components/CanvasItem.jsx:56 -#, javascript-format -msgid "and ${ canvas.req } Pixels set" -msgstr "" - -#: src/components/CanvasItem.jsx:59 -msgid "Top 10 Daily Ranking" -msgstr "" - -#: src/components/CanvasItem.jsx:65 -msgid "Dimensions" -msgstr "" - #: src/components/Converter.jsx:190 msgid "Choose Canvas" msgstr "" @@ -1090,30 +1114,6 @@ msgstr "" msgid "Download Template" msgstr "" -#: src/components/LogInArea.jsx:21 -msgid "Login to access more features and stats." -msgstr "" - -#: src/components/LogInArea.jsx:23 -msgid "Login with Name or Mail:" -msgstr "" - -#: src/components/LogInArea.jsx:30 -msgid "I forgot my Password." -msgstr "" - -#: src/components/LogInArea.jsx:31 -msgid "or login with:" -msgstr "" - -#: src/components/LogInArea.jsx:72 -msgid "or register here:" -msgstr "" - -#: src/components/LogInArea.jsx:79 -msgid "Register" -msgstr "" - #: src/components/ChangeMail.jsx:91 #: src/components/ChangeName.jsx:68 #: src/components/ChangePassword.jsx:110 @@ -1121,6 +1121,28 @@ msgstr "" msgid "Save" msgstr "" +#: src/components/LogInForm.jsx:76 +msgid "Name or Email" +msgstr "" + +#: src/components/LogInForm.jsx:87 +msgid "LogIn" +msgstr "" + +#: src/components/UserMessages.jsx:28 +msgid "" +"Please verify your mail address \n" +"or your account could get deleted after a few days." +msgstr "" + +#: src/components/UserMessages.jsx:49 +msgid "A new verification mail is getting sent to you." +msgstr "" + +#: src/components/UserMessages.jsx:53 +msgid "Click here to request a new verification mail." +msgstr "" + #: src/components/ChangePassword.jsx:22 msgid "Passwords do not match." msgstr "" @@ -1141,6 +1163,10 @@ msgstr "" msgid "Confirm New Password" msgstr "" +#: src/components/ChangeName.jsx:64 +msgid "New Username" +msgstr "" + #: src/components/ChangeMail.jsx:59 msgid "" "Changed Mail successfully. We sent you a verification mail, " @@ -1151,10 +1177,6 @@ msgstr "" msgid "New Mail" msgstr "" -#: src/components/DeleteAccount.jsx:66 -msgid "Yes, Delete My Account!" -msgstr "" - #: src/components/SocialSettings.jsx:38 msgid "Block all Private Messages" msgstr "" @@ -1167,30 +1189,8 @@ msgstr "" msgid "You have no users blocked" msgstr "" -#: src/components/UserMessages.jsx:28 -msgid "" -"Please verify your mail address \n" -"or your account could get deleted after a few days." -msgstr "" - -#: src/components/UserMessages.jsx:49 -msgid "A new verification mail is getting sent to you." -msgstr "" - -#: src/components/UserMessages.jsx:53 -msgid "Click here to request a new verification mail." -msgstr "" - -#: src/components/ChangeName.jsx:64 -msgid "New Username" -msgstr "" - -#: src/components/LogInForm.jsx:76 -msgid "Name or Email" -msgstr "" - -#: src/components/LogInForm.jsx:87 -msgid "LogIn" +#: src/components/DeleteAccount.jsx:66 +msgid "Yes, Delete My Account!" msgstr "" #: src/components/windows/Help.jsx:14 diff --git a/webpack.config.server.babel.js b/webpack.config.server.babel.js index 4f5ef073..c0803f11 100644 --- a/webpack.config.server.babel.js +++ b/webpack.config.server.babel.js @@ -150,7 +150,7 @@ export default ({ ), }, { - from: path.resolve(__dirname, 'captchaFonts'), + from: path.resolve(__dirname, 'deployment', 'captchaFonts'), to: path.resolve(__dirname, 'dist', 'captchaFonts'), }, {