From b672ae4ce6006ac359176dd4489416ceef0766a2 Mon Sep 17 00:00:00 2001 From: Djyp Forest Fortin Date: Wed, 13 Mar 2019 23:11:17 +0100 Subject: [PATCH 1/3] Added an env var in the Dockerfile Regarding the start.sh file, to run Horizon, this env variable must exist ! --- contrib/docker/Dockerfile.apache | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index d541efa5b..03871d4e7 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -54,6 +54,7 @@ ENV APP_ENV=production \ DB_HOST=db \ BROADCAST_DRIVER=log \ QUEUE_DRIVER=redis \ + HORIZON_EMBED=TRUE \ HORIZON_PREFIX=horizon-pixelfed \ REDIS_HOST=redis \ SESSION_SECURE_COOKIE=true \ From 8131cc87126da7fcadb9d132f6e4118678667f10 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 17 Mar 2019 00:47:06 -0600 Subject: [PATCH 2/3] Update web routes --- routes/web.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/routes/web.php b/routes/web.php index 9ad2d8827..674f29478 100644 --- a/routes/web.php +++ b/routes/web.php @@ -278,12 +278,9 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('p/{username}/{id}/c', 'CommentController@showAll'); Route::get('p/{username}/{id}/edit', 'StatusController@edit'); Route::post('p/{username}/{id}/edit', 'StatusController@editStore'); - // Route::get('p/{username}/{id}.json', 'StatusController@showObject'); Route::get('p/{username}/{id}', 'StatusController@show'); Route::get('{username}/saved', 'ProfileController@savedBookmarks'); Route::get('{username}/followers', 'ProfileController@followers')->middleware('auth'); Route::get('{username}/following', 'ProfileController@following')->middleware('auth'); Route::get('{username}', 'ProfileController@show'); - // Route::get('p/{username}/{id}/embed', 'StatusController@showEmbed'); - // Route::get('{username}', 'ProfileController@showVue'); }); From 3a289ec80efb099f0ca66abfc88645476c99bd9f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 17 Mar 2019 00:50:26 -0600 Subject: [PATCH 3/3] Update Help Center --- resources/lang/en/helpcenter.php | 25 ++ resources/views/site/help.blade.php | 300 ++++++++++++++---- .../site/help/abusive-activity.blade.php | 26 -- .../views/site/help/partial/sidebar.blade.php | 5 - routes/web.php | 1 - 5 files changed, 256 insertions(+), 101 deletions(-) create mode 100644 resources/lang/en/helpcenter.php delete mode 100644 resources/views/site/help/abusive-activity.blade.php diff --git a/resources/lang/en/helpcenter.php b/resources/lang/en/helpcenter.php new file mode 100644 index 000000000..2ae6d85ce --- /dev/null +++ b/resources/lang/en/helpcenter.php @@ -0,0 +1,25 @@ + 'Help Center', + 'whatsnew' => 'What\'s New', + + 'gettingStarted' => 'Getting Started', + 'sharingMedia' => 'Sharing Media', + 'profile' => 'Profile', + 'stories' => 'Stories', + 'hashtags' => 'Hashtags', + 'discover' => 'Discover', + 'directMessages' => 'Direct Messages', + 'timelines' => 'Timelines', + + 'communityGuidelines' => 'Community Guidelines', + 'whatIsTheFediverse' => 'What is the fediverse?', + 'controllingVisibility' => 'Controlling Visibility', + 'blockingAccounts' => 'Blocking Accounts', + 'safetyTips' => 'Safety Tips', + 'reportSomething' => 'Report Something', + 'dataPolicy' => 'Data Policy' + +]; \ No newline at end of file diff --git a/resources/views/site/help.blade.php b/resources/views/site/help.blade.php index b8138ca88..847c8597f 100644 --- a/resources/views/site/help.blade.php +++ b/resources/views/site/help.blade.php @@ -3,94 +3,256 @@ @section('section')
-

Help

+

{{__('helpcenter.helpcenter')}}

-
-
-
- Getting Started -
-
-
-
- Hashtags -
-
-
-
- Sharing Photos & Videos -
-
-
-
- Discover -
-
-
-
- Your Profile -
-
-
-
- Direct Messaging -
-
-
-
- Stories -
-
-
-
- Timelines -
+
+
+

