Merge pull request #30 from cato447/itempageCSS

Added styling to item storage page
This commit is contained in:
cato
2022-07-09 04:03:24 +02:00
committed by GitHub
10 changed files with 25186 additions and 961 deletions

2
.gitignore vendored
View File

@@ -90,3 +90,5 @@ out
# Gradle
.gradle
!gradle/wrapper/gradle-wrapper.jar
frontend/src/index.js

22408
frontend/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -11,6 +11,7 @@
"axios": "^0.27.2",
"core-js": "^3.8.3",
"vue": "^2.6.14",
"vue-router": "^4.0.15",
"vuejs-logger": "^1.5.5"
},
"devDependencies": {
@@ -21,6 +22,8 @@
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"node-sass": "^7.0.1",
"sass-loader": "^13.0.0",
"vue-template-compiler": "^2.6.14"
},
"eslintConfig": {

View File

@@ -1,10 +1,10 @@
<template>
<div id="app">
<ItemModel />
<ItemModel/>
</div>
</template>
<script>
import ItemModel from "./components/ItemModel.vue";
import ItemModel from "@/components/ItemModel";
export default {
components: {
ItemModel

View File

@@ -0,0 +1,128 @@
<template>
<div class="main">
<span class="text">404</span>
<h1>Maybe going home helps</h1>
<a href="#">Home</a>
</div>
</template>
<script>
export default {
name: "Custom404Page"
}
</script>
<style lang="scss">
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200&display=swap');
*,
*::before,
*::after {
box-sizing: border-box;
margin: 0;
padding: 0;
}
.main {
height: 100vh;
display: grid;
justify-content: center;
align-items: center;
align-content: space-between;
background-color: #213737;
}
.text {
cursor: default;
position: absolute;
align-self: center;
top: 25%;
right: 50%;
transform: translate(50%,50%);
text-transform: uppercase;
font-family: Montserrat, sans-serif;
font-size: 16vh;
font-weight: 700;
color: #F5F5F5;
text-shadow:
1px 1px 1px #919191,
1px 2px 1px #919191,
1px 3px 1px #919191,
1px 4px 1px #919191,
1px 5px 1px #919191,
1px 6px 1px #919191,
1px 7px 1px #919191,
1px 8px 1px #919191,
1px 9px 1px #919191,
1px 10px 1px #919191,
1px 18px 6px rgba(16,16,16,0.4),
1px 22px 10px rgba(16,16,16,0.2),
1px 25px 35px rgba(16,16,16,0.2),
1px 30px 60px rgba(16,16,16,0.4);
}
h1{
color: #F5F5F5;
position: relative;
font-family: "Source Code Pro", monospace;
font-size: 1.5vh;
top: 53.5vh;
font-weight: 400;
}
h1::before,
h1::after{
content: "";
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
h1::before{
background: #213737;
animation: shifteffect 4s steps(22) forwards;
}
h1::after{
width: 0.1vh;
background: white;
animation:
shifteffect 4s steps(22) forwards,
blinkeffect 600ms steps(22) infinite;
}
a{
font-family: Montserrat, sans-serif;
position: absolute;
top: 4%;
right: 5%;
font-size: 2vh;
text-transform: uppercase;
text-decoration: none;
color: #F5F5F5;
transition: all 300ms;
}
a:hover{
cursor: pointer;
font-size: 2.5vh;
transition: all 300ms;
}
@keyframes shifteffect{
to{
left: 100%;
}
}
@keyframes blinkeffect{
to{
background: transparent;
}
}
</style>

View File

@@ -0,0 +1,71 @@
<template>
<div class="main">
<div v-if="loading">
<h1 class="loading">Loading...</h1>
</div>
<div v-else>
<!-- navbar -->
<header class="navbar-header">
<div class="logo">
<a>Home</a>
</div>
<input type="checkbox" class="menu-btn" id="menu-btn">
<label for="menu-btn" class="menu-icon">
<span class="menu-icon__line"></span>
</label>
<ul class="nav-links">
<li class="nav-link">
<a href="#">Profile</a>
</li>
<li class="nav-link">
<a href="#">Storage</a>
</li>
<li class="nav-link">
<a href="#">Recipes</a>
</li>
<li class="nav-link">
<a href="#">About</a>
</li>
</ul>
</header>
</div>
</div>
</template>
<script>
export default {
name: "HomePage"
}
</script>
<style lang="scss">
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200&display=swap');
@import 'src/styling/navbar';
*,
*::before,
*::after {
box-sizing: border-box;
margin: 0;
padding: 0;
}
.main {
font-family: 'Montserrat', sans-serif;
height: 100vh;
display: grid;
justify-content: center;
align-items: center;
font-size: 1.25rem;
background-color: darkcyan;
}
</style>

View File

@@ -1,125 +1,535 @@
<template>
<div>
<h1 class="title">Items</h1>
<h1 class="email">{{userEmail}}</h1>
<body>
<div class="main">
<h1 class="email">{{ userEmail }}</h1>
<section class="itemapp">
<div v-if="loading">
<h1 class="loading">Loading...</h1>
</div>
<div v-else>
<header class="header">
<input class="newItemName"
autofocus autocomplete="off"
:placeholder="this.inputPlaceholder"
v-model="newItem"
<!-- navbar -->
<div class="navbar-header">
<div class="logo">
<a>Storage</a>
</div>
<span class="divider"></span>
<input type="checkbox" class="menu-btn" id="menu-btn">
<label for="menu-btn" class="menu-icon">
<span class="menu-icon__line"></span>
</label>
<ul class="nav-links">
<li class="nav-link">
<router-link to="/">Home</router-link>
</li>
<li class="nav-link">
<router-link to="/profile">Profile</router-link>
</li>
<li class="nav-link">
<router-link to="/recipes">Recipes</router-link>
</li>
<li class="nav-link">
<router-link to="/shoppinglist">Shoppinglist</router-link>
</li>
</ul>
</div>
<!-- input field -->
<div class="inputField-header">
<input class="newItemName" id="inputTextField" autofocus autocomplete="off" placeholder=" " v-model="newItem"
@keyup.enter="addItem"/>
</header>
<section class="main" v-show="items.length" v-cloak>
<label for="inputTextField" class="formLabel">
Add here ...
</label>
</div>
<!-- response element -->
<div class="item-section" v-show="items.length" v-cloak>
<ul class="item-list">
<li v-for="item in items"
class="item"
:key="item.id">
<div class="view">
<label @dblclick="editItem(item)">{{ item.name }} {{ item.quantity }}{{ item.unit }}</label>
<button class="destroy" @click="removeItem(item)"></button>
</div>
<div class="view">
<label class="item-name" @dblclick="editItem(item)">
<span class="item-name-fame">{{ item.name.toUpperCase() }} </span>
<span class="item-information-frame">{{ item.quantity }} {{ item.unit.toLowerCase() }}</span>
</label>
<button class="destroy" @click="removeItem(item)"></button>
</div>
</li>
</ul>
</section>
</div>
</div>
</section>
</div>
</body>
</template>
<script>
import api from '../Api';
const Items = {
name: 'Items',
props: {
activeUser: Object
},
// app initial state
data: function() {
return {
items: [],
newItem: '',
editedItem: null,
loading: true,
error: null,
id: 0
}
},
mounted() {
api.getAll()
.then(response => {
this.$log.debug("Data loaded: ", response.data)
this.items = response.data
})
<script>
import api from '../Api';
const Items = {
name: 'Items',
props: {
activeUser: Object
},
// app initial state
data: function () {
return {
items: [],
newItem: '',
editedItem: null,
loading: true,
error: null,
id: 0
}
},
mounted() {
api.getAll()
.then(response => {
this.$log.debug("Data loaded: ", response.data)
this.items = response.data
})
.catch(error => {
this.$log.debug(error)
this.error = "Failed to load items"
})
.finally(() => this.loading = false)
},
computed: {
userEmail: function () {
return this.activeUser ? this.activeUser.email : ''
},
inputPlaceholder: function () {
return this.activeUser ? this.activeUser.given_name + ', what do you want to add?' : 'What needs to be added'
}
},
methods: {
addItem: function () {
var value = this.newItem && this.newItem.trim()
if (!value) {
return
}
var components = value.split(' ')
api.createNew(components[0],
parseInt(components[1].replace ( /[^\d.]/g, '' )),
components[1].replace(/[0-9]/g, '') === 'ml' ? 'MILLILETERS' : "GRAMMS"
).then( (response) => {
this.$log.debug("New item created:", response);
this.items.push({
id: response.data.id,
name: components[0],
quantity: parseInt(components[1].replace ( /[^\d.]/g, '' )),
unit: components[1].replace(/[0-9]/g, '') === 'MILLILETERS' ? 'ml' : 'g'
})
}).catch((error) => {
this.$log.debug(error);
this.error = "Failed to add item"
});
this.newItem = ''
},
removeItem: function (item) { // notice NOT using "=>" syntax
api.removeForId(item.id).then(() => {
this.$log.debug("Item removed:", item);
this.items.splice(this.items.indexOf(item), 1)
}).catch((error) => {
this.$log.debug(error);
this.error = "Failed to remove item"
})
.finally(() => this.loading = false)
},
computed: {
userEmail: function () {
return this.activeUser ? this.activeUser.email : ''
},
inputPlaceholder: function () {
return this.activeUser ? this.activeUser.given_name + ', what do you want to add?' : 'What needs to be added'
}
},
methods: {
addItem: function () {
var value = this.newItem && this.newItem.trim()
if (!value) {
return
}
var components = value.split(' ')
api.createNew(components[0],
parseInt(components[1].replace(/[^\d.]/g, '')),
components[1].replace(/[0-9]/g, '') === 'ml' ? 'MILLILETERS' : "GRAMMS"
).then((response) => {
this.$log.debug("New item created:", response);
this.items.push({
id: response.data.id,
name: components[0],
quantity: parseInt(components[1].replace(/[^\d.]/g, '')),
unit: components[1].replace(/[0-9]/g, '') === 'MILLILETERS' ? 'ml' : 'g'
})
}).catch((error) => {
this.$log.debug(error);
this.error = "Failed to add item"
});
this.newItem = ''
},
directives: {
'item-focus': function (el, binding) {
if (binding.value) {
el.focus()
}
removeItem: function (item) { // notice NOT using "=>" syntax
api.removeForId(item.id).then(() => {
this.$log.debug("Item removed:", item);
this.items.splice(this.items.indexOf(item), 1)
}).catch((error) => {
this.$log.debug(error);
this.error = "Failed to remove item"
})
}
},
directives: {
'item-focus': function (el, binding) {
if (binding.value) {
el.focus()
}
}
}
}
}
export default Items
</script>
</script>
<style lang="scss">
@import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200&display=swap');
@import 'src/styling/navbar';
:root{
--globalFontSize: 20px; // 1/108
--globalFontSizeHalf: var(--globalFontSize) * 0.5;
--globalFontSizeOneAndHalf: var(--globalFontSize) * 1.5;
--globalFontSizeTenth: var(--globalFontSize) * 0.1;
--globalFontSizeFifth: var(--globalFontSize) * 0.2;
--globalFontSizeFourFiths: var(--globalFontSize) * 0.8;
}
*,
*::before,
*::after {
box-sizing: border-box;
margin: 0;
padding: 0;
}
body{
margin: 0;
padding: 0;
background-color:darkcyan;
}
.main {
position: relative;
font-family: 'Montserrat', sans-serif;
height: 100vh;
display: grid;
justify-content: center;
align-items: center;
font-size: 1.25vh;
background-color: darkcyan;
}
/* input field styling */
.inputField-header {
z-index: 3;
position: fixed;
width: 20vh;
left: 50%;
transform: translateX(-50%);
}
.newItemName {
z-index: 3;
position: relative;
top: -65.5vh; // 0,65 of height
left: 0;
width: 100%;
height: 100%;
border: 0.07352941176470588vh solid white; // 0.10 of font size // u cannot use var here
border-radius: 0.4411764705882353vh; // times 2 of border
font-family: inherit;
font-size: inherit;
color: black;
outline: none;
padding: 0.5vh;// size of font
box-shadow: 10px 10px 30px rgba(0, 0, 0, 0.4); // 0.5 size of font and 1.5 size of font
background: darkcyan;
}
.newItemName:hover {
border-color: black;
}
.newItemName:focus {
border-color: black;
}
.formLabel {
z-index: 3;
position: relative;
top: -67.75vh;
left: 0.75vh;
padding: 0.1vh;
font-size: 0.1vh;
color: white;
cursor: text;
transition: top 200ms ease-in, left 200ms ease-in, font-size 200ms ease-in;
background-color: darkcyan;
}
.newItemName:hover ~ .formLabel, .newItemName:not(:placeholder-shown).newItemName:not(:hover) ~ .formLabel {
top: -69.30vh;
left: 0.15vw;
font-size: 0.1vh;
color: black;
}
.newItemName:focus ~ .formLabel, .newItemName:not(:placeholder-shown).newItemName:not(:focus) ~ .formLabel {
top: -69.30vh;
left: 0.15vw;
font-size: 0.1vh;
color: black;
}
/* Workaround for below WQHD resolution */
@media screen and (max-height: 1400px) {
.formLabel{
opacity: 0;
}
}
/* item section */
.item-section{
z-index: 2;
position: absolute;
top: 80%;
left: 50%;
font-size: 20px;
margin-left: 30px;
}
.item-list{
z-index: 2;
align-self: center;
position: relative;
display: grid;
top: -60vh;
left: -44.33vw;
row-gap: 75px;
column-gap: 340px;
.item{
z-index: 2;
text-align: center;
position: relative;
margin-top: 0;
font-family: Montserrat, sans-serif;
list-style: none;
background: darkslategrey;
box-shadow: 10px 10px 30px rgba(0, 0, 0, 0.6);
display: flex;
padding: 100px;
width: 300px;
}
.item-name{
z-index: 2;
position: relative;
left: -20px;
}
.item-name-fame{
z-index: 2;
letter-spacing: 4px;
font-size: 30px;
}
.item-name-fame:after{
content:'';
display:block;
border-bottom:2px solid #000;
height:0;
position:relative;
top: 16px;
width:250px;
}
.item-information-frame{
position: relative;
letter-spacing: 2px;
top: 32px;
}
.view{
position: relative;
color: white;
top: -60px;
left: -52px;
}
.destroy{
display: block;
position: relative;
left: 0;
border-radius: 1px;
border: solid black 1px;
transform: rotate(45deg);
height: 50px;
width: 2px;
top: 140px;
}
.destroy:after{
content: '';
border-radius: 1px;
border: solid black 1px;
position: fixed;
transform: rotate(-90deg);
height: 50px;
width: 2px;
top: -2px;
}
.destroy:hover{
cursor: pointer;
}
}
@media (max-width: 2299px) {
.item-list{
grid-template-columns: repeat(4, 2vh);
}
}
@media (min-width: 2100px) {
.item-list{
grid-template-columns: repeat(5, 2vh);
}
}
@media (min-width: 2560px) {
.item-list{
grid-template-columns: repeat(6, 2vh);
}
}
@media (min-width: 3800px) {
.item-list{
grid-template-columns: repeat(9, 2vh);
border-collapse: separate;
border-spacing: 0 15px;
}
}
/* responsive */
@media (max-height: 1440px) and (min-width: 720px) {
.item-section{
font-size: 40/3 px;
margin-left: 80px;
}
.item-list{
z-index: 2;
align-self: center;
position: relative;
display: grid;
top: -60vh;
left: -44.33vw;
row-gap: 50px;
column-gap: 230px;
grid-template-columns: repeat(4, 2vh);
.item{
width: 200px;
height: 200px;
}
.item-name{
left: -30px;
}
.item-name-fame{
position: relative;
letter-spacing: 4px;
font-size: 12px;
top: -20px;
}
.item-name-fame:after{
content:'';
display:block;
border-bottom:2px solid #000;
height:0;
position:relative;
top: 8px;
width:170px;
}
.item-information-frame{
font-size: 8px;
letter-spacing: 1px;
top: -5px;
}
.view{
position: relative;
color: white;
top: -50px;
left: -52px;
}
.destroy{
display: block;
position: relative;
left: -10px;
border-radius: 1px;
border: solid black 1px;
transform: rotate(45deg);
height: 35px;
width: 2px;
top: 50px;
}
.destroy:after{
content: '';
border-radius: 1px;
border: solid black 1px;
position: fixed;
transform: rotate(-90deg);
height: 35px;
width: 2px;
top: -2px;
}
.destroy:hover{
cursor: pointer;
}
}
@media (min-width: 1440px) {
.item-section{
font-size: 40/3 px;
margin-left: 24px;
}
.item-list{
grid-template-columns: repeat(9, 2vh)
}
}
}
</style>

View File

@@ -21,5 +21,5 @@ Vue.use(VueLogger, options);
new Vue({
el: '#app',
template: '<App/>',
components: { App }
components: { App}
});

View File

@@ -0,0 +1,248 @@
.navbar-header {
position: fixed;
display: flex;
justify-content: space-between;
align-items: center;
top: 2vh;
left: 0;
width: 100vw;
padding: 0 5vw;
color: black;
z-index: 4;
a {
text-decoration: none;
color: inherit;
text-transform: uppercase;
font-size: 2vh;
}
.nav-links {
display: flex;
list-style: none;
a {
margin: 0.2vh;
padding: 1vh 0.5vh;
transition: all 300ms;
}
a:hover {
font-size: 3vh;
transition: all 300ms;
}
}
}
.divider{
flex-grow: 1;
border-bottom: 0.1vh solid black;
margin: 5px;
}
.menu-icon {
position: relative;
padding: 0.5vh 0.5vh;
cursor: pointer;
z-index: 1;
display: none;
&__line {
display: block;
position: relative;
background: black;
height: 0.2vh;
width: 3vh;
border-radius: 2vh;
&::before, &::after {
content: '';
position: absolute;
height: 100%;
width: 100%;
border-radius: 2vh;
background: black;
transition: background .8s ease;
}
&::before {
transform: translateY(-0.75vh);
}
&::after {
transform: translateY(0.75vh);
}
}
}
.menu-btn {
display: none;
}
.logo{
padding: 0.5vh 0.5vh;
}
.logo:hover {
cursor: default;
}
@media screen {
.navbar-header {
.menu-icon {
display: block;
font-weight: bold;
&__line {
animation: closedButton 1s backwards;
animation-direction: reverse;
&::before {
animation: closedButtonBefore 1s backwards;
animation-direction: reverse;
}
&::after {
animation: closedButtonAfter 1s backwards;
animation-direction: reverse;
}
}
}
.nav-links {
position: absolute;
top: -2vh;
left: 0;
opacity: 0;
flex-direction: column;
justify-content: space-evenly;
align-items: center;
padding: 5vh 0;
width: 100vw;
height: 120vh;
font-weight: bolder;
letter-spacing: 0.25vh;
color: white;
background: #272727;
transition: opacity 0.8s 0.5s,
clip-path 1s 0.5s;
clip-path: circle(9.615384615384615vh at top right);
.nav-links {
opacity: 0;
transform: translateX(100%);
width: 100%;
text-align: center;
a {
display: block;
padding: 2vh 0;
}
}
}
.menu-btn:checked{
body{
overflow: hidden;
}
}
.menu-btn:checked ~ .nav-links {
opacity: 1;
clip-path: circle(100% at center);
.nav-link {
opacity: 1;
transform: translateX(0);
}
}
.menu-btn:checked ~ .menu-icon {
.menu-icon__line {
background: white;
animation: openButton 1s forwards;
&::before {
background: white;
animation: openButtonBefore 1s forwards;
}
&::after {
background: white;
animation: openButtonAfter 1s forwards;
}
}
}
}
}
@keyframes openButtonBefore {
0% {
transform: translateY(-0.75vh) rotate(0deg);
}
50% {
transform: translateY(0px) rotate(0deg);
}
100% {
transform: translateY(0px) rotate(90deg);
}
}
@keyframes openButton {
50% {
transform: rotate(0deg);
}
100% {
transform: rotate(45deg);
}
}
@keyframes openButtonAfter {
0% {
transform: translateY(0.75vh) rotate(0deg);
}
50% {
transform: translateY(0px) rotate(0deg);
}
100% {
transform: translateY(0px) rotate(90deg);
}
}
@keyframes closedButtonBefore {
0% {
transform: translateY(-0.75vh) rotate(0deg);
}
50% {
transform: translateY(0px) rotate(0deg);
}
100% {
transform: translateY(0px) rotate(90deg);
}
}
@keyframes closedButton {
50% {
transform: rotate(0deg);
}
100% {
transform: rotate(45deg);
}
}
@keyframes closedButtonAfter {
0% {
transform: translateY(0.75vh) rotate(0deg);
}
50% {
transform: translateY(0px) rotate(0deg);
}
100% {
transform: translateY(0px) rotate(90deg);
}
}

File diff suppressed because it is too large Load Diff