Merge branch 'master' into translations

[bookstack] / routes / web.php

diff --git a/routes/web.php b/routes/web.php
index 45957ac626e2e1cb34bdb71ddefbe2278b24bcb5..076ffb94f133e648a0298a4e9e588ea3634aba95 100644 (file)
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,7 @@
 <?php
 
+Route::get('/translations.js', 'HomeController@getTranslations');
+
 // Authenticated routes...
 Route::group(['middleware' => 'auth'], function () {
 
@@ -87,15 +89,15 @@ Route::group(['middleware' => 'auth'], function () {
         Route::delete('/{imageId}', 'ImageController@destroy');
     });
 
-    // File routes
-    Route::get('/files/{id}', 'FileController@get');
-    Route::post('/files/upload', 'FileController@upload');
-    Route::post('/files/upload/{id}', 'FileController@uploadUpdate');
-    Route::post('/files/link', 'FileController@attachLink');
-    Route::put('/files/{id}', 'FileController@update');
-    Route::get('/files/get/page/{pageId}', 'FileController@listForPage');
-    Route::put('/files/sort/page/{pageId}', 'FileController@sortForPage');
-    Route::delete('/files/{id}', 'FileController@delete');
+    // Attachments routes
+    Route::get('/attachments/{id}', 'AttachmentController@get');
+    Route::post('/attachments/upload', 'AttachmentController@upload');
+    Route::post('/attachments/upload/{id}', 'AttachmentController@uploadUpdate');
+    Route::post('/attachments/link', 'AttachmentController@attachLink');
+    Route::put('/attachments/{id}', 'AttachmentController@update');
+    Route::get('/attachments/get/page/{pageId}', 'AttachmentController@listForPage');
+    Route::put('/attachments/sort/page/{pageId}', 'AttachmentController@sortForPage');
+    Route::delete('/attachments/{id}', 'AttachmentController@delete');
 
     // AJAX routes
     Route::put('/ajax/page/{id}/save-draft', 'PageController@saveDraft');
@@ -107,7 +109,6 @@ Route::group(['middleware' => 'auth'], function () {
         Route::get('/get/{entityType}/{entityId}', 'TagController@getForEntity');
         Route::get('/suggest/names', 'TagController@getNameSuggestions');
         Route::get('/suggest/values', 'TagController@getValueSuggestions');
-        Route::post('/update/{entityType}/{entityId}', 'TagController@updateForEntity');
     });
 
     Route::get('/ajax/search/entities', 'SearchController@searchEntitiesAjax');
@@ -153,7 +154,7 @@ Route::group(['middleware' => 'auth'], function () {
 });
 
 // Social auth routes
-Route::get('/login/service/{socialDriver}', 'Auth\RegisterController@getSocialLogin');
+Route::get('/login/service/{socialDriver}', 'Auth\LoginController@getSocialLogin');
 Route::get('/login/service/{socialDriver}/callback', 'Auth\RegisterController@socialCallback');
 Route::get('/login/service/{socialDriver}/detach', 'Auth\RegisterController@detachSocialAccount');
 Route::get('/register/service/{socialDriver}', 'Auth\RegisterController@socialRegister');