Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
projet-cdaw
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Quentin Vrel
projet-cdaw
Commits
707aa1ff
Commit
707aa1ff
authored
Dec 03, 2020
by
Zohten
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gvipers.imt-lille-douai.fr/QVrel/projet-cdaw
parents
8b249049
e07ff1bf
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
88 deletions
+22
-88
UserRibbon.vue
frontend/src/components/UserRibbon.vue
+1
-0
CheckboxInput.vue
frontend/src/components/form/CheckboxInput.vue
+0
-81
TextInput.vue
frontend/src/components/form/TextInput.vue
+0
-2
index.js
frontend/src/router/index.js
+5
-0
Home.vue
frontend/src/views/Home.vue
+5
-0
Login.vue
frontend/src/views/Login.vue
+6
-5
Register.vue
frontend/src/views/Register.vue
+5
-0
No files found.
frontend/src/components/UserRibbon.vue
View file @
707aa1ff
...
...
@@ -30,6 +30,7 @@ export default {
},
methods
:
{
logout
:
function
()
{
localStorage
.
removeItem
(
'user'
);
this
.
$router
.
push
(
'/'
)
}
}
...
...
frontend/src/components/form/CheckboxInput.vue
deleted
100644 → 0
View file @
8b249049
<
template
>
<div
class=
"form-check row"
>
<label
class=
"col-md-4 col-form-label text-md-right"
:for=
"this.id"
>
{{
label
}}
</label>
<input
class=
"form-check-input"
type=
"checkbox"
:id=
"this.id"
:name=
"this.id"
>
</div>
</
template
>
<
script
>
export
default
{
props
:
{
id
:
{
type
:
String
,
default
:
''
},
label
:
{
type
:
String
,
default
:
'label'
}
}
}
</
script
>
<
style
>
.row
{
display
:
flex
;
flex-wrap
:
wrap
;
margin-right
:
-15px
;
margin-left
:
-15px
;
}
.form-check-input
{
height
:
1.5em
;
width
:
1.5em
;
}
.form-check
{
position
:
relative
;
display
:
block
;
padding-left
:
1.25rem
;
}
.col-md-4
{
flex
:
0
0
33.3333333333%
;
max-width
:
33.3333333333%
;
}
.text-md-right
{
text-align
:
right
!important
;
}
.col-form-label
{
padding-top
:
calc
(
0.375rem
+
1px
);
padding-bottom
:
calc
(
0.375rem
+
1px
);
margin-bottom
:
0
;
line-height
:
1.6
;
font-style
:
normal
;
font-weight
:
bold
;
font-size
:
24px
;
line-height
:
42px
;
color
:
#000000
;
}
.col-md-6
{
flex
:
0
0
50%
;
max-width
:
50%
;
}
.col-md-4
,
.col-md-6
{
position
:
relative
;
width
:
100%
;
padding-right
:
15px
;
padding-left
:
15px
;
}
.form-control
{
display
:
block
;
width
:
100%
;
padding
:
0.375rem
0.75rem
;
font-size
:
1rem
;
font-weight
:
400
;
line-height
:
1.6
;
color
:
#495057
;
background-color
:
#fff
;
background-clip
:
padding-box
;
border
:
1px
solid
#ced4da
;
border-radius
:
0.25rem
;
transition
:
border-color
0.15s
ease-in-out
,
box-shadow
0.15s
ease-in-out
;
}
</
style
>
\ No newline at end of file
frontend/src/components/form/TextInput.vue
View file @
707aa1ff
...
...
@@ -22,8 +22,6 @@ export default {
.row
{
display
:
flex
;
flex-wrap
:
wrap
;
margin-right
:
-15px
;
margin-left
:
-15px
;
}
.col-md-4
{
flex
:
0
0
33.3333333333%
;
...
...
frontend/src/router/index.js
View file @
707aa1ff
...
...
@@ -31,6 +31,11 @@ const routes = [
path
:
'/login'
,
name
:
'Login'
,
component
:
()
=>
import
(
'../views/Login.vue'
)
},
{
path
:
'/profile'
,
name
:
'Profile'
,
component
:
()
=>
import
(
'../views/Profile.vue'
)
}
]
...
...
frontend/src/views/Home.vue
View file @
707aa1ff
...
...
@@ -18,6 +18,11 @@ export default {
PageTitle
,
ButtonText
},
beforeCreate
()
{
if
(
localStorage
.
getItem
(
'user'
)
!=
null
)
{
this
.
$router
.
push
(
'/lobby'
);
}
},
methods
:
{
onSubmit
:
function
(){
if
(
event
.
submitter
.
id
==
'login'
)
{
...
...
frontend/src/views/Login.vue
View file @
707aa1ff
...
...
@@ -5,8 +5,6 @@
<div
class=
"form-content"
>
<text-input
id=
"login"
label=
"Pseudo"
/>
<pwd-input
id=
"password"
label=
"Mot de passe"
/>
<checkbox-input
id=
"remember"
label=
"Se souvenir de moi"
/>
</div>
<svg-button
id=
"back"
svg=
"/icons/back.svg"
/>
...
...
@@ -21,15 +19,18 @@ import PageTitle from '@/components/PageTitle.vue'
import
SvgButton
from
'@/components/SvgButton.vue'
import
TextInput
from
'@/components/form/TextInput.vue'
import
PwdInput
from
'@/components/form/PwdInput.vue'
import
CheckboxInput
from
'@/components/form/CheckboxInput.vue'
export
default
{
name
:
'Login'
,
components
:
{
PageTitle
,
SvgButton
,
TextInput
,
PwdInput
,
CheckboxInput
PwdInput
},
beforeCreate
()
{
if
(
localStorage
.
getItem
(
'user'
)
!=
null
)
{
this
.
$router
.
push
(
'/lobby'
);
}
},
data
()
{
return
{
...
...
frontend/src/views/Register.vue
View file @
707aa1ff
...
...
@@ -43,6 +43,11 @@ export default {
showNotFilledError
:
false
,
}
},
beforeCreate
()
{
if
(
localStorage
.
getItem
(
'user'
)
!=
null
)
{
this
.
$router
.
push
(
'/lobby'
);
}
},
methods
:
{
onSubmit
:
async
function
(){
// If we press back, we go back
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment