diff --git a/resources/css/app.css b/resources/css/app.css
index fa1e61cb2..70759e542 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -82,7 +82,7 @@ @keyframes lds-heart {
*/
html,
body {
- @apply w-full min-h-full bg-neutral-50 dark:bg-base dark:text-neutral-400;
+ @apply w-full min-h-full bg-gray-50 dark:bg-base dark:text-neutral-400;
}
body {
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index f85dc268e..ede49117a 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -61,7 +61,7 @@ class="text-sm dark:text-neutral-400 hover:text-coollabs dark:hover:text-warning
-
+
Don't have an account?
@@ -82,7 +82,7 @@ class="block w-full text-center py-3 px-4 rounded-lg border border-neutral-300 d
- or
+ or
continue with
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 3db943726..cdfa52a98 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -33,7 +33,8 @@ function getOldOrLocal($key, $localValue)
Root User Setup
-
This user will be the root user with full admin access.
+
This user will be the root user with full
+ admin access.
@@ -58,13 +59,16 @@ function getOldOrLocal($key, $localValue)
-
+
- Your password should be min 8 characters long and contain at least one uppercase letter, one lowercase letter, one number, and one symbol.
+ Your password should be min 8 characters long and contain at least one uppercase letter,
+ one lowercase letter, one number, and one symbol.
-
+
Create Account
@@ -74,17 +78,18 @@ function getOldOrLocal($key, $localValue)
-
+
Already have an account?
-
+
{{ __('auth.already_registered') }}
-
+
\ No newline at end of file
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
index a4a07ebd6..3e0c237b4 100644
--- a/resources/views/auth/reset-password.blade.php
+++ b/resources/views/auth/reset-password.blade.php
@@ -47,16 +47,19 @@
label="{{ __('input.email') }}" />
-
+
-
+
- Your password should be min 8 characters long and contain at least one uppercase letter, one lowercase letter, one number, and one symbol.
+ Your password should be min 8 characters long and contain at least one uppercase letter,
+ one lowercase letter, one number, and one symbol.
-
+
{{ __('auth.reset_password') }}
@@ -66,17 +69,18 @@
-
+
Remember your password?
-
+
Back to Login
-
+
\ No newline at end of file
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
index d4531cbe8..05dbcc90c 100644
--- a/resources/views/auth/two-factor-challenge.blade.php
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -120,7 +120,7 @@ class="mt-2 text-sm dark:text-neutral-400 hover:text-black dark:hover:text-white
-
+
Need help?
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index c577f7248..7bb366cd4 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -2,7 +2,7 @@
-
+ }, timeout);
+ return;
+ } else {
+ window.location.reload();
+ }
+ })
+ window.Livewire.on('info', (message) => {
+ if (typeof message === 'string') {
+ window.toast('Info', {
+ type: 'info',
+ description: message,
+ })
+ return;
+ }
+ if (message.length == 1) {
+ window.toast('Info', {
+ type: 'info',
+ description: message[0],
+ })
+ } else if (message.length == 2) {
+ window.toast(message[0], {
+ type: 'info',
+ description: message[1],
+ })
+ }
+ })
+ window.Livewire.on('error', (message) => {
+ if (typeof message === 'string') {
+ window.toast('Error', {
+ type: 'danger',
+ description: message,
+ })
+ return;
+ }
+ if (message.length == 1) {
+ window.toast('Error', {
+ type: 'danger',
+ description: message[0],
+ })
+ } else if (message.length == 2) {
+ window.toast(message[0], {
+ type: 'danger',
+ description: message[1],
+ })
+ }
+ })
+ window.Livewire.on('warning', (message) => {
+ if (typeof message === 'string') {
+ window.toast('Warning', {
+ type: 'warning',
+ description: message,
+ })
+ return;
+ }
+ if (message.length == 1) {
+ window.toast('Warning', {
+ type: 'warning',
+ description: message[0],
+ })
+ } else if (message.length == 2) {
+ window.toast(message[0], {
+ type: 'warning',
+ description: message[1],
+ })
+ }
+ })
+ window.Livewire.on('success', (message) => {
+ if (typeof message === 'string') {
+ window.toast('Success', {
+ type: 'success',
+ description: message,
+ })
+ return;
+ }
+ if (message.length == 1) {
+ window.toast('Success', {
+ type: 'success',
+ description: message[0],
+ })
+ } else if (message.length == 2) {
+ window.toast(message[0], {
+ type: 'success',
+ description: message[1],
+ })
+ }
+ })
+ });
+
+