Revize eadc983d

Issue #8010 @3h

Uprava "Categories" podle specifikovaneho navrhu. Predelany ssytem vyberu categories, kde lze vybrat vice kategorii najednou a po stisknuti tlacitka ENTER se uzivatel prenese do seznamu vsech vybranych artefaktu.

app/Http/Controllers/ArtefactController.php

@@ -53 +53 @@
         }
     }
 
+    /**
+     * Returns view of artefacts related to the chosen category
+     *
+     * @param $id string with categories ids
+     * @return Factory|View
+     */
+    public function showCategories($id)
+    {
+        $textWithIds  = $id;
+        $pieces = explode(",", $textWithIds);
+        $artefacts = array();
+        for($i = 0;$i < count($pieces); $i++)
+        {
+            if($pieces[$i] == null || !strcmp($pieces[$i], ""))
+            {
+                continue;
+            }
+
+            $categoryArtefacts = ArtefactCategory::where('category_id', $pieces[$i])->get();
+            if(count($categoryArtefacts) > 0)
+            {
+                foreach($categoryArtefacts as $ar)
+                {
+                    array_push($artefacts, Artefact::where('id', $ar->artefact_id)->get());
+                }
+            }
+        }
+
+        if(count($artefacts) > 0)
+        {
+            return view('artefact.category', ['artefacts' => $artefacts]);
+        }
+        else
+        {
+            return view('artefact.category', ['artefacts' => array()]);
+        }
+    }
+
     /**
      * Returns view of single artefact given by its id.
      *

resources/lang/en/general.php

@@ -30 +30 @@
     'register' => 'register',
     'topics' => 'topics',
     'artefacts' => 'books',
-    'favourite_artefacts' => 'my books',
-    'favourite_metadata' => 'my notes',
+    'favourite_artefacts' => 'likes',
+    'favourite_metadata' => 'notes',
     'charts' => 'charts',
 
     /*

resources/sass/_custom.scss

@@ -713 +713 @@
         }
     }
 
+    .btn-dark:not(:disabled):not(.disabled).active{
+        background-color: $theme-color-four;
+        color:white;
+        border-color: $theme-color-five;
+    }
+
     //CATEGORY/{id} -h2 title NO ARTEFACTS
     .category-h2 {
         color: $theme-color-four;
@@ -726 +732 @@
         }
     }
 
+    //CATEGORIES - Main menu
+    .cat-main-menu{
+        font-size: 1.75rem;
+        text-align: center;
+        margin-bottom: 30pt;
+
+        a,a:visited{
+            color: $theme-color-two;
+            text-decoration: none;
+        }
+
+        a:hover{
+            color: $theme-color-four;
+        }
+
+    }
+
+    //CATEGORIES - Wrapper around Enter button
+    .cat-wrapper{
+        margin:auto;
+        display:block;
+        //align-content: center;
+        //margin:auto;
+        //display:block;
+    }
+
+    //CATEGORIES - Enter button
+    .btn.button-square.cat-enter-butt {
+        font-size: 8pt;
+        background-color: grey;
+        color: $theme-color-one;
+        border: 0.5pt solid $theme-color-one;
+        border-radius: 0;
+        bottom: 5%;
+        position: fixed;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 6.5rem;
+        height: 2rem;
+        font-weight: $font-weight-one;
+
+        &:active, &:focus, &:visited, &:hover {
+            outline: none;
+            box-shadow: none;
+            color: $theme-color-one;
+        }
+
+        &:hover {
+            color: $theme-color-four;
+        }
+    }
+
     //VERIFY - main text
     .ver-text{
 

resources/views/categories/index.blade.php

@@ -5 +5 @@
 @section('content')
     <div class="container">
         @if(isset($user))
-            {{--<p><?php dd($categories); ?></p>--}}
-            <div class="cat-main-div" onclick="resetEnter()">
+            <div class="row">
+                <div class="col cat-main-menu">
+                    <a  href="{{ url('/') }}">
+                        {{ __('general.home') }}
+                    </a>
+                </div>
+                <div class="col cat-main-menu">
+                    <a href="{{ url('/categories') }}">
+                        {{ __('general.topics') }}
+                    </a>
+                </div>
+                <div class="col cat-main-menu">
+                    <a href="{{ url('/artefact') }}">
+                        {{ __('general.artefacts') }}
+                    </a>
+                </div>
+                <div class="col cat-main-menu">
+                    <a href="{{ url('/favartefacts') }}">
+                        {{ __('general.favourite_artefacts') }}
+                    </a>
+                </div>
+                <div class="col cat-main-menu">
+                    <a href="{{ url('/favmetadata') }}">
+                        {{ __('general.favourite_metadata') }}
+                    </a>
+                </div>
+                <div class="col cat-main-menu">
+                    <a href="{{ url('/charts') }}">
+                        {{ __('general.charts') }}
+                    </a>
+                </div>
+                <div class="col cat-main-menu">
+                    <a href="{{ url('/czech') }}">
+                        {{ __('general.cs') }}
+                    </a>
+                </div>
+            </div>
+            <div class="cat-main-div" {{--onclick="resetEnter()"--}}>
                 <div class="head-title text-center cat-main-topic">
                     <h1>choose a topic</h1>
                 </div>
-                <div class="d-flex flex-wrap justify-content-around">
+                <div class="d-flex flex-wrap justify-content-around btn-group" data-toggle="buttons">
                     @for($k = 0; $k < $count;$k++)
-                        {{--                        <div class="d-flex cat-col-md-2">--}}
                         <div class="d-flex col-sm-12 col-md-6 col-lg-4 col-xl-3">
-                            <a href="{{ url('/category/' . $categoryNames[$k]->id) }}"
-                               class="btn btn-dark cat-tile w-100 mt-4">
+                            <a id="cat-but-id{{$categoryNames[$k]->id}}"{{--href="{{ url('/category/' . $categoryNames[$k]->id) }}"--}}
+                                class="btn btn-dark cat-tile w-100 mt-4">
                                 {{$categoryNames[$k]->nameCZ}}
                             </a>
                         </div>
@@ -30 +65 @@
             </ul>
         @endif
     </div>
+    <div class="cat-wrapper">
+        <a class="btn button-square cat-enter-butt" onclick="test()" role="button">enter</a>
+    </div>
+    <div class="row justify-content-md-center">
+        <div class="col-md-auto">
+{{--
+            <a class="btn button-square cat-enter-butt" onclick="test()" role="button">enter</a>
+--}}
+        </div>
+    </div>
+    <script>
+        function test()
+        {
+            var btns = $(".btn-dark:not(:disabled):not(.disabled).active");
+            if(btns.length > 0)
+            {
+                var text = "";
+                for(var i = 0; i < btns.length;i++)
+                {
+                    var idE =  btns[i].id;
+                    var num = idE.substring(10, idE.length);
+                    text += num + ",";
+                }
+                window.location.href = "{{url('/category/multi/')}}/" + text;
+            }
+        }
+    </script>
 @endsection

routes/web.php

@@ -21 +21 @@
 Route::post('/artefact/like/{id}', 'ArtefactController@like');
 Route::post('/artefact/unlike/{id}', 'ArtefactController@unlike');
 Route::get('/category/{id}', 'ArtefactController@showCategory');
+Route::get('/category/multi/{id}', 'ArtefactController@showCategories');
 Route::get('/detail/like/{id}', 'DetailsController@like');
 Route::get('/detail/unlike/{id}', 'DetailsController@unlike');
 Route::resource('/detail', 'DetailsController', array('only' => array('index', 'show')));