Liquid song table and Merged with downloads

database/factories/UserFactory.php

@@ -24,5 +24,6 @@ $factory->define(User::class, function (Faker $faker) {
         'email_verified_at' => now(),
         'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
         'remember_token' => Str::random(10),
+        'numLogin' => random_int(1,100),
     ];
 });

public/js/myScript.js

@@ -78,7 +78,7 @@ $(document).ready(function () {
     }
     function secToHMS(sec) {
         var date = new Date(0);
-        date.setSeconds(sec);
+        date.setSeconds(Math.round(sec));
         return date.toISOString().substr(11,8);
     }
     function playTimePos(audioID) {

resources/lang/ru/ui.php

@@ -1,9 +1,9 @@
 <?php
 
 return[
-    'h1_title' => 'Знаменное пение',
+    'h1_title' => 'Зна мен ное пение',
     'login' => 'Войти',
-    'register' => 'Регистрация',
+    'register' => 'Регистр.',
     'name' => 'ФИО',
     'pwd_lb' => 'Пароль',
     'pwd_lb2' => 'Подтвредите пароль',
@@ -14,8 +14,8 @@ return[
     'logout' => 'Выйти',
     'tb_title' => 'Название',
     'tb_ctrl' => 'Управление',
-    'tb_play' => 'Воспроизведние',
-    'tb_down' => 'Скачать',
+    'tb_play' => 'Воспроизведение',
+    'tb_down' => 'Загрузка',
     'tb_uname' => 'ФИО Пользователя',
     'badge_play' => 'Раз проиграно',
     'badge_down' => 'Раз скачано',

resources/views/home.blade.php

@@ -11,13 +11,11 @@
                         @auth
                         @if(Auth::user()->isAdmin)
                         <div class="btn-group">
-                            <div class="btn btn-sm btn-outline-primary text-left" id="fScan">
-                                <i class="fas fa-retweet"></i>
-                                {{ __('ui.rescan') }}
+                            <div class="btn btn-sm btn-outline-primary text-left" id="fScan" title="{{ __('ui.rescan') }}">
+                                <i class="fas fa-sync"></i>
                             </div>
-                            <a href="{{route('ucontrol')}}" class="btn btn-sm btn-outline-primary text-right">
+                            <a href="{{route('ucontrol')}}" class="btn btn-sm btn-outline-primary text-right" title="{{ __('ui.umanage') }}">
                                 <i class="fas fa-user-cog"></i>
-                                {{ __('ui.umanage') }}
                             </a>
                         </div>
                         @endif
@@ -35,19 +33,19 @@
                             <div class="alert alert-danger">{{ __('ui.login_req') }}</div>
                         @else
 
-                            <table class="table ">
-                                <thead class="thead-dark">
-                                <tr>
-                                    <th scope="col" class="col-8">{{__('ui.tb_title')}}</th>
-                                    <th scope="col" class="controls col-2"><i class="fas fa-play-circle"></i> {{__('ui.tb_play')}}</th>
-                                    <th scope="col" class="controls col-1" title="{{__('ui.tb_down')}}"><i class="fas fa-file-audio"></i></th>
-                                </tr>
-                                </thead>
-                                <tbody>
+                            <div class="container">
+
+                                <div class="row bg-dark text-light px-2 py-3 font-weight-bold">
+                                    <div class="col-sm ">{{__('ui.tb_title')}}</div>
+                                    <div class="col col-sm-3 controls text-truncate">
+                                        {{__('ui.tb_play')}} и {{__('ui.tb_down')}}
+                                    </div>
+                                </div>
+
                                 @foreach($song_list as $song)
                                     @if($song->type == 'dir')
-                                        <tr class="thead-light">
-                                            <th colspan="4">
+                                        <div class="row bg-light p-2 align-items-center" >
+                                            <div class="col-sm font-weight-bold">
                                                 @if(Auth::user()->isAdmin)
                                                     <div class="input-group">
                                                         <input type="text" class="form-control bg-light" value="{{$song->title}}">
@@ -61,15 +59,17 @@
                                                 @else
                                                 {{$song->title}}
                                                 @endif
-                                            </th>
-                                        </tr>
-                                        @elseif($song->type == 'txt')
-                                        <tr class="thead-light">
-                                            <th colspan="4" class="font-weight-lighter">{!! nl2br(e($song->description)) !!}</th>
-                                        </tr>
+                                            </div>
+                                        </div>
+                                    @elseif($song->type == 'txt')
+                                        <div class="row bg-light p-2 border-top border-bottom">
+                                            <div class="col-sm font-italic">{!! nl2br(e($song->description)) !!}</div>
+                                        </div>
                                     @else
-                                    <tr>
-                                        <td style="text-align: left;" class="text-left align-middle">
+
+                                    <div class="row p-2 border-bottom align-items-center">
+
+                                        <div class="text-left align-middle col-sm">
                                             @if(Auth::user()->isAdmin)
                                                 <div class="input-group">
                                                     <input type="text" class="form-control" value="{{$song->title}}">
@@ -83,15 +83,37 @@
                                             @else
                                                 {{$song->title}}
                                             @endif
-                                        </td>
-                                        <td class="controls btn-toolbar btn-group-vertical">
+                                            <!-- real html5 audio object -->
+                                                <audio id="audio_object_{{$song->id}}" audio_id="{{$song->id}}" class="audio" step="10">
+                                                    <source src="{{$song->file_name}}" type="audio/mpeg">
+                                                    {{ __('ui.err_play') }}
+                                                </audio>
+                                        </div>
+                                        <!--
+                                        <div class="controls col-sm col-sm-auto">
+                                            <div class="btn-group">
+                                                <a class="btn btn-sm btn-outline-success dw_btn"
+                                                   audio_id="{{$song->id}}" route="{{route('mdown', $song->id)}}"
+                                                   href="{{$song->file_name}}" target="_blank">
+                                                    <i class="fas fa-file-download"></i>
+                                                </a>
+                                                <div class="btn btn-sm btn-outline-success disabled" id="dw_num_{{$song->id}}"
+                                                     title="{{__('ui.badge_down')}}">
+                                                    {{ $song->downloads }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                        -->
+                                        <div class="controls col-md-auto btn-group-vertical btn-toolbar">
+
                                             <div class="btn-group">
                                                 <div class="btn btn-sm btn-primary disabled text-nowrap">
                                                     <span id="curTime_{{$song->id}}">00:00:00</span> - <span id="trkTime_{{$song->id}}">00:00:00</span>
                                                 </div>
                                                 <div class="btn-group">
-                                                    <div class="btn btn-sm btn-outline-primary dropdown-toggle" title="{{__('ui.fwbk_stpep')}}"
+                                                    <div class="btn btn-sm btn-outline-primary" title="{{__('ui.fwbk_stpep')}}"
                                                          data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                        <i class="fas fa-caret-square-down"></i>
                                                     </div>
                                                     <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" audio_id="{{$song->id}}">
                                                         <div class="dropdown-item disabled">{{__('ui.fwbk_stpep')}}</div>
@@ -101,13 +123,19 @@
                                                     </div>
                                                 </div>
                                                 <div class="btn btn-sm btn-outline-primary repeat_btn" audio_id="{{$song->id}}" title="{{__('ui.loop')}}">
-                                                    <i class="fas fa-sync-alt"></i>
+                                                    <i class="fas fa-retweet"></i>
                                                 </div>
                                                 <div class="btn btn-sm btn-outline-primary disabled" id="play_num_{{$song->id}}"
                                                      title="{{__('ui.badge_play')}}">
                                                     {{ $song->played }}
                                                 </div>
+
+                                                <div class="btn btn-sm btn-outline-success disabled" id="dw_num_{{$song->id}}" style="width: 30px; flex: initial"
+                                                     title="{{__('ui.badge_down')}}">
+                                                    {{ $song->downloads }}
+                                                </div>
                                             </div>
+
                                             <div class="btn-group" audio_id="{{$song->id}}">
                                                 <div class="btn btn-sm btn-outline-primary s_bkw" title="{{__('ui.s_bkw')}}" direction="1">
                                                     <i class="fas fa-backward"></i>
@@ -119,31 +147,20 @@
                                                 <div class="btn btn-sm btn-outline-primary s_fwd" title="{{__('ui.s_fwd')}}" direction="0">
                                                     <i class="fas fa-forward"></i>
                                                 </div>
-                                            </div>
-                                        </td>
-                                        <td class="controls">
-                                            <div class="btn-group-vertical">
-                                                <a class="btn btn-sm btn-outline-success dw_btn"
-                                                     audio_id="{{$song->id}}" route="{{route('mdown', $song->id)}}"
+
+                                                <a class="btn btn-sm btn-outline-success dw_btn" style="width: 30px; flex: initial"
+                                                   audio_id="{{$song->id}}" route="{{route('mdown', $song->id)}}"
                                                    href="{{$song->file_name}}" target="_blank">
                                                     <i class="fas fa-file-download"></i>
                                                 </a>
-                                                <div class="btn btn-sm btn-outline-success disabled" id="dw_num_{{$song->id}}"
-                                                     title="{{__('ui.badge_down')}}">
-                                                    {{ $song->downloads }}
-                                                </div>
                                             </div>
-                                            <!-- real html5 audio object -->
-                                            <audio id="audio_object_{{$song->id}}" audio_id="{{$song->id}}" class="audio" step="10">
-                                                <source src="{{$song->file_name}}" type="audio/mpeg">
-                                                {{ __('ui.err_play') }}
-                                            </audio>
-                                        </td>
-                                    </tr>
+
+                                        </div>
+
+                                    </div>
                                     @endif
                                 @endforeach
-                                </tbody>
-                            </table>
+                            </div>
 
                         @endguest
 

resources/views/layouts/app.blade.php

@@ -45,7 +45,9 @@
                 <a class="navbar-brand" href="{{ url('/') }}">
                     {{ __('ui.h1_title') }}
                 </a>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
+                <button class="navbar-toggler" type="button" data-toggle="collapse"
+                        data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
                     <span class="navbar-toggler-icon"></span>
                 </button>
 

resources/views/layouts/page.blade.php

@@ -67,8 +67,8 @@
 <div class="flex-center position-ref full-height">
     @if (Route::has('login'))
         <div class="top-right links">
-            <a href="/lang/en">🇬🇧</a>
-            <a href="/lang/ru">🇷🇺</a>
+            <a href="/lang/en">EN</a>
+            <a href="/lang/ru">RU</a>
             @auth
                 <a href="{{ url('/home') }}">🎧{{ __('ui.panel') }}</a>
             @else

resources/views/users.blade.php

@@ -12,17 +12,14 @@
                             @auth
                                 @if(Auth::user()->isAdmin)
                                     <div class="btn-group">
-                                        <a href="{{route('home')}}" class="btn btn-sm btn-outline-primary text-right">
-                                            <i class="fas fa-walking"></i>
-                                            {{ __('ui.back_catlog') }}
+                                        <a href="{{route('home')}}" class="btn btn-sm btn-outline-primary text-right" title="{{ __('ui.back_catlog') }}">
+                                            &larr;&nbsp;<i class="fas fa-walking"></i>
                                         </a>
-                                        <a href="{{route('ushutdown')}}" class="btn btn-sm btn-outline-primary text-right">
+                                        <a href="{{route('ushutdown')}}" class="btn btn-sm btn-outline-primary text-right" title="{{ __('ui.disable_all') }}">
                                             <i class="fas fa-user-slash"></i>
-                                            {{ __('ui.disable_all') }}
                                         </a>
-                                        <a href="{{route('ugreen')}}" class="btn btn-sm btn-outline-primary text-right">
+                                        <a href="{{route('ugreen')}}" class="btn btn-sm btn-outline-primary text-right" title="{{ __('ui.allow_all') }}">
                                             <i class="fas fa-user"></i>
-                                            {{ __('ui.allow_all') }}
                                         </a>
                                     </div>
                                 @endif

resources/views/welcome.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.page')
 
 @section('content')
-    <div class="title m-b-md">
+    <div class="title text-truncate text-wrap mx-5 px-3">
         {{ __('ui.h1_title') }}
     </div>