Merge pull request #34 from TheBarbaraIsTaken/frontend-fixes

Fixed some problems on the UI
EotvosCollegium · May 22, 2023 · 825ea1c · 825ea1c
2 parents 4593eaa + 2cc7c46
commit 825ea1c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 27 deletions.
diff --git a/lang/en/auth.php b/lang/en/auth.php
@@ -13,8 +13,8 @@
     |
     */
 
-    'failed' => 'These credentials do not match our records.',
-    'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'failed' => 'A megadott adatok hibásak.',
+    'password' => 'A megadott jelszó hibás.',
+    'throttle' => 'Túl sok bejelentkezési kísérlet. Próbálja meg :seconds másodperc múlva.',
 
 ];
diff --git a/lang/en/pagination.php b/lang/en/pagination.php
@@ -13,7 +13,7 @@
     |
     */
 
-    'previous' => '&laquo; Previous',
-    'next' => 'Next &raquo;',
+    'previous' => '&laquo; Előző',
+    'next' => 'Következő &raquo;',
 
 ];
diff --git a/lang/en/passwords.php b/lang/en/passwords.php
@@ -13,10 +13,10 @@
     |
     */
 
-    'reset' => 'Your password has been reset!',
-    'sent' => 'We have emailed your password reset link!',
-    'throttled' => 'Please wait before retrying.',
-    'token' => 'This password reset token is invalid.',
-    'user' => "We can't find a user with that email address.",
+    'reset' => 'Jelszava helyre lett állítva!',
+    'sent' => 'Elküldtük a jelszó-visszaállítási linket e-mail címére!',
+    'throttled' => 'Kérjük, várjon, mielőtt újra próbálkozik.',
+    'token' => 'Nem megfelelő jelszó-visszaállítási kulcs.',
+    'user' => "A megadott felhasználó nem található.",
 
 ];
diff --git a/resources/views/alumni/index.blade.php b/resources/views/alumni/index.blade.php
@@ -137,7 +137,6 @@
                                         $majors_array = Arr::flatten($alumnus->majors()->select('name')->get()->makeHIdden('pivot')->toArray());
                                     @endphp
                                     <span>
-                                        <i class="far fa-calendar-alt"></i>
                                         <span>Egyetemi szak(ok): {{ implode(", ", $majors_array) }}</span>
                                     </span>
                                     @endif

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -1,18 +1,19 @@
 @extends('layouts.app')
+@section('title', 'Bejelentkezés')
 
 @section('content')
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">
-                <div class="card-header">{{ __('Login') }}</div>
+                <div class="card-header">{{ __('Bejelentkezés') }}</div>
 
                 <div class="card-body">
                     <form method="POST" action="{{ route('login') }}">
                         @csrf
 
                         <div class="row mb-3">
-                            <label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
+                            <label for="email" class="col-md-4 col-form-label text-md-end">{{ __('E-mail cím') }}</label>
 
                             <div class="col-md-6">
                                 <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
@@ -26,7 +27,7 @@
                         </div>
 
                         <div class="row mb-3">
-                            <label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Password') }}</label>
+                            <label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Jelszó') }}</label>
 
                             <div class="col-md-6">
                                 <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@@ -45,7 +46,7 @@
                                     <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
 
                                     <label class="form-check-label" for="remember">
-                                        {{ __('Remember Me') }}
+                                        {{ __('Jegyezz meg!') }}
                                     </label>
                                 </div>
                             </div>
@@ -54,12 +55,12 @@
                         <div class="row mb-0">
                             <div class="col-md-8 offset-md-4">
                                 <button type="submit" class="btn btn-primary">
-                                    {{ __('Login') }}
+                                    {{ __('Bejelentkezés') }}
                                 </button>
 
                                 @if (Route::has('password.request'))
                                     <a class="btn btn-link" href="{{ route('password.request') }}">
