diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index f883236f..84b6c3c6 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -131,8 +131,25 @@ class Controller extends BaseController public function __call($method, $arguments) { if(substr($method, 0, 5) == 'view_') { $view = substr($method, 5); - if(view()->exists($view)) { return view($view); } + if(view()->exists($view)) { return view($view, $this->getSidebareData()); } } return abort(404); } + + public function getSidebareData() + { + $populair = []; + $apiResult = $this->API('nieuws/populair?aantal=5'); + foreach ($apiResult as $_newsItem) { + $populair[] = new \Model\NewsItem($_newsItem); + } + + $newsItems = []; + $apiResult = $this->API('nieuws/overzicht?aantal=5'); + foreach ($apiResult->news as $_newsItem) { + $newsItems[] = new \Model\NewsItem($_newsItem); + } + + return ['newsItems' => $newsItems, 'populair' => $populair]; + } } diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 1e31bfcc..d9306a72 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -35,19 +35,9 @@ class NewsController extends Controller $newsItem->video = null; // Videos will be embedded $newsItem->content = $source->blocks; - $populair = []; - $apiResult = $this->API('nieuws/populair?aantal=5'); - foreach ($apiResult as $_newsItem) { - $populair[] = new \Model\NewsItem($_newsItem); - } - $newsItems = []; - $apiResult = $this->API('nieuws/overzicht?aantal=5'); - foreach ($apiResult->news as $_newsItem) { - $newsItems[] = new \Model\NewsItem($_newsItem); - } - return view('newsitem', ['newsItems' => $newsItems, 'populair' => $populair, 'news' => $newsItem, 'metadata' => $newsItem->metadata]); + return view('newsitem', array_merge($this->getSidebareData(), ['news' => $newsItem, 'metadata' => $newsItem->metadata])); } } diff --git a/app/Http/Controllers/RadioController.php b/app/Http/Controllers/RadioController.php index 32790d00..6eeb9cfb 100644 --- a/app/Http/Controllers/RadioController.php +++ b/app/Http/Controllers/RadioController.php @@ -7,32 +7,47 @@ use \Model\Programma; class RadioController extends Controller { - public function schedule(Request $request, $shiftWeeks = 0) + public function schedule(Request $request, $date = '') { - $apiResult = $this->API('programma/schema/week/' . (int)$shiftWeeks); + $apiResult = $this->API('programma/schema/week/0'); $start = self::JsonToDateTime($apiResult->startdate); $end = self::JsonToDateTime($apiResult->enddate); $schedule = []; foreach($apiResult->schedule as $program) { - $schedule[] = [ + $schedule[self::JsonToDateTime($program->start)->format('Ymd')][] = [ 'starttime' => self::JsonToDateTime($program->start), 'endtime' => self::JsonToDateTime($program->end), - 'shift' => (int)$shiftWeeks, + 'shift' => 0, 'program' => new \Model\Program($program->program) ]; } - return view($request->ajax() ? 'radioscheduleweek' : 'radioschedule', ['start' => $start, 'end' => $end, 'schedule' => $schedule, 'shift' => $shiftWeeks]); + if ($date) { + $days = [ + 'custom' => (new \DateTime($date))->format('Ymd'), + ]; + } else { + $days = [ + 'day_before_yesterday' => (new \DateTime("-2 day"))->format('Ymd'), + 'yesterday' => (new \DateTime("yesterday"))->format('Ymd'), + 'today' => (new \DateTime("now"))->format('Ymd'), + 'tomorrow' => (new \DateTime("+1 day"))->format('Ymd'), + 'day_after_tomorrow' => (new \DateTime("+2 day"))->format('Ymd'), + 'custom' => (new \DateTime($date))->format('Ymd'), + ]; + } + + return view($request->ajax() ? 'partial/radioscheduleweek' : 'radioschedule', ['start' => $start, 'end' => $end, 'schedule' => $schedule, 'shift' => 0, 'days' => $days, 'date' => $date]); } - + public function onair() { $data = $this->API('programma/schema/onair'); return response()->json($data); } - public function program($id) + public function program($id) { $apiResult = $this->API('programma/details/' . (int)$id); return view('radioprogram', ['program' => new \Model\Program($apiResult)]); @@ -45,7 +60,7 @@ class RadioController extends Controller $podcast = new \Model\Podcast($apiResult); $related = []; - if($podcast->program != null) + if($podcast->program != null) { $apiRelated = $this->API("podcast/programma/{$podcast->program->id}?date={$podcast->created->format('Y-m-d')}"); foreach($apiRelated->podcasts as $relatedItem) @@ -54,7 +69,7 @@ class RadioController extends Controller } } - return view('podcastitem', ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'related' => $related, 'searchURL' => 'gemist/zoeken']); + return view('podcastitem', array_merge($this->getSidebareData(), ['podcast' => $podcast, 'metadata' => $podcast->metadata, 'related' => $related, 'searchURL' => 'gemist/zoeken'])); } public function podcasts(Request $request, $programma = null) @@ -65,14 +80,14 @@ class RadioController extends Controller $action = 'programma/' . (int)$programma; $viewData['program'] = new \Model\Program($this->API('programma/details/' . (int)$programma)); } - - return $this->getPodcastList($request, $action, $viewData); + + return $this->getPodcastList($request, $action, array_merge($this->getSidebareData(), $viewData)); } public function searchpodcast(Request $request, $query) { return $this->getPodcastList($request, 'zoeken/' . $query)->with('query', urldecode($query)); - } + } public function terugluisteren(Request $request) { @@ -89,9 +104,9 @@ class RadioController extends Controller } } - return view('programlist', ['programs' => array_reverse($programs)]); + return view('programlist', array_merge($this->getSidebareData(), ['programs' => array_reverse($programs)])); } - + private function getPodcastList(Request $request, $action, $viewData = []) { $page = (int)$request->get('pagina', 1); diff --git a/public/css/airplay.png b/public/css/airplay.png new file mode 100644 index 00000000..eb6c03ed Binary files /dev/null and b/public/css/airplay.png differ diff --git a/public/css/airplay.svg b/public/css/airplay.svg new file mode 100644 index 00000000..e11f0081 --- /dev/null +++ b/public/css/airplay.svg @@ -0,0 +1 @@ +7 \ No newline at end of file diff --git a/public/css/chromecast.png b/public/css/chromecast.png new file mode 100644 index 00000000..320fe006 Binary files /dev/null and b/public/css/chromecast.png differ diff --git a/public/css/chromecast.svg b/public/css/chromecast.svg new file mode 100644 index 00000000..c3a88f1a --- /dev/null +++ b/public/css/chromecast.svg @@ -0,0 +1 @@ +5 \ No newline at end of file diff --git a/public/css/components/posts.css.map b/public/css/components/posts.css.map new file mode 100644 index 00000000..7124fe73 --- /dev/null +++ b/public/css/components/posts.css.map @@ -0,0 +1 @@ +{"version":3,"sourceRoot":"","sources":["../../../resources/assets/sass/components/posts.scss","../../../resources/assets/sass/abstracts/_mixin.scss"],"names":[],"mappings":"AAEE;EACE;ECAF;EACA;EACA;EDAE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAIN;ECzBA;EACA;EACA;EDyBE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EAEA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAIJ;ECvGF;EACA;EACA;;ADwGI;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAKN;EACE;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE","file":"posts.css"} \ No newline at end of file diff --git a/public/css/jumpforward.png b/public/css/jumpforward.png new file mode 100644 index 00000000..69f27ca1 Binary files /dev/null and b/public/css/jumpforward.png differ diff --git a/public/css/jumpforward.svg b/public/css/jumpforward.svg new file mode 100644 index 00000000..4a79c8e7 --- /dev/null +++ b/public/css/jumpforward.svg @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/public/css/mediaplayer_plugins.min.css b/public/css/mediaplayer_plugins.min.css new file mode 100644 index 00000000..f29cc4d5 --- /dev/null +++ b/public/css/mediaplayer_plugins.min.css @@ -0,0 +1 @@ +.mejs-airplay-button>button,.mejs__airplay-button>button{background:url(airplay.svg) no-repeat 0 4px}.mejs-airplay-button>button .fill,.mejs__airplay-button>button .fill{fill:#fff}.mejs-airplay-button>button.active .fill,.mejs__airplay-button>button.active .fill{fill:#66a8cc}.mejs-chromecast-button>button,.mejs__chromecast-button>button{--disconnected-color:#fff;background:none;display:inline-block}.mejs-chromecast-container,.mejs__chromecast-container{background:#000;color:#fff;font-size:10px;left:0;padding:5px;position:absolute;top:0;z-index:1}.mejs-chromecast-layer>img,.mejs__chromecast-layer>img{left:0;position:absolute;top:0;z-index:0}.mejs-chromecast-icon,.mejs__chromecast-icon{background:url(chromecast.svg) no-repeat 0 0;display:inline-block;height:14px;margin-right:5px;width:17px}.mejs-contextmenu,.mejs__contextmenu{background:#fff;border:1px solid #999;border-radius:4px;left:0;padding:10px;position:absolute;top:0;width:150px;z-index:1}.mejs-contextmenu-separator,.mejs__contextmenu-separator{background:#333;font-size:0;height:1px;margin:5px 6px}.mejs-contextmenu-item,.mejs__contextmenu-item{color:#333;cursor:pointer;font-size:12px;padding:4px 6px}.mejs-contextmenu-item:hover,.mejs__contextmenu-item:hover{background:#2c7c91;color:#fff}.mejs-jump-forward-button>button,.mejs__jump-forward-button>button{background:url(jumpforward.svg) no-repeat 0 0;color:#fff;font-size:8px;line-height:normal;position:relative}.mejs-skip-back-button>button,.mejs__skip-back-button>button{background:url(skipback.svg) no-repeat 0 -1px;color:#fff;font-size:8px;line-height:normal;position:relative} \ No newline at end of file diff --git a/public/css/skipback.png b/public/css/skipback.png new file mode 100644 index 00000000..edeb9f49 Binary files /dev/null and b/public/css/skipback.png differ diff --git a/public/css/skipback.svg b/public/css/skipback.svg new file mode 100644 index 00000000..12e1c643 --- /dev/null +++ b/public/css/skipback.svg @@ -0,0 +1,17 @@ + + + + +2 + + + + + + + + diff --git a/public/css/style.css b/public/css/style.css index df4af12a..ad1bf7b6 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -396,13 +396,26 @@ display: flex; justify-content: space-between; } +.tabs.fit_content { + width: fit-content; +} +.tabs .box_header { + padding-right: 20px; +} +.tabs .box_header:last-of-type { + padding-right: 0; +} .tabs .box_header span { color: #999; border-bottom: none; cursor: pointer; + padding-bottom: 3px; +} +.tabs .box_header.extra-small span { + font-size: 12px; } .tabs .box_header.small span { - font-size: 13px; + font-size: 14px; } .tabs .box_header.medium span { font-size: 18px; @@ -410,6 +423,7 @@ .tabs .box_header.active span, .tabs .box_header:hover span { color: #0f259d; border-bottom: 3px solid #0f259d; + padding-bottom: 0; } .tab_content { @@ -432,17 +446,18 @@ height: 100%; object-fit: cover; } -.blog .post h2 { +.blog .post .post_title { margin: 0; -} -.blog .post h2 a { font-family: Montserrat, serif; font-size: 14px; font-weight: 600; line-height: 1.43; color: #1a1a1a; +} +.blog .post .post_title a { text-decoration: none; display: inline-block; + color: #1a1a1a; } .blog .post .col-8 { padding: 0; @@ -461,6 +476,16 @@ overflow: hidden; white-space: nowrap; } +.blog .post .disabled { + color: #A1A1A1; + cursor: not-allowed; +} +.blog .post .post_body { + font-family: Nunito, serif; + font-size: 15px; + line-height: 1.6; + color: #282828; +} .sidebar .box { width: calc(100% - 38px); @@ -641,6 +666,40 @@ white-space: nowrap; } +.bread_crumb { + height: 38px; + margin: 0; + padding: 0; + list-style: none; +} +.bread_crumb li { + float: left; + font-family: Nunito, serif; + font-size: 12px; + font-weight: 500; + line-height: 3.17; + text-align: left; + color: #666; + margin-right: 5px; +} +.bread_crumb li a { + color: #666; + text-decoration: none; +} +.bread_crumb li i { + font-size: 8px; +} + +.page_title { + margin: 17px 0; + font-family: Montserrat, serif; + font-size: 40px; + font-weight: 600; + line-height: 1.15; + text-align: left; + color: #282828; +} + .post_container { padding: 40px 135px; background-color: #f9f9f9; @@ -651,30 +710,9 @@ margin-right: 50px; } .post_container .bread_crumb { - height: 38px; - margin: 0; - padding: 0; - list-style: none; border-bottom: 1px solid #efefef; padding-bottom: 18px; } -.post_container .bread_crumb li { - float: left; - font-family: Nunito, serif; - font-size: 12px; - font-weight: 500; - line-height: 3.17; - text-align: left; - color: #666; - margin-right: 5px; -} -.post_container .bread_crumb li a { - color: #666; - text-decoration: none; -} -.post_container .bread_crumb li i { - font-size: 8px; -} .post_container .post_tags { margin: 0; padding: 0; @@ -699,15 +737,6 @@ text-decoration: none; text-transform: uppercase; } -.post_container h1 { - margin: 17px 0; - font-family: Montserrat, serif; - font-size: 40px; - font-weight: 600; - line-height: 1.15; - text-align: left; - color: #282828; -} .post_container .post_body { width: 100%; font-family: Nunito, serif; @@ -792,6 +821,88 @@ color: #ED1C24; } +#schedule a { + text-decoration: none; +} +#schedule .program-title { + font-family: Montserrat, serif; + font-size: 14px; + font-weight: 600; + line-height: 1.43; + color: #1a1a1a; +} +#schedule .program-times { + display: block; + height: 30px; + font-family: Nunito, serif; + font-size: 12px; + font-weight: 500; + line-height: 3.17; + letter-spacing: normal; + text-align: left; + color: #666; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} +#schedule .no-results, #schedule .loading { + font-family: Montserrat, serif; + font-size: 14px; + font-weight: 600; + line-height: 1.43; + color: #1a1a1a; + text-align: center; + padding: 20px; +} +#schedule .no-results span, #schedule .loading span { + margin-right: 10px; +} + +.page_container { + background-color: #fff; + width: calc(100% - 270px); + padding: 32px 135px; +} +.page_container.grey-background { + background-color: #f9f9f9; +} + +.page_body { + font-family: Nunito, serif; + font-size: 15px; + line-height: 1.6; + color: #282828; +} + +.action_button { + text-decoration: none; + color: #282828; +} + +.input_container { + border: 1px solid #efefef; + border-radius: 5px; + background-color: #fff; + display: flex; + height: 48px; + font-family: Montserrat, serif; + font-size: 16px; + line-height: 1.25; + color: #1a1a1a; +} +.input_container .input_prefix, .input_container .input_postfix { + padding: 13px 10px 13px 15px; +} +.input_container input { + border: none; + padding: 13px 5px; + font-family: Montserrat, serif; + font-size: 16px; + font-weight: 600; + line-height: 1.25; + color: #1a1a1a; +} + .footer_container { font-family: Montserrat, serif; font-size: 14px; diff --git a/public/css/style.css.map b/public/css/style.css.map index 4ed320ca..550dc5b1 100644 --- a/public/css/style.css.map +++ b/public/css/style.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../resources/assets/sass/abstracts/_fonts.scss","../../resources/assets/sass/base/_clearfix.scss","../../resources/assets/sass/base/_container.scss","../../resources/assets/sass/components/_button.scss","../../resources/assets/sass/components/_header.scss","../../resources/assets/sass/components/_menu.scss","../../resources/assets/sass/abstracts/_mixin.scss","../../resources/assets/sass/abstracts/_variables.scss","../../resources/assets/sass/components/_now-playing.scss","../../resources/assets/sass/components/_main_news.scss","../../resources/assets/sass/components/_box.scss","../../resources/assets/sass/components/_blog.scss","../../resources/assets/sass/components/_sidebar.scss","../../resources/assets/sass/components/_radio_box.scss","../../resources/assets/sass/components/_contact_box.scss","../../resources/assets/sass/components/_featured.scss","../../resources/assets/sass/components/_podcast_items.scss","../../resources/assets/sass/components/_post.scss","../../resources/assets/sass/components/_footer.scss"],"names":[],"mappings":";AAAQ;AACA;AACA;ACFR;EACE;EACA;EACA;;;ACHF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;ACPF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AClBJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACLF;EACE;EACA;EACA;;AAEA;ECLA;EACA;EACA;EDKE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA,OEUS;EFTT,aEUU;EFTV,WEUQ;EFTR;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAMV;EACE;;AAEA;EACE;EC9FF;EACA;EACA;;AD+FE;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;;AAMR;EACE;;AAEA;EACE;EACA;;AAGF;EC/IA;EACA;EACA;;AD+IE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGE;EACE;;AACA;EACE;;AAIN;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AGrMR;EACE;;;AAEF;EACE;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC/CV;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EAEA;;AAEA;EH/BJ;EACA;EACA;;AGgCM;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA,OFdiB;EEejB;;AAEF;EACE;EACA;;AAEF;EH1DJ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EGiDM,OFvBiB;;;AG7CzB;EAWE;;AAVA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAGJ;EACE;EACA;;AAEE;EACE;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAIA;EACE;EACA;;;AAKR;EACE;;AACA;EACE;;;ACrDJ;ELCE;EACA;EACA;;AKAA;EACE;;AAEA;EACE;EACA;EACA;;AAEF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAGF;ELvBF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AMnBF;EACE;;;ACCF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EPNA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AOAA;EACE;EACA;EACA;EACA;EACA;EACA;;;ACvBJ;EACE;;AACA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;ERLA;EACA;EACA;EACA;EACA;EACA;;;ASzBA;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;ET2BA;EACA;;AACA;EAhBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AASA;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;ASIA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AC3BF;EVAA;EACA;EACA;;AUCE;EACE;;AACA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EVwBJ;EACA;;AACA;EAhBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AASA;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AWlBF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EXTF;EACA;EACA;EWSE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAIN;EXlCA;EACA;EACA;EWkCE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EAEA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAIJ;EXhHF;EACA;EACA;;AWiHI;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAKN;EACE;EACA;;AAEF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AC5JN;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EZ5DA;EACA;EACA;;AY6DE;EACE;EACA;;AAEA;EACE;;AAKN;EACE;EZ1EF;EACA;EACA;;AY2EE;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;AAEF;EACE","file":"style.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../resources/assets/sass/abstracts/_fonts.scss","../../resources/assets/sass/base/_clearfix.scss","../../resources/assets/sass/base/_container.scss","../../resources/assets/sass/components/_button.scss","../../resources/assets/sass/components/_header.scss","../../resources/assets/sass/components/_menu.scss","../../resources/assets/sass/abstracts/_mixin.scss","../../resources/assets/sass/abstracts/_variables.scss","../../resources/assets/sass/components/_now-playing.scss","../../resources/assets/sass/components/_main_news.scss","../../resources/assets/sass/components/_box.scss","../../resources/assets/sass/components/_blog.scss","../../resources/assets/sass/components/_sidebar.scss","../../resources/assets/sass/components/_radio_box.scss","../../resources/assets/sass/components/_contact_box.scss","../../resources/assets/sass/components/_featured.scss","../../resources/assets/sass/components/_podcast_items.scss","../../resources/assets/sass/components/_bread_crumb.scss","../../resources/assets/sass/components/_page_title.scss","../../resources/assets/sass/components/_post.scss","../../resources/assets/sass/components/_schedule.scss","../../resources/assets/sass/components/_page.scss","../../resources/assets/sass/components/_input.scss","../../resources/assets/sass/components/_footer.scss"],"names":[],"mappings":";AAAQ;AACA;AACA;ACFR;EACE;EACA;EACA;;;ACHF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;ACPF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AClBJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACLF;EACE;EACA;EACA;;AAEA;ECLA;EACA;EACA;EDKE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA,OEUS;EFTT,aEUU;EFTV,WEUQ;EFTR;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAMV;EACE;;AAEA;EACE;EC9FF;EACA;EACA;;AD+FE;EACE;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;;AAMR;EACE;;AAEA;EACE;EACA;;AAGF;EC/IA;EACA;EACA;;AD+IE;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGE;EACE;;AACA;EACE;;AAIN;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AGrMR;EACE;;;AAEF;EACE;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC/CV;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EAEA;;AAEA;EH/BJ;EACA;EACA;;AGgCM;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA,OFdiB;EEejB;;AAEF;EACE;EACA;;AAEF;EH1DJ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EGiDM,OFvBiB;;;AG7CzB;EAWE;;AAVA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAGJ;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;;AAGF;EACE;;AAIA;EACE;EACA;EACA;;;AAKR;EACE;;AACA;EACE;;;AClEJ;ELCE;EACA;EACA;;AKAA;EACE;;AAEA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAIJ;EACE;;AAGF;ELxBF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AKiBE;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AC7CN;EACE;;;ACCF;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAGF;EPNA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AOAA;EACE;EACA;EACA;EACA;EACA;EACA;;;ACvBJ;EACE;;AACA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;ERLA;EACA;EACA;EACA;EACA;EACA;;;ASzBA;EACE;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;ET2BA;EACA;;AACA;EAhBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AASA;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;ASIA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AC3BF;EVAA;EACA;EACA;;AUCE;EACE;;AACA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EVwBJ;EACA;;AACA;EAhBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AASA;EA3CA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AWjBF;EACE;EXAA;EACA;EACA;;AWCA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;;ACtBN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;ACLF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAGF;EbdA;EACA;EACA;EacE;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIN;EACE;EAEA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAIJ;EbnFF;EACA;EACA;;AaoFI;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;;AAKN;EACE;EACA;;AAEF;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;;AC9HJ;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EdLA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AcHA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;ACzBN;EACE;EACA;EACA;;AACA;EACE;;;AAGJ;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AChBF;EACE;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EAEA;EACA;EACA;EACA;EACA;;;ACtBJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE;;AAEA;EACE;EACA;EACA;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EjB5DA;EACA;EACA;;AiB6DE;EACE;EACA;;AAEA;EACE;;AAKN;EACE;EjB1EF;EACA;EACA;;AiB2EE;EACE;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;;AAEF;EACE","file":"style.css"} \ No newline at end of file diff --git a/resources/assets/sass/components/_blog.scss b/resources/assets/sass/components/_blog.scss index 0bc955a4..d92af9bf 100644 --- a/resources/assets/sass/components/_blog.scss +++ b/resources/assets/sass/components/_blog.scss @@ -11,17 +11,18 @@ height: 100%; object-fit: cover; } - h2 { + .post_title { margin: 0; + font-family: Montserrat, serif; + font-size: 14px; + font-weight: 600; + line-height: 1.43; + color: #1a1a1a; a { - font-family: Montserrat, serif; - font-size: 14px; - font-weight: 600; - line-height: 1.43; - color: #1a1a1a; text-decoration: none; display: inline-block; + color: #1a1a1a; } } @@ -32,5 +33,17 @@ .post_date { @include post_date; } + + .disabled { + color: #A1A1A1; + cursor: not-allowed; + } + + .post_body { + font-family: Nunito, serif; + font-size: 15px; + line-height: 1.6; + color: #282828; + } } -} \ No newline at end of file +} diff --git a/resources/assets/sass/components/_box.scss b/resources/assets/sass/components/_box.scss index ecbd00d7..e25ede41 100644 --- a/resources/assets/sass/components/_box.scss +++ b/resources/assets/sass/components/_box.scss @@ -27,15 +27,27 @@ .tabs { display: flex; justify-content: space-between; + &.fit_content { + width: fit-content; + } .box_header { + padding-right: 20px; + &:last-of-type { + padding-right: 0; + } span { color: #999; border-bottom: none; cursor: pointer; + padding-bottom: 3px; + } + + &.extra-small span { + font-size: 12px; } &.small span { - font-size: 13px; + font-size: 14px; } &.medium span { @@ -46,6 +58,7 @@ span { color: #0f259d; border-bottom: 3px solid #0f259d; + padding-bottom: 0; } } } diff --git a/resources/assets/sass/components/_bread_crumb.scss b/resources/assets/sass/components/_bread_crumb.scss new file mode 100644 index 00000000..52238f84 --- /dev/null +++ b/resources/assets/sass/components/_bread_crumb.scss @@ -0,0 +1,26 @@ +@use "../abstracts/mixin" as *; + +.bread_crumb { + height: 38px; + @include reset-list; + + li { + float: left; + font-family: Nunito, serif; + font-size: 12px; + font-weight: 500; + line-height: 3.17; + text-align: left; + color: #666; + margin-right: 5px; + + a { + color: #666; + text-decoration: none; + } + + i { + font-size: 8px; + } + } +} diff --git a/resources/assets/sass/components/_input.scss b/resources/assets/sass/components/_input.scss new file mode 100644 index 00000000..5ec29aac --- /dev/null +++ b/resources/assets/sass/components/_input.scss @@ -0,0 +1,27 @@ +.input_container { + border: 1px solid #efefef; + border-radius: 5px; + background-color: #fff; + display: flex; + height: 48px; + + font-family: Montserrat, serif; + font-size: 16px; + line-height: 1.25; + color: #1a1a1a; + + .input_prefix, .input_postfix { + padding: 13px 10px 13px 15px; + } + + input { + border: none; + padding: 13px 5px; + + font-family: Montserrat, serif; + font-size: 16px; + font-weight: 600; + line-height: 1.25; + color: #1a1a1a; + } +} diff --git a/resources/assets/sass/components/_page.scss b/resources/assets/sass/components/_page.scss new file mode 100644 index 00000000..8f6bebb7 --- /dev/null +++ b/resources/assets/sass/components/_page.scss @@ -0,0 +1,18 @@ +.page_container { + background-color: #fff; + width: CALC(100% - 270px); + padding: 32px 135px; + &.grey-background { + background-color: #f9f9f9; + } +} +.page_body { + font-family: Nunito, serif; + font-size: 15px; + line-height: 1.6; + color: #282828; +} +.action_button { + text-decoration: none; + color: #282828; +} diff --git a/resources/assets/sass/components/_page_title.scss b/resources/assets/sass/components/_page_title.scss new file mode 100644 index 00000000..66e4c3ea --- /dev/null +++ b/resources/assets/sass/components/_page_title.scss @@ -0,0 +1,9 @@ +.page_title { + margin: 17px 0; + font-family: Montserrat, serif; + font-size: 40px; + font-weight: 600; + line-height: 1.15; + text-align: left; + color: #282828; +} diff --git a/resources/assets/sass/components/_post.scss b/resources/assets/sass/components/_post.scss index 4a204000..969d3c70 100644 --- a/resources/assets/sass/components/_post.scss +++ b/resources/assets/sass/components/_post.scss @@ -1,4 +1,5 @@ @use "../abstracts/mixin" as *; + .post_container { padding: 40px 135px; background-color: #f9f9f9; @@ -10,31 +11,10 @@ } .bread_crumb { - height: 38px; - @include reset-list; border-bottom: 1px solid #efefef; padding-bottom: 18px; - - li { - float: left; - font-family: Nunito, serif; - font-size: 12px; - font-weight: 500; - line-height: 3.17; - text-align: left; - color: #666; - margin-right: 5px; - - a { - color: #666; - text-decoration: none; - } - - i { - font-size: 8px; - } - } } + .post_tags { @include reset-list; height: 31px; @@ -59,15 +39,6 @@ } } } - h1 { - margin: 17px 0; - font-family: Montserrat, serif; - font-size: 40px; - font-weight: 600; - line-height: 1.15; - text-align: left; - color: #282828; - } .post_body { width: 100%; diff --git a/resources/assets/sass/components/_program.scss b/resources/assets/sass/components/_program.scss new file mode 100644 index 00000000..e69de29b diff --git a/resources/assets/sass/components/_schedule.scss b/resources/assets/sass/components/_schedule.scss new file mode 100644 index 00000000..6841f793 --- /dev/null +++ b/resources/assets/sass/components/_schedule.scss @@ -0,0 +1,29 @@ +@use "../abstracts/mixin" as *; + +#schedule { + a { + text-decoration: none; + } + .program-title { + font-family: Montserrat, serif; + font-size: 14px; + font-weight: 600; + line-height: 1.43; + color: #1a1a1a; + } + .program-times { + @include post_date; + } + .no-results, .loading { + font-family: Montserrat, serif; + font-size: 14px; + font-weight: 600; + line-height: 1.43; + color: #1a1a1a; + text-align: center; + padding: 20px; + span { + margin-right: 10px; + } + } +} diff --git a/resources/assets/sass/layout/_gids.scss b/resources/assets/sass/layout/_gids.scss new file mode 100644 index 00000000..2d385816 --- /dev/null +++ b/resources/assets/sass/layout/_gids.scss @@ -0,0 +1 @@ +@use "../components/schedule"; diff --git a/resources/assets/sass/layout/_index.scss b/resources/assets/sass/layout/_index.scss index f5fe66a4..19824583 100644 --- a/resources/assets/sass/layout/_index.scss +++ b/resources/assets/sass/layout/_index.scss @@ -2,4 +2,6 @@ @forward 'home'; @forward 'news_post'; @forward 'post'; +@forward 'gids'; +@forward 'program'; @forward 'footer'; diff --git a/resources/assets/sass/layout/_post.scss b/resources/assets/sass/layout/_post.scss index 92b2f57d..7c6a8f26 100644 --- a/resources/assets/sass/layout/_post.scss +++ b/resources/assets/sass/layout/_post.scss @@ -1 +1,3 @@ +@use "../components/bread_crumb"; +@use "../components/page_title"; @use "../components/post"; diff --git a/resources/assets/sass/layout/_program.scss b/resources/assets/sass/layout/_program.scss new file mode 100644 index 00000000..1fb58ff6 --- /dev/null +++ b/resources/assets/sass/layout/_program.scss @@ -0,0 +1,3 @@ +@use "../components/page"; +@use "../components/input"; +@use "../components/program"; diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 88ba4089..2d201624 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -77,7 +77,7 @@ @endif -
{!!$item->title!!}
published) . ' om ' . $item->published->format('H:i'); @@ -144,7 +144,7 @@
-

{!!$podcast->title!!}

+

{!!$podcast->title!!}

@if ($podcast->program)