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
a6f47bee
Commit
a6f47bee
authored
5 years ago
by
Ratnadeep Rajendra Kharade
Browse files
Options
Download
Email Patches
Plain Diff
Fixed bug on login page.
parent
db76e59f
master
15-find-the-street-name-by-geo-location-data
16-create-search-location-functionality
18-design-feedback-page-2
20-ride-history
20-ride-history-2
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
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
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
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
search_functionality
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/app/app.component.html
+1
-1
src/app/app.component.html
src/app/app.component.ts
+10
-3
src/app/app.component.ts
src/app/auth/login/login.page.ts
+1
-0
src/app/auth/login/login.page.ts
src/app/rest.service.ts
+1
-0
src/app/rest.service.ts
with
13 additions
and
4 deletions
+13
-4
src/app/app.component.html
+
1
-
1
View file @
a6f47bee
<ion-app>
<ion-split-pane
contentId=
"main-content"
>
<ion-menu
contentId=
"main-content"
type=
"overlay"
*ngIf=
"restService.isUserLoggedIn"
>
<ion-menu
contentId=
"main-content"
type=
"overlay"
*ngIf=
"restService.isUserLoggedIn
&& !restService.isLoginPage
"
>
<ion-header>
<ion-toolbar>
<ion-title>
Menu
</ion-title>
...
...
This diff is collapsed.
Click to expand it.
src/app/app.component.ts
+
10
-
3
View file @
a6f47bee
...
...
@@ -15,7 +15,7 @@ import { RestService } from './rest.service';
})
export
class
AppComponent
{
isLoginPage
=
false
;
public
appPages
=
[
{
...
...
@@ -36,9 +36,16 @@ export class AppComponent {
private
statusBar
:
StatusBar
,
public
restService
:
RestService
,
private
storage
:
Storage
,
private
router
:
Router
)
{
private
router
:
Router
)
{
this
.
initializeApp
();
let
href
=
window
.
location
.
pathname
if
(
href
===
"
/login
"
)
{
this
.
restService
.
isLoginPage
=
true
;
}
else
{
this
.
restService
.
isLoginPage
=
false
;
}
this
.
storage
.
get
(
'
token
'
).
then
((
token
)
=>
{
if
(
token
===
""
)
{
this
.
router
.
navigateByUrl
(
'
/login
'
);
...
...
This diff is collapsed.
Click to expand it.
src/app/auth/login/login.page.ts
+
1
-
0
View file @
a6f47bee
...
...
@@ -38,6 +38,7 @@ export class LoginPage implements OnInit {
.
subscribe
((
data
)
=>
{
console
.
log
(
'
my data:
'
,
data
);
this
.
restService
.
setToken
(
data
.
token
);
this
.
restService
.
isLoginPage
=
false
;
this
.
router
.
navigateByUrl
(
'
/home
'
);
},
(
error
)
=>
{
console
.
log
(
error
);
...
...
This diff is collapsed.
Click to expand it.
src/app/rest.service.ts
+
1
-
0
View file @
a6f47bee
...
...
@@ -7,6 +7,7 @@ import { Storage } from '@ionic/storage';
export
class
RestService
{
public
isUserLoggedIn
=
false
;
public
isLoginPage
=
false
;
constructor
(
private
storage
:
Storage
)
{
}
...
...
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