Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IDATT2106 Scrum Team 02
Frontend
Commits
649e4686
Commit
649e4686
authored
1 year ago
by
Ingrid Martinsheimen Egge
Browse files
Options
Downloads
Patches
Plain Diff
Melding forteller hva slags vare som har blitt lagt i kjøleskapet
parent
dcf49e98
No related branches found
Branches containing commit
No related tags found
1 merge request
!13
Fridge view
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/ItemSearch.vue
+1
-1
1 addition, 1 deletion
src/components/ItemSearch.vue
src/views/FridgeView.vue
+6
-4
6 additions, 4 deletions
src/views/FridgeView.vue
with
7 additions
and
5 deletions
src/components/ItemSearch.vue
+
1
−
1
View file @
649e4686
...
...
@@ -55,7 +55,7 @@ export default {
{
"
quantity
"
:
this
.
selectedItem
.
amount
.
quantity
*
num
,
"
unit
"
:
this
.
selectedItem
.
amount
.
unit
}}
).
then
(()
=>
this
.
$emit
(
'
itemsAdded
'
,
this
)).
catch
((
_
)
=>
console
.
log
(
"
No items were added to the fridge
"
))
).
then
(()
=>
this
.
$emit
(
'
itemsAdded
'
,
this
.
selectedItem
)).
catch
((
_
)
=>
console
.
log
(
"
No items were added to the fridge
"
))
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/views/FridgeView.vue
+
6
−
4
View file @
649e4686
<
template
><h1>
Kjøleskap
</h1><br><br>
<main>
<ItemSearch
v-if=
"searchVisible"
@
itemsAdded=
"updateFridge"
></ItemSearch>
<div
id =
"fridgeMsg"
><p>
Melding fra kjøleskapet:
</p><span>
{{
this
.
fridgeMsg
}}
</span></div>
<eat-fridge-item-modal
@
closeModal=
"hideModal"
v-if=
"visible"
:fridge-item=
"selectedItem"
></eat-fridge-item-modal>
...
...
@@ -63,15 +61,19 @@ export default {
updateFridgeMessage
(
msg
){
this
.
fridgeMsg
=
msg
;
},
async
updateFridge
()
{
async
updateFridge
(
addedItem
)
{
this
.
fridgeItems
=
await
API
.
getFridgeItems
();
this
.
fridgeItems
=
await
API
.
getFridgeItems
();
this
.
hideItemSearch
();
this
.
updateFridgeMessage
(
"
Varen
ble lagt i kjøleskapet.
"
)
this
.
updateFridgeMessage
(
addedItem
.
name
+
"
ble lagt i kjøleskapet.
"
)
},
},
async
mounted
()
{
this
.
fridgeItems
=
await
API
.
getFridgeItems
();
if
(
this
.
fridgeItems
.
length
===
0
){
this
.
fridgeMsg
=
"
Kjøleskapet ditt er tomt. Legg inn varer ved å trykke på pluss-knappen nederst i høyre hjørne
"
}
}
}
</
script
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment