Merge pull request #1548 from pixelfed/frontend-ui-refactor

Frontend ui refactor
This commit is contained in:
daniel 2019-07-22 22:40:15 -06:00 committed by GitHub
commit 0d5f347750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 7 deletions

View file

@ -5,10 +5,6 @@ namespace App\Util\Lexer;
class RestrictedNames class RestrictedNames
{ {
public static $blacklist = [ public static $blacklist = [
'about',
'abuse',
'administrator',
'app',
'autoconfig', 'autoconfig',
'blog', 'blog',
'broadcasthost', 'broadcasthost',
@ -97,7 +93,11 @@ class RestrictedNames
// Reserved routes // Reserved routes
'a', 'a',
'app',
'about',
'abuse',
'account', 'account',
'admins',
'api', 'api',
'audio', 'audio',
'auth', 'auth',
@ -124,6 +124,7 @@ class RestrictedNames
'css', 'css',
'd', 'd',
'dashboard', 'dashboard',
'dmca',
'db', 'db',
'deck', 'deck',
'dev', 'dev',
@ -136,15 +137,27 @@ class RestrictedNames
'docs', 'docs',
'docs', 'docs',
'drive', 'drive',
'drives',
'driver', 'driver',
'e',
'error', 'error',
'explore', 'explore',
'export',
'exports',
'f',
'feed', 'feed',
'font', 'font',
'fonts', 'fonts',
'follow',
'follows',
'followme',
'follow-me',
'follow_me',
'g', 'g',
'gdpr', 'gdpr',
'graph', 'graph',
'ghost',
'ghosts',
'group', 'group',
'groups', 'groups',
'h', 'h',
@ -164,7 +177,12 @@ class RestrictedNames
'images', 'images',
'invite', 'invite',
'invites', 'invites',
'import',
'imports',
'j',
'js', 'js',
'k',
'key',
'l', 'l',
'lab', 'lab',
'labs', 'labs',
@ -186,6 +204,7 @@ class RestrictedNames
'news', 'news',
'news', 'news',
'newsfeed', 'newsfeed',
'o',
'oauth', 'oauth',
'official', 'official',
'p', 'p',
@ -197,13 +216,21 @@ class RestrictedNames
'photos', 'photos',
'password', 'password',
'privacy', 'privacy',
'private',
'q',
'quote',
'query',
'r',
'review',
'reset', 'reset',
'report', 'report',
'results', 'results',
'reports', 'reports',
'robot', 'robot',
'robots', 'robots',
's',
'search', 'search',
'sell',
'send', 'send',
'settings', 'settings',
'status', 'status',
@ -217,20 +244,24 @@ class RestrictedNames
'support', 'support',
'svg', 'svg',
'svgs', 'svgs',
't',
'terms', 'terms',
'telescope', 'telescope',
'timeline', 'timeline',
'timelines', 'timelines',
'tour', 'tour',
'tv', 'tv',
'u',
'user', 'user',
'users', 'users',
'username', 'username',
'usernames', 'usernames',
'v', 'v',
'valet',
'video', 'video',
'videos', 'videos',
'vendor', 'vendor',
'w',
'waiter', 'waiter',
'wall', 'wall',
'whats-new', 'whats-new',
@ -240,7 +271,9 @@ class RestrictedNames
'ws', 'ws',
'wss', 'wss',
'www', 'www',
'valet', 'x',
'y',
'z',
'400', '400',
'401', '401',
'403', '403',

View file

@ -6,10 +6,8 @@
<a href="{{route('site.contact')}}" class="text-primary pr-3">{{__('site.contact-us')}}</a> <a href="{{route('site.contact')}}" class="text-primary pr-3">{{__('site.contact-us')}}</a>
@endif @endif
<a href="{{route('site.help')}}" class="text-primary pr-3">{{__('site.help')}}</a> <a href="{{route('site.help')}}" class="text-primary pr-3">{{__('site.help')}}</a>
<a href="{{route('site.opensource')}}" class="text-primary pr-3">{{__('site.opensource')}}</a>
<a href="{{route('site.terms')}}" class="text-primary pr-3">{{__('site.terms')}}</a> <a href="{{route('site.terms')}}" class="text-primary pr-3">{{__('site.terms')}}</a>
<a href="{{route('site.privacy')}}" class="text-primary pr-3">{{__('site.privacy')}}</a> <a href="{{route('site.privacy')}}" class="text-primary pr-3">{{__('site.privacy')}}</a>
<a href="{{route('site.platform')}}" class="text-primary pr-3">API</a>
<a href="{{route('site.language')}}" class="text-primary pr-3">{{__('site.language')}}</a> <a href="{{route('site.language')}}" class="text-primary pr-3">{{__('site.language')}}</a>
<a href="https://pixelfed.org" class="text-muted float-right" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by Pixelfed</a> <a href="https://pixelfed.org" class="text-muted float-right" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by Pixelfed</a>
</p> </p>

View file

@ -0,0 +1,10 @@
@extends('settings.template')
@section('section')
<div class="title">
<h3 class="font-weight-bold">Drive</h3>
</div>
<hr>
@endsection