diff options
Diffstat (limited to 'site')
| -rw-r--r-- | site/app/Http/Controllers/OfferController.php | 6 | ||||
| -rw-r--r-- | site/config/app.php | 2 | ||||
| -rw-r--r-- | site/public/css/colors.css | 39 | ||||
| -rw-r--r-- | site/public/css/custom.css | 49 | ||||
| -rw-r--r-- | site/resources/views/offer.blade.php | 28 | ||||
| -rw-r--r-- | site/resources/views/snippets/footer.blade.php | 2 | ||||
| -rw-r--r-- | site/resources/views/snippets/navbar.blade.php | 4 | ||||
| -rw-r--r-- | site/resources/views/snippets/sortbuttons.blade.php | 20 |
8 files changed, 131 insertions, 19 deletions
diff --git a/site/app/Http/Controllers/OfferController.php b/site/app/Http/Controllers/OfferController.php index 563708f..392fb68 100644 --- a/site/app/Http/Controllers/OfferController.php +++ b/site/app/Http/Controllers/OfferController.php @@ -7,6 +7,7 @@ use Illuminate\Support\Facades\DB; use App\Http\Controllers\Controller; use Cookie; +use Carbon; use Illuminate\Support\Facades\Input; class OfferController extends Controller { @@ -70,6 +71,11 @@ class OfferController extends Controller { if ( "misc" == $view_name ) { $view_name = "Andere Angebote"; } + + /* + * For strftime() in view. + */ + setlocale(LC_TIME, 'de_DE.utf8'); return view('offer', ['data' => $data, 'spirit_type' => $view_name]); } diff --git a/site/config/app.php b/site/config/app.php index 138a41a..59d20f6 100644 --- a/site/config/app.php +++ b/site/config/app.php @@ -65,7 +65,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'Europe/Berlin', /* |-------------------------------------------------------------------------- diff --git a/site/public/css/colors.css b/site/public/css/colors.css new file mode 100644 index 0000000..be2d738 --- /dev/null +++ b/site/public/css/colors.css @@ -0,0 +1,39 @@ +.bg-primary, .bg-dark { + background-color: #1289A7 !important; + background-color: #0652DD !important; + background-color: #142639 !important; +} +a, .page-link { + color: #142639; + color: #406485; + color: #142639; + color: #12CBC4; + color: #0fb9b1; + color: #1289A7 ; +} +a:hover, .page-link:hover { + color: #0fb9b1; + color: #12CBC4; +} +a.u:hover, .page-link:hover { + text-decoration-style: dotted; +} +.navbar-light { + color: #424242 !important; +} + +.btn-secondary { + background-color: #406485 !important; + background-color: #778ca3 !important; + background-color: #d1d8e0 !important; + color: #142639 !important; +} +.btn-outline-success { + color: #1289A7 !important; + border: 1px solid #1289A7 !important; +} + +.text-primary { + color: #142639 !important; +} + diff --git a/site/public/css/custom.css b/site/public/css/custom.css index b718b50..742b363 100644 --- a/site/public/css/custom.css +++ b/site/public/css/custom.css @@ -58,3 +58,52 @@ opacity: 0.7; filter: grayscale(100%); } +.u { + text-decoration: underline; +} +.card { + /* + background-color: #d1d8e0; + box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); + box-shadow: 0 .25rem .75rem #d1d8e0; + border: 0.5px solid #d1d8e0 !important; + box-shadow: 1rem 1rem 1rem #d1d8e0 !important; + */ + box-shadow: 0rem 0rem .5rem .15rem #d1d8e0, 1rem 1rem 1rem #d1d8e0 !important; +} + +footer { + /* + background-color: #d1d8e0 !important; + box-shadow: -0.5rem 0 .1rem .15rem #d1d8e0; + box-shadow: 0 -0.5rem .1rem .05rem #d1d8e0; + */ + box-shadow: 0 -0.2rem .1rem .05rem #d1d8e0; +} +.jumbotron.box-shadow { + box-shadow: 0rem 0rem .5rem .15rem #d1d8e0, 1rem 1rem 1rem #d1d8e0 !important; +} +.text-fade-out { + position: absolute; + bottom: 45%; + left: 0; + width: 100%; + text-align: center; + margin: 0; padding: 8px 0; + background-image: linear-gradient(to bottom, transparent, white); +} +/* + * Not used. + */ +.created_at { + bottom: 5px; + /* + margin-top: 200%; + */ + position: absolute; + background-color: #d1d8e0 !important; + color: #142639 !important; + padding-left:5px; + padding-right: 5px; + opacity: 0.9; +} diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php index 7ff92d3..82b109c 100644 --- a/site/resources/views/offer.blade.php +++ b/site/resources/views/offer.blade.php @@ -2,7 +2,7 @@ @section('content') <div class="container"> - <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark"> + <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark bbg-white ttext-dark box-shadow"> <div class="col-md-6 px-0"> <h1 class="display-4 font-italic">{{ ucfirst($spirit_type) }}</h1> <!--p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Täglich neue Schnäppchen.</p--> @@ -32,6 +32,14 @@ foreach( $data as $offer) { <div class="card-body d-none d-md-flex flex-row align-items-start"> <div class="card-img-overlay" title="{{$offer->name}} :: {{ $offer->shop }}"> <p class="card-text bg-danger float-right rounded off-badge">{{ $offer->procent}}%</p> +<!-- + <p class="card-text h-100 float-right"> + <span class="bg-danger ffloat-right rounded off-badge">{{ $offer->procent}}%</span> + <span class="created_at d-flex ffloat-right rounded">{{ date("d.m.y", $offer->created_at) }}</span> + </p> +--> + + <!--p class="card-text created_at h-100 float-right d-flex fflex-column justify-content-end">{{ $offer->created_at}}</p--> </div> <div class="card-img-overlay w-55"> <div class="d-inline align-items-start text-left w-100 mb-2"> @@ -41,21 +49,27 @@ foreach( $data as $offer) { <h4 class="mb-0 hide-overflow h-45"> <a class="text-dark ttext-truncate hide-overflow" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a> + <span class="text-fade-out"></span> </h4> - <p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}</strong> + <p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}*</strong> <span class="float-right text-muted">{{ TF::fF($offer->base_price ) }}€/L</span> </p> <div class="mb-1 text-muted w-100"> <span class="float-right">{{ TF::fF($offer->volume) . " Liter" }}</span><span>{{ TF::fF($offer->abv) . "%" }} Alk.</span> </div> - <a href="{{ $offer->url }}">Jetzt bestellen</a> - <p class="text-muted text-small w-100 nmt-10"> + <a class="u" href="{{ $offer->url }}">Jetzt bestellen</a> + <p class="text-muted text-small w-100 nnmt-10"> Versand: {{ TF::fF($offer->shipping_costs) }}€ <span class=" float-right">Gratis ab {{ $offer->free_shipping }}</span> + <br> +<!-- + <span class=" float-right">{{ date("d.m.Y", $offer->created_at) }}</span> +--> + <span class=" float-right">* Preis vom {{ strftime("%d. %B", $offer->created_at) }}</span> </p> </div> </div> - <img class="card-img-right flex-auto d-none d-md-block img-thumbnail" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}"> + <img class="card-img-right flex-auto d-none d-md-block border-left-0 img-thumbnail" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}"> <!-- <= sm --> <!-- Maybe make the image a link @@ -85,12 +99,14 @@ foreach( $data as $offer) { <span class="float-right">{{ TF::fF($offer->volume) . " Liter" }}</span><span>{{ TF::fF($offer->abv) . "%" }} Alk.</span> </div> - <p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}</strong> + <p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}*</strong> <span class="float-right text-muted">{{ TF::fF($offer->base_price ) }}€/L</span> </p> <strong><a href="{{ $offer->url }}" class="text-large">Jetzt bestellen</a></strong> <p class="text-muted text-small w-100 nmt-10"> Versand: {{ TF::fF($offer->shipping_costs) }}€ <span class=" float-right">Gratis ab {{ $offer->free_shipping }}</span> + <br> + <span class=" float-right">* Preis vom {{ strftime("%d. %B", $offer->created_at) }}</span> </p> </div> </div> diff --git a/site/resources/views/snippets/footer.blade.php b/site/resources/views/snippets/footer.blade.php index 80ea21e..c0365a4 100644 --- a/site/resources/views/snippets/footer.blade.php +++ b/site/resources/views/snippets/footer.blade.php @@ -1,4 +1,4 @@ -<footer class="footer"> +<footer class="footer border-top"> <div class="container"> <div class="row"> <div class="col"> diff --git a/site/resources/views/snippets/navbar.blade.php b/site/resources/views/snippets/navbar.blade.php index f9f1860..51387da 100644 --- a/site/resources/views/snippets/navbar.blade.php +++ b/site/resources/views/snippets/navbar.blade.php @@ -1,6 +1,6 @@ <header> <!-- Fixed navbar --> - <nav class="navbar navbar-expand-md navbar-dark ffixed-top bg-dark"> + <nav class="navbar navbar-expand-md navbar-dark ffixed-top bg-primary nnavbar-light"> <a class="navbar-brand" href="/">Alkobote.de</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> @@ -27,7 +27,7 @@ </li> </ul> <form class="form-inline mt-2 mt-md-0"> - <input class="form-control mr-sm-2" type="text" placeholder="Suchen" aria-label="Search"> + <input class="form-control mr-sm-2" type="text" placeholder="Suchen… zB Glenfiddich" aria-label="Search"> <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Suchen</button> </form> </div> diff --git a/site/resources/views/snippets/sortbuttons.blade.php b/site/resources/views/snippets/sortbuttons.blade.php index fd568fa..bf99649 100644 --- a/site/resources/views/snippets/sortbuttons.blade.php +++ b/site/resources/views/snippets/sortbuttons.blade.php @@ -1,9 +1,9 @@ <div class="container"> <div class="row"> -<div class="btn-toolbar mb-2 align-top" role="toolbar" aria-label="Sortieren"> +<div class="btn-toolbar mb-2 align-top " role="toolbar" aria-label="Sortieren"> <div class="btn-group" role="group" aria-label="Sortieren"> - <div class="dropdown"> + <div class="dropdown mr-2"> <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Preis </button> @@ -12,8 +12,8 @@ <a class="dropdown-item" href="?sort=price&order=desc">Höchster Preis</a> </div> </div> - <div class="dropdown"> - <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <div class="dropdown mr-2"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Name </button> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> @@ -21,8 +21,8 @@ <a class="dropdown-item" href="?sort=name&order=desc">Umgekehrt</a> </div> </div> - <div class="dropdown"> - <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <div class="dropdown mr-2"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Shop </button> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> @@ -30,8 +30,10 @@ <a class="dropdown-item" href="?sort=shop&order=desc">Umgekehrt</a> </div> </div> - <div class="dropdown"> - <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + </div> + <div class="btn-group" role="group" aria-label="Sortieren"> + <div class="dropdown mr-2"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Preisnachlass </button> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> @@ -40,7 +42,7 @@ </div> </div> <div class="dropdown"> - <button class="ml-2 btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Aktualität </button> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> |