UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-01 18:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Timeline, remove simple mode and set labs deprecation date

Browse source
This commit is contained in:
Daniel Supernault 2020-12-14 00:49:45 -07:00
parent 21a5739f1e
commit df9c3adff6
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 193 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Settings/LabsSettings.php
View file

@ -41,10 +41,7 @@ trait LabsSettings {
} }
if($request->has('profile_layout')) { if($request->has('profile_layout')) {
if($profile->profile_layout != 'moment') {
$profile->profile_layout = 'moment';
$changes = true;
}
} else { } else {
$profile->profile_layout = null; $profile->profile_layout = null;
$changes = true; $changes = true;

19
resources/assets/js/components/Timeline.vue
View file

@ -23,7 +23,7 @@
</div> </div>
<hr> <hr>
</div> </div>
<div :class="[modes.distractionFree ? 'col-md-8 col-lg-8 offset-md-2 px-0 mb-sm-3 timeline order-2 order-md-1':'col-md-8 col-lg-8 px-0 mb-sm-3 timeline order-2 order-md-1']"> <div class="col-md-8 col-lg-8 px-0 mb-sm-3 timeline order-2 order-md-1">
<div style="margin-top:-2px;"> <div style="margin-top:-2px;">
<story-component v-if="config.features.stories"></story-component> <story-component v-if="config.features.stories"></story-component>
</div> </div>
@ -96,7 +96,7 @@
</div> </div>
<div class="card mb-sm-4 status-card card-md-rounded-0 shadow-none border"> <div class="card mb-sm-4 status-card card-md-rounded-0 shadow-none border">
<div v-if="!modes.distractionFree && status" class="card-header d-inline-flex align-items-center bg-white"> <div v-if="status" class="card-header d-inline-flex align-items-center bg-white">
<!-- <img v-bind:src="status.account.avatar" width="38px" height="38px" class="cursor-pointer" style="border-radius: 38px;" @click="profileUrl(status)" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"> --> <!-- <img v-bind:src="status.account.avatar" width="38px" height="38px" class="cursor-pointer" style="border-radius: 38px;" @click="profileUrl(status)" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"> -->
<!-- <div v-if="hasStory" class="has-story has-story-sm cursor-pointer shadow-sm" @click="profileUrl(status)"> <!-- <div v-if="hasStory" class="has-story has-story-sm cursor-pointer shadow-sm" @click="profileUrl(status)">
<img class="rounded-circle box-shadow" :src="status.account.avatar" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"> <img class="rounded-circle box-shadow" :src="status.account.avatar" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
@ -162,7 +162,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div v-if="!modes.distractionFree" class="reactions my-1 pb-2"> <div class="reactions my-1 pb-2">
<h3 v-if="status.favourited" class="fas fa-heart text-danger pr-3 m-0 cursor-pointer" title="Like" v-on:click="likeStatus(status, $event);"></h3> <h3 v-if="status.favourited" class="fas fa-heart text-danger pr-3 m-0 cursor-pointer" title="Like" v-on:click="likeStatus(status, $event);"></h3>
<h3 v-else class="far fa-heart pr-3 m-0 like-btn text-lighter cursor-pointer" title="Like" v-on:click="likeStatus(status, $event);"></h3> <h3 v-else class="far fa-heart pr-3 m-0 like-btn text-lighter cursor-pointer" title="Like" v-on:click="likeStatus(status, $event);"></h3>
<h3 v-if="!status.comments_disabled" class="far fa-comment text-lighter pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3> <h3 v-if="!status.comments_disabled" class="far fa-comment text-lighter pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
@ -180,7 +180,7 @@
</span> </span>
</div> </div>
<div class="likes font-weight-bold" v-if="expLc(status) == true && !modes.distractionFree"> <div class="likes font-weight-bold" v-if="expLc(status) == true">
<span class="like-count">{{status.favourites_count}}</span> {{status.favourites_count == 1 ? 'like' : 'likes'}} <span class="like-count">{{status.favourites_count}}</span> {{status.favourites_count == 1 ? 'like' : 'likes'}}
</div> </div>
<div class="caption"> <div class="caption">
@ -213,9 +213,6 @@
<a :href="statusUrl(status)" class="text-muted"> <a :href="statusUrl(status)" class="text-muted">
<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago> <timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
</a> </a>
<a v-if="modes.distractionFree" class="float-right" :href="status.url">
<i class="fas fa-ellipsis-h fa-lg text-muted"></i>
</a>
</p> </p>
</div> </div>
</div> </div>
@ -257,7 +254,7 @@
</div> </div>
</div> </div>
<div v-if="!modes.distractionFree" class="col-md-4 col-lg-4 my-4 order-1 order-md-2 d-none d-md-block"> <div class="col-md-4 col-lg-4 my-4 order-1 order-md-2 d-none d-md-block">
<div> <div>
<!-- <div class="mb-4"> <!-- <div class="mb-4">
@ -755,12 +752,6 @@
this.showReadMore = true; this.showReadMore = true;
} }
if(localStorage.getItem('pf_metro_ui.exp.df') == 'true') {
this.modes.distractionFree = true;
} else {
this.modes.distractionFree = false;
}
if(localStorage.getItem('metro-tips') == 'false') { if(localStorage.getItem('metro-tips') == 'false') {
this.showTips = false; this.showTips = false;
} }

