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

Merge branch 'frontend-ui-refactor' into patch-23

This commit is contained in:
Stasiek Michalski 2018-06-18 12:55:21 +02:00 committed by GitHub
parent 3f2aa0a327 3c63e20343
commit b7dfe762f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 133 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/CommentController.php
View File

@ -34,7 +34,7 @@ class CommentController extends Controller
$reply = new Status();
$reply->profile_id = $profile->id;
$reply->caption = e(strip_tags($comment));
$reply->caption = e($comment);
$reply->rendered = $comment;
$reply->in_reply_to_id = $status->id;
$reply->in_reply_to_profile_id = $status->profile_id;
@ -44,7 +44,7 @@ class CommentController extends Controller
CommentPipeline::dispatch($status, $reply);
if($request->ajax()) {
$response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url()];
$response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url(), 'comment' => $reply->caption];
} else {
$response = redirect($status->url());
}

6
config/app.php
View File

@ -65,7 +65,7 @@ return [
|
*/
'timezone' => 'UTC',
'timezone' => env('APP_TIMEZONE', 'UTC'),
/*
|--------------------------------------------------------------------------
@ -78,7 +78,7 @@ return [
|
*/
'locale' => 'en',
'locale' => env('APP_LOCALE', 'en'),
/*
|--------------------------------------------------------------------------
@ -91,7 +91,7 @@ return [
|
*/
'fallback_locale' => 'en',
'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
/*
|--------------------------------------------------------------------------

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

23
public/img/pixelfed-icon-color.svg Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="50px" height="50px" viewBox="0 0 50 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="icon-copy-8" fill-rule="nonzero">
<g id="photos" transform="translate(0.500000, 0.500000)">
<g id="Group-3">
<g id="Group-2">
<path d="M21.8377091,23.3816448 C21.8883023,23.7349539 21.9237176,24.0924792 21.9237176,24.4592798 C21.9237176,28.6332184 18.5086769,32.048259 14.3347384,32.048259 L7.58897916,32.048259 C3.41504062,32.048259 0,28.6332184 0,24.4592798 C0,20.6917733 2.78515535,17.5516224 6.39666621,16.9748599 C6.39666621,16.9748599 6.39750943,16.9757032 6.39750943,16.9757032 C6.39750943,16.9748599 6.39666621,16.9740167 6.39666621,16.9740167 C6.78623381,16.9116184 7.18254716,16.8703007 7.58897916,16.8703007 L14.3347384,16.8703007 C18.1418763,16.8703007 21.3090103,19.7144814 21.8377091,23.3816448 Z" id="Combined-Shape" fill="#BF3F8A"></path>
<path d="M31.9479158,6.39160689 C31.3660941,2.78515535 28.2284728,0.00505931944 24.4643391,0.00505931944 C20.7002055,0.00505931944 17.5625842,2.78515535 16.9807625,6.39160689 C17.3037157,6.62433559 17.6157071,6.87730156 17.9057747,7.16736921 L22.6758697,11.9374642 C23.5115007,12.7730951 24.1025978,13.7621921 24.4643391,14.8136873 C25.0191778,16.4242373 25.0191778,18.1831941 24.4643391,19.7937441 C24.2147461,20.5172268 23.8538479,21.2078239 23.3808016,21.8419252 C23.7357971,21.8933617 24.095852,21.9296201 24.4643391,21.9296201 C24.8328262,21.9296201 25.1928811,21.8942049 25.5478767,21.8419252 C26.331228,21.7280906 27.074948,21.4953619 27.7630154,21.1597603 C29.2943028,20.4135107 30.5380521,19.1697614 31.2843018,17.638474 C31.7716829,16.6384152 32.0533183,15.521992 32.0533183,14.3397977 L32.0533183,7.59403848 C32.0533183,7.1842336 32.0111573,6.78454737 31.9479158,6.39160689 Z" id="Shape" fill="#ED8611"></path>
<path d="M31.0229036,41.7503472 L26.2528086,36.9802522 C25.4171776,36.1446213 24.8260805,35.1555243 24.4643391,34.1040291 C23.9095005,32.4934791 23.9095005,30.7345224 24.4643391,29.1239724 C24.7139322,28.4004897 25.0748304,27.7098926 25.5478767,27.0757912 C25.1928811,27.0243548 24.8328262,26.9880963 24.4643391,26.9880963 C24.095852,26.9880963 23.7357971,27.0235116 23.3808016,27.0757912 C22.5974503,27.1896259 21.8537303,27.4223546 21.1656629,27.7579561 C19.6343755,28.5042057 18.3906262,29.7479551 17.6443765,31.2792424 C17.1569954,32.2793012 16.87536,33.3957244 16.87536,34.5779187 L16.87536,41.323678 C16.87536,41.7334828 16.917521,42.1331691 16.9807625,42.5261095 C17.5625842,46.1325611 20.7002055,48.9126571 24.4643391,48.9126571 C28.2284728,48.9126571 31.3660941,46.1325611 31.9479158,42.5261095 C31.6249626,42.2925376 31.3129712,42.0395717 31.0229036,41.7503472 Z" id="Shape" fill="#2E86DD"></path>
<path d="M42.5311689,16.9757032 C42.2984402,17.2986564 42.0454742,17.6106477 41.7554066,17.9007154 L36.9853115,22.6708104 C36.1496806,23.5064413 35.1605837,24.0966953 34.1090884,24.4592798 C32.4985384,25.0141185 30.7395817,25.0141185 29.1290317,24.4592798 C28.405549,24.2096867 27.7149519,23.8487886 27.0808505,23.3757422 C27.0294141,23.7307378 26.9939989,24.0907927 26.9939989,24.4592798 C26.9939989,24.8277669 27.0294141,25.1878218 27.0808505,25.5428174 C27.1946852,26.3261687 27.4274139,27.0698887 27.7630154,27.7579561 C28.509265,29.2892435 29.7530144,30.5329928 31.2843018,31.2792424 C32.2843606,31.7666235 33.4007837,32.048259 34.582978,32.048259 L41.3287373,32.048259 C41.7385422,32.048259 42.1382284,32.006098 42.5311689,31.9428565 C46.1376204,31.3610348 48.9177164,28.2234135 48.9177164,24.4592798 C48.9177164,20.6951462 46.1376204,17.5566817 42.5311689,16.9757032 Z" id="Shape" fill="#9EE85D"></path>
<path d="M41.7554066,7.16736921 C39.0942045,4.50616718 34.9093041,4.25320121 31.9479158,6.39160689 C32.0111573,6.78454737 32.0533183,7.1842336 32.0533183,7.59403848 L32.0533183,14.3397977 C32.0533183,15.521992 31.7716829,16.6384152 31.2843018,17.638474 C30.5380521,19.1697614 29.2943028,20.4135107 27.7630154,21.1597603 C27.074948,21.4953619 26.331228,21.7280906 25.5478767,21.8419252 C25.7628978,22.1294632 25.9922536,22.4094122 26.2528086,22.6699672 C26.5133635,22.9305221 26.7933125,23.159878 27.0808505,23.374899 C27.7149519,23.8479454 28.405549,24.2096867 29.1290317,24.4584366 C30.7395817,25.0132753 32.4985384,25.0132753 34.1090884,24.4584366 C35.1605837,24.095852 36.1496806,23.5055981 36.9853115,22.6699672 L41.7554066,17.8998722 C42.0454742,17.6098045 42.2984402,17.2978132 42.5311689,16.9748599 C44.6704178,14.0134716 44.4166086,9.82941445 41.7554066,7.16736921 Z" id="Shape" fill="#F0C51A"></path>
<path d="M42.5311689,31.9428565 C42.1382284,32.006098 41.7385422,32.048259 41.3287373,32.048259 L34.582978,32.048259 C33.4007837,32.048259 32.2843606,31.7666235 31.2843018,31.2792424 C29.7530144,30.5329928 28.509265,29.2892435 27.7630154,27.7579561 C27.4274139,27.0698887 27.1946852,26.3261687 27.0808505,25.5428174 C26.7933125,25.7578385 26.5133635,25.9871943 26.2528086,26.2477493 C25.9922536,26.5083042 25.7628978,26.7882532 25.5478767,27.0757912 C25.0748304,27.7098926 24.713089,28.4004897 24.4643391,29.1239724 C23.9095005,30.7345224 23.9095005,32.4934791 24.4643391,34.1040291 C24.8269237,35.1555243 25.4171776,36.1446213 26.2528086,36.9802522 L31.0229036,41.7503472 C31.3129712,42.0404149 31.6249626,42.2933809 31.9479158,42.5261095 C34.9093041,44.6645152 39.0942045,44.4115493 41.7554066,41.7503472 C44.4166086,39.0891452 44.6704178,34.9042448 42.5311689,31.9428565 Z" id="Shape" fill="#49B85F"></path>
<path d="M24.4643391,14.8145305 C24.1017546,13.7630353 23.5115007,12.7739384 22.6758697,11.9383074 L17.9057747,7.16736921 C17.6157071,6.87730156 17.3037157,6.62433559 16.9807625,6.39160689 C14.0193742,4.25320121 9.83447377,4.50616718 7.17327175,7.16736921 C4.51206972,9.82857123 4.25910375,14.0117852 6.39666621,16.9731735 C6.78623381,16.9116184 7.18254716,16.8703007 7.58897916,16.8703007 L14.3347384,16.8703007 C18.1418763,16.8703007 21.3090103,19.7144814 21.8377091,23.3816448 C21.841082,23.3791151 21.8444549,23.3774287 21.8478278,23.374899 C22.1353658,23.159878 22.4153148,22.9305221 22.6758697,22.6699672 C22.9364247,22.4094122 23.1657805,22.1294632 23.3808016,21.8419252 C23.8538479,21.2078239 24.2155893,20.5172268 24.4643391,19.7937441 C25.0191778,18.1831941 25.0191778,16.4242373 24.4643391,14.8145305 Z" id="Shape" fill="#ED5B47"></path>
<path d="M22.6758697,26.2477493 C22.4153148,25.9871943 22.1353658,25.7578385 21.8478278,25.5428174 C21.2137264,25.069771 20.5231293,24.7080297 19.7996466,24.4592798 C18.1890966,23.9044411 16.4301399,23.9044411 14.8195899,24.4592798 C13.7680946,24.8218644 12.7789977,25.4121183 11.9433668,26.2477493 L7.17327175,31.0178443 C6.8832041,31.3079119 6.63023813,31.6199033 6.39750943,31.9428565 C4.25910375,34.9042448 4.51206972,39.0891452 7.17327175,41.7503472 C9.83447377,44.4115493 14.0193742,44.6645152 16.9807625,42.5261095 C16.917521,42.1331691 16.87536,41.7334828 16.87536,41.323678 L16.87536,34.5779187 C16.87536,33.3957244 17.1569954,32.2793012 17.6443765,31.2792424 C18.3906262,29.7479551 19.6343755,28.5042057 21.1656629,27.7579561 C21.8537303,27.4223546 22.5974503,27.1896259 23.3808016,27.0757912 C23.1657805,26.7882532 22.9364247,26.5083042 22.6758697,26.2477493 Z" id="Shape" fill="#8D59A8"></path>
</g>
<path d="M22.9797433,30.3617318 L27.2641103,30.3617318 C31.3001553,30.3617318 34.5720162,27.1514896 34.5720162,23.191455 C34.5720162,19.2314205 31.3001553,16.0211782 27.2641103,16.0211782 L21.0804977,16.0211782 C18.7520102,16.0211782 16.8643981,17.8732411 16.8643981,20.1578764 L16.8643981,36.258456 L22.9797433,30.3617318 Z" id="Path-6-Copy-2" fill="#FFFFFF"></path>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@ -1,6 +1,6 @@
{
"/js/app.js": "/js/app.js?id=10b2b118e1aa4607622d",
"/css/app.css": "/css/app.css?id=d8339100d1c73fdb7957",
"/js/app.js": "/js/app.js?id=4c2440700c647b915b2e",
"/css/app.css": "/css/app.css?id=a7c64d139bb04ef8e290",
"/js/timeline.js": "/js/timeline.js?id=d9a3145c0cd21ca09172",
"/js/activity.js": "/js/activity.js?id=723dfb98bbbc96a9d39f"
}

3
resources/assets/js/components/commentform.js vendored
View File

@ -21,6 +21,7 @@ $(document).ready(function() {
var username = res.data.username;
var permalink = res.data.url;
var profile = res.data.profile;
var reply = res.data.comment;
if($('.status-container').length == 1) {
var comments = el.parents().eq(3).find('.comments');
@ -28,7 +29,7 @@ $(document).ready(function() {
var comments = el.parents().eq(1).find('.comments');
}
var comment = '<p class="mb-0"><span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="' + profile + '">' + username + '</a></bdi></span><span class="comment-text">'+ commenttext + '</span><span class="float-right"><a href="' + permalink + '" class="text-dark small font-weight-bold">1s</a></span></p>';
var comment = '<p class="mb-0"><span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="' + profile + '">' + username + '</a></bdi></span><span class="comment-text">'+ reply + '</span><span class="float-right"><a href="' + permalink + '" class="text-dark small font-weight-bold">1s</a></span></p>';
comments.prepend(comment);

10
resources/assets/sass/custom.scss vendored
View File

@ -198,6 +198,10 @@ body, button, input, textarea {
border-width: 0!important;
border-radius: 0!important;
}
.card-md-rounded-0 {
border-width: 1px 0;
border-radius:0 !important;
}
}
@keyframes loading-bar {
@ -242,6 +246,12 @@ body, button, input, textarea {
background-position: 50%;
}
.status-photo img {
object-fit: contain;
max-height: calc(100vh - (6rem));
}
@keyframes fadeInDown {
0% {
opacity: 0;

13
resources/lang/de/navmenu.php Normal file
View File

@ -0,0 +1,13 @@
<?php
return [
'viewMyProfile' => 'Mein Profil anschauen',
'myTimeline' => 'Meine Timeline',
'publicTimeline' => '&Ouml;ffentliche Timeline',
'remoteFollow' => 'Aus der Ferne folgen',
'settings' => 'Einstellungen',
'admin' => 'Administration',
'logout' => 'Abmelden',
];

1
resources/lang/de/notification.php
View File

@ -5,5 +5,6 @@ return [
'likedPhoto' => 'gef&auml;llt dein Foto.',
'startedFollowingYou' => 'folgt dir nun.',
'commented' => 'hat deinen Post kommentiert.',
'mentionedYou' => 'hat dich erw&auml;hnt.'
];

4
resources/lang/en/profile.php
View File

@ -4,5 +4,5 @@ return [
'emptyTimeline' => 'This user has no posts yet!',
'emptyFollowers' => 'This user has no followers yet!',
'emptyFollowing' => 'This user is not following anyone yet!',
'savedWarning' => 'Only you can see what you\'ve saved',
];
'savedWarning' => 'Only you can see what you’ve saved',
];

13
resources/lang/he/navmenu.php Normal file
View File

@ -0,0 +1,13 @@
<?php
return [
'viewMyProfile' => 'צפה בפרופיל שלי',
'myTimeline' => 'ציר הזמן שלי',
'publicTimeline' => 'ציר הזמן הציבורי',
'remoteFollow' => 'עקיבה מרחוק',
'settings' => 'הגדרות',
'admin' => 'מנהל',
'logout' => 'התנתק',
];

1
resources/lang/he/notification.php
View File

@ -5,5 +5,6 @@ return [
'likedPhoto' => 'אהבו את התמונה שלך.',
'startedFollowingYou' => 'התחיל לעקוב אחריך.',
'commented' => 'הגיב על הפוסט שלך.',
'mentionedYou' => 'הזכיר אותך.'
];

4
resources/views/errors/403.blade.php
View File

@ -5,9 +5,9 @@
<div class="error-page py-5 my-5">
<div class="card mx-5">
<div class="card-body p-5">
<h1 class="text-center">403 - Forbidden</h1>
<h1 class="text-center">403 – Forbidden</h1>
</div>
</div>
</div>
</div>
@endsection
@endsection

4
resources/views/errors/404.blade.php
View File

@ -5,9 +5,9 @@
<div class="error-page py-5 my-5">
<div class="card mx-5">
<div class="card-body p-5">
<h1 class="text-center">404 - Page Not Found</h1>
<h1 class="text-center">404 – Page Not Found</h1>
</div>
</div>
</div>
</div>
@endsection
@endsection

4
resources/views/errors/503.blade.php
View File

@ -5,10 +5,10 @@
<div class="error-page py-5 my-5">
<div class="card mx-5">
<div class="card-body p-5 text-center">
<h1>503 - Service Unavailable</h1>
<h1>503 – Service Unavailable</h1>
<p class="lead mb-0">Our services are overloaded at the moment, please try again later.</p>
</div>
</div>
</div>
</div>
@endsection
@endsection

4
resources/views/layouts/partial/nav.blade.php
View File

@ -1,8 +1,8 @@
<nav class="navbar navbar-expand navbar-light navbar-laravel sticky-top">
<div class="container">
<a class="navbar-brand d-flex align-items-center" href="{{ url('/timeline') }}" title="Logo">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="mr-2"><path d="M23 19a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h4l2-3h6l2 3h4a2 2 0 0 1 2 2z"></path><circle cx="12" cy="13" r="4"></circle></svg>
<strong class="font-weight-bold">{{ config('app.name', 'Laravel') }}</strong>
<img src="/img/pixelfed-icon-color.svg" height="60px" class="p-2">
<span class="h4 font-weight-bold mb-0">{{ config('app.name', 'Laravel') }}</span>
</a>
<div class="collapse navbar-collapse" id="navbarSupportedContent">

2
resources/views/profile/followers.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.app',['title' => $profile->username . "'s followers"])
@extends('layouts.app',['title' => $profile->username . "’s followers"])
@section('content')

2
resources/views/profile/following.blade.php
View File

@ -1,4 +1,4 @@
@extends('layouts.app',['title' => $profile->username . "'s follows"])
@extends('layouts.app',['title' => $profile->username . "’s follows"])
@section('content')

8
resources/views/report/form.blade.php
View File

@ -22,12 +22,12 @@
<div class="row">
<div class="col-12 col-md-8 offset-md-2 my-3">
<p><a class="btn btn-light btn-block p-4 font-weight-bold" disabled>
I'm not interested in this content
I’m not interested in this content
</a></p>
</div>
<div class="col-12 col-md-8 offset-md-2 my-3">
<p><a class="btn btn-light btn-block p-4 font-weight-bold">
It's spam
It’s spam
</a></p>
</div>
<div class="col-12 col-md-8 offset-md-2 my-3">
@ -37,7 +37,7 @@
</div>
<div class="col-12 col-md-8 offset-md-2 my-3">
<p><a class="btn btn-light btn-block p-4 font-weight-bold">
It's abusive or harmful
It’s abusive or harmful
</a></p>
</div>
<div class="col-12 col-md-8 offset-md-2 my-3">
@ -51,4 +51,4 @@
</div>
</div>
@endsection
@endsection

8
resources/views/site/fediverse.blade.php
View File

@ -7,15 +7,15 @@
</div>
<hr>
<section>
<p class="lead">Fediverse is a portmanteau of "federation" and "universe". It is a common, informal name for a somewhat broad federation of social network servers.</p>
<p class="lead">Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a somewhat broad federation of social network servers.</p>
<p class="lead font-weight-bold text-muted mt-4">Supported Fediverse Projects</p>
<ul class="lead pl-4">
<li><a href="https://joinmastodon.org" rel="nofollow noopener">Mastodon</a> - A federated twitter alternative.</li>
<li><a href="https://pleroma.social" rel="nofollow noopener">Pleroma</a> - A federated twitter alternative.</li>
<li><a href="https://joinmastodon.org" rel="nofollow noopener">Mastodon</a> – A federated twitter alternative.</li>
<li><a href="https://pleroma.social" rel="nofollow noopener">Pleroma</a> – A federated twitter alternative.</li>
</ul>
</section>
@endsection
@push('meta')
<meta property="og:description" content="What's Fediverse">
<meta property="og:description" content="What’s Fediverse">
@endpush

2
resources/views/site/language.blade.php
View File

@ -6,7 +6,7 @@
<h3 class="font-weight-bold">Language</h3>
</div>
<hr>
<div class="alert alert-info font-weight-bold">We're still working on localization support!</div>
<div class="alert alert-info font-weight-bold">We’re still working on localization support!</div>
<p class="lead">Current Locale: <span class="font-weight-bold">{{App::getLocale()}}</span></p>
<p class="lead">Select from one of the supported languages:</p>
<ul class="list-group">

10
resources/views/site/privacy.blade.php
View File

@ -16,7 +16,7 @@
Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
</li>
<li>
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over PixelFed.
Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it’s important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over PixelFed.
</li>
<li>
IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.
@ -27,7 +27,7 @@
<p class="lead">Any of the information we collect from you may be used in the following ways:</p>
<ul class="lead pl-4">
<li>
To provide the core functionality of PixelFed. You can only interact with other people's content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
To provide the core functionality of PixelFed. You can only interact with other people’s content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
</li>
<li>
To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.
@ -57,7 +57,7 @@
<p class="lead">You may irreversibly delete your account at any time.</p>
<h4 class="font-weight-bold">Do we use cookies?</h4>
<p class="lead">Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
<p class="lead">Yes. Cookies are small files that a site or its service provider transfers to your computer’s hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
</p>
<p class="lead">We use cookies to understand and save your preferences for future visits.</p>
@ -66,8 +66,8 @@
<p class="lead">Your public content may be downloaded by other servers in the network. Your public and followers-only posts are delivered to the servers where your followers reside, and direct messages are delivered to the servers of the recipients, in so far as those followers or recipients reside on a different server than this.</p>
<p class="lead">When you authorize an application to use your account, depending on the scope of permissions you approve, it may access your public profile information, your following list, your followers, your lists, all your posts, and your favourites. Applications can never access your e-mail address or password.</p>
<h4 class="font-weight-bold">Children's Online Privacy Protection Act Compliance</h4>
<p class="lead">Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children's Online Privacy Protection Act) do not use this site.</p>
<h4 class="font-weight-bold">Children’s Online Privacy Protection Act Compliance</h4>
<p class="lead">Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (Children’s Online Privacy Protection Act) do not use this site.</p>
<h4 class="font-weight-bold">Changes to our Privacy Policy</h4>
<p class="lead">If we decide to change our privacy policy, we will post those changes on this page.</p>

18
resources/views/status/show.blade.php
View File

@ -3,7 +3,7 @@
@section('content')
<div class="container px-0 mt-md-4">
<div class="card status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
<div class="card card-md-rounded-0 status-container orientation-{{$status->firstMedia()->orientation ?? 'unknown'}}">
<div class="row mx-0">
<div class="d-flex d-md-none align-items-center justify-content-between card-header bg-white w-100">
<div class="d-flex align-items-center status-username">
@ -87,23 +87,23 @@
</div>
</div>
<div class="card-body flex-grow-0 py-1">
<div class="reactions h3 mb-0">
<div class="reactions my-1">
<form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$status->id}}" data-action="like">
@csrf
<input type="hidden" name="item" value="{{$status->id}}">
<button class="btn btn-link text-dark btn-lg p-0" type="submit" title="Like!">
<span class="far fa-heart fa-lg mb-0"></span>
<button class="btn btn-link text-dark p-0 border-0" type="submit" title="Like!">
<h3 class="far fa-heart m-0"></h3>
</button>
</form>
<span class="far fa-comment pt-1 pr-3" title="Comment"></span>
<h3 class="far fa-comment pr-3 m-0" title="Comment"></h3>
@if(Auth::check())
@if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
<form method="post" action="/i/delete" class="d-inline-flex">
@csrf
<input type="hidden" name="type" value="post">
<input type="hidden" name="item" value="{{$status->id}}">
<button type="submit" class="btn btn-link btn-lg text-dark p-0" title="Remove">
<span class="far fa-trash-alt fa-lg mb-0"></span>
<button type="submit" class="btn btn-link text-dark p-0 border-0" title="Remove">
<h3 class="far fa-trash-alt m-0"></h3>
</button>
</form>
@endif
@ -112,8 +112,8 @@
<form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$status->id}}" data-action="bookmark">
@csrf
<input type="hidden" name="item" value="{{$status->id}}">
<button class="btn btn-link text-dark p-0 btn-lg" type="submit" title="Save">
<span class="far fa-bookmark fa-lg mb-0"></span>
<button class="btn btn-link text-dark p-0 border-0" type="submit" title="Save">
<h3 class="far fa-bookmark m-0"></h3>
</button>
</form>
</span>

18
resources/views/status/template.blade.php
View File

@ -1,4 +1,4 @@
<div class="card my-4 status-card">
<div class="card my-4 status-card card-md-rounded-0">
<div class="card-header d-inline-flex align-items-center bg-white">
<img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" style="border-radius: 32px;">
<a class="username font-weight-bold pl-2 text-dark" href="{{$item->profile->url()}}">
@ -44,20 +44,22 @@
</a>
@endif
<div class="card-body">
<div class="reactions h3">
<form class="like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$item->id}}" data-action="like" data-count="{{$item->likes_count}}">
<div class="reactions my-1">
<form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$item->id}}" data-action="like" data-count="{{$item->likes_count}}">
@csrf
<input type="hidden" name="item" value="{{$item->id}}">
<button class="btn btn-link text-dark p-0" type="submit" title=""Like!>
<span class="far fa-heart status-heart fa-2x"></span>
<h3 class="far fa-heart status-heart m-0"></h3>
</button>
</form>
<span class="far fa-comment status-comment-focus" title="Comment"></span>
<h3 class="far fa-comment status-comment-focus" title="Comment"></h3>
<span class="float-right">
<form class="bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$item->id}}" data-action="bookmark">
<form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$item->id}}" data-action="bookmark">
@csrf
<input type="hidden" name="item" value="{{$item->id}}">
<button class="btn btn-link text-dark p-0" type="submit" title="Save"><span class="far fa-bookmark" style="font-size:25px;"></span></button>
<button class="btn btn-link text-dark p-0 border-0" type="submit" title="Save">
<h3 class="far fa-bookmark m-0"></h3>
</button>
</form>
</span>
</div>
@ -103,7 +105,7 @@
<form class="comment-form" method="post" action="/i/comment" data-id="{{$item->id}}" data-truncate="true">
@csrf
<input type="hidden" name="item" value="{{$item->id}}">
<input class="form-control status-reply-input" name="comment" placeholder="Add a comment...">
<input class="form-control status-reply-input" name="comment" placeholder="Add a comment…">
</form>
</div>
</div>

2
resources/views/timeline/partial/new-form.blade.php
View File

@ -1,4 +1,4 @@
<div class="card">
<div class="card card-md-rounded-0">
<div class="card-header font-weight-bold">New Post</div>
<div class="card-body" id="statusForm">
@if (session('error'))

16
resources/views/timeline/personal.blade.php
View File

@ -6,8 +6,8 @@
@section('content')
<div class="container">
<div class="col-12 col-md-8 offset-md-2 pt-4">
<div class="container p-0">
<div class="col-md-10 col-lg-8 mx-auto pt-4 px-0">
@if ($errors->any())
<div class="alert alert-danger">
<ul>
@ -27,7 +27,7 @@
@endforeach
@if($timeline->count() == 0)
<div class="card">
<div class="card card-md-rounded-0">
<div class="card-body py-5">
<div class="d-flex justify-content-center align-items-center">
<p class="lead font-weight-bold mb-0">{{ __('timeline.emptyPersonalTimeline') }}</p>
@ -37,11 +37,11 @@
@endif
</div>
<div class="page-load-status">
<div class="infinite-scroll-request">
<div class="d-none fixed-top loading-page"></div>
<div class="page-load-status" style="display: none;">
<div class="infinite-scroll-request" style="display: none;">
<div class="fixed-top loading-page"></div>
</div>
<div class="infinite-scroll-last">
<div class="infinite-scroll-last" style="display: none;">
<h3>No more content</h3>
<p class="text-muted">
Maybe you could try
@ -49,7 +49,7 @@
more people you can follow.
</p>
</div>
<div class="infinite-scroll-error">
<div class="infinite-scroll-error" style="display: none;">
<h3>Whoops, an error</h3>
<p class="text-muted">
Try reloading the page

14
resources/views/timeline/public.blade.php
View File

@ -6,8 +6,8 @@
@section('content')
<div class="container">
<div class="col-12 col-md-8 offset-md-2 pt-4">
<div class="container px-0">
<div class="col-md-10 col-lg-8 mx-auto pt-4 px-0">
@if ($errors->any())
<div class="alert alert-danger">
<ul>
@ -28,11 +28,11 @@
@endforeach
</div>
<div class="page-load-status">
<div class="infinite-scroll-request">
<div class="d-none fixed-top loading-page"></div>
<div class="page-load-status" style="display: none;">
<div class="infinite-scroll-request" style="display: none;">
<div class="fixed-top loading-page"></div>
</div>
<div class="infinite-scroll-last">
<div class="infinite-scroll-last" style="display: none;">
<h3>No more content</h3>
<p class="text-muted">
Maybe you could try
@ -40,7 +40,7 @@
more people you can follow.
</p>
</div>
<div class="infinite-scroll-error">
<div class="infinite-scroll-error" style="display: none;">
<h3>Whoops, an error</h3>
<p class="text-muted">
Try reloading the page