Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed some problems on the UI #34

Merged
merged 7 commits into from
May 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lang/en/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',

];
4 changes: 2 additions & 2 deletions lang/en/pagination.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
|
*/

'previous' => '« Previous',
'next' => 'Next »',
'previous' => '« Előző',
'next' => 'Következő »',

];
10 changes: 5 additions & 5 deletions lang/en/passwords.php
Original file line number Diff line number Diff line change
Expand Up @@ -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ó.",

];
1 change: 0 additions & 1 deletion resources/views/alumni/index.blade.php
Original file line number Diff 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
13 changes: 7 additions & 6 deletions resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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">
Expand All @@ -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>
Expand All @@ -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>
Expand Down
13 changes: 7 additions & 6 deletions resources/views/auth/register.blade.php
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions resources/views/home.blade.php
Original file line number Diff line number Diff line change
@@ -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'))
Expand All @@ -14,7 +15,7 @@
</div>
@endif

{{ __('You are logged in!') }}
{{ __('Ön sikeresen bejelentkezett') }}
</div>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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">
Expand Down