Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
hdastageeri
hft_awado_app
Commits
e878023d
Commit
e878023d
authored
5 years ago
by
Ratnadeep Rajendra Kharade
Browse files
Options
Download
Email Patches
Plain Diff
Integrated login with api call
parent
e329eaf8
master
1-login-with-token-authentication
10-show-bikes-from-api-response-on-map
13-show-bike-details
14-api-integration-for-registration
15-find-the-street-name-by-geo-location-data
16-create-search-location-functionality
17-create-toast-message-service
18-design-feedback-page
18-design-feedback-page-2
19-registration-page-validation
20-ride-history
20-ride-history-2
21-reservation-history
22-hire-reserved-bike
24-routing-from-users-current-position-to-the-bike
25-current-bike-reservation-workflow
28-routing-from-bike-location-to-user-s-destination
34-navigation-menu-is-getting-displayed-on-login-page
36-cancel-hired-bike
37-display-username-on-homepage
38-display-calculated-name-of-the-street-on-reservation-and-hire-page
39-validation-on-login-page
4-reserve-a-bike
40-map-performance-improvement-map-angle-doesn-t-change-when-selected-3d
41-display-live-location-of-user-on-map
42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation
42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation-2
45-show-stepwise-navigation-instructions-on-my-ride-page
46-show-bicycle-route-between-bike-and-user-s-destination
47-show-alternate-routes-for-bike-to-destination
48-create-a-common-service-for-getting-user-s-current-location-and-live-location
49-show-loading-page
50-add-dependencies-locally-to-improve-app-performance
51-while-navigating-between-pages-map-doesn-t-load-properly
52-page-loader-is-getting-displayed-everywhere
53-scrollining-in-ride-history
53-scrollining-in-ride-history-2
55-change-password
56-create-dummy-page-or-menu-for-hotline-contact
57-registration-not-working-from-app
58-add-flow-on-navigate-button-to-route-from-user-to-bike
6-user-registration
60-create-common-theming-styles-and-colors
61-chnage-styles-for-bike-list-and-bug-fixes
62-change-in-feedback-workflow
63-password-reset-api-integration
64-close-button-on-home-page-to-redirect-to-bike-list
66-highlight-selected-route-from-list-of-different-routes
67-deactivate-user-api-integration
68-display-no-go-areas-on-map
69-add-launcher-icon-for-application-on-android
70-add-validation-for-feedback-should-not-be-empty
71-prediction-ui-implementation-send-location-of-bike-to-backend
72-feedback-toast-message
73-removal-here-maps-api-key
Show-Bike-details-when-bike-icon-is-clicked
prototype1
search_functionality
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/app.module.ts
+3
-0
src/app/app.module.ts
src/app/auth/login/login.page.html
+1
-1
src/app/auth/login/login.page.html
src/app/auth/login/login.page.ts
+23
-7
src/app/auth/login/login.page.ts
with
27 additions
and
8 deletions
+27
-8
src/app/app.module.ts
+
3
-
0
View file @
e878023d
...
...
@@ -10,11 +10,14 @@ import { AppComponent } from './app.component';
import
{
AppRoutingModule
}
from
'
./app-routing.module
'
;
import
{
Geolocation
}
from
'
@ionic-native/geolocation/ngx
'
;
import
{
HttpClientModule
}
from
'
@angular/common/http
'
;
@
NgModule
({
declarations
:
[
AppComponent
],
entryComponents
:
[],
imports
:
[
BrowserModule
,
HttpClientModule
,
IonicModule
.
forRoot
(),
AppRoutingModule
],
...
...
This diff is collapsed.
Click to expand it.
src/app/auth/login/login.page.html
+
1
-
1
View file @
e878023d
...
...
@@ -27,7 +27,7 @@
</div>
<div
padding
>
<ion-button
size=
"large"
expand=
"block"
(click)=
"
clickMe
()"
>
Login
</ion-button>
<ion-button
size=
"large"
expand=
"block"
(click)=
"
login
()"
>
Login
</ion-button>
</div>
</ion-col>
</ion-row>
...
...
This diff is collapsed.
Click to expand it.
src/app/auth/login/login.page.ts
+
23
-
7
View file @
e878023d
import
{
Component
,
OnInit
}
from
'
@angular/core
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
Observable
}
from
'
rxjs
'
;
import
{
HttpClient
}
from
'
@angular/common/http
'
;
@
Component
({
selector
:
'
app-login
'
,
templateUrl
:
'
./login.page.html
'
,
...
...
@@ -9,20 +12,33 @@ import { Router } from '@angular/router';
export
class
LoginPage
implements
OnInit
{
username
=
""
;
password
=
""
;
correctCredentials
=
false
;
correctCredentials
=
false
;
loginApi
:
Observable
<
any
>
;
constructor
(
private
router
:
Router
)
{
}
constructor
(
private
router
:
Router
,
public
httpClient
:
HttpClient
)
{
}
ngOnInit
()
{
}
clickMe
()
{
if
(
this
.
username
===
"
admin
"
&&
this
.
password
===
"
admin
"
||
this
.
username
===
"
demo
"
&&
this
.
password
===
"
demo
"
)
{
this
.
router
.
navigateByUrl
(
'
/home
'
);
}
else
{
this
.
correctCredentials
=
true
;
}
login
()
{
this
.
loginApiCall
();
}
loginApiCall
()
{
this
.
loginApi
=
this
.
httpClient
.
post
(
'
http://193.196.52.237:8081/authenticate
'
,
{
"
email
"
:
this
.
username
,
"
password
"
:
this
.
password
});
this
.
loginApi
.
subscribe
((
data
)
=>
{
console
.
log
(
'
my data:
'
,
data
);
this
.
router
.
navigateByUrl
(
'
/home
'
);
},
(
error
)
=>
{
console
.
log
(
error
);
this
.
correctCredentials
=
true
;
});
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets