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
b6ab096d
Commit
b6ab096d
authored
1 year ago
by
Ingrid
Browse files
Options
Downloads
Patches
Plain Diff
flere seksjoner lagt inn. Endring i css
parent
966da95e
No related branches found
Branches containing commit
No related tags found
1 merge request
!21
Merge profilinnstillinger into main
Pipeline
#218273
failed
1 year ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/views/ProfileSettings.vue
+104
-24
104 additions, 24 deletions
src/views/ProfileSettings.vue
with
104 additions
and
24 deletions
src/views/ProfileSettings.vue
+
104
−
24
View file @
b6ab096d
<
template
>
<
template
>
<main>
<main>
<h1>
Profilinnstillinger
</h1>
<h1>
<br><br>
Profilinnstillinger
<br>
</h1>
<div
id =
"profilepicture"
>
<div
id =
"profilepicture"
>
<Icon
icon=
"material-symbols:person"
:color=
iconColor
:style=
"
{ fontSize: '
3
0px'}" />
<Icon
icon=
"material-symbols:person"
:color=
iconColor
:style=
"
{ fontSize: '
50
0px'}" />
</div>
</div>
<h2>
Petter
</h2>
<button
id=
"changeUserBtn"
>
Bytt bruker
</button>
<button
id=
"changeUserBtn"
>
Bytt bruker
</button>
<form
@
submit.prevent=
"submit"
>
<form
@
submit.prevent=
"submit"
>
<label
for=
"brukernavn"
>
N
avn
</label><br>
<label
for=
"brukernavn"
>
Profiln
avn
</label><br>
<input
type=
"text"
required
><br>
<input
type=
"text"
required
><br>
<br>
<h
3
>
Brukertype
</h
3
>
<h
4
>
Brukertype
</h
4
>
<input
type=
"radio"
id=
"normal"
name=
"userType"
value=
"normal"
>
<input
type=
"radio"
id=
"normal"
name=
"userType"
value=
"normal"
>
<label
for=
"normal"
>
Vanlig
</label><br>
<label
for=
"normal"
>
Standard
</label><br>
<input
type=
"radio"
id=
"restricted"
name=
"userType"
value=
"restricted"
>
<input
type=
"radio"
id=
"restricted"
name=
"userType"
value=
"restricted"
>
<label
for=
"restricted"
>
Begrenset - Kan ikke redigere ukeplan eller handleliste
</label><br>
<label
for=
"restricted"
>
Begrenset - Kan ikke redigere ukeplan eller handleliste
</label><br>
<br>
<br>
<h3>
Profilbilde
</h3>
<h3>
Profilbilde
</h3>
<div
id=
"changeUserImage"
>
<div
id=
"changeUserImage"
>
<div
id =
"profilepicture"
>
<div
id =
"profilepicture"
>
<Icon
icon=
"material-symbols:person"
:color=
iconColor
:style=
"
{ fontSize: '30px'}" />
<Icon
icon=
"material-symbols:person"
:color=
iconColor
:style=
"
{ fontSize: '30px'}" />
<img
src=
"#"
alt=
"profile picture"
>
</div>
</div>
<button>
Endre bilde
</button>
<button>
Endre bilde
</button>
</div>
</div>
<div
id =
"submitbuttonBox"
>
<div
id =
"submitbuttonBox"
>
<button>
Lagre brukerinnstillinger
</button>
<button
class=
"saveBtn"
@
click=
"saveUserSettings"
>
Lagre brukerinnstillinger
</button>
<button>
Slett brukerprofil
</button>
<button
class=
"delBtn"
@
click=
"deleteUser"
>
Slett brukerprofil
</button>
</div>
</div>
</form>
</form>
...
@@ -40,39 +41,58 @@
...
@@ -40,39 +41,58 @@
<form
@
submit.prevent=
"submit"
>
<form
@
submit.prevent=
"submit"
>
<h2>
Matpreferanser
</h2>
<h2>
-Matpreferanser-
</h2>
<p
class =
"infoText"
>
Hvis huket av, så vil du kun få oppskrifter av disse typene:
</p>
<input
type=
"checkbox"
id=
"vegetar"
name=
"vegetar"
value=
"vegetar"
>
<input
type=
"checkbox"
id=
"vegetar"
name=
"vegetar"
value=
"vegetar"
>
<label
for=
"vegetar"
>
vegetar
</label><br>
<label
for=
"vegetar"
>
vegetar
</label><br>
<input
type=
"checkbox"
id=
"vegan"
name=
"vegan"
value=
"vegan"
>
<input
type=
"checkbox"
id=
"vegan"
name=
"vegan"
value=
"vegan"
>
<label
for=
"veg
etar
"
>
vegan
</label><br>
<label
for=
"veg
an
"
>
vegan
</label><br>
<br>
<br>
<h3>
Allergener
</h3>
<h2>
-Allergener-
</h2>
<p
class =
"infoText"
>
Du vil ikke få forslag om oppskrifter med disse varene:
</p>
<input
type=
"checkbox"
id=
"gluten"
name=
"gluten"
value=
"Gluten"
>
<input
type=
"checkbox"
id=
"gluten"
name=
"gluten"
value=
"Gluten"
>
<label
for=
"
vehicle1
"
>
gluten
</label><br>
<label
for=
"
allergen
"
>
gluten
</label><br>
<input
type=
"checkbox"
id=
"nøtter"
name=
"nøtter"
value=
"nøtter"
>
<input
type=
"checkbox"
id=
"nøtter"
name=
"nøtter"
value=
"nøtter"
>
<label
for=
"
vehicle1
"
>
nøtter
</label><br>
<label
for=
"
allergen
"
>
nøtter
</label><br>
<input
type=
"checkbox"
id=
"melk"
name=
"melk"
value=
"melk"
>
<
button>
Lagre Appinnstillinger
</button
>
<
label
for=
"allergen"
>
melk
</label><br
>
<button
class=
"saveBtn"
@
click=
"saveFoodPreference"
>
Lagre matpreferanser
<br>
og allergener
</button>
</form>
</form>
<h1>
Konto-innstillinger
</h1>
<h1>
Konto-innstillinger
</h1>
<form
@
submit.prevent=
"submit"
>
<form
@
submit.prevent=
"submit"
>
<p
class=
"infoText"
>
OBS: Ved å endre epost endrer du også brukernavnet ditt
</p>
<label
for=
"email"
>
Epost
</label><br>
<label
for=
"email"
>
Epost
</label><br>
<input
type=
"text"
id=
"email"
>
<input
type=
"text"
id=
"email"
>
<label
for=
"password"
>
Passord
</label><br>
<label
for=
"password"
>
Passord
</label><br>
<input
type=
"password"
id=
"password"
>
<input
type=
"password"
id=
"password"
>
<button>
Lagre
App
innstillinger
</button>
<button
class=
"saveBtn"
@
click=
"saveAccountSettings"
>
Lagre
konto
innstillinger
</button>
</form>
</form>
<br>
<br>
<hr>
</main>
<form
@
submit.prevent=
"submit"
id =
"dangerZone"
>
<h1>
🔺FARESONE🔺
</h1>
<p
class=
"infoText"
>
Ved å trykke på knappen nedenfor, vil du slette din SmartMat-konto
</p>
<input
type=
"checkbox"
id=
"melk"
name=
"melk"
value=
"melk"
>
<label
for=
"allergen"
>
Jeg bekrefter jeg skjønner dette, og ønsker å slette kontoen min SmartMat-konto for alltid.
</label><br>
<button
class=
"delBtn"
@
click=
"deleteAccount"
>
SLETT KONTO
</button>
</form>
<br><br><br>
</main>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -86,22 +106,61 @@ export default {
...
@@ -86,22 +106,61 @@ export default {
iconColor
()
{
iconColor
()
{
return
"
#000000
"
return
"
#000000
"
}
}
},
methods
:
{
saveUserSettings
(){
alert
(
"
(Denne knappen gjør ingen ting) brukerinnstillinger lagret!
"
)
},
saveAccountSettings
(){
alert
(
"
(Denne knappen gjør ingen ting) konto oppdatert
"
)
},
deleteAccount
(){
alert
(
"
(Denne knappen gjør ingen ting) men account deleted
"
)
},
deleteUser
(){
alert
(
"
(Denne knappen gjør ingen ting) bruker slettet
"
)
},
saveFoodPreference
()
{
alert
(
"
(Denne knappen gjør ingen ting) matpreferanser lagret
"
)
}
}
}
}
}
</
script
>
</
script
>
<
style
scoped
lang =
"scss"
>
<
style
scoped
lang =
"scss"
>
#dangerZone
{
color
:
white
;
color
:
darkred
;
qwidth
:
100%
;
}
#profilepicture
{
#profilepicture
{
display
:flex
;
border-radius
:
50%
;
border-radius
:
50%
;
width
:
50px
;
width
:
100px
;
height
:
100px
;
background-color
:
white
;
background-color
:
white
;
border
:
2px
solid
black
;
justify-content
:
center
;
align-items
:
center
;
border
:
3px
solid
base
.
$grey
;
}
}
#changeUserImage
{
#changeUserImage
{
display
:flex
;
display
:flex
;
}
}
#changeUserImage
#profilepicture
{
width
:
50px
;
height
:
50px
;
}
.infoText
{
background-color
:
white
;
padding
:
.5em
;
margin
:
.4em
;
}
form
{
form
{
background-color
:
base
.
$grey
;
background-color
:
base
.
$grey
;
color
:
black
;
color
:
black
;
...
@@ -126,12 +185,32 @@ input[type="password"]{
...
@@ -126,12 +185,32 @@ input[type="password"]{
button
{
button
{
background-color
:
base
.
$red
;
background-color
:
base
.
$red
;
color
:
black
;
color
:
black
;
border
:
1px
solid
black
;
border
:
1px
solid
black
;
margin
:
1em
;
margin
:
1em
;
}
}
button
:hover
{
background-color
:
#282828
;
}
.saveBtn
,
.delBtn
{
background-color
:
base
.
$green
;
color
:
white
;
font-weight
:
bold
;
padding
:
.9em
;
border
:none
;
}
.delBtn
{
background-color
:
darkred
;
}
#changeUserBtn
{
#changeUserBtn
{
padding
:
.9em
;
padding
:
.9em
;
padding-right
:
1
.5em
;
}
}
main
{
main
{
...
@@ -141,8 +220,9 @@ main {
...
@@ -141,8 +220,9 @@ main {
justify-content
:
center
;
justify-content
:
center
;
align-items
:
center
;
align-items
:
center
;
flex-direction
:
column
;
flex-direction
:
column
;
width
:
9
0%
;
width
:
10
0%
;
text-align
:
left
;
text-align
:
left
;
left
:
0
;
}
}
...
...
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