diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 5e66d8271..d3abf4dc8 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -92,7 +92,7 @@ class AccountController extends Controller Mail::to($user->email)->send(new ConfirmEmail($verify)); - return redirect()->back()->with('status', 'Email verification email sent!'); + return redirect()->back()->with('status', 'Verification email sent!'); } public function confirmVerifyEmail(Request $request, $userToken, $randomToken) diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php new file mode 100644 index 000000000..0e72e7efb --- /dev/null +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -0,0 +1,85 @@ +validate($request, [ + 'action' => 'required|string' + ]); + + $action = $request->input('action'); + + $actions = [ + 'ignore', + 'cw', + 'unlist', + 'delete', + 'shadowban', + 'ban' + ]; + + if(!in_array($action, $actions)) { + return abort(403); + } + + $report = Report::findOrFail($id); + + $this->handleReportAction($report, $action); + + return response()->json(['msg'=> 'Success']); + } + + public function handleReportAction(Report $report, $action) + { + $item = $report->reported(); + $report->admin_seen = Carbon::now(); + + switch ($action) { + case 'ignore': + $report->not_interested = true; + break; + + case 'cw': + $item->is_nsfw = true; + $item->save(); + $report->nsfw = true; + break; + + case 'unlist': + $item->visibility = 'unlisted'; + $item->save(); + break; + + case 'delete': + // Todo: fire delete job + $report->admin_seen = null; + break; + + case 'shadowban': + // Todo: fire delete job + $report->admin_seen = null; + break; + + case 'ban': + // Todo: fire delete job + $report->admin_seen = null; + break; + + default: + $report->admin_seen = null; + break; + } + + $report->save(); + + return $this; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index ebe315966..18eb861b7 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -21,7 +21,7 @@ class SiteController extends Controller public function homeGuest() { - return view('welcome'); + return view('site.index'); } public function homeTimeline() diff --git a/config/pixelfed.php b/config/pixelfed.php index 527a9f0f7..b33c6c885 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.1.6', + 'version' => '0.1.7', /* |-------------------------------------------------------------------------- diff --git a/public/img/online_world.svg b/public/img/online_world.svg new file mode 100644 index 000000000..ec99d371d --- /dev/null +++ b/public/img/online_world.svg @@ -0,0 +1,448 @@ + + + + + + image/svg+xml + + online world + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + online world + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/sample-post.jpeg b/public/img/sample-post.jpeg new file mode 100644 index 000000000..ecc2aae76 Binary files /dev/null and b/public/img/sample-post.jpeg differ diff --git a/resources/lang/he/navmenu.php b/resources/lang/he/navmenu.php index 32d78da75..87c0f12a0 100644 --- a/resources/lang/he/navmenu.php +++ b/resources/lang/he/navmenu.php @@ -9,5 +9,6 @@ return [ 'settings' => 'הגדרות', 'admin' => 'מנהל', 'logout' => 'התנתק', - + 'directMessages' => 'הודעות ישירות', + ]; diff --git a/resources/lang/he/profile.php b/resources/lang/he/profile.php index 5c76cbd91..6211907e1 100644 --- a/resources/lang/he/profile.php +++ b/resources/lang/he/profile.php @@ -3,6 +3,7 @@ return [ 'emptyTimeline' => 'למשתמש זה עדיין אין פוסטים!', 'emptyFollowers' => 'למשתמש זה עדיין אין עוקבים!', - 'emptyFollowing' => 'משתמש זה עדיין אינו עוקב אחרי אף אחד!', + 'emptyFollowing' => 'משתמש זה עדיין אינו עוקב אחרי אף אחד!', + 'emptySaved' => 'עדיין לא שמרת שום פוסט!', 'savedWarning' => 'רק אתם יכולים לראות את מה ששמרתם', ]; diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php new file mode 100644 index 000000000..50ce20627 --- /dev/null +++ b/resources/views/site/index.blade.php @@ -0,0 +1,172 @@ +@extends('layouts.app') + +@section('content') + + +
+
+

Image Sharing for Everyone

+

A free and ethical photo sharing platform.

+
+
+
+
+
+
+
+
+

+ Ad Free +

+

No Ads or Trackers

+
+
+
+
+
+
+

+ Chronological +

+

Timelines in order

+
+
+
+
+
+
+

+ Federated +

+

A network of millions

+
+
+
+
+
+
+

+ Discover +

+

Discover popular posts

+
+
+
+
+
+
+

+ Photo Filters +

+

Add an optional filter

+
+
+
+
+
+
+

+ Stories +

+

Coming Soon!

+
+
+
+
+
+
+
+
+
+ + + username + +
+
+ +
+
+ +
+

+ + username + + Hello world! #introduction +

+
+
+
+
+
+
+
+
+ +
+
+

Create. Discover. Share.

+

+ A feature rich photo sharing experience
+

+
+
+
+
+
+ +
+
+
+ +
+

Powered by People

+

+ Pixelfed is an open-source, federated platform.
+ You can run your own instance or join one.
+

+{{--

+ About this Instance + Login +

--}} +
+ + +
+
+
+
+@endsection + +@push('meta') + + +@endpush