Bring some responsive styles, subject to later improvements
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<coverage generated="1607048925926" clover="3.2.0">
|
<coverage generated="1607048976462" clover="3.2.0">
|
||||||
<project timestamp="1607048925926" name="All files">
|
<project timestamp="1607048976462" name="All files">
|
||||||
<metrics statements="7" coveredstatements="4" conditionals="0" coveredconditionals="0" methods="3" coveredmethods="1" elements="10" coveredelements="5" complexity="0" loc="7" ncloc="7" packages="2" files="3" classes="3"/>
|
<metrics statements="7" coveredstatements="4" conditionals="0" coveredconditionals="0" methods="3" coveredmethods="1" elements="10" coveredelements="5" complexity="0" loc="7" ncloc="7" packages="2" files="3" classes="3"/>
|
||||||
<package name="components">
|
<package name="components">
|
||||||
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
|
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ export default {
|
|||||||
<div class='footer quiet pad2 space-top1 center small'>
|
<div class='footer quiet pad2 space-top1 center small'>
|
||||||
Code coverage generated by
|
Code coverage generated by
|
||||||
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
||||||
at Fri Dec 04 2020 03:28:45 GMT+0100 (Central European Standard Time)
|
at Fri Dec 04 2020 03:29:36 GMT+0100 (Central European Standard Time)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="../prettify.js"></script>
|
<script src="../prettify.js"></script>
|
||||||
|
|||||||
@@ -94,7 +94,7 @@
|
|||||||
<div class='footer quiet pad2 space-top1 center small'>
|
<div class='footer quiet pad2 space-top1 center small'>
|
||||||
Code coverage generated by
|
Code coverage generated by
|
||||||
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
||||||
at Fri Dec 04 2020 03:28:45 GMT+0100 (Central European Standard Time)
|
at Fri Dec 04 2020 03:29:36 GMT+0100 (Central European Standard Time)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="../prettify.js"></script>
|
<script src="../prettify.js"></script>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
<div class='footer quiet pad2 space-top1 center small'>
|
<div class='footer quiet pad2 space-top1 center small'>
|
||||||
Code coverage generated by
|
Code coverage generated by
|
||||||
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
||||||
at Fri Dec 04 2020 03:28:45 GMT+0100 (Central European Standard Time)
|
at Fri Dec 04 2020 03:29:36 GMT+0100 (Central European Standard Time)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="prettify.js"></script>
|
<script src="prettify.js"></script>
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ export default {
|
|||||||
<div class='footer quiet pad2 space-top1 center small'>
|
<div class='footer quiet pad2 space-top1 center small'>
|
||||||
Code coverage generated by
|
Code coverage generated by
|
||||||
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
||||||
at Fri Dec 04 2020 03:28:45 GMT+0100 (Central European Standard Time)
|
at Fri Dec 04 2020 03:29:36 GMT+0100 (Central European Standard Time)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="../prettify.js"></script>
|
<script src="../prettify.js"></script>
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ export default {
|
|||||||
<div class='footer quiet pad2 space-top1 center small'>
|
<div class='footer quiet pad2 space-top1 center small'>
|
||||||
Code coverage generated by
|
Code coverage generated by
|
||||||
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
||||||
at Fri Dec 04 2020 03:28:45 GMT+0100 (Central European Standard Time)
|
at Fri Dec 04 2020 03:29:36 GMT+0100 (Central European Standard Time)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="../prettify.js"></script>
|
<script src="../prettify.js"></script>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@
|
|||||||
<div class='footer quiet pad2 space-top1 center small'>
|
<div class='footer quiet pad2 space-top1 center small'>
|
||||||
Code coverage generated by
|
Code coverage generated by
|
||||||
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
|
||||||
at Fri Dec 04 2020 03:28:45 GMT+0100 (Central European Standard Time)
|
at Fri Dec 04 2020 03:29:36 GMT+0100 (Central European Standard Time)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="../prettify.js"></script>
|
<script src="../prettify.js"></script>
|
||||||
|
|||||||
10
src/App.vue
10
src/App.vue
@@ -27,18 +27,16 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
main {
|
main {
|
||||||
margin-top: 58px;
|
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
|
margin: 58px auto 0 auto;
|
||||||
h1 {
|
max-width: 1200px;
|
||||||
font-size: 28px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
width: -webkit-max-content;
|
width: -webkit-max-content;
|
||||||
width: -moz-max-content;
|
width: -moz-max-content;
|
||||||
width: max-content;
|
width: max-content;
|
||||||
padding-right: 1rem;
|
padding-right: 1rem;
|
||||||
|
padding-bottom: 0.35rem;
|
||||||
font-size: 26px;
|
font-size: 26px;
|
||||||
border-bottom: 2px solid @primary-color;
|
border-bottom: 2px solid @primary-color;
|
||||||
margin-bottom: 1.35rem;
|
margin-bottom: 1.35rem;
|
||||||
@@ -47,7 +45,9 @@ main {
|
|||||||
|
|
||||||
h3 {
|
h3 {
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
|
font-weight: lighter;
|
||||||
text-transform: capitalize;
|
text-transform: capitalize;
|
||||||
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,3 +1,14 @@
|
|||||||
@primary-color: #0c9696;
|
@primary-color: #0c9696;
|
||||||
@secondary-color: #ffffff;
|
@secondary-color: #ffffff;
|
||||||
@text-color: #333;
|
@text-color: #333;
|
||||||
|
|
||||||
|
@sm: 640px;
|
||||||
|
// => @media (min-width: 640px) { ... }
|
||||||
|
@md: 768px;
|
||||||
|
// => @media (min-width: 768px) { ... }
|
||||||
|
@lg: 1024px;
|
||||||
|
// => @media (min-width: 1024px) { ... }
|
||||||
|
@xl: 1280px;
|
||||||
|
// => @media (min-width: 1280px) { ... }
|
||||||
|
@2xl: 1536px;
|
||||||
|
// => @media (min-width: 1536px) { ... }
|
||||||
|
|||||||
@@ -21,7 +21,20 @@ export default {
|
|||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
.grid {
|
.grid {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 1fr 1fr 1fr;
|
grid-template-columns: 1fr;
|
||||||
column-gap: 1rem;
|
column-gap: 1rem;
|
||||||
|
row-gap: 1.5rem;
|
||||||
|
|
||||||
|
@media screen and (min-width: @sm) {
|
||||||
|
grid-template-columns: 1fr 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: @md) {
|
||||||
|
grid-template-columns: 1fr 1fr 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: @lg) {
|
||||||
|
grid-template-columns: repeat(4, 1fr);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,10 +1,19 @@
|
|||||||
<template>
|
<template>
|
||||||
<article class="grid-item">
|
<article class="grid-item">
|
||||||
<router-link :to="`/fruit/${item.id}`">
|
<router-link :to="`/fruit/${item.id}`">
|
||||||
|
<div class="thumbnail">
|
||||||
<img :src="item.image" :alt="item.name" />
|
<img :src="item.image" :alt="item.name" />
|
||||||
<h2>{{ item.name }}</h2>
|
</div>
|
||||||
|
<section>
|
||||||
|
<h3>
|
||||||
|
{{ item.name }}
|
||||||
<span class="tag" :style="{ backgroundColor: item.color }">{{ item.taste }}</span>
|
<span class="tag" :style="{ backgroundColor: item.color }">{{ item.taste }}</span>
|
||||||
<p class="price">{{ item.price + "$" }}</p>
|
</h3>
|
||||||
|
|
||||||
|
<hr />
|
||||||
|
|
||||||
|
<p class="price">{{ "$" + item.price }}</p>
|
||||||
|
</section>
|
||||||
</router-link>
|
</router-link>
|
||||||
</article>
|
</article>
|
||||||
</template>
|
</template>
|
||||||
@@ -19,33 +28,68 @@ export default {
|
|||||||
|
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
.grid-item {
|
.grid-item {
|
||||||
padding: 1rem;
|
border-radius: 10px;
|
||||||
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.4);
|
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.4);
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
h2 {
|
&:hover .thumbnail img {
|
||||||
text-transform: capitalize;
|
transform: scale(1.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
display: block;
|
||||||
|
text-decoration: none;
|
||||||
|
color: inherit;
|
||||||
|
|
||||||
|
.thumbnail {
|
||||||
|
height: 285px;
|
||||||
|
overflow: hidden;
|
||||||
|
box-shadow: 0 1px 4px 1px #d2d2f2;
|
||||||
|
|
||||||
|
img {
|
||||||
|
border-radius: 10px 10px 0 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
object-fit: cover;
|
||||||
|
max-width: 100%;
|
||||||
|
transition: transform 0.4s ease-in-out;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
section {
|
||||||
|
padding: 1.5rem 1rem;
|
||||||
|
|
||||||
|
h3 {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
margin-bottom: 0.55rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr {
|
||||||
|
width: 100px;
|
||||||
|
color: #cece;
|
||||||
|
margin: 1.35rem auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tag {
|
.tag {
|
||||||
font-weight: bold;
|
|
||||||
text-transform: lowercase;
|
|
||||||
display: inline-block;
|
|
||||||
color: #ffffff;
|
|
||||||
padding: 0.35rem;
|
|
||||||
min-width: 85px;
|
|
||||||
border-radius: 25px;
|
border-radius: 25px;
|
||||||
}
|
padding: 0.55rem;
|
||||||
|
margin-left: 0.75rem;
|
||||||
img {
|
color: #ffffff;
|
||||||
width: 100%;
|
font-size: 14px;
|
||||||
height: 350px;
|
font-weight: bold;
|
||||||
object-fit: cover;
|
text-align: center;
|
||||||
max-width: 100%;
|
text-transform: lowercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
.price {
|
.price {
|
||||||
font-size: 24px;
|
text-align: center;
|
||||||
|
margin: 0;
|
||||||
|
font-size: 28px;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -19,12 +19,20 @@ nav {
|
|||||||
padding: 0.5rem;
|
padding: 0.5rem;
|
||||||
box-shadow: 0 19px 34px -15px #d2d2f2;
|
box-shadow: 0 19px 34px -15px #d2d2f2;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 28px;
|
||||||
|
font-weight: lighter;
|
||||||
|
}
|
||||||
|
|
||||||
&.main-nav {
|
&.main-nav {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: calc(58px - 0.5rem * 2);
|
height: calc(58px - 0.5rem * 2);
|
||||||
|
z-index: 15;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 35px;
|
width: 35px;
|
||||||
height: 35px;
|
height: 35px;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<h1>Fruit Details</h1>
|
<h2>Fruit Details</h2>
|
||||||
{{ this.fruit }}
|
{{ this.fruit }}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="fruits">
|
||||||
<h1>Fruits Directory</h1>
|
<h2>Directory</h2>
|
||||||
<Grid :data="this.fruits" />
|
<Grid :data="this.fruits" />
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import Fruits from "@/views/Fruits.vue";
|
|||||||
describe("Test Fruits page.", () => {
|
describe("Test Fruits page.", () => {
|
||||||
it("dispatches getFruits on mounted", async () => {
|
it("dispatches getFruits on mounted", async () => {
|
||||||
// axios.get.mockImplementationOnce(() => Promise.resolve({ data: { data: "value" } }));
|
// axios.get.mockImplementationOnce(() => Promise.resolve({ data: { data: "value" } }));
|
||||||
const wrapper = mount(Fruits, { store, stubs: { RouterLink: RouterLinkStub } });
|
mount(Fruits, { store, stubs: { RouterLink: RouterLinkStub } });
|
||||||
|
|
||||||
await store.dispatch("getFruits");
|
await store.dispatch("getFruits");
|
||||||
expect(store.state.fruits.length).toBe(7);
|
expect(store.state.fruits.length).toBe(7);
|
||||||
|
|||||||
Reference in New Issue
Block a user