40
resources/views/settings/labs.blade.php
View file

@ -6,9 +6,6 @@
<p class="lead">Experimental features</p> <p class="lead">Experimental features</p>
</div> </div>
<hr> <hr>
<div class="alert alert-primary px-3 h6 text-center">
<strong>Warning:</strong> Some experimental features may contain bugs or missing functionality
</div>
<div class="alert alert-warning px-3 h6"> <div class="alert alert-warning px-3 h6">
We are deprecating Labs in a future version. Some features will no longer be supported. For more information, click <a href="{{route('help.labs-deprecation')}}" class="font-weight-bold">here</a>. We are deprecating Labs in a future version. Some features will no longer be supported. For more information, click <a href="{{route('help.labs-deprecation')}}" class="font-weight-bold">here</a>.
</div> </div>
@ -18,15 +15,15 @@
</div> </div>
<form method="post"> <form method="post">
@csrf @csrf
@if(config('exp.lc') == true)
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" checked disabled> <input class="form-check-input" type="checkbox" name="dark_mode" id="dark_mode" {{request()->hasCookie('dark-mode') ? 'checked':''}}>
<label class="form-check-label font-weight-bold"> <label class="form-check-label font-weight-bold" for="dark_mode">
{{__('Hidden like counts on Timelines')}} {{__('Dark Mode')}}
</label> </label>
<p class="text-muted small help-text">Like counts are hidden on timelines. This experiment was enabled for all users and can only be changed by the instance administrator.</p> <p class="text-muted small help-text">Use dark mode theme.</p>
</div> </div>
@endif @if(!now()->gt(now()->parse('2021-06-14 07:22:46')))
@if($profile->profile_layout == 'moment')
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" name="profile_layout" id="profile_layout" {{$profile->profile_layout == 'moment' ? 'checked':''}} value="{{$profile->profile_layout}}"> <input class="form-check-input" type="checkbox" name="profile_layout" id="profile_layout" {{$profile->profile_layout == 'moment' ? 'checked':''}} value="{{$profile->profile_layout}}">
<label class="form-check-label font-weight-bold" for="profile_layout"> <label class="form-check-label font-weight-bold" for="profile_layout">
@ -34,7 +31,6 @@
</label> </label>
<p class="text-muted small help-text">MomentUI offers an alternative layout for posts and your profile.</p> <p class="text-muted small help-text">MomentUI offers an alternative layout for posts and your profile.</p>
</div> </div>
@if($profile->profile_layout == 'moment')
<div class="form-check pb-3"> <div class="form-check pb-3">
<label class="form-check-label font-weight-bold mb-3" for="profile_layout"> <label class="form-check-label font-weight-bold mb-3" for="profile_layout">
{{__('MomentUI Profile Header Color')}} {{__('MomentUI Profile Header Color')}}
@ -151,14 +147,16 @@
</div> </div>
<p class="text-muted small help-text">Set your MomentUI profile background color. Adding a custom header image will be supported in a future version.</p> <p class="text-muted small help-text">Set your MomentUI profile background color. Adding a custom header image will be supported in a future version.</p>
</div> </div>
@endif @else
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" name="dark_mode" id="dark_mode" {{request()->hasCookie('dark-mode') ? 'checked':''}}> <input class="form-check-input" type="checkbox" name="profile_layout" id="profile_layout" {{$profile->profile_layout == 'moment' ? 'checked':''}} value="{{$profile->profile_layout}}" disabled>
<label class="form-check-label font-weight-bold" for="dark_mode"> <label class="form-check-label font-weight-bold" for="profile_layout">
{{__('MetroUI Dark Mode')}} {{__('Use MomentUI for posts and your profile')}}
</label> </label>
<p class="text-muted small help-text">Use dark mode theme.</p> <p class="text-muted small help-text"><span class="badge badge-secondary">DEPRECATED</span> MomentUI offers an alternative layout for posts and your profile.</p>
</div> </div>
@endif
@if(config('exp.rec') == true) @if(config('exp.rec') == true)
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" name="show_suggestions" id="show_suggestions"> <input class="form-check-input" type="checkbox" name="show_suggestions" id="show_suggestions">
@ -176,9 +174,9 @@
<p class="text-muted small help-text">Collapses captions/comments more than 3 lines.</p> <p class="text-muted small help-text">Collapses captions/comments more than 3 lines.</p>
</div> </div>
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" id="distraction_free"> <input class="form-check-input" type="checkbox" id="distraction_free" disabled>
<label class="form-check-label font-weight-bold">Simple Mode (Timelines only)</label> <label class="form-check-label font-weight-bold">Simple Mode (Timelines only)</label>
<p class="text-muted small help-text">An experimental content-first timeline layout</p> <p class="text-muted small help-text"><span class="badge badge-secondary">REMOVED</span> An experimental content-first timeline layout</p>
</div> </div>
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" id="show_tips"> <input class="form-check-input" type="checkbox" id="show_tips">
@ -190,11 +188,11 @@
<label class="form-check-label font-weight-bold">Force Metro Layout</label> <label class="form-check-label font-weight-bold">Force Metro Layout</label>
<p class="text-muted small help-text">Force MetroUI layout for profiles and posts.</p> <p class="text-muted small help-text">Force MetroUI layout for profiles and posts.</p>
</div> </div>
@if(config('exp.rec') == true)
<div class="py-3"> <div class="py-3">
<p class="font-weight-bold text-muted text-center">Discovery</p> <p class="font-weight-bold text-muted text-center">Discovery</p>
<hr> <hr>
</div> </div>
@if(config('exp.rec') == true)
<div class="form-check pb-3"> <div class="form-check pb-3">
<input class="form-check-input" type="checkbox" name="profile_suggestions" id="profile_suggestions" {{$profile->is_suggestable ? 'checked' : ''}}> <input class="form-check-input" type="checkbox" name="profile_suggestions" id="profile_suggestions" {{$profile->is_suggestable ? 'checked' : ''}}>
<label class="form-check-label font-weight-bold" for="profile_suggestions"> <label class="form-check-label font-weight-bold" for="profile_suggestions">
@ -203,6 +201,7 @@
<p class="text-muted small help-text">Allow your profile to be listed in Profile Suggestions.</p> <p class="text-muted small help-text">Allow your profile to be listed in Profile Suggestions.</p>
</div> </div>
@endif @endif
@endif
<div class="form-group row"> <div class="form-group row">
<div class="col-12"> <div class="col-12">
<hr> <hr>
@ -213,6 +212,8 @@
@endsection @endsection
@push('scripts') @push('scripts')
@if(!now()->gt(now()->parse('2021-06-14 07:22:46')))
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
let showSuggestions = localStorage.getItem('pf_metro_ui.exp.rec') == 'false' ? false : true; let showSuggestions = localStorage.getItem('pf_metro_ui.exp.rec') == 'false' ? false : true;
@ -229,7 +230,7 @@ $(document).ready(function() {
} }
if(distractionFree == true) { if(distractionFree == true) {
$('#distraction_free').attr('checked', true); localStorage.removeItem('pf_metro_ui.exp.df');
} }
if(localStorage.getItem('metro-tips') !== 'false') { if(localStorage.getItem('metro-tips') !== 'false') {
@ -281,4 +282,5 @@ $(document).ready(function() {
}) })
}); });
</script> </script>
@endif
@endpush @endpush

