diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 671c8aafee..3eb7783e3d 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -192,11 +192,6 @@ class UsersController extends Controller $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; - // Make sure the offset and limit are actually integers and do not exceed system limits - $offset = ($request->input('offset') > $users->count()) ? $users->count() : app('api_offset_value'); - $limit = app('api_limit_value'); - - switch ($request->input('sort')) { case 'manager': $users = $users->OrderManager($order); @@ -273,7 +268,17 @@ class UsersController extends Controller } $users = Company::scopeCompanyables($users); - + + + // Make sure the offset and limit are actually integers and do not exceed system limits + $offset = ($request->input('offset') > $users->count()) ? $users->count() : app('api_offset_value'); + $limit = app('api_limit_value'); + + \Log::debug('Requested offset: '. $request->input('offset')); + \Log::debug('App offset: '. app('api_offset_value')); + \Log::debug('Actual offset: '. $offset); + \Log::debug('Limit: '. $limit); + $total = $users->count(); $users = $users->skip($offset)->take($limit)->get(); diff --git a/public/css/build/app.css b/public/css/build/app.css index 39ca7c10c6..394c114a5d 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 3a0b1c80ce..9675f14e55 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index f8b08cbfa0..fb0da5468b 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/css/dist/bootstrap-table.css b/public/css/dist/bootstrap-table.css index 2607add786..b3304f6aeb 100644 Binary files a/public/css/dist/bootstrap-table.css and b/public/css/dist/bootstrap-table.css differ diff --git a/public/css/dist/signature-pad.min.css b/public/css/dist/signature-pad.min.css index 7065929572..218b9c2365 100644 Binary files a/public/css/dist/signature-pad.min.css and b/public/css/dist/signature-pad.min.css differ diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css index fa7c210124..bdab8393c5 100644 Binary files a/public/css/dist/skins/skin-black-dark.min.css and b/public/css/dist/skins/skin-black-dark.min.css differ diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css index 5a5decc906..2d3d0edc3b 100644 Binary files a/public/css/dist/skins/skin-black.min.css and b/public/css/dist/skins/skin-black.min.css differ diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index a70912484e..9c1e130515 100644 Binary files a/public/css/dist/skins/skin-blue-dark.min.css and b/public/css/dist/skins/skin-blue-dark.min.css differ diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css index 09b0bba755..cdc62766ec 100644 Binary files a/public/css/dist/skins/skin-blue.min.css and b/public/css/dist/skins/skin-blue.min.css differ diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css index 25ebe1f277..8f5c99c013 100644 Binary files a/public/css/dist/skins/skin-contrast.min.css and b/public/css/dist/skins/skin-contrast.min.css differ diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index 12bcb66477..7c035a9ec9 100644 Binary files a/public/css/dist/skins/skin-green-dark.min.css and b/public/css/dist/skins/skin-green-dark.min.css differ diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css index 620d48e3f4..cd113d5e54 100644 Binary files a/public/css/dist/skins/skin-green.min.css and b/public/css/dist/skins/skin-green.min.css differ diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css index 8c0492a9b5..b52b17dd02 100644 Binary files a/public/css/dist/skins/skin-orange-dark.min.css and b/public/css/dist/skins/skin-orange-dark.min.css differ diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css index af01a70cff..411d4994ac 100644 Binary files a/public/css/dist/skins/skin-orange.min.css and b/public/css/dist/skins/skin-orange.min.css differ diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css index 0c0a5bd957..33a21545b3 100644 Binary files a/public/css/dist/skins/skin-purple-dark.min.css and b/public/css/dist/skins/skin-purple-dark.min.css differ diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css index 8a89eae1a6..344cbfce10 100644 Binary files a/public/css/dist/skins/skin-purple.min.css and b/public/css/dist/skins/skin-purple.min.css differ diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index afe056285f..b92ad70dfa 100644 Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css index 4f73db5918..c6167ad739 100644 Binary files a/public/css/dist/skins/skin-red.min.css and b/public/css/dist/skins/skin-red.min.css differ diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css index 73b2bba0df..aea34738e2 100644 Binary files a/public/css/dist/skins/skin-yellow-dark.min.css and b/public/css/dist/skins/skin-yellow-dark.min.css differ diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css index f64159f334..5424b7f75d 100644 Binary files a/public/css/dist/skins/skin-yellow.min.css and b/public/css/dist/skins/skin-yellow.min.css differ diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js index 15466571b5..f65d4fdd87 100644 Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ diff --git a/public/js/dist/all-defer.js b/public/js/dist/all-defer.js index 9d8d7da83c..53e56a8a67 100644 Binary files a/public/js/dist/all-defer.js and b/public/js/dist/all-defer.js differ diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 9958ba9c01..654014484d 100644 Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js index 341a58a6fa..ede82d13f7 100644 Binary files a/public/js/dist/bootstrap-table.js and b/public/js/dist/bootstrap-table.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 22f5e6285f..f7cb1e2f76 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,52 +1,21 @@ { - "/js/build/app.js": "/js/build/app.js?id=72071a8a4dc754c61b0440d3c4119cbf", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091", - "/css/build/overrides.css": "/css/build/overrides.css?id=c8c36239d8ef77849c8c42c7edcb9d2e", - "/css/build/app.css": "/css/build/app.css?id=63bae107587455323cedd08aff2e387d", - "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa", - "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=268041e902b019730c23ee3875838005", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=d409d9b1a3b69247df8b98941ba06e33", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=4a9e8c5e7b09506fa3e3a3f42849e07f", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=21fef066e0bb1b02fd83fcb6694fad5f", - "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9f944e8021781af1ce45d27765d1c0c2", - "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=cf6c8c340420724b02d6e787ef9bded5", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=7f0eb9e355b36b41c61c3af3b4d41143", - "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=6cf460bed48ab738041f60231a3f005a", - "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=0ed42b67f9b02a74815e885bfd9e3f66", - "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f", - "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f0fbbb0ac729ea092578fb05ca615460", - "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb", - "/css/dist/all.css": "/css/dist/all.css?id=9018274cd8ec7ffde02affc2215df5e5", - "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", - "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", - "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=69e5d8e4e818f05fd882cceb758d1eba", - "/css/webfonts/fa-brands-400.woff2": "/css/webfonts/fa-brands-400.woff2?id=189b85e9c72c6f75e464c3f58a6707cf", - "/css/webfonts/fa-regular-400.ttf": "/css/webfonts/fa-regular-400.ttf?id=ed4c23399d1013809882e90bfe396d1b", - "/css/webfonts/fa-regular-400.woff2": "/css/webfonts/fa-regular-400.woff2?id=be75b1958ae0da55e1eed562d9b7713d", - "/css/webfonts/fa-solid-900.ttf": "/css/webfonts/fa-solid-900.ttf?id=dfdc7801582dd0d20ea75faa3b96c296", - "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=a0feb384c3c6071947a49708f2b0bc85", - "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=e24ec0b8661f7fa333b29444df39e399", - "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=e11465c0eff0549edd4e8ea6bbcf242f", - "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=2bd29fa7f9d666800c246a52ce708633", - "/js/build/vendor.js": "/js/build/vendor.js?id=a2b971da417306a63385c8098acfe4af", - "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=1f678160a05960c3087fb8263168ff41", - "/js/dist/all.js": "/js/dist/all.js?id=256c2e7da22a51ce49b03ffa24527cee", - "/js/dist/all-defer.js": "/js/dist/all-defer.js?id=7f9a130eda6916eaa32a0a57e81918f3", - "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0ed42b67f9b02a74815e885bfd9e3f66", - "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=1f33ca3d860461c1127ec465ab3ebb6b", - "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=6cf460bed48ab738041f60231a3f005a", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=392cc93cfc0be0349bab9697669dd091", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=4a9e8c5e7b09506fa3e3a3f42849e07f", - "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=fc7adb943668ac69fe4b646625a7571f", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=21fef066e0bb1b02fd83fcb6694fad5f", - "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=b9a74ec0cd68f83e7480d5ae39919beb", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=7f0eb9e355b36b41c61c3af3b4d41143", - "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=cf6c8c340420724b02d6e787ef9bded5", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9f944e8021781af1ce45d27765d1c0c2", - "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=268041e902b019730c23ee3875838005", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=d409d9b1a3b69247df8b98941ba06e33", - "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=f0fbbb0ac729ea092578fb05ca615460" + "/js/build/app.js": "/js/build/app.js", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css", + "/css/build/overrides.css": "/css/build/overrides.css", + "/css/build/app.css": "/css/build/app.css", + "/css/build/AdminLTE.css": "/css/build/AdminLTE.css", + "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css", + "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css", + "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css", + "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css", + "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css", + "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css", + "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css", + "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css" } diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 128817a119..5e16953427 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -859,4 +859,32 @@ input[type="radio"]:checked::before { /** --------------------------------------- **/ /** End checkbox styles to replace iCheck **/ -/** --------------------------------------- **/ \ No newline at end of file +/** --------------------------------------- **/ + +/** +/** Separator styles with text in the middle. Currently only used by the login page but +/** could be used elsewhere. + */ + +.separator { + display: flex; + align-items: center; + text-align: center; + padding-top: 20px; + color: #959495; +} + +.separator::before, +.separator::after { + content: ''; + flex: 1; + border-bottom: 1px solid #959495; +} + +.separator:not(:empty)::before { + margin-right: .25em; +} + +.separator:not(:empty)::after { + margin-left: .25em; +} \ No newline at end of file diff --git a/resources/lang/en-US/auth/general.php b/resources/lang/en-US/auth/general.php index 4486f090b2..e6a6eed0fc 100644 --- a/resources/lang/en-US/auth/general.php +++ b/resources/lang/en-US/auth/general.php @@ -12,7 +12,7 @@ return [ 'remember_me' => 'Remember Me', 'username_help_top' => 'Enter your username to be emailed a password reset link.', 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', - 'google_login' => 'Or login with Google Workspace', + 'google_login' => 'Login with Google Workspace', 'google_login_failed' => 'Google Login failed, please try again.', ]; diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 5e1ad742e3..ec2c9c121a 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -499,5 +499,6 @@ return [ 'action_permission_generic' => 'You do not have permission to :action this :item_type', 'edit' => 'edit', 'action_source' => 'Action Source', + 'or' => 'or', ]; diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index bd91170b7d..16c67ff2b9 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -17,6 +17,18 @@
+ @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!='')) + +

+ + + {{ trans('auth/general.google_login') }} + + +
{{ strtoupper(trans('general.or')) }}
+ @endif + +

{{ trans('auth/general.login_prompt') }}

@@ -93,12 +105,6 @@
- @if (($snipeSettings->google_login=='1') && ($snipeSettings->google_client_id!='') && ($snipeSettings->google_client_secret!='')) - - - {{ trans('auth/general.google_login') }} - - @endif