UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-27 00:33:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Update web routes
This commit is contained in:
daniel 2018-09-02 00:11:02 -06:00 committed by GitHub
commit 6968ac874a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
resources/views/federation/remotefollow.blade.php
View file

@ -3,8 +3,6 @@
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="col-12"> <div class="col-12">
<div class="card mt-5">
<div class="card-body p-0">
<div class="row"> <div class="row">
<div class="col-12 col-md-8 offset-md-2 p-5"> <div class="col-12 col-md-8 offset-md-2 p-5">
<div class="title text-center pb-3"> <div class="title text-center pb-3">
@ -15,31 +13,6 @@
</div> </div>
</div> </div>
</div> </div>
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
</div>
@endif
<form method="post">
@csrf
<div class="card rounded-0 card-disabled">
<div class="card-body">
<div class="form-group row mb-2">
<label class="col-sm-3 col-form-labe font-weight-bold">Profile URL</label>
<div class="col-sm-8">
<input type="text" class="form-control" name="url" value="" disabled>
<p class="help-text small text-muted">ex: me@example.com or http://example.net/nickname</p>
</div>
</div>
</div>
<div class="card-footer px-5 text-center">
<button type="submit" class="btn btn-primary py-0 font-weight-bold" disabled>Remote Follow</button>
</div>
</div>
</form>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -59,10 +59,10 @@
{{__('navmenu.directMessages')}} {{__('navmenu.directMessages')}}
</a> --}} </a> --}}
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item font-weight-bold" href="{{route('remotefollow')}}"> {{-- <a class="dropdown-item font-weight-bold" href="{{route('remotefollow')}}">
<span class="fas fa-user-plus pr-1"></span> <span class="fas fa-user-plus pr-1"></span>
{{__('navmenu.remoteFollow')}} {{__('navmenu.remoteFollow')}}
</a> </a> --}}
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}"> <a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
<span class="fas fa-cog pr-1"></span> <span class="fas fa-cog pr-1"></span>
{{__('navmenu.settings')}} {{__('navmenu.settings')}}

2
routes/web.php
View file

@ -54,8 +54,6 @@ Route::domain(config('pixelfed.domain.app'))->middleware('validemail')->group(fu
Route::group(['prefix' => 'i'], function () { Route::group(['prefix' => 'i'], function () {
Route::redirect('/', '/'); Route::redirect('/', '/');
Route::get('compose', 'StatusController@compose')->name('compose'); Route::get('compose', 'StatusController@compose')->name('compose');
Route::get('remote-follow', 'FederationController@remoteFollow')->name('remotefollow');
Route::post('remote-follow', 'FederationController@remoteFollowStore')->middleware('throttle:100,1440');
Route::post('comment', 'CommentController@store')->middleware('throttle:1000,1440'); Route::post('comment', 'CommentController@store')->middleware('throttle:1000,1440');
Route::post('delete', 'StatusController@delete')->middleware('throttle:1000,1440'); Route::post('delete', 'StatusController@delete')->middleware('throttle:1000,1440');
Route::post('mute', 'AccountController@mute')->middleware('throttle:100,1440'); Route::post('mute', 'AccountController@mute')->middleware('throttle:100,1440');