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

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

Closes #1412
This commit is contained in:
daniel 2019-06-17 13:02:53 -06:00 committed by GitHub
parent eb0de7e986 36e15a52e4
commit 7d5a6a8b41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
resources/views/settings/applications.blade.php
View File

@ -2,20 +2,23 @@
@section('section') @section('section')
<div class="title"> <div class="title">
<h3 class="font-weight-bold">Applications</h3> <h3 class="font-weight-bold">Applications</h3>
</div> </div>
<hr> <hr>
<passport-authorized-clients></passport-authorized-clients> @if(config('pixelfed.oauth_enabled') == true)
<passport-personal-access-tokens></passport-personal-access-tokens> <passport-authorized-clients></passport-authorized-clients>
<passport-personal-access-tokens></passport-personal-access-tokens>
@else
<p class="lead">OAuth has not been enabled on this instance.</p>
@endif
@endsection @endsection
@push('scripts') @push('scripts')
<script type="text/javascript" src="{{mix('js/developers.js')}}"></script> <script type="text/javascript" src="{{mix('js/developers.js')}}"></script>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
el: '#content' el: '#content'
}); });
</script> </script>
@endpush @endpush

20
resources/views/settings/developers.blade.php
View File

@ -2,19 +2,23 @@
@section('section') @section('section')
<div class="title"> <div class="title">
<h3 class="font-weight-bold">Developers</h3> <h3 class="font-weight-bold">Developers</h3>
</div> </div>
<hr> <hr>
<passport-clients></passport-clients> @if(config('pixelfed.oauth_enabled') == true)
<passport-clients></passport-clients>
@else
<p class="lead">OAuth has not been enabled on this instance.</p>
@endif
@endsection @endsection
@push('scripts') @push('scripts')
<script type="text/javascript" src="{{mix('js/developers.js')}}"></script> <script type="text/javascript" src="{{mix('js/developers.js')}}"></script>
<script type="text/javascript"> <script type="text/javascript">
new Vue({ new Vue({
el: '#content' el: '#content'
}); });
</script> </script>
@endpush @endpush

3
resources/views/settings/partial/sidebar.blade.php
View File

@ -43,6 +43,7 @@
<a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Data Export</a> <a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Data Export</a>
</li> </li>
@if(config('pixelfed.oauth_enabled') == true)
<li class="nav-item"> <li class="nav-item">
<hr> <hr>
</li> </li>
@ -52,6 +53,8 @@
<li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}"> <li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}">
<a class="nav-link font-weight-light text-muted" href="{{route('settings.developers')}}">Developers</a> <a class="nav-link font-weight-light text-muted" href="{{route('settings.developers')}}">Developers</a>
</li> </li>
@endif
<li class="nav-item"> <li class="nav-item">
<hr> <hr>
</li> </li>