aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2452 from pixelfed/staging

Browse Source 
Staging
pull/2470/head
daniel 5 years ago committed by GitHub
parent 907c96ea9a bafd6079e3
commit 2373111501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 171 additions and 73 deletions
Show Stats Download Patch File Download Diff File

2
CHANGELOG.md
Unescape Escape View File

@ -99,6 +99,8 @@
- Updated RegisterController, make the minimum user password length configurable. ([09479c02](https://github.com/pixelfed/pixelfed/commit/09479c02))
- Updated AuthServiceProvider, added support for configurable OAuth tokens and refresh tokens lifetime. ([7cfae612](https://github.com/pixelfed/pixelfed/commit/7cfae612))
- Updated EmailService, make case insensitive. ([1b41d664](https://github.com/pixelfed/pixelfed/commit/1b41d664))
- Updated DiscoverController, fix trending api. ([2ab2c9a](https://github.com/pixelfed/pixelfed/commit/2ab2c9a))
- Updated Dark Mode layout. ([d6f8170](https://github.com/pixelfed/pixelfed/commit/d6f8170))
## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
### Added

6
app/Http/Controllers/DiscoverController.php
Unescape Escape View File

@ -177,16 +177,20 @@ class DiscoverController extends Controller
$request->input('range') == 'alltime' ? '-1' :
($request->input('range') == 'daily' ? 1 : 31) : 1;
$key = ':api:discover:trending:v1:range:' . $range;
$key = ':api:discover:trending:v2:range:' . $range;
$ttl = now()->addHours(2);
$res = Cache::remember($key, $ttl, function() use($range) {
if($range == '-1') {
$res = Status::whereVisibility('public')
->whereType('photo')
->whereIsNsfw(false)
->orderBy('likes_count','desc')
->take(12)
->get();
} else {
$res = Status::whereVisibility('public')
->whereType('photo')
->whereIsNsfw(false)
->orderBy('likes_count','desc')
->take(12)
->where('created_at', '>', now()->subDays($range))

13
public/css/appdark.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/discover.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
Unescape Escape View File

@ -5,7 +5,7 @@
"/js/activity.js": "/js/activity.js?id=838e242ddbe91e559f00",
"/js/app.js": "/js/app.js?id=d1274e1bbd0cccd6089f",
"/css/app.css": "/css/app.css?id=77729cabd5c8a0ad09b8",
"/css/appdark.css": "/css/appdark.css?id=e608aa1d95e1c8ed3060",
"/css/appdark.css": "/css/appdark.css?id=995ec87dd4aff426cd1c",
"/css/landing.css": "/css/landing.css?id=3092e86721fa8b922c06",
"/css/quill.css": "/css/quill.css?id=e3741782d15a3031f785",
"/js/collectioncompose.js": "/js/collectioncompose.js?id=3fd79944492361ec7347",
@ -15,7 +15,7 @@
"/js/compose-classic.js": "/js/compose-classic.js?id=283f19c895f4118a2a8b",
"/js/developers.js": "/js/developers.js?id=f75deca5ccf47d43eb07",
"/js/direct.js": "/js/direct.js?id=6a80114ecc453b2b994a",
"/js/discover.js": "/js/discover.js?id=6d88f29999bdd651ec35",
"/js/discover.js": "/js/discover.js?id=dd07b617f5f5f4714164",
"/js/hashtag.js": "/js/hashtag.js?id=eb4ce037114cd78a8678",
"/js/loops.js": "/js/loops.js?id=1dcb3790eb9ea4ea5848",
"/js/mode-dot.js": "/js/mode-dot.js?id=d54ad862baf30ee756f8",
@ -28,5 +28,5 @@
"/js/status.js": "/js/status.js?id=b744f13cca28d1e9964e",
"/js/story-compose.js": "/js/story-compose.js?id=6308c4b7cb5baa4517d3",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=ece67a5ba28761df4d88",
"/js/timeline.js": "/js/timeline.js?id=1c669431fc1f27faca58"
"/js/timeline.js": "/js/timeline.js?id=97f92ccb18f86c57dfad"
}

6
resources/assets/js/components/DiscoverComponent.vue
Unescape Escape View File

@ -81,7 +81,7 @@
</div>
</div>
</section>
<section class="pt-5 mb-5 section-explore">
<section v-if="posts.length" class="pt-5 mb-5 section-explore">
<div class="profile-timeline pt-3">
<div class="row p-0 mt-5">
<!-- <div class="col-12 mb-3 d-flex justify-content-between align-items-center">
@ -284,10 +284,10 @@
})
.then(res => {
if(this.trendingRange == 'daily') {
this.trendingDaily = res.data;
this.trendingDaily = res.data.filter(t => t.sensitive == false);
}
if(this.trendingRange == 'monthly') {
this.trendingMonthly = res.data;
this.trendingMonthly = res.data.filter(t => t.sensitive == false);
}
this.trending = res.data;
});

8
resources/assets/js/components/Timeline.vue
Unescape Escape View File

@ -16,8 +16,8 @@
</span>
</p>
<p class="mb-0 d-none d-md-block">
<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
<i class="fas fa-camera fa-lg pt-1"></i>
<a class="btn btn-block btn-primary btn-sm font-weight-bold" href="/i/compose" data-toggle="modal" data-target="#composeModal">
New Post
</a>
</p>
</div>
@ -379,8 +379,8 @@
</span>
</p>
<p class="mb-0 d-none d-md-block">
<a class="btn btn-block btn-primary btn-sm font-weight-bold border" href="/i/compose" data-toggle="modal" data-target="#composeModal">
<i class="fas fa-camera fa-lg pt-1"></i>
<a class="btn btn-block btn-primary btn-sm font-weight-bold" href="/i/compose" data-toggle="modal" data-target="#composeModal">
New Post
</a>
</p>
</div>

95
resources/assets/sass/appdark.scss vendored
Unescape Escape View File

@ -19,18 +19,66 @@
background: #ADAFAE !important;
}
.border-top {
border-top: 1px solid #282828 !important;
}
.border-bottom {
border-bottom: 1px solid #282828 !important;
}
.btn-outline-light {
border-color: #E2E8F0 !important;
color: #E2E8F0 !important;
}
.modal-content,
.card,
.dropdown-menu,
.bg-white,
.list-group-item,
.autocomplete-result-list,
.postPresenterContainer,
.postComponent .card-body.flex-grow-0.py-1,
.postComponent .reactions,
.postComponent .status-comments,
.navbar-laravel {
background: #2D3748 !important;
background: #000 !important;
}
.autocomplete-result-list {
z-index: 99999;
}
.pill-to {
background: #282828 !important;
}
.dropdown-item:hover,
.tt-suggestion:hover,
.dropdown-item:focus,
.tt-suggestion:focus,
.chat-msg:hover,
.result-card .media:hover {
background: #181818 !important;
}
.notification-card .contents {
scrollbar-color: dark;
}
body, html {
scrollbar-color: dark;
}
.modal-content,
.form-control,
.img-thumbnail {
border: 1px solid #282828 !important;
}
.navbar.border-bottom {
border-color: #282828 !important;
}
.postComponent .border-left {
@ -44,7 +92,7 @@
input,
textarea {
color: #E2E8F0 !important;
background: #4A5568 !important;
background: #000 !important;
}
.far, .fas,
@ -55,15 +103,42 @@ textarea {
color: #ADAFAE !important;
}
.form-control.search-form-input {
color: #E2E8F0 !important;
background: #4A5568 !important;
}
.btn-outline-primary {
border-color: #4A5568 !important;
}
.postComponent .status-comments {
border-top: 1px solid #282828 !important;
border-bottom: 1px solid #282828 !important;
}
.messages-page .card-header {
border-bottom: 1px solid #282828;
}
hr {
border-color: #282828 !important;
}
::-webkit-scrollbar {
width: 15px;
}
::-webkit-scrollbar-track {
background: #202020;
border-left: 1px solid #2c2c2c;
}
::-webkit-scrollbar-thumb {
background: #3e3e3e;
border: solid 3px #202020;
border-radius: 7px;
}
::-webkit-scrollbar-thumb:hover {
background: white;
}
@import "components/filters";
@import "components/typeahead";
@ -74,6 +149,8 @@ textarea {
@import "moment";
@import '~animate.css/animate.min.css';
.border {
border: 1px solid #4A5568 !important;
}
border-color: #282828 !important;
}

97
resources/assets/sass/dark.scss vendored
Unescape Escape View File

@ -1,4 +1,4 @@
// Cyborg 4.2.1
// Cyborg 4.5.3
// Bootswatch
//
@ -9,24 +9,24 @@ $white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
$gray-400: #ADAFAE !default;
$gray-400: #adafae !default;
$gray-500: #888 !default;
$gray-600: #555 !default;
$gray-700: #2D3748 !default;
$gray-700: #282828 !default;
$gray-800: #222 !default;
$gray-900: #212529 !default;
$black: #000 !default;
$blue: #2A9FD6 !default;
$blue: #2a9fd6 !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$pink: #e83e8c !default;
$red: #CC0000 !default;
$red: #c00 !default;
$orange: #fd7e14 !default;
$yellow: #FF8800 !default;
$green: #77B300 !default;
$yellow: #f80 !default;
$green: #77b300 !default;
$teal: #20c997 !default;
$cyan: #9933CC !default;
$cyan: #93c !default;
$primary: $blue !default;
$secondary: $gray-600 !default;
@ -42,27 +42,28 @@ $yiq-contrasted-threshold: 175 !default;
// Body
$body-bg: #1A202C !default;
$body-color: $gray-500 !default;
$body-bg: #060606 !default;
$body-color: $gray-400 !default;
// Fonts
$font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif;
$font-size-base: 0.9rem;
$font-weight-lighter: 300;
$line-height-base: 1.6;
$headings-color: $white !default;
$font-size-lg: ($font-size-base * 1.25);
$font-size-sm: ($font-size-base * .875);
$headings-color: $white !default;
// Tables
$table-accent-bg: rgba($white,.05) !default;
$table-hover-bg: rgba($white,.075) !default;
$table-color: $white !default;
$table-accent-bg: rgba($white, .05) !default;
$table-hover-bg: rgba($white, .075) !default;
$table-border-color: $gray-700 !default;
$table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default;
$table-dark-color: $body-bg !default;
$table-dark-bg: $gray-500 !default;
$table-dark-border-color: darken($gray-500, 7.5%) !default;
// Buttons
@ -70,13 +71,11 @@ $input-btn-padding-x: 1rem !default;
// Forms
$input-disabled-bg: $gray-400 !default;
$input-border-color: transparent !default;
$input-disabled-bg: $gray-400 !default;
$input-border-color: $white !default;
$input-group-addon-color: $white !default;
$input-group-addon-bg: $gray-700 !default;
$input-group-addon-border-color: transparent !default;
$custom-file-color: $white !default;
$custom-file-border-color: $gray-700 !default;
@ -84,7 +83,6 @@ $custom-file-border-color: $gray-700 !default;
$dropdown-bg: $gray-700 !default;
$dropdown-divider-bg: $gray-800 !default;
$dropdown-link-color: $white !default;
$dropdown-link-hover-color: $white !default;
$dropdown-link-hover-bg: $primary !default;
@ -106,62 +104,65 @@ $navbar-dark-hover-color: $white !default;
$pagination-color: $white !default;
$pagination-bg: $gray-700 !default;
$pagination-border-color: transparent !default;
$pagination-hover-color: $white !default;
$pagination-hover-bg: $primary !default;
$pagination-hover-border-color: $pagination-border-color !default;
$pagination-disabled-bg: $pagination-bg !default;
$pagination-disabled-border-color: $pagination-border-color !default;
// Jumbotron
$jumbotron-bg: $gray-700 !default;
$jumbotron-bg: $gray-700 !default;
// Cards
$card-bg: $gray-700 !default;
$card-bg: $gray-700 !default;
// Tooltips
$tooltip-bg: $gray-700 !default;
$tooltip-opacity: 1 !default;
$tooltip-bg: $gray-700 !default;
$tooltip-opacity: 1 !default;
// Popovers
$popover-bg: $gray-700 !default;
$popover-bg: $gray-700 !default;
// Modals
// Toasts
$modal-content-bg: $gray-800 !default;
$toast-color: $white !default;
$toast-background-color: $gray-800 !default;
$toast-border-color: $gray-700 !default;
$toast-header-color: $body-color !default;
$toast-header-background-color: $toast-background-color !default;
$toast-header-border-color: $toast-border-color !default;
// Modals
$modal-header-border-color: $gray-700 !default;
$modal-content-bg: $gray-800 !default;
$modal-header-border-color: $gray-700 !default;
// Progress bars
$progress-bg: $gray-700 !default;
$progress-bg: $gray-700 !default;
// List group
$list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $primary !default;
$list-group-disabled-bg: $gray-700 !default;
$list-group-action-active-bg: $primary !default;
$list-group-bg: $gray-800 !default;
$list-group-border-color: $gray-700 !default;
$list-group-hover-bg: $primary !default;
$list-group-disabled-bg: $gray-700 !default;
$list-group-action-active-bg: $primary !default;
// Breadcrumbs
$breadcrumb-bg: $gray-700 !default;
$breadcrumb-bg: $gray-700 !default;
// Close
$close-color: $white !default;
$close-text-shadow: none !default;
$close-color: $white !default;
$close-text-shadow: none !default;
// Code
$pre-color: inherit !default;
$pre-color: inherit !default;

7
resources/views/layouts/blank.blade.php
Unescape Escape View File

@ -23,7 +23,14 @@
<link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
<link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
<link rel="canonical" href="{{request()->url()}}">
@if(request()->cookie('dark-mode'))
<link href="{{ mix('css/appdark.css') }}" rel="stylesheet" data-stylesheet="dark">
@else
<link href="{{ mix('css/app.css') }}" rel="stylesheet" data-stylesheet="light">
@endif
@stack('styles')
<script type="text/javascript">window._sharedData = {curUser: {}, version: 0}; window.App = {config: {!!App\Util\Site\Config::json()!!}};</script>

Write Preview
Loading…
Cancel
Save