mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-19 21:11:26 +00:00
Merge pull request #751 from pixelfed/frontend-ui-refactor
Frontend ui refactor
This commit is contained in:
commit
d1b31b2c59
3 changed files with 32 additions and 29 deletions
|
@ -23,7 +23,7 @@ return [
|
||||||
| This value is the version of your PixelFed instance.
|
| This value is the version of your PixelFed instance.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'version' => '0.7.7',
|
'version' => '0.7.8',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
@ -496,18 +496,21 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
deletePost() {
|
deletePost() {
|
||||||
if($('body').hasClass('loggedIn') == false) {
|
var result = confirm('Are you sure you want to delete this post?');
|
||||||
return;
|
if (result) {
|
||||||
}
|
if($('body').hasClass('loggedIn') == false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
axios.post('/i/delete', {
|
axios.post('/i/delete', {
|
||||||
type: 'status',
|
type: 'status',
|
||||||
item: this.status.id
|
item: this.status.id
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
swal('Success', 'You have successfully deleted this post', 'success');
|
swal('Success', 'You have successfully deleted this post', 'success');
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
swal('Error', 'Something went wrong. Please try again later.', 'error');
|
swal('Error', 'Something went wrong. Please try again later.', 'error');
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(functio
|
||||||
|
|
||||||
Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () {
|
Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () {
|
||||||
Route::get('/', 'SiteController@home')->name('timeline.personal');
|
Route::get('/', 'SiteController@home')->name('timeline.personal');
|
||||||
Route::post('/', 'StatusController@store')->middleware('throttle:500,1440');
|
Route::post('/', 'StatusController@store');
|
||||||
|
|
||||||
Auth::routes();
|
Auth::routes();
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
||||||
Route::get('accounts/verify_credentials', 'ApiController@verifyCredentials');
|
Route::get('accounts/verify_credentials', 'ApiController@verifyCredentials');
|
||||||
Route::post('avatar/update', 'ApiController@avatarUpdate');
|
Route::post('avatar/update', 'ApiController@avatarUpdate');
|
||||||
Route::get('likes', 'ApiController@hydrateLikes');
|
Route::get('likes', 'ApiController@hydrateLikes');
|
||||||
Route::post('media', 'ApiController@uploadMedia')->middleware('throttle:500,1440');
|
Route::post('media', 'ApiController@uploadMedia');
|
||||||
Route::get('notifications', 'ApiController@notifications');
|
Route::get('notifications', 'ApiController@notifications');
|
||||||
Route::get('timelines/public', 'PublicApiController@publicTimelineApi');
|
Route::get('timelines/public', 'PublicApiController@publicTimelineApi');
|
||||||
Route::get('timelines/home', 'PublicApiController@homeTimelineApi');
|
Route::get('timelines/home', 'PublicApiController@homeTimelineApi');
|
||||||
|
@ -58,7 +58,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
||||||
Route::group(['prefix' => 'local'], function () {
|
Route::group(['prefix' => 'local'], function () {
|
||||||
Route::get('i/follow-suggestions', 'ApiController@followSuggestions');
|
Route::get('i/follow-suggestions', 'ApiController@followSuggestions');
|
||||||
Route::post('i/more-comments', 'ApiController@loadMoreComments');
|
Route::post('i/more-comments', 'ApiController@loadMoreComments');
|
||||||
Route::post('status/compose', 'InternalApiController@compose')->middleware('throttle:500,1440');
|
Route::post('status/compose', 'InternalApiController@compose');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -67,20 +67,20 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
||||||
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::post('comment', 'CommentController@store')->middleware('throttle:1000,1440');
|
Route::post('comment', 'CommentController@store');
|
||||||
Route::post('delete', 'StatusController@delete')->middleware('throttle:1000,1440');
|
Route::post('delete', 'StatusController@delete');
|
||||||
Route::post('mute', 'AccountController@mute');
|
Route::post('mute', 'AccountController@mute');
|
||||||
Route::post('block', 'AccountController@block');
|
Route::post('block', 'AccountController@block');
|
||||||
Route::post('like', 'LikeController@store')->middleware('throttle:1000,1440');
|
Route::post('like', 'LikeController@store');
|
||||||
Route::post('share', 'StatusController@storeShare')->middleware('throttle:1000,1440');
|
Route::post('share', 'StatusController@storeShare');
|
||||||
Route::post('follow', 'FollowerController@store')->middleware('throttle:250,1440');
|
Route::post('follow', 'FollowerController@store');
|
||||||
Route::post('bookmark', 'BookmarkController@store')->middleware('throttle:250,1440');
|
Route::post('bookmark', 'BookmarkController@store');
|
||||||
Route::get('lang/{locale}', 'SiteController@changeLocale');
|
Route::get('lang/{locale}', 'SiteController@changeLocale');
|
||||||
Route::get('restored', 'AccountController@accountRestored');
|
Route::get('restored', 'AccountController@accountRestored');
|
||||||
|
|
||||||
Route::get('verify-email', 'AccountController@verifyEmail');
|
Route::get('verify-email', 'AccountController@verifyEmail');
|
||||||
Route::post('verify-email', 'AccountController@sendVerifyEmail')->middleware('throttle:10,1440');
|
Route::post('verify-email', 'AccountController@sendVerifyEmail');
|
||||||
Route::get('confirm-email/{userToken}/{randomToken}', 'AccountController@confirmVerifyEmail')->middleware('throttle:10,1440');
|
Route::get('confirm-email/{userToken}/{randomToken}', 'AccountController@confirmVerifyEmail');
|
||||||
|
|
||||||
Route::get('auth/sudo', 'AccountController@sudoMode');
|
Route::get('auth/sudo', 'AccountController@sudoMode');
|
||||||
Route::post('auth/sudo', 'AccountController@sudoModeVerify');
|
Route::post('auth/sudo', 'AccountController@sudoModeVerify');
|
||||||
|
@ -92,7 +92,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
||||||
|
|
||||||
Route::group(['prefix' => 'report'], function () {
|
Route::group(['prefix' => 'report'], function () {
|
||||||
Route::get('/', 'ReportController@showForm')->name('report.form');
|
Route::get('/', 'ReportController@showForm')->name('report.form');
|
||||||
Route::post('/', 'ReportController@formStore')->middleware('throttle:10,5');
|
Route::post('/', 'ReportController@formStore');
|
||||||
Route::get('not-interested', 'ReportController@notInterestedForm')->name('report.not-interested');
|
Route::get('not-interested', 'ReportController@notInterestedForm')->name('report.not-interested');
|
||||||
Route::get('spam', 'ReportController@spamForm')->name('report.spam');
|
Route::get('spam', 'ReportController@spamForm')->name('report.spam');
|
||||||
Route::get('spam/comment', 'ReportController@spamCommentForm')->name('report.spam.comment');
|
Route::get('spam/comment', 'ReportController@spamCommentForm')->name('report.spam.comment');
|
||||||
|
@ -118,19 +118,19 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
||||||
Route::redirect('/', '/settings/home');
|
Route::redirect('/', '/settings/home');
|
||||||
Route::get('home', 'SettingsController@home')
|
Route::get('home', 'SettingsController@home')
|
||||||
->name('settings');
|
->name('settings');
|
||||||
Route::post('home', 'SettingsController@homeUpdate')->middleware('throttle:250,1440');
|
Route::post('home', 'SettingsController@homeUpdate');
|
||||||
Route::get('avatar', 'SettingsController@avatar')->name('settings.avatar');
|
Route::get('avatar', 'SettingsController@avatar')->name('settings.avatar');
|
||||||
Route::post('avatar', 'AvatarController@store');
|
Route::post('avatar', 'AvatarController@store');
|
||||||
Route::get('password', 'SettingsController@password')->name('settings.password')->middleware('dangerzone');
|
Route::get('password', 'SettingsController@password')->name('settings.password')->middleware('dangerzone');
|
||||||
Route::post('password', 'SettingsController@passwordUpdate')->middleware(['throttle:2,1440','dangerzone']);
|
Route::post('password', 'SettingsController@passwordUpdate')->middleware('dangerzone');
|
||||||
Route::get('email', 'SettingsController@email')->name('settings.email');
|
Route::get('email', 'SettingsController@email')->name('settings.email');
|
||||||
Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications');
|
Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications');
|
||||||
Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy');
|
Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy');
|
||||||
Route::post('privacy', 'SettingsController@privacyStore')->middleware('throttle:250,1440');
|
Route::post('privacy', 'SettingsController@privacyStore');
|
||||||
Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users');
|
Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users');
|
||||||
Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate')->middleware('throttle:100,1440');
|
Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate');
|
||||||
Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');
|
Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');
|
||||||
Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate')->middleware('throttle:100,1440');
|
Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate');
|
||||||
Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances');
|
Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances');
|
||||||
|
|
||||||
// Todo: Release in 0.7.2
|
// Todo: Release in 0.7.2
|
||||||
|
|
Loading…
Reference in a new issue