Merge pull request #623 from pixelfed/frontend-ui-refactor

Frontend ui refactor

README.md

@@ -1,4 +1,6 @@
 # PixelFed: Federated Image Sharing
+[![Backers on Open Collective](https://opencollective.com/pixelfed-528/backers/badge.svg)](#backers)
+ [![Sponsors on Open Collective](https://opencollective.com/pixelfed-528/sponsors/badge.svg)](#sponsors) 
 
 PixelFed is a federated social image sharing platform, similar to Instagram.
 Federation is done using the [ActivityPub](https://activitypub.rocks/) protocol,
@@ -73,3 +75,33 @@ Matrix](https://matrix.to/#/#freenode_#pixelfed:matrix.org)
 
 The lead maintainer is on Patreon! You can become a Patron at
 https://www.patreon.com/dansup
+
+### Contributors
+
+This project exists thanks to all the people who contribute. 
+<a href="https://github.com/pixelfed/pixelfed/graphs/contributors"><img src="https://opencollective.com/pixelfed-528/contributors.svg?width=890&button=false" /></a>
+
+
+### Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/pixelfed-528#backer)]
+
+<a href="https://opencollective.com/pixelfed-528#backers" target="_blank"><img src="https://opencollective.com/pixelfed-528/backers.svg?width=890"></a>
+
+
+### Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/pixelfed-528#sponsor)]
+
+<a href="https://opencollective.com/pixelfed-528/sponsor/0/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/1/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/2/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/3/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/4/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/5/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/6/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/7/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/8/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/pixelfed-528/sponsor/9/website" target="_blank"><img src="https://opencollective.com/pixelfed-528/sponsor/9/avatar.svg"></a>
+
+

package.json

@@ -7,7 +7,8 @@
         "watch-poll": "npm run watch -- --watch-poll",
         "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "postinstall": "opencollective-postinstall"
     },
     "devDependencies": {
         "axios": "^0.18",
@@ -24,6 +25,7 @@
         "filesize": "^3.6.1",
         "infinite-scroll": "^3.0.4",
         "laravel-echo": "^1.4.0",
+        "opencollective-postinstall": "^2.0.1",
         "plyr": "^3.4.7",
         "pusher-js": "^4.2.2",
         "readmore-js": "^2.2.1",
@@ -31,6 +33,11 @@
         "sweetalert": "^2.1.0",
         "twitter-text": "^2.0.5",
         "vue-infinite-loading": "^2.4.3",
-        "vue-loading-overlay": "^3.1.0"
+        "vue-loading-overlay": "^3.1.0",
+        "opencollective": "^1.0.3"
+    },
+    "collective": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/pixelfed-528"
     }
-}
+}

resources/lang/de/auth.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'failed'   => 'Diese Daten stimmen nicht mit unserem Register überein.',
+    'failed'   => 'Diese Anmeldeinformationen stimmen nicht mit unseren Daten überein.',
     'throttle' => 'Zu viele Login-Versuche. Versuche es in :seconds Sekunden erneut.',
 
 ];

resources/lang/de/passwords.php

@@ -13,10 +13,10 @@ return [
     |
     */
 
-    'password' => 'Passwörter müssen mindestens 6 Zeichen sein und die Bestätigung muss übereinstimmen.',
+    'password' => 'Passwörter müssen mindestens 6 Zeichen lang sein und mit der Bestätigung übereinstimmen.',
     'reset'    => 'Dein Passwort wurde zurückgesetzt!',
-    'sent'     => 'Wir haben die eine Password-Rücksetzungs-E-Mail gesendet!',
-    'token'    => 'Dieser Passwort-Rücksetzungs-Code ist nicht gültig.',
+    'sent'     => 'Wir haben dir eine E-Mail zum Zurücksetzen deines Passworts gesendet!',
+    'token'    => 'Dieser Passwort-Reset-Code ist ungültig.',
     'user'     => 'Wir konnten keinen Nutzer mit dieser E-Mail-Adresse finden.',
 
 ];

resources/lang/de/site.php

@@ -0,0 +1,16 @@
+<?php
+
+return [
+
+	'about'			=> 'Über',
+	'help'			=> 'Hilfe',
+	'language'		=> 'Sprache',
+	'fediverse'		=> 'Fediverse',
+	'opensource'	=> 'Open Source',
+	'terms'			=> 'Nutzungshinweise',
+	'privacy'		=> 'Privacy',
+	'l10nWip'		=> 'Wir arbeiten noch an der Unterstützung weiterer Sprachen.',
+	'currentLocale' => 'Aktuelle Sprache',
+	'selectLocale'  => 'Wähle eine der unterstützten Sprachen aus',
+  
+];

resources/lang/de/validation.php

@@ -21,7 +21,7 @@ return [
     'alpha_dash'           => ':attribute darf nur Buchstaben, Zahlen, und Bindestriche beinhalten.',
     'alpha_num'            => ':attribute darf nur Buchstaben und Zahlen beinhalten.',
     'array'                => ':attribute muss ein Array sein.',
-    'before'               => ':attribute muss vor dem :date fallen.',
+    'before'               => ':attribute muss ein Datum vor dem :date sein.',
     'before_or_equal'      => ':attribute muss auf den :date oder davor fallen.',
     'between'              => [
         'numeric' => ':attribute muss eine Zahl zwischen :min bis :max sein.',