{{__('helpcenter.whatsnew')}}

+
-
-
+
+ +
+
+

+ +

+

{{__('helpcenter.gettingStarted')}}

+
+

How can I create an account?

+

How can I change my bio?

+
+
+
+ +
+
+ +
+
+

+ +

+

Hashtags

+
+

 

+

 

+
+
+
+ +
+
+ +
+
+

+ +

+

{{__('helpcenter.sharingMedia')}}

+
+

How do I create a post?

+

How do I add a filter?

+
+
+
+ +
+
+ +
+
+

+ +

+

{{__('helpcenter.discover')}}

+
+

 

+

 

+
+
+
+ +
+
+ +
+
+

+ +

+

{{__('helpcenter.profile')}}

+
+

How can I make my account private?

+

How can I secure my account?

+
+
+
+ +
+
+ +
+
+

+ +

+

{{__('helpcenter.directMessages')}}

+
+

 

+

 

+
+
+
+ +
+
+ +
+
+

+ +

+

{{__('helpcenter.stories')}}

+
+

 

+

 

+
+
+
+ +
+
+ +
+
+

+ +

+

{{__('helpcenter.timelines')}}

+
+

 

+

 

+
+
+
+ +
-
- Community Guidelines -
+ +
+
+

+ +

+

{{__('helpcenter.communityGuidelines')}}

+
+

 

+

 

+
+
+
+
-
- Blocking accounts -
+ +
+
+

+ +

+

{{__('helpcenter.blockingAccounts')}}

+
+

 

+

 

+
+
+
+
-
- What is the fediverse? -
+ +
+
+

+ +

+

{{__('helpcenter.whatIsTheFediverse')}}

+
+

 

+

 

+
+
+
+
-
- Safety Tips -
+ +
+
+

+ +

+

{{__('helpcenter.safetyTips')}}

+
+

 

+

 

+
+
+
+
-
- Controlling your visibility -
+ +
+
+

+ +

+

{{__('helpcenter.controllingVisibility')}}

+
+

 

+

 

+
+
+
+
-
- Report Something -
+ +
+
+

+ +

+

{{__('helpcenter.reportSomething')}}

+
+

 

+

 

+
+
+
+
-
- Abuse/malicious activity -
-
-
-
- Data Policy -
+ +
+
+

{{__('helpcenter.dataPolicy')}}

+
+
+
{{--
diff --git a/resources/views/site/help/abusive-activity.blade.php b/resources/views/site/help/abusive-activity.blade.php deleted file mode 100644 index bf9e36197..000000000 --- a/resources/views/site/help/abusive-activity.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -@extends('site.help.partial.template', ['breadcrumb'=>'Abusive/Malicious Activity']) - -@section('section') - -
-

Abusive/Malicious Activity

-
-
-
-
-
-
-
- -
-
-
-
-

This page isn't available

-

We haven't finished it yet, it will be updated soon!

-
-
-
-
-
-@endsection diff --git a/resources/views/site/help/partial/sidebar.blade.php b/resources/views/site/help/partial/sidebar.blade.php index 64835a44d..daa8b0807 100644 --- a/resources/views/site/help/partial/sidebar.blade.php +++ b/resources/views/site/help/partial/sidebar.blade.php @@ -43,11 +43,6 @@ Controlling Visibility -
  • - - Abusive Activity - -
  • Blocking Accounts diff --git a/routes/web.php b/routes/web.php index 674f29478..bb56b69e6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -252,7 +252,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('community-guidelines', 'SiteController@communityGuidelines')->name('help.community-guidelines'); Route::view('controlling-visibility', 'site.help.controlling-visibility')->name('help.controlling-visibility'); - Route::view('abusive-activity', 'site.help.abusive-activity')->name('help.abusive-activity'); Route::view('blocking-accounts', 'site.help.blocking-accounts')->name('help.blocking-accounts'); Route::view('report-something', 'site.help.report-something')->name('help.report-something'); Route::view('data-policy', 'site.help.data-policy')->name('help.data-policy');