Skip to content

Commit

Permalink
Add Pug to project, plus some work on frontend.
Browse files Browse the repository at this point in the history
  • Loading branch information
scouillard committed Feb 6, 2020
1 parent ad9ba6e commit cb32598
Show file tree
Hide file tree
Showing 9 changed files with 212 additions and 170 deletions.
210 changes: 63 additions & 147 deletions composer.lock

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions public/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -11356,3 +11356,56 @@ a.text-dark:focus {
}
}

.title {
font-size: 24px;
font-weight: 600;
text-transform: uppercase;
}

.sub-title {
font-size: 18px;
font-weight: 600;
}

.user_header {
border-bottom: 2px solid black;
padding-bottom: 25px;
}

.user_header .user_image {
max-width: 100px;
display: block;
margin-left: auto;
margin-right: auto;
}

.user_recipes {
padding-top: 25px;
}

.user_recipe {
padding: 10px;
padding-right: 25px;
border-bottom: 1px solid whitesmoke;
}

.user_recipe .rating {
font-weight: 600;
font-size: 24px;
color: #cf0c0c;
text-align: right;
}

.user_recipe .user_chili_image {
display: block;
margin-left: auto;
margin-right: auto;
max-width: 150px;
}

.user_recipe .user_recipe_buttons {
position: absolute;
bottom: 0;
right: 0;
}

Binary file added public/user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/userchili.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions resources/sass/_global.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@


.title {
font-size: 24px;
font-weight: 600;
text-transform: uppercase;
}

.sub-title {
font-size: 18px;
font-weight: 600;
}
50 changes: 50 additions & 0 deletions resources/sass/_user.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@


.user_header {
border-bottom: 2px solid black;
padding-bottom: 25px;

.user_image {
max-width: 100px;
display: block;
margin-left: auto;
margin-right: auto;
}
}

.user_recipes {
padding-top: 25px;


}

.user_recipe {
padding: 10px;
padding-right: 25px;
border-bottom: 1px solid whitesmoke;

.rating {
font-weight: 600;
font-size: 24px;
color: $primary;
text-align: right;
}

.user_chili_image {
display: block;
margin-left: auto;
margin-right: auto;
max-width: 150px;
}

p {
// max-width: 400px;
}

.user_recipe_buttons {
position: absolute;
bottom: 0;
right: 0;
}

}
4 changes: 4 additions & 0 deletions resources/sass/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
// Bootstrap
@import '~bootstrap/scss/bootstrap';

// GLOBAL
@import 'global';

// VIEWS
@import 'homepage';
@import 'user';
23 changes: 0 additions & 23 deletions resources/views/home.blade.php

This file was deleted.

30 changes: 30 additions & 0 deletions resources/views/home.blade.pug
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@extends('layouts.app')

@section('content')

.container
.user_header
.row
.col-3
img(src='user.png' class="user_image")
.col-9
.title USER NAME
.sub-title x Recipes
.user_recipes
.user_recipe
.row
.col-3
img(src='userchili.jpg' class="user_chili_image")
.col-6
.title NAME OF THE CHILI
p Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.

.col-3
.rating 9.77/10
.user_recipe_buttons
button(type="button" class="btn btn-link") Edit
button(type="button" class="btn btn-link") Delete



@endsection

0 comments on commit cb32598

Please sign in to comment.