miguel456/athenahr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "merge 1""

Browse Source 
This reverts commit 0c463d1f10.
This commit is contained in:
Miguel Nogueira
2022-10-24 01:04:22 +01:00
parent 0c463d1f10
commit b89d71b371
166 changed files with 4250 additions and 1833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/auth/2fa.blade.php
View File

@@ -13,7 +13,7 @@
<div class="brand-wrapper">
<img src="{{ config('adminlte.logo_img') }}" alt="logo" class="logo">{{ config('adminlte.logo') }}
</div>
<p class="login-card-description">{{__('messages.2fa_txt')}}</p>
<p class="login-card-description">{{__('Multi-factor authentication is enabled for your account.')}}</p>
<form action="{{ route('verify2FA') }}" method="POST" id="verify">
@csrf
<div class="form-group">
@@ -24,8 +24,9 @@
</form>
<p class="login-card-footer-text">{{__("Don't know the code?")}} <a href="{{ route('logout') }}" class="text-reset">{{__('Cancel sign in (sign out)')}}</a></p>
<nav class="login-card-footer-nav">
<a href="#!">{{__('Terms of Service')}}</a>
<a href="#!">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.guidelines_url') }}">{{__('Community Guidelines')}}</a>
<a href="{{ config('app.privacy_url') }}">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.terms_url') }}">{{__('Terms of Service')}}</a>
</nav>
</div>
</div>

12
resources/views/auth/login.blade.php
View File

@@ -13,7 +13,7 @@
<div class="brand-wrapper">
<img src="{{ config('adminlte.logo_img') }}" alt="logo" class="logo rounded mr-2">{{ config('adminlte.logo') }}
</div>
<p class="login-card-description">{{__('messages.signin_cta')}}</p>
<p class="login-card-description">{{__('Sign in to your account')}}</p>
<form action="{{ route('login') }}" method="POST" id="loginForm">
@csrf
@if ($demoActive)
@@ -45,13 +45,17 @@
<input type="checkbox" name="remember" id="remember" />
</div>
<input name="login" id="login" class="btn btn-block login-btn mb-4" type="submit" value="{{__('Sign in')}}">
<p class="text-center">{{ __('OR') }}</p>
<div class="social-login">
<a class="btn btn-block mb-4 btn-discord" href="{{ route('discordRedirect') }}"><i class="fa-brands fa-discord"></i> Continue with Discord</a>
</div>
</form>
<a href="{{ route('password.request') }}" class="forgot-password-link">{{__('Forgot password?')}}</a>
<p class="login-card-footer-text">{{__("Don't have an account?")}} <a href="{{ route('register') }}" class="text-reset">{{__('Sign up here')}}</a></p>
<nav class="login-card-footer-nav">
<a href="#!">{{__('Terms of Service')}}</a>
<a href="#!">{{__('Privacy Policy')}}</a>
<a href="#!">{{__('Community Guidelines')}}</a>
<a href="{{ config('app.terms_url') }}">{{__('Terms of Service')}}</a>
<a href="{{ config('app.privacy_url') }}">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.guidelines_url') }}">{{__('Community Guidelines')}}</a>
</nav>
</div>

6
resources/views/auth/passwords/email.blade.php
View File

@@ -31,9 +31,9 @@
</form>
<a href="{{ route('login') }}">{{__('Back to login')}}</a>
<nav class="login-card-footer-nav">
<a href="#!">{{__('Terms of Service')}}</a>
<a href="#!">{{__('Privacy Policy')}}</a>
<a href="#!">{{__('Community Guidelines')}}</a>
<a href="{{ config('app.terms_url') }}">{{__('Terms of Service')}}</a>
<a href="{{ config('app.privacy_url') }}">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.guidelines_url') }}">{{__('Community Guidelines')}}</a>
</nav>
</div>

6
resources/views/auth/passwords/reset.blade.php
View File

