Skip to content

Commit

Permalink
Merge pull request #33 from mark-fajardo/feature/CMB-129
Browse files Browse the repository at this point in the history
Feature/cmb 129
  • Loading branch information
mark-fajardo authored Nov 13, 2021
2 parents a1e88ba + 8a308bd commit 6cf2945
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 30 deletions.
2 changes: 2 additions & 0 deletions app/Repository/RecipeRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public function getRecommendedRecipes(): array
->where(AppConstants::STATUS, 1)
->orderBy(AppConstants::ID, AppConstants::DESC)
->orderBy(AppConstants::UPDATED_AT, AppConstants::DESC)
->limit(20)
->get()
);
}
Expand All @@ -52,6 +53,7 @@ public function getRecommendedVideoRecipes(): array
->where(AppConstants::STATUS, 1)
->orderBy(AppConstants::ID, AppConstants::DESC)
->orderBy(AppConstants::UPDATED_AT, AppConstants::DESC)
->limit(6)
->get()
);
}
Expand Down
2 changes: 1 addition & 1 deletion public/css/front.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/recipe.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"/js/main.js": "/js/main.js?id=854411fbff00fb88e082",
"/js/maintenance.js": "/js/maintenance.js?id=88edd1f4e1664776f5a5",
"/css/maintenance.css": "/css/maintenance.css?id=117c1b2d2d14734e56c0",
"/css/front.css": "/css/front.css?id=c4ee18684d8999bfe090",
"/css/front.css": "/css/front.css?id=182cb4147266a0e4f325",
"/js/notFound.js": "/js/notFound.js?id=024809506ee623c9eb8c",
"/js/recipe.js": "/js/recipe.js?id=91953d525343abefbd4c",
"/js/recipe.js": "/js/recipe.js?id=87cc8ba315406e8a1b85",
"/js/recipeList.js": "/js/recipeList.js?id=50c8290af994d3fdd95b",
"/js/timeline.js": "/js/timeline.js?id=d845e30ff1a2441d91da"
}
24 changes: 0 additions & 24 deletions resources/css/common/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -1737,10 +1737,6 @@ option {
width: 100%;
}

.about-page .page-barner-bg {
/*background: rgba(0, 0, 0, 0) url("/img/chef_morris/far_with_pepper_landscape_cropped.jpg") no-repeat scroll center center / cover;*/
}

.count-area-bg:after,
.page-barner-bg::after {
background: #000;
Expand Down Expand Up @@ -2251,10 +2247,6 @@ ul.page-pagination li a {
18. BLOG PAGE
=================================*/

.blog-page .page-barner-bg {
/*background: rgba(0, 0, 0, 0) url("/img/chef_morris/tinola_noodles.jpg") no-repeat scroll center center / cover;*/
}

.blog-page.section-padding {
padding-top: 50px;
}
Expand Down Expand Up @@ -2574,10 +2566,6 @@ ul.blog-instagram-feed-widget li {
19. SINGLE BLOG PAGE
================================*/

.single-blog-page .page-barner-bg {
background: rgba(0, 0, 0, 0) url("/img/chef_morris/seafood_in_coconut_milk_pasta_square.jpg") no-repeat scroll center center / cover;
}

.single-blog-page .title-and-meta::after {
left: 0;
margin-left: auto;
Expand All @@ -2587,10 +2575,6 @@ ul.blog-instagram-feed-widget li {
Gallery Page
*/

.gallery-page .page-barner-bg {
/*background: rgba(0, 0, 0, 0) url("/img/chef_morris/rana_1_landscape.jpg") no-repeat scroll center center / cover;*/
}

.gallery-page .title-and-meta::after {
left: 0;
margin-left: auto;
Expand Down Expand Up @@ -2651,10 +2635,6 @@ ul.blog-instagram-feed-widget li {
20. MENU PAGE
================================*/

.menu-page .page-barner-bg {
/*background: rgba(0, 0, 0, 0) url("/img/chef_morris/recipe_book.jpg") no-repeat scroll center center / cover;*/
}

.style-three .promotion-area-bg {
background: #f4f4f4 none repeat scroll 0 0;
}
Expand Down Expand Up @@ -2737,10 +2717,6 @@ ul.blog-instagram-feed-widget li {
21. CONTACT US PAGE
==================================*/

.contact-us-page .page-barner-bg {
/*background: rgba(0, 0, 0, 0) url("/img/chef_morris/tiramisu_2_landscape.jpg") no-repeat scroll center center / cover;*/
}

.single-contact-widget {
margin-bottom: 30px;
}
Expand Down
8 changes: 6 additions & 2 deletions resources/js/Components/Recipe/Header.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<header class="top-area single-page single-blog-page" id="home">
<div class="page-barner-bg"></div>
<div class="page-barner-bg" :style="'background: rgba(0, 0, 0, 0) url(\'' + this.recipe.main_image + '\') no-repeat scroll center center / cover'"></div>
<Nav/>
<PageBanner banner-for="recipe"/>
</header>
Expand All @@ -9,9 +9,13 @@
<script>
import Nav from '../../Common/Nav';
import PageBanner from '../../Common/PageBanner';
import { mapGetters } from 'vuex';
export default {
name: 'Header',
components: { PageBanner, Nav }
components: { PageBanner, Nav },
computed: {
...mapGetters('Recipe', ['recipe']),
}
}
</script>

0 comments on commit 6cf2945

Please sign in to comment.