1day2die преди 2 години
родител
ревизия
81662b8e17
променени са 2 файла, в които са добавени 152 реда и са изтрити 140 реда
  1. 3 0
      app/Http/Controllers/Auth/RegisterController.php
  2. 149 140
      resources/views/auth/register.blade.php

+ 3 - 0
app/Http/Controllers/Auth/RegisterController.php

@@ -67,6 +67,9 @@ class RegisterController extends Controller
         if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true') {
             $validationRules['g-recaptcha-response'] = ['required', 'recaptcha'];
         }
+        if (config('SETTINGS::SYSTEM:SHOW_TOS') == 'true') {
+            $validationRules['terms'] = ['required'];
+        }
 
         if (config('SETTINGS::SYSTEM:REGISTER_IP_CHECK', 'true') == 'true') {
 

+ 149 - 140
resources/views/auth/register.blade.php

@@ -3,184 +3,193 @@
 @section('content')
 
     <body class="hold-transition dark-mode register-page">
-        <div class="register-box">
-            <div class="card card-outline card-primary">
-                <div class="card-header text-center">
-                    <a href="{{ route('welcome') }}" class="h1"><b
-                            class="mr-1">{{ config('app.name', 'Laravel') }}</b></a>
-                </div>
-                <div class="card-body">
-                    @if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_USERS'))
-                        <div class="alert alert-warning p-2 m-2">
-                            <h5><i class="icon fas fa-exclamation-circle"></i> {{ __('Warning!') }}</h5>
-                            {{ __('The system administrator has blocked the registration of new users') }}
-                        </div>
-                        <div class="text-center">
-                            <a class="btn btn-primary" href="{{ route('login') }}">{{ __('Back') }}</a>
-                        </div>
-                    @else
-                        <p class="login-box-msg">{{ __('Register a new membership') }}</p>
+    <div class="register-box">
+        <div class="card card-outline card-primary">
+            <div class="card-header text-center">
+                <a href="{{ route('welcome') }}" class="h1"><b
+                        class="mr-1">{{ config('app.name', 'Laravel') }}</b></a>
+            </div>
+            <div class="card-body">
+                @if (!config('SETTINGS::SYSTEM:CREATION_OF_NEW_USERS'))
+                    <div class="alert alert-warning p-2 m-2">
+                        <h5><i class="icon fas fa-exclamation-circle"></i> {{ __('Warning!') }}</h5>
+                        {{ __('The system administrator has blocked the registration of new users') }}
+                    </div>
+                    <div class="text-center">
+                        <a class="btn btn-primary" href="{{ route('login') }}">{{ __('Back') }}</a>
+                    </div>
+                @else
+                    <p class="login-box-msg">{{ __('Register a new membership') }}</p>
 
-                        <form method="POST" action="{{ route('register') }}">
+                    <form method="POST" action="{{ route('register') }}">
 
-                            @error('ip')
-                                <span class="text-danger" role="alert">
+                        @error('ip')
+                        <span class="text-danger" role="alert">
                                     <small><strong>{{ $message }}</strong></small>
                                 </span>
-                            @enderror
+                        @enderror
 
-                            @error('registered')
-                                <span class="text-danger" role="alert">
+                        @error('registered')
+                        <span class="text-danger" role="alert">
                                     <small><strong>{{ $message }}</strong></small>
                                 </span>
-                            @enderror
-                            @if ($errors->has('ptero_registration_error'))
-                                @foreach ($errors->get('ptero_registration_error') as $err)
-                                    <span class="text-danger" role="alert">
+                        @enderror
+                        @if ($errors->has('ptero_registration_error'))
+                            @foreach ($errors->get('ptero_registration_error') as $err)
+                                <span class="text-danger" role="alert">
                                         <small><strong>{{ $err }}</strong></small>
                                     </span>
-                                @endforeach
-                            @endif
-
-                            @csrf
-                            <div class="form-group">
-                                <div class="input-group">
-                                    <input type="text" class="form-control @error('name') is-invalid @enderror"
-                                        name="name" value="{{ old('name') }}" placeholder="{{ __('Username') }}"
-                                        required autocomplete="name" autofocus>
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <span class="fas fa-user"></span>
-                                        </div>
+                            @endforeach
+                        @endif
+
+                        @csrf
+                        <div class="form-group">
+                            <div class="input-group">
+                                <input type="text" class="form-control @error('name') is-invalid @enderror"
+                                       name="name" value="{{ old('name') }}" placeholder="{{ __('Username') }}"
+                                       required autocomplete="name" autofocus>
+                                <div class="input-group-append">
+                                    <div class="input-group-text">
+                                        <span class="fas fa-user"></span>
                                     </div>
                                 </div>
-                                @error('name')
-                                    <span class="text-danger" role="alert">
+                            </div>
+                            @error('name')
+                            <span class="text-danger" role="alert">
                                         <small><strong>{{ $message }}</strong></small>
                                     </span>
-                                @enderror
-                            </div>
+                            @enderror
+                        </div>
 
 
-                            <div class="form-group">
-                                <div class="input-group mb-3">
-                                    <input type="email" name="email"
-                                        class="form-control  @error('email') is-invalid @enderror"
-                                        placeholder="{{ __('Email') }}" value="{{ old('email') }}" required
-                                        autocomplete="email">
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <span class="fas fa-envelope"></span>
-                                        </div>
+                        <div class="form-group">
+                            <div class="input-group mb-3">
+                                <input type="email" name="email"
+                                       class="form-control  @error('email') is-invalid @enderror"
+                                       placeholder="{{ __('Email') }}" value="{{ old('email') }}" required
+                                       autocomplete="email">
+                                <div class="input-group-append">
+                                    <div class="input-group-text">
+                                        <span class="fas fa-envelope"></span>
                                     </div>
                                 </div>
-                                @error('email')
-                                    <span class="text-danger" role="alert">
+                            </div>
+                            @error('email')
+                            <span class="text-danger" role="alert">
                                         <small><strong>{{ $message }}</strong></small>
                                     </span>
-                                @enderror
-                            </div>
+                            @enderror
+                        </div>
 
-                            <div class="form-group">
-                                <div class="input-group mb-3">
-                                    <input type="password" class="form-control @error('password') is-invalid @enderror"
-                                        placeholder="{{ __('Password') }}" name="password" required
-                                        autocomplete="new-password">
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <span class="fas fa-lock"></span>
-                                        </div>
+                        <div class="form-group">
+                            <div class="input-group mb-3">
+                                <input type="password" class="form-control @error('password') is-invalid @enderror"
+                                       placeholder="{{ __('Password') }}" name="password" required
+                                       autocomplete="new-password">
+                                <div class="input-group-append">
+                                    <div class="input-group-text">
+                                        <span class="fas fa-lock"></span>
                                     </div>
                                 </div>
-                                @error('password')
-                                    <span class="text-danger" role="alert">
+                            </div>
+                            @error('password')
+                            <span class="text-danger" role="alert">
                                         <small><strong>{{ $message }}</strong></small>
                                     </span>
-                                @enderror
-                            </div>
+                            @enderror
+                        </div>
 
+                        <div class="input-group mb-3">
+                            <input type="password" class="form-control" name="password_confirmation"
+                                   placeholder="{{ __('Retype password') }}" required autocomplete="new-password">
+                            <div class="input-group-append">
+                                <div class="input-group-text">
+                                    <span class="fas fa-lock"></span>
+                                </div>
+                            </div>
+                        </div>
+                        @if (config('SETTINGS::REFERRAL::ENABLED') == 'true')
                             <div class="input-group mb-3">
-                                <input type="password" class="form-control" name="password_confirmation"
-                                    placeholder="{{ __('Retype password') }}" required autocomplete="new-password">
+                                <input type="text" value="{{ Request::get('ref') }}" class="form-control"
+                                       name="referral_code"
+                                       placeholder="{{ __('Referral code') }} ({{ __('optional') }})">
                                 <div class="input-group-append">
                                     <div class="input-group-text">
-                                        <span class="fas fa-lock"></span>
+                                        <span class="fas fa-user-check"></span>
                                     </div>
                                 </div>
                             </div>
-                            @if (config('SETTINGS::REFERRAL::ENABLED') == 'true')
-                                <div class="input-group mb-3">
-                                    <input type="text" value="{{ \Request::get('ref') }}" class="form-control"
-                                        name="referral_code"
-                                        placeholder="{{ __('Referral code') }} ({{ __('optional') }})">
-                                    <div class="input-group-append">
-                                        <div class="input-group-text">
-                                            <span class="fas fa-user-check"></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            @endif
-                            @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true')
-                                <div class="input-group mb-3">
-                                    {!! htmlFormSnippet() !!}
-                                    @error('g-recaptcha-response')
-                                        <span class="text-danger" role="alert">
+                        @endif
+                        @if (config('SETTINGS::RECAPTCHA:ENABLED') == 'true')
+                            <div class="input-group mb-3">
+                                {!! htmlFormSnippet() !!}
+                                @error('g-recaptcha-response')
+                                <span class="text-danger" role="alert">
                                             <small><strong>{{ $message }}</strong></small>
                                         </span>
-                                    @enderror
-                                </div>
-                            @endif
+                                @enderror
+                            </div>
+                        @endif
 
-                            <div class="row">
-                                <div class="col-8">
+                        <div class="row">
+                            <div class="col-12">
+                                @if (config('SETTINGS::SYSTEM:SHOW_TOS'))
 
-                                    {{--                            <div class="icheck-primary"> --}}
-                                    {{--                                <input type="checkbox" id="agreeTerms" name="terms" value="agree"> --}}
-                                    {{--                                <label for="agreeTerms"> --}}
-                                    {{--                                    I agree to the <a href="#">terms</a> --}}
-                                    {{--                                </label> --}}
-                                    {{--                            </div> --}}
-                                </div>
-                                <!-- /.col -->
-                                <div class="col-4">
-                                    <button type="submit" class="btn btn-primary">{{ __('Register') }}</button>
-                                </div>
-                                <!-- /.col -->
+                                    <div class="icheck-primary">
+                                        <input type="checkbox" id="agreeTerms" name="terms" value="agree">
+                                        <label for="agreeTerms">
+                                            {{__("I agree to the")}} <a target="_blank" href="{{route("tos")}}">{{__("Terms of Service")}}</a>
+                                        </label>
+                                    </div>
+                                        @error('terms')
+                                        <span class="text-danger" role="alert">
+                                            <small><strong>{{ $message }}</strong></small>
+                                       </span>
+                                        @enderror
+
+                                @endif
                             </div>
-                        </form>
-
-                        {{--                <div class="social-auth-links text-center"> --}}
-                        {{--                    <a href="#" class="btn btn-block btn-primary"> --}}
-                        {{--                        <i class="fab fa-facebook mr-2"></i> --}}
-                        {{--                        Sign up using Facebook --}}
-                        {{--                    </a> --}}
-                        {{--                    <a href="#" class="btn btn-block btn-danger"> --}}
-                        {{--                        <i class="fab fa-google-plus mr-2"></i> --}}
-                        {{--                        Sign up using Google+ --}}
-                        {{--                    </a> --}}
-                        {{--                </div> --}}
-
-                        <a href="{{ route('login') }}" class="text-center">{{ __('I already have a membership') }}</a>
-                </div>
-                <!-- /.form-box -->
-            </div><!-- /.card -->
-        </div>
-        <!-- /.register-box -->
-
-        {{-- imprint and privacy policy --}}
-        <div class="fixed-bottom ">
-            <div class="container text-center">
-                @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
-                    <a target="_blank" href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
-                @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
-                    <a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
-                @endif
-                @if (config('SETTINGS::SYSTEM:SHOW_TOS'))
-                    | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
-                @endif
+                        </div>
+                        <!-- /.col -->
+                        <div class="col-4">
+                            <button type="submit" class="btn btn-primary">{{ __('Register') }}</button>
+                        </div>
+                        <!-- /.col -->
             </div>
+            </form>
+
+            {{--                <div class="social-auth-links text-center"> --}}
+            {{--                    <a href="#" class="btn btn-block btn-primary"> --}}
+            {{--                        <i class="fab fa-facebook mr-2"></i> --}}
+            {{--                        Sign up using Facebook --}}
+            {{--                    </a> --}}
+            {{--                    <a href="#" class="btn btn-block btn-danger"> --}}
+            {{--                        <i class="fab fa-google-plus mr-2"></i> --}}
+            {{--                        Sign up using Google+ --}}
+            {{--                    </a> --}}
+            {{--                </div> --}}
+
+            <a href="{{ route('login') }}" class="text-center">{{ __('I already have a membership') }}</a>
+        </div>
+        <!-- /.form-box -->
+    </div><!-- /.card -->
+    </div>
+    <!-- /.register-box -->
+
+    {{-- imprint and privacy policy --}}
+    <div class="fixed-bottom ">
+        <div class="container text-center">
+            @if (config('SETTINGS::SYSTEM:SHOW_IMPRINT'))
+                <a target="_blank" href="{{ route('imprint') }}"><strong>{{ __('Imprint') }}</strong></a> |
+            @endif
+            @if (config('SETTINGS::SYSTEM:SHOW_PRIVACY'))
+                <a target="_blank" href="{{ route('privacy') }}"><strong>{{ __('Privacy') }}</strong></a>
+            @endif
+            @if (config('SETTINGS::SYSTEM:SHOW_TOS'))
+                | <a target="_blank" href="{{ route('tos') }}"><strong>{{ __('Terms of Service') }}</strong></a>
+            @endif
         </div>
+    </div>
     </body>
     @endif
 @endsection