chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3093 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2021-12-28 19:38:51 -07:00 committed by GitHub
parent cc63d3d1f7 2b11205a2c
commit d2bc455194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/exp.php
View File

@ -9,5 +9,5 @@ return [
'polls' => env('EXP_POLLS', false),
'cached_public_timeline' => env('EXP_CPT', false),
'gps' => env('EXP_GPS', false),
'spa' => env('EXP_SPA', true),
'spa' => true,
];

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -28,5 +28,5 @@
"/js/status.js": "/js/status.js?id=49fd7ac5b254220021f9",
"/js/stories.js": "/js/stories.js?id=f882708d5f00b4738dd7",
"/js/story-compose.js": "/js/story-compose.js?id=0f9d2f7ce5e63ef14c6a",
"/js/timeline.js": "/js/timeline.js?id=9957922a584a21f8f74f"
"/js/timeline.js": "/js/timeline.js?id=6c63b66614c9e768546c"
}

24
resources/assets/js/components/Timeline.vue
View File

@ -20,6 +20,18 @@
</div>
<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`feed-${index}-${status.id}`">
<div v-if="index == 1 && !loading && showPromo" class="">
<div class="card rounded-0 shadow-none border border-top-0 py-5">
<div class="card-body p-5 my-5">
<h1>A New Experience Awaits</h1>
<p class="lead">Try out an early release of our upcoming design</p>
<p class="mb-0 d-flex align-items-center">
<a class="btn btn-primary font-weight-bold py-1 px-4 rounded-pill mr-4" href="/i/web">Try new UI</a>
<a class="font-weight-bold text-muted" href="/" @click.prevent="hidePromo()">Hide</a>
</p>
</div>
</div>
</div>
<!-- <div v-if="index == 0 && showTips && !loading" class="my-4 card-tips">
<announcements-card v-on:show-tips="showTips = $event"></announcements-card>
</div> -->
@ -509,7 +521,8 @@
recentFeedMax: null,
reactionBar: true,
emptyFeed: false,
filters: []
filters: [],
showPromo: false,
}
},
@ -527,6 +540,10 @@
el.setAttribute('data-stylesheet', 'dark');
}*/
if(this.config.ab.spa === true) {
this.showPromo = localStorage.getItem('pf_metro_ui.exp.spa') == 'false' ? false : true;
}
if(localStorage.getItem('pf_metro_ui.exp.rec') == 'false') {
this.showSuggestions = false;
} else {
@ -1067,6 +1084,11 @@
return s;
});
},
hidePromo() {
localStorage.setItem('pf_metro_ui.exp.spa', 'false');
this.showPromo = false;
}
},
beforeDestroy () {