6
resources/views/site/help/labs-deprecation.blade.php
View file

@ -9,13 +9,13 @@
<p class="lead">We are deprecating Labs in a future version. No new experiments will be released. We will give 6 months notice before removing Labs.</p> <p class="lead">We are deprecating Labs in a future version. No new experiments will be released. We will give 6 months notice before removing Labs.</p>
<hr> <hr>
<h4 class="font-weight-bold">When will labs be deprecated?</h4> <h4 class="font-weight-bold">When will labs be deprecated?</h4>
<p>TBA</p> <p>June 14 2021</p>
<hr> <hr>
<h4 class="font-weight-bold">What features will be deprecated?</h4> <h4 class="font-weight-bold">What features will be deprecated?</h4>
<p>TBA</p> <p>All features except Dark Mode</p>
<hr> <hr>
<h4 class="font-weight-bold">Why is Labs being deprecated?</h4> <h4 class="font-weight-bold">Why is Labs being deprecated?</h4>
<p>Labs was started in early 2019 to test experimental designs and features. Now the project is more mature, we are outgrowing some of these experiments.</p> <p>Labs was started in early 2019 to test experimental designs and features. Now the project is more mature, we are outgrowing some of these experiments.</p>
<hr> <hr>
<p class="small">Last Updated: April 10/2020</p> <p class="small">Last Updated: Dec 14 2020</p>
@endsection @endsection