@@ -70,9 +70,9 @@
</form>
<a href="{{ route('login') }}">{{__('Back to sign in')}}</a>
<nav class="login-card-footer-nav">
<a href="#!">{{__('Terms of Service')}}</a>
<a href="#!">{{__('Privacy Policy')}}</a>
<a href="#!">{{__('Community Guidelines')}}</a>
<a href="{{ config('app.terms_url') }}">{{__('Terms of Service')}}</a>
<a href="{{ config('app.privacy_url') }}">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.guidelines_url') }}">{{__('Community Guidelines')}}</a>
</nav>
</div>

26
resources/views/auth/register.blade.php
View File

@@ -72,11 +72,16 @@
<label for="password" class="sr-only">{{__('Password')}}</label>
<input type="password" name="password" id="password" class="form-control" placeholder="{{__('Password')}}">
</div>
<div class="form-group mb-4">
<div class="form-group mb-2">
<label for="passwordc" class="sr-only">{{__('Confirm Password')}}</label>
<input type="password" id="passwordc" name="password_confirmation" class="form-control" placeholder="{{__('Confirm Password')}}" />
</div>
<div class="form-group mb-4 mt-5">
<label for="dob" class="sr-only">{{__('Date of birth')}}</label>
<input type="text" class="form-control" name="dob" id="dob" placeholder="Date of birth">
<span class="text-muted text-sm"><i class="fas fa-info-circle"></i> {!! __("<b>Why do we need this?</b> We use your age information to make sure you meet age requirements for certain positions, and to make sure that everyone is compliant with our terms of service.") !!} </span>
</div>
@if(\App\Facades\Options::getOption('requireGameLicense') && \App\Facades\Options::getOption('currentGame') == 'MINECRAFT')
<div class="form-group mt-5">
@@ -85,13 +90,26 @@
</div>
@endif
<div class="form-group mt-3">
<label for="legal"><input type="checkbox" name="acceptTerms"> {!! __('I have read and agree with the :appName <a href=":communityGuidelinesUrlConfigValue" target="_blank">Community Guidelines</a>, <a href=":privacyPolicyUrlConfigValue" target="_blank">Privacy Policy</a> and <a href=":termsUrlConfigValue" target="_blank">Terms of Service</a>.', ['communityGuidelinesUrlConfigValue' => config('app.guidelines_url'), 'privacyPolicyUrlConfigValue' => config('app.privacy_url'), 'termsUrlConfigValue' => config('app.terms_url'), 'appName' => config('app.name')]) !!}</label>
</div>
<input name="register" id="register" class="btn btn-block login-btn mb-4" type="submit" value="{{__('Sign up')}}">
</form>
<script>
flatpickr('#dob', {
altInput: true,
altFormat: "F j, Y",
dateFormat: "Y-m-d",
});
</script>
<p class="login-card-footer-text">{{__('Have an account with us?')}} <a href="{{ route('login') }}" class="text-reset">{{__('Sign in here')}}</a></p>
<nav class="login-card-footer-nav">
<a href="#!">{{__('Terms of Service')}}</a>
<a href="#!">{{__('Privacy Policy')}}</a>
<a href="#!">{{__('Community Guidelines')}}</a>
<a href="{{ config('app.terms_url') }}">{{__('Terms of Service')}}</a>
<a href="{{ config('app.privacy_url') }}">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.guidelines_url') }}">{{__('Community Guidelines')}}</a>
</nav>
</div>
</div>

6
resources/views/auth/verify.blade.php
View File

@@ -30,9 +30,9 @@
</form>
<nav class="login-card-footer-nav">
<a href="#!">{{__('messages.terms')}}</a>
<a href="#!">{{__('messages.ppolicy')}}</a>
<a href="#!">{{__('Community Guidelines')}}</a>
<a href="{{ config('app.terms_url') }}">{{__('Terms of Service')}}</a>
<a href="{{ config('app.privacy_url') }}">{{__('Privacy Policy')}}</a>
<a href="{{ config('app.guidelines_url') }}">{{__('Community Guidelines')}}</a>
</nav>
</div>