Browse Source

Help system and admin user add

Alexandr 5 years ago
parent
commit
b974e128db

+ 13 - 1
app/Http/Controllers/HomeController.php

@@ -105,6 +105,18 @@ class HomeController extends Controller
     }
 
     public function userAdd(){
-        return view('auth.register');
+        return view('auth.register', ['express'=>True]);
+    }
+
+    public function addNewUser(Request $request){
+
+        $usr = new User();
+        $usr->name = $request->name;
+        $usr->email = $request->email;
+        $usr->password = Hash::make($request->password);
+        $usr->setRememberToken(Str::random(60));
+        $usr->save();
+
+        return redirect('users')->with('status', __('ui.adduserok'));
     }
 }

BIN
public/img/player_help.png


+ 15 - 0
resources/lang/en/ui.php

@@ -49,4 +49,19 @@ return[
     'lockdown_on' => 'Lockdown Initiated. Registration closed.',
     'lockdown_off' => 'Lockdown canceled. Registration opened.',
     'lockdown_ask' => 'Disable lockdown and open the Registration?',
+    'adduserok' => 'A new user has been added succesfully',
+    'help_btn' => 'UI Help',
+    'help_1' => 'Album title',
+    'help_2' => 'Album description',
+    'help_3' => 'Track Name',
+    'help_4' => 'Time played - Track length (HH:MM:SS)',
+    'help_5' => 'Set Forward/Backward step (5sec, 1min, 10min)',
+    'help_6' => 'Loop track playback (switch)',
+    'help_7' => 'How much times tack has been listened (counter)',
+    'help_8' => 'How much times track has been downloaded (counter)',
+    'help_9' => 'Backward step',
+    'help_10' => 'Play/Pause',
+    'help_11' => 'Forward step',
+    'help_12' => 'Download this track',
+
 ];

+ 14 - 0
resources/lang/ru/ui.php

@@ -49,4 +49,18 @@ return[
     'lockdown_on' => 'Локдаун. Регистрация закрыта.',
     'lockdown_off' => 'Локдаун отключен. Регистрация открыта.',
     'lockdown_ask' => 'Отключить локдаун и открыть регистрацию?',
+    'adduserok' => 'Новый пользователь успешно добавлен',
+    'help_btn' => 'Справка по интерфейсу',
+    'help_1' => 'Название альбома',
+    'help_2' => 'Описание альбома',
+    'help_3' => 'Название трека',
+    'help_4' => 'Програно - Длинна трека (часы:мин:сек)',
+    'help_5' => 'Шаг премотки (5 сек, 1 мин, 10 мин)',
+    'help_6' => 'Зациклить воспроизвдение трека (переключатель)',
+    'help_7' => 'Сколько раз прослушан трек (счетчик)',
+    'help_8' => 'сколько раз трек скачан (счетчик)',
+    'help_9' => 'Мотать назад',
+    'help_10' => 'Впоспр./Пауза',
+    'help_11' => 'Мотать вперед',
+    'help_12' => 'Скачать трек',
 ];

+ 10 - 4
resources/views/auth/register.blade.php

@@ -8,14 +8,16 @@
                 <div class="card-header">{{ __('ui.register') }}</div>
 
                 <div class="card-body">
-                    <form method="POST" action="{{ route('register') }}">
+                    <form method="POST" action="@if($express){{ route('addnewuser') }}@else{{ route('register') }}@endif">
                         @csrf
 
                         <div class="form-group row">
                             <label for="name" class="col-md-4 col-form-label text-md-right">{{ __('ui.name') }}</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>
+                                    <input id="name" type="text"
+                                           class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}"
+                                           required autocomplete="name" autofocus>
 
                                 @error('name')
                                     <span class="invalid-feedback" role="alert">
@@ -29,7 +31,9 @@
                             <label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail') }}</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">
+                                <input id="email" type="email"
+                                       class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}"
+                                       required autocomplete="email">
 
                                 @error('email')
                                     <span class="invalid-feedback" role="alert">
@@ -45,7 +49,9 @@
                             <div class="col-md-6">
                                 <div class="input-group">
 
-                                <input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
+                                <input id="password" type="password"
+                                       class="form-control @error('password') is-invalid @enderror" name="password"
+                                       required autocomplete="new-password">
                                     <div class="input-group-append">
                                         <div class="btn btn-outline-secondary" id="passgen" title="{{__('ui.gen_passw')}}">
                                             <i class="fas fa-redo-alt"></i>

