some css tweaks and other minor improvements/fixes

This commit is contained in:
noxy
2019-11-27 15:23:48 +00:00
parent 5fc7bf3036
commit 50ba00431b
35 changed files with 880 additions and 104 deletions

View File

@@ -7,20 +7,4 @@
</style>
<h5>Oh shit! Something went wrong!</h5>
<div id="sf-resetcontent" class="sf-reset box">
<h6>Please don't send this fucking text to an admin, we have other problems.</h6>
<?php
$iv = openssl_random_pseudo_bytes(16);
?>
@if(!env('APP_DEBUG'))
<div class="block">
{{bin2hex($iv)}}<br>
{{openssl_encrypt($exception, 'aes128', env('APP_KEY'), 0, $iv)}}
</div>
@else
<div class="block">
<pre>{{$exception}}</pre>
</div>
@endif
</div>
<p>Please try again later</p>

View File

@@ -3,7 +3,7 @@
@include('partials.flash')
<div class="page-header">
<h5>Register your w0bm.com Account</h5>
<p style="color:red;">Note: We do not reset passwords, make sure to write down your password on paper, otherwise you need create a new account or start to circlejerk in the IRC!</p>
<p style="color:red;">Note: I do not reset passwords, make sure to pick a strong password which you can remember, write down/save to your keepass to not lose access, otherwise you would need to create a new account!</p>
</div>
<div class="register">
<form class="form-horizontal" method="post" action="{{action('UserController@store')}}">
@@ -15,7 +15,7 @@
</div>
<div class="form-group">
<div class="">
{!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email']) !!}
{!! Form::email('email', null, ['class' => 'form-control', 'placeholder' => 'Email | Must be valid! Confirmation will be sent out']) !!}
</div>
</div>
<div class="form-group">
@@ -34,15 +34,14 @@
</div>
</div>
<div class="form-group">
<div class="">
</div>
</div>
{!!captcha_img('flat')!!} <input class="form-control" type="text" name="captcha" placeholder="Verify Captcha">
</div>
<div class="form-group terms">
<div style="text-align: center;">
<p><input type="checkbox" checked required name="terms"> I am at least 18 years or older and I have read and understand the <a href="/rules">Rules</a></p>
</div>
<div class="">
<button type="submit" class="btn btn-primary">Register</button>
<button type="submit" class="btn btn-primary">Register</button>
</div>
</div>
</form>
@@ -56,6 +55,6 @@
<p>By clicking on "Register" you accept our <a href="/rules">Rules</a></p>
<p>Note: we do NOT reset passwords for now, make sure to save your password correctly</p>
</div>
-->
-->
@endsection

View File

@@ -1,4 +1,5 @@
<!DOCTYPE html>
<!--RENDERED IN {{ (microtime(true) - LARAVEL_START) }} SECONDS-->
<html lang="en">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +13,22 @@
<meta property="og:site_name" content="w0bm.com" />
<meta property="og:title" content="@if(isset($video)){{$video->videotitle}}@endif">
@if(auth()->check())<meta property="og:description" content="Tags:@if(isset($video)) {{ $video->getTagListAttribute() }} @endif">@endif
<meta property="og:image" content="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif/>
@if(isset($video))
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<meta property="og:image" content="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif/>
@elseif($tag == 'nsfw')
@if(file_exists(public_path() . 'thumbs/blurred/{{$video->file}}' . '_blurred.png'))
<meta property="og:image" content="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif/>
@else
{{$video->blurryThumb()}}
<meta property="og:image" content="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif/>
@endif
@endif
@endforeach
@endif
@endif
@if(auth()->check())<meta property="og:video" content="@if(isset($video))/b/{{ $video->file }} @endif">@endif
<meta property="og:url" content="@if(isset($video))/{{ $video->id }}@endif">
<meta property="og:video:type" content="video/webm">

View File

@@ -44,6 +44,9 @@
<div class="">
<button type="submit" class="btn btn-primary">Register</button>
</div>
<div>
{!! Recaptcha::render() !!}
</div>
</div>
</form>
</div>

View File

@@ -1,5 +1,11 @@
@extends('profilelayout')
@section('content')
<h5>Terms of Service / AGB</h5>
<p>It's a privilege, not a right.</p>
<h5>Terms of Service</h5>
<p>It's a privilege, not a right</p>
<p>As of the 25th of November, 2019 I write down the following terms of my service.</p>
<p>w0bm.com is free of charge for the users for as long as I (sirx) will provide this service for you (the users)</p>
<p>w0bm.com can close at any time without any notice.</p>
<p>You are free to make backups of videos you enjoy, I will not enforce any IP blacklisting for downloading all videos, I have enough traffic for now! (This may change if there will ever be a host change with a traffic limit!)</p>
<p>The admin (sirx) decides in which direction it goes according to general video content, direction may change at any time, not following can lead to a temporary account suspension or a simple warning!</p>
<p>Donations will not be accepted any longer since they were a high risk and money fucks up character. I will work for this service, every day with my man power! If you feel like you want to dontate money, please donate money to charity instead or give it to a homeless person!</p>
@endsection

View File

@@ -139,9 +139,6 @@
{{$video->tesThumb()}}
<div class="centered">
<div class="modal-content col-md-5">
<div class="alert alert-info" role="alert">
Accepting z0rfugees, please visit us in the <a href="/irc">IRC</a>
</div>
<div class="modal-header">
<h4 class="modal-title" id="filterModalTitle">Login</h4> <span>to watch this webbum</span>
</div>
@@ -158,7 +155,20 @@
</div>
<div class="media not-logged-in">
<div class="media-left">
<img class="media-object" src="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif">
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<img class="media-object" src="@if(isset($video))/thumbs/beta/{{str_replace(".webm","",$video->file)}}.png"@endif">
@elseif($tag == 'nsfw')
@if(file_exists(public_path() . 'thumbs/blurred/{{$video->file}}' . '_blurred.png'))
<img class="media-object" src="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif">
@else
{{$video->blurryThumb()}}
<img class="media-object" src="@if(isset($video))/thumbs/blurred/{{str_replace(".webm","",$video->file)}}_blurred.png"@endif">
@endif
@endif
@endforeach
@endif
</div>
<div class="media-koerper">
<h4 class="media-heading">
@@ -181,6 +191,9 @@
<a href="/contact">Contact</a> | <a href="/irc">IRC</a>
</div>
</div>
<div hidden class="testthumbnailslol">
</div>
</div>
@endif
@endsection

View File

@@ -12,6 +12,7 @@
<thead>
<tr>
<th>ID</th>
<th>Thumb</th>
<th>Video Title</th>
<th>Artist</th>
<th>Songtitle</th>
@@ -33,6 +34,9 @@
@if($edit)
<input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
@endif
</td>
<td>
<img id="indexthumb" src="/thumbs/beta/{{$thumb}}.png">
</td>
<td>
<span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>

View File

@@ -51,10 +51,27 @@
<script type="text/javascript" defer src="/njum/js/popper.min.js"></script>
<script type="text/javascript" defer src="/njum/js/bootstrap.min.js"></script>
<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" defer src="/njum/js/newscript.js"></script>
<script type="text/javascript" src="/js/clipboard.min.js"></script>
<script type="text/javascript" defer src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
<script src="/njum/js/sticky_video.js"></script>
<script>
// Initialize
//new StickyVideo('sticky-container')
</script>
<script type="text/javascript">
var clipboard = new ClipboardJS('.copylink');
clipboard.on('success', function(e) {
console.info('Action:', e.action);
console.info('Text:', e.text);
console.info('Trigger:', e.trigger);
e.clearSelection();
});
clipboard.on('error', function(e) {
console.error('Action:', e.action);
console.error('Trigger:', e.trigger);
});
</script>
</html>

View File

@@ -35,15 +35,17 @@
</div>
<div class="form-group">
<label for="tageditor">Add Tags</label>
<div class="frontendedittags">
@include('partials.tags')
</div>
</div>
<div class="deleteit">
@endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#"><i class="fa fa-trash fa-lg"></i> Remove upload</a>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-dark">Save changes</button>
</div>
</div>
</div>

View File

@@ -12,7 +12,10 @@
@if(Auth::check())
<li class="nav-link dropdown">
<button id="nav-user" class="btn btn-dark nav-link bg-toggle dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span><i class="fa fa-user fa-lg"></i> {{Auth::user()->username}}</span>
<span>
@if(Auth::user()->messagesRecv()->unread()->count() < 1)
<span class="nomsg">|</span>@else
<span class="yesmg">|</span>@endif {{Auth::user()->username}}</span>
</button>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="grid-menu">
@@ -32,10 +35,11 @@
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Links
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="dropdown-menu LinksGrid" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="/index">Index</a>
<a class="dropdown-item" href="/categories">Categories</a>
<a class="dropdown-item" href="/about">About</a>
<a class="dropdown-item" href="/rules">Rules</a>
<a class="dropdown-item" href="/stats">Stats</a>
</div>
</li>

View File

@@ -30,8 +30,8 @@
<p>Abuse of this form will be awarded with a permanent ban!</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Send Report</button>
<button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-dark">Send Report</button>
</div>
</div>
</div>

View File

@@ -12,7 +12,7 @@
</div>
</div>
<div class="sendtags">
<button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-primary">Submit</button>
<button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-dark">Submit</button>
</div>
</div>
@else
@@ -24,11 +24,11 @@
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="badge badge-success">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-success" href="#"><i class="fa fa-times"></i></a></span>@endif
<span class="badge badge-sfw"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@endif
@elseif($tag == 'nsfw')
<span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="badge badge-danger">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-danger" href="#"><i class="fa fa-times"></i></a></span>@endif
<span class="badge badge-nsfw"><a href="/index?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@endif
@else
<span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge badge-secondary">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-secondary" href="#"><i class="fa fa-times"></i></a></span>@endif
<span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@endif
@endif
@endforeach
@else

View File

@@ -7,7 +7,7 @@
</div>
<li class="list-group-item">
@include('partials.flash')
<button id="btn-upload" type="button" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
<button id="btn-upload" type="button" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
<span class="" id="laz0r-fire"></span>
<span class="hidden-xs" id="shoop-laz0r"></span>
</button>

View File

@@ -1,5 +1,6 @@
<ul class="nav justify-content-center">
<li class="safe-for-rating">
<div class="monchichi">
<li class="safe-for-rating legacy-item">
<a class="badge video-id">{{$video->id}}</a>
<a class="badge video-rating {{$sfw ? 'sfw' : 'nsfw'}}">{{$sfw ? "sfw" : "nsfw"}}</a>
</li>
@@ -19,6 +20,9 @@
@else
@endif
</li>
<li class="legacy-item">
<button class="copylink" data-clipboard-text="{{url($video->id)}}" title="Copy URL!"><i class="fa fa-link"></i></button>
</li>
<li class="legacy-item">
<button type="button" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
<i class="fa fa-lg fa-info-circle"></i>
@@ -41,4 +45,5 @@
<li class="legacy-item">
<button id="webm_report" class="btn btn-dark" data-toggle="modal" data-target="#webmreportmodal"><i class="fa fa-warning fa-md"></i></button>
</li>
</ul>
</div>
</ul>

View File

@@ -1,4 +1,7 @@
<div class="popover-metadata">
<div class="filesize">
<span class="dlwebm badge badge-secondary"><a class='file_size' href='{{ '/b/' . $video->file }}' download>{{ HumanReadable::bytesToHuman($video->filesize()) }}</a></span>
</div>
@if($video->videotitle) <div class="artist">
<strong>Videotitle:</strong> {{$video->videotitle}}
</div>@endif
@@ -20,16 +23,12 @@
<div class="added">
<strong>Added:</strong> <a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>
</div>
<div class="filesize">
<span class="badge badge-secondary">{{ HumanReadable::bytesToHuman($video->filesize()) }}</span>
<span class="download-webm"><a class='file_size' href='{{ '/b/' . $video->file }}' download>DL</a></span>
</div>
<div class="toggo tag-panel-body">
<div id="tag-display" class="tag-panel-body">
<div class="toggo tag-panel-body smallfontsize">
<div id="tag-display " class="tag-panel-body">
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
<span class="badge badge-sfw"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
@elseif($tag == 'nsfw')
<span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
@else

View File

@@ -24,25 +24,15 @@
@endif
<div class="container-fluid row p-0" id="wrapper">
<div class="col-sm scrollable hidden-xs p-0">
<div class="col-sm p-0 linkeLeiste">
<div class="zeugs">
@if(auth()->check() && (auth()->user()->can("edit_video") || auth()->user()->id == $video->user_id)) <a class="edit_video" href="#" data-toggle="modal" data-target="#webmeditmodal">[edit]</a>@endif @if(auth()->check() && auth()->user()->can("delete_video"))<a class="delete_video" href="#">[del]</a>@endif
</div>
</div>
<div class="container p-0">
<div class="col-md p-0">
@yield('floatvid')
@include('partials.flash')
@include('partials.comments')
</div>
<div class="col-sm scrollable p-0"></div>
</div>
<wip>
<div id="untenlinks">
<div id="zomgmenu">
<a href="/">Random</a> |
<a href="/index">index</a> |
<a href="/main">index</a> |
<a href="/categories">categories</a> |
<a href="irc://irc.n0xy.net/w0bm">IRC</a> (<a href="http://webirc.n0xy.net/?channels=%23w0bm?nick=BLAH">Webchat</a>) |
<a href="irc://irc.n0xy.net/w0bm">IRC</a> |
<a href="/about">About</a> |
<div class="layoutkek">
<li role="presentation" class="layoutChanger" id="layoutSwitcher">
@@ -79,11 +69,24 @@
@endif
@else
@endif
<br>
<span>v.1.{{ filemtime("z0mb/css/z0mb.css") }} WIP</span>
</div>
</div>
<div class="container p-0">
<div class="col-md p-0">
@yield('floatvid')
@include('partials.flash')
@include('partials.comments')
</div>
<div class="col-sm scrollable p-0"></div>
</div>
<wip>
</wip>
<div class="col-sm scrollable hidden-xs p-0"></div>
<work>v.1.{{ filemtime("z0mb/css/z0mb.css") }} WIP</work>
</div>
This page took {{ (microtime(true) - LARAVEL_START) }} seconds to render
</body>
<script type="text/javascript" defer src="/z0mb/js/jquery.min.js"></script>
<script type="text/javascript" defer src="/zßmb/js/jquery.timeago.js"></script>

View File

@@ -1,15 +1,22 @@
<div class="card @if($del = !is_null($comment->deleted_at)) panel-danger @else panel-default @endif" data-id="{{$comment->id}}" author="{{$comment->user->username}}">
<div class="comment panel-body" author="{{$comment->user->username}}">
@simplemd($comment->content)
</div>
<div class="panel-footer">by <a class="{{$comment->user->username}}" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small>
@if($mod)
<div class="Avatar">
<span class="avatarBox"><img src="https://f0ck.it/uploads/2019/11/BCKEXcV.png"></span>
</div>
<a class="{{$comment->user->username}} user_name" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a>
<a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a>
@if($mod)
@if($del)
<a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
@else
<a class="delete_comment" href="#" onclick="deleteComment($(this))">[del]</a>
<a class="edit_comment" href="#" onclick="editComment($(this))">[edit]</a>
<a class="delete_comment" href="#" onclick="deleteComment($(this))">[D]</a>
{{-- <a class="edit_comment" href="#" onclick="editComment($(this))">[E]</a> --}}
@endif
@endif
<div class="commentContent">
@simplemd($comment->content)
</div>
</div>
<div class="panel-footer">
</div>
</div>

View File

@@ -7,7 +7,7 @@
{!! Form::textarea('comment', null, ['placeholder' => 'Write something useful', 'id' => 'cinput', 'class' => 'form-control bg-´dark text-light comment-entry-textarea', 'required' => 'required']) !!}
</div>
<div class="commentButton">
<div id="comment_tools" class="commentform-panel-footer"><button type="submit" class="btn btn-primary btn-sm">Post</button>
<div id="comment_tools" class="commentform-panel-footer"><button type="submit" class="btn btn-dark btn-sm">Post</button>
</div>
</div>
</div>

View File

@@ -1,9 +1,8 @@
<div class="modal fade" id="filterselectmodal" tabindex="-1" role="dialog" aria-labelledby="Select filter">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="filterModalTitle">Add Tags to filter out</h4>
<div class="topper">
<h4 class="modal-title" id="filterModalTitle">Add Tags to filter out</h4>
<p>When entering a tag you will no longer see videos with that tag.</p>
</div>
<div class="modal-body">
@@ -11,8 +10,8 @@
{{--<input class="form-control" type="text" id="filter" data-role="tagsinput" value="{{ implode(',', auth()->user()->categories) }}">--}}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button href="/filter" type="submit" id="submitfilter" class="btn btn-primary" value="Save">Save</button>
<button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
<button href="/filter" type="submit" id="submitfilter" class="btn btn-dark" value="Save">Save</button>
</div>
</div>
</div>

View File

@@ -20,9 +20,40 @@
@endif
@endif
<div data-simplebar class="container-fluid">
<div id="zomgmenu">
<a href="/">Random</a> |
<a href="/index">index</a> |
<a href="/categories">categories</a> |
<a href="irc://irc.n0xy.net/w0bm">IRC</a> |
<a href="/about">About</a> |
<div class="layoutkek">
<li role="presentation" class="layoutChanger" id="layoutSwitcher">
<a data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span> Layout
</a>
<ul class="dropdown-menu">
<div class="layoutblah">
<button id="layout1">w0bm.com</button>
<br>
<button id="layout2">Njum</button>
<br>
<button id="layout4">nojsz0mbie</button>
<br>
<button id="layout5">m0bile</button>
</div>
</ul>
</li>
</div>
<br>
<a href="{{url('user', Auth::user()->username)}}">{{Auth::user()->username}}</a>
<a href="{{url('messages')}}" style="font-size: 10px;">[ {{Auth::user()->messagesRecv()->unread()->count()}} ]</a>
<a href="#" data-toggle="modal" style="font-size: 10px;" data-target="#filterselectmodal">[ filter ]</a>
<a style="font-size: 10px;" href="{{url('logout')}}">[ logout ]</a> |
<a href="{{url('upload')}}">[ upload ]</a>
</div>
<div class="container">
@yield('novidcontent')
<wip>v.1.{{ filemtime("z0mb/css/z0mb.css") }} WIP</wip>
</div>
</div>
</body>