Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
allo-app
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
Nabil Sadki
allo-app
Commits
d046fe6d
Commit
d046fe6d
authored
Sep 24, 2019
by
Nabil Sadki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v1.1.2.0' into v1.1.4.0
parents
f8938999
33c31a98
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
39 deletions
+28
-39
login.page.html
src/app/pages/compte/login/login.page.html
+15
-39
login.page.scss
src/app/pages/compte/login/login.page.scss
+13
-0
No files found.
src/app/pages/compte/login/login.page.html
View file @
d046fe6d
<ion-header>
<ion-header>
<ion-toolbar
color=
"primary"
>
<ion-toolbar
color=
"primary"
padding-right
>
<ion-title>
Connexion
</ion-title>
<ion-title>
Connexion
</ion-title>
<ion-button
size=
"small"
fill=
"solid"
color=
"light"
slot=
"end"
(
click
)="
presentHelpModal
()"
>
<ion-button
size=
"small"
fill=
"solid"
color=
"light"
slot=
"end"
(
click
)="
presentHelpModal
()"
>
<ion-icon
name=
"information"
></ion-icon>
<ion-icon
name=
"information"
></ion-icon>
...
@@ -9,30 +9,6 @@
...
@@ -9,30 +9,6 @@
<ion-content
text-center
color=
"primary"
padding
>
<ion-content
text-center
color=
"primary"
padding
>
<!-- <img src="../../../assets/logo-full-white.png" /> -->
<!-- <img src="../../../assets/logo-full-white.png" /> -->
<ion-icon
name=
"unlock"
class=
"key-logo"
></ion-icon>
<ion-icon
name=
"unlock"
class=
"key-logo"
></ion-icon>
<!-- <ion-card>
<form #form="ngForm" (ngSubmit)="login(form)">
<ion-grid>
<ion-row justify-content-center>
<ion-col align-self-center size-md="6" size-lg="5" size-xs="12">
<div text-center>
<h3>Login</h3>
</div>
<div padding>
<ion-item>
<ion-input name="email" type="email" placeholder="your@email.com" ngModel required></ion-input>
</ion-item>
<ion-item>
<ion-input name="password" type="password" placeholder="Password" ngModel required></ion-input>
</ion-item>
</div>
<div padding>
<ion-button size="large" type="submit" [disabled]="form.invalid" expand="block">Login</ion-button>
</div>
</ion-col>
</ion-row>
</ion-grid>
</form>
</ion-card> -->
<form
[
formGroup
]="
validationsForm
"
(
ngSubmit
)="
onSubmit
(
validationsForm
.
value
)"
>
<form
[
formGroup
]="
validationsForm
"
(
ngSubmit
)="
onSubmit
(
validationsForm
.
value
)"
>
<ion-card
color=
"light"
no-padding
no-margin
>
<ion-card
color=
"light"
no-padding
no-margin
>
<ion-card-content
no-padding
>
<ion-card-content
no-padding
>
...
@@ -73,26 +49,26 @@
...
@@ -73,26 +49,26 @@
Connexion
Connexion
</ion-button>
</ion-button>
</form>
</form>
<
ion-item-divider
color=
"primary"
lines=
"none"
>
</ion-item-divider
>
<
!-- <ion-item-divider color="primary" lines="none"> </ion-item-divider> --
>
<!-- <ion-item-divider color="primary" justify-content-center>
<!-- <ion-item-divider color="primary" justify-content-center>
Se connecter avec Facebook ou Google
Se connecter avec Facebook ou Google
</ion-item-divider> -->
</ion-item-divider> -->
<div
class=
"separator"
>
<ion-button
color=
"light"
expand=
"block"
class=
"btn-g"
(
click
)="
doAnonymousLogIn
()"
no-margin
>
<span>
Autres options :
</span>
</div>
<ion-grid
no-padding
margin-top
>
<ion-row>
<ion-col
class=
"ion-no-padding ion-text-start"
>
<ion-button
color=
"dark"
class=
"btn-g"
(
click
)="
doAnonymousLogIn
()"
no-margin
>
<ion-icon
name=
"walk"
></ion-icon>
<ion-icon
name=
"walk"
></ion-icon>
Connexion a
nonyme
A
nonyme
</ion-button>
</ion-button>
<ion-grid
>
</ion-col
>
<ion-row
>
<ion-col
class=
"ion-no-padding"
>
<!-- <ion-col
>
<ion-button
color=
"light"
class=
"btn-g ion-no-margin"
>
<ion-button expand="block" class="btn-fb" no-margi
n>
<ion-icon
name=
"person-add"
></ion-ico
n>
<ion-icon name="logo-facebook"></ion-icon>
Créer un compte
</ion-button>
</ion-button>
</ion-col> -->
<ion-col>
<!-- <ion-button color="light" expand="block" class="btn-g" (click)="doGoogleLogin()" no-margin>
<ion-icon name="logo-google"></ion-icon>
</ion-button> -->
</ion-col>
</ion-col>
</ion-row>
</ion-row>
</ion-grid>
</ion-grid>
...
...
src/app/pages/compte/login/login.page.scss
View file @
d046fe6d
...
@@ -20,3 +20,15 @@ ion-icon.key-logo {
...
@@ -20,3 +20,15 @@ ion-icon.key-logo {
color
:
var
(
--
ion-color-danger
);
color
:
var
(
--
ion-color-danger
);
font-size
:
12px
;
font-size
:
12px
;
}
}
div
.separator
{
border-bottom
:
1px
solid
;
position
:
relative
;
margin-top
:
30px
;
span
{
position
:
absolute
;
top
:
-12px
;
background
:
var
(
--
ion-color-primary
,
#cc3333
);
left
:
10px
;
padding
:
0
5px
;
}
}
\ No newline at end of file
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