+ 38 - 2
resources/views/home.blade.php

@@ -12,8 +12,8 @@
                             {{ __('ui.panel') }}
                         </div>
                         @auth
-                        @if(Auth::user()->isAdmin)
                         <div class="btn-group">
+                            @if(Auth::user()->isAdmin)
                             <div class="btn btn-sm btn-outline-primary text-left text-truncate" id="fScan" title="{{ __('ui.rescan') }}">
                                 <i class="fas fa-sync"></i>
                             </div>
@@ -24,8 +24,12 @@
                                     class="btn btn-sm btn-outline-primary text-right text-truncate" title="{{__('ui.lockreg')}}">
                                 <i class="fas @if($srv_state['lockdown']=='yes') fa-unlock-alt @else fa-lock @endif"></i>
                             </button>
+                            @endif
+                                <div class="btn btn-sm btn-outline-primary text-left text-truncate"
+                                     data-toggle="modal" data-target="#helpModal" title="{{ __('ui.help_btn') }}">
+                                    <i class="fas fa-question"></i>
+                                </div>
                         </div>
-                        @endif
                         @endauth
                     </div>
 
@@ -222,4 +226,36 @@
             </div>
         </div>
     </div>
+
+    <div class="modal fade" id="helpModal" tabindex="-1" role="dialog" aria-labelledby="helpModalLabel" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="helpModalLabel">{{ __('ui.help_btn') }}</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <img src="{{ asset('img/player_help.png') }}" class="img-fluid">
+                    <ul class="list-group list-group-flush">
+                        <li class="list-group-item text-danger">1) {{ __('ui.help_1') }}</li>
+                        <li class="list-group-item text-danger">2) {{ __('ui.help_2') }}</li>
+                        <li class="list-group-item text-danger">3) {{ __('ui.help_3') }}</li>
+                        <li class="list-group-item text-danger">4) {{ __('ui.help_4') }}</li>
+                        <li class="list-group-item text-danger">5) {{ __('ui.help_5') }}</li>
+                        <li class="list-group-item text-danger">6) {{ __('ui.help_6') }}</li>
+                        <li class="list-group-item text-danger">7) {{ __('ui.help_7') }}</li>
+                        <li class="list-group-item text-danger">8) {{ __('ui.help_8') }}</li>
+                        <li class="list-group-item text-danger">9) {{ __('ui.help_9') }}</li>
+                        <li class="list-group-item text-danger">10) {{ __('ui.help_10') }}</li>
+                        <li class="list-group-item text-danger">11) {{ __('ui.help_11') }}</li>
+                        <li class="list-group-item text-danger">12) {{ __('ui.help_12') }}</li>
+                    </ul>
+                </div>
+                <div class="modal-footer">
+                </div>
+            </div>
+        </div>
+    </div>
 @endsection

+ 6 - 5
resources/views/layouts/page.blade.php

@@ -9,9 +9,11 @@
     <!-- Fonts -->
     <link href="https://fonts.googleapis.com/css?family=Nunito:200,600" rel="stylesheet">
 
-    <!-- Scripts -->
-    <script src="{{ asset('js/app.js') }}" defer></script>
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+    <!-- Bootstrap CDN -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
+    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
 
     <!-- Styles -->
     <link href="{{ asset('css/page.css') }}" rel="stylesheet">
@@ -30,7 +32,7 @@
                 @if (Route::has('register'))
                     <a
                     @if($srv_state['lockdown']=='yes')
-                    style="text-decoration: line-through"
+                    style="text-decoration: line-through; cursor: pointer"
                     data-toggle="modal" data-target="#noticeModal"
                     @else
                     href="{{ route('register') }}"
@@ -64,7 +66,6 @@
                <a href="mailto:{{ $srv_state['srv_email'] }}">{{ $srv_state['srv_email'] }}</a>
             </div>
             <div class="modal-footer">
-
             </div>
           </div>
         </div>

+ 1 - 0
routes/web.php

@@ -45,4 +45,5 @@ Route::post('/pwupdate/{user}', 'HomeController@usrUpdatePw')->name('nepwupd');
 Route::post('/lockreg', 'HomeController@switchRegLock')->name('lockregon');
 Route::get('/lockoff', 'HomeController@switchRegLock')->name('lockregoff');
 Route::get('/useradd', 'HomeController@userAdd')->name('manualadd');
+Route::post('/plususer', 'HomeController@addNewUser')->name('addnewuser');