diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/Auth/LoginRequest.php index 2143861..8e98c6c 100644 --- a/app/Http/Requests/Auth/LoginRequest.php +++ b/app/Http/Requests/Auth/LoginRequest.php @@ -49,7 +49,7 @@ class LoginRequest extends FormRequest RateLimiter::hit($this->throttleKey()); throw ValidationException::withMessages([ - 'email' => __('auth.failed'), + 'email' => 'auth.failed', ]); } diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 117ff49..3dd2f0b 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -17,7 +17,7 @@ class RouteServiceProvider extends ServiceProvider * * @var string */ - public const HOME = '/dashboard'; + public const HOME = '/journal-entries'; /** * The controller namespace for the application. diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index 0b15a9f..264c930 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -7,7 +7,7 @@
- {{ __('This is a secure area of the application. Please confirm your password before continuing.') }} + This is a secure area of the application. Please confirm your password before continuing.
@@ -18,7 +18,7 @@
- +
- - {{ __('Confirm') }} - + Confirm
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 66937f3..2c3bcd5 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -7,7 +7,7 @@
- {{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }} + Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.
@@ -21,15 +21,13 @@
- +
- - {{ __('Email Password Reset Link') }} - + Email Password Reset Link
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 453039e..487703e 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -17,14 +17,14 @@
- +
- +
@if (Route::has('password.request')) - - {{ __('Forgot your password?') }} - + Forgot your password? @endif - - {{ __('Login') }} - + Login
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index af17d99..7995a0c 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -14,21 +14,21 @@
- +
- +
- +
- + - {{ __('Already registered?') }} + Already registered? - - {{ __('Register') }} - + Register
diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index 8da6ed3..5c1dbbd 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -17,21 +17,21 @@
- +
- +
- +
- - {{ __('Reset Password') }} + Reset Password
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index 877a351..cdec0c1 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -7,12 +7,12 @@
- {{ __('Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }} + Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.
@if (session('status') == 'verification-link-sent')
- {{ __('A new verification link has been sent to the email address you provided during registration.') }} + A new verification link has been sent to the email address you provided during registration.
@endif @@ -21,18 +21,13 @@ @csrf
- - {{ __('Resend Verification Email') }} - + Resend Verification Email
@csrf - - +
diff --git a/resources/views/components/auth-validation-errors.blade.php b/resources/views/components/auth-validation-errors.blade.php index fc0eaeb..0b5addf 100644 --- a/resources/views/components/auth-validation-errors.blade.php +++ b/resources/views/components/auth-validation-errors.blade.php @@ -2,10 +2,7 @@ @if ($errors->any())
-
- {{ __('Whoops! Something went wrong.') }} -
- +
Whoops! Something went wrong.
    @foreach ($errors->all() as $error)
  • {{ $error }}
  • diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php deleted file mode 100644 index 025a79a..0000000 --- a/resources/views/dashboard.blade.php +++ /dev/null @@ -1,17 +0,0 @@ - - -

    - {{ __('Dashboard') }} -

    -
    - -
    -
    -
    -
    - You're logged in! -
    -
    -
    -
    -
    diff --git a/resources/views/foods/edit.blade.php b/resources/views/foods/edit.blade.php index f36ee87..4833634 100644 --- a/resources/views/foods/edit.blade.php +++ b/resources/views/foods/edit.blade.php @@ -16,7 +16,7 @@
    - +
    - +
    - + - +
    - +
    - + -

    - {{ __('Foods') }} -

    +

    Foods

    diff --git a/resources/views/journal-entries/create-from-nutrients.blade.php b/resources/views/journal-entries/create-from-nutrients.blade.php index f79e381..ba1ed86 100644 --- a/resources/views/journal-entries/create-from-nutrients.blade.php +++ b/resources/views/journal-entries/create-from-nutrients.blade.php @@ -1,8 +1,6 @@ -

    - {{ __('Add Nutrient Journal Entry') }} -

    +

    Add Nutrient Journal Entry

    diff --git a/resources/views/journal-entries/create.blade.php b/resources/views/journal-entries/create.blade.php index b48d12c..85e5020 100644 --- a/resources/views/journal-entries/create.blade.php +++ b/resources/views/journal-entries/create.blade.php @@ -1,8 +1,6 @@ -

    - {{ __('Add Journal Entries') }} -

    +

    Add Journal Entries

    diff --git a/resources/views/journal-entries/index.blade.php b/resources/views/journal-entries/index.blade.php index c61513c..ffe2656 100644 --- a/resources/views/journal-entries/index.blade.php +++ b/resources/views/journal-entries/index.blade.php @@ -1,8 +1,6 @@ -

    - {{ __(":name's Journal", ['name' => Auth::user()->name]) }} -

    +

    {{ Auth::user()->name }}'s Journal

    diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index ad05fa8..3b67f39 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -5,25 +5,17 @@
    - - - @@ -78,7 +60,6 @@