-                                        {{ __('Forgot Your Password?') }}
+                                        {{ __('Elfelejtette jelszavát?') }}
                                     </a>
                                 @endif
                             </div>

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -1,18 +1,19 @@
 @extends('layouts.app')
+@section('title', 'Regisztráció')
 
 @section('content')
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">
-                <div class="card-header">{{ __('Register') }}</div>
+                <div class="card-header">{{ __('Regisztráció') }}</div>
 
                 <div class="card-body">
                     <form method="POST" action="{{ route('register') }}">
                         @csrf
 
                         <div class="row mb-3">
-                            <label for="name" class="col-md-4 col-form-label text-md-end">{{ __('Name') }}</label>
+                            <label for="name" class="col-md-4 col-form-label text-md-end">{{ __('Név') }}</label>
 
                             <div class="col-md-6">
                                 <input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>
@@ -26,7 +27,7 @@
                         </div>
 
                         <div class="row mb-3">
-                            <label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
+                            <label for="email" class="col-md-4 col-form-label text-md-end">{{ __('E-mail cím') }}</label>
 
                             <div class="col-md-6">
                                 <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
@@ -40,7 +41,7 @@
                         </div>
 
                         <div class="row mb-3">
-                            <label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Password') }}</label>
+                            <label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Jelszó') }}</label>
 
                             <div class="col-md-6">
                                 <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
@@ -54,7 +55,7 @@
                         </div>
 
                         <div class="row mb-3">
-                            <label for="password-confirm" class="col-md-4 col-form-label text-md-end">{{ __('Confirm Password') }}</label>
+                            <label for="password-confirm" class="col-md-4 col-form-label text-md-end">{{ __('Jelszó megerősítése') }}</label>
 
                             <div class="col-md-6">
                                 <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
@@ -64,7 +65,7 @@
                         <div class="row mb-0">
                             <div class="col-md-6 offset-md-4">
                                 <button type="submit" class="btn btn-primary">
-                                    {{ __('Register') }}
+                                    {{ __('Regisztráció') }}
                                 </button>
                             </div>
                         </div>

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
@@ -1,11 +1,12 @@
 @extends('layouts.app')
+@section('title', 'Bejelentkezés')
 
 @section('content')
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">
-                <div class="card-header">{{ __('Dashboard') }}</div>
+                <div class="card-header">{{ __('Bejelentkezve') }}</div>
 
                 <div class="card-body">
                     @if (session('status'))
@@ -14,7 +15,7 @@
                         </div>
                     @endif
 
-                    {{ __('You are logged in!') }}
+                    {{ __('Ön sikeresen bejelentkezett') }}
                 </div>
             </div>
         </div>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -18,7 +18,8 @@
     @vite(['resources/sass/app.scss', 'resources/js/app.js'])
     <style>
 
-        </style>
+    </style>
+    <link rel="icon" type="image/x-icon" href="https://eotvos.elte.hu/media/da/30/e9a7dd3606d1cf1b44a674b6b3f4d7b52638a8a0cdc56526c14c0010e4c0/ec_logo.png">
 </head>
 <body>
     <div id="app">
@@ -73,7 +74,7 @@
                                     <a class="dropdown-item" href="{{ route('logout') }}"
                                        onclick="event.preventDefault();
                                                      document.getElementById('logout-form').submit();">
-                                        {{ __('Logout') }}
+                                        {{ __('Kijelentkezés') }}
                                     </a>
 
                                     <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
-Original file line number
+Diff line change
@@ Expand Up / @@ -137,7 +137,6 @@ @@
                                             $majors_array = Arr::flatten($alumnus->majors()->select('name')->get()->makeHIdden('pivot')->toArray());
                                         @endphp
                                         <span>
-                                            <i class="far fa-calendar-alt"></i>
                                             <span>Egyetemi szak(ok): {{ implode(", ", $majors_array) }}</span>
                                         </span>
                                         @endif
@@ Expand Down @@