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
e491395d
Commit
e491395d
authored
5 years ago
by
gap95
Browse files
Options
Download
Email Patches
Plain Diff
scrolling added in ride history
parent
96705627
master
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
53-scrollining-in-ride-history-2
57-registration-not-working-from-app
58-add-flow-on-navigate-button-to-route-from-user-to-bike
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
1 merge request
!41
Resolve "Scrollining in Ride History"
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/app/app-routing.module.ts
+41
-36
src/app/app-routing.module.ts
src/app/app.component.ts
+5
-0
src/app/app.component.ts
src/app/hirebike/hirebike.page.ts
+1
-0
src/app/hirebike/hirebike.page.ts
src/app/ridehistory/ridehistory.page.scss
+1
-1
src/app/ridehistory/ridehistory.page.scss
with
48 additions
and
37 deletions
+48
-37
src/app/app-routing.module.ts
+
41
-
36
View file @
e491395d
import
{
NgModule
}
from
'
@angular/core
'
;
import
{
NgModule
}
from
'
@angular/core
'
;
import
{
PreloadAllModules
,
RouterModule
,
Routes
}
from
'
@angular/router
'
;
import
{
PreloadAllModules
,
RouterModule
,
Routes
}
from
'
@angular/router
'
;
const
routes
:
Routes
=
[
const
routes
:
Routes
=
[
{
{
path
:
''
,
path
:
''
,
redirectTo
:
'
login
'
,
redirectTo
:
'
login
'
,
pathMatch
:
'
full
'
pathMatch
:
'
full
'
},
},
{
{
path
:
'
home
'
,
path
:
'
home
'
,
loadChildren
:
()
=>
import
(
'
./home/home.module
'
).
then
(
m
=>
m
.
HomePageModule
)
loadChildren
:
()
=>
import
(
'
./home/home.module
'
).
then
(
m
=>
m
.
HomePageModule
)
},
},
{
{
path
:
'
list
'
,
path
:
'
list
'
,
loadChildren
:
()
=>
import
(
'
./list/list.module
'
).
then
(
m
=>
m
.
ListPageModule
)
loadChildren
:
()
=>
import
(
'
./list/list.module
'
).
then
(
m
=>
m
.
ListPageModule
)
},
},
{
{
path
:
'
login
'
,
path
:
'
login
'
,
loadChildren
:
()
=>
import
(
'
./auth/login/login.module
'
).
then
(
m
=>
m
.
LoginPageModule
)
loadChildren
:
()
=>
import
(
'
./auth/login/login.module
'
).
then
(
m
=>
m
.
LoginPageModule
)
},
},
{
{
path
:
'
register
'
,
path
:
'
register
'
,
loadChildren
:
()
=>
import
(
'
./auth/register/register.module
'
).
then
(
m
=>
m
.
RegisterPageModule
)
loadChildren
:
()
=>
import
(
'
./auth/register/register.module
'
).
then
(
m
=>
m
.
RegisterPageModule
)
},
{
},
{
path
:
'
myreservation
'
,
path
:
'
myreservation
'
,
loadChildren
:
()
=>
import
(
'
./myreservation/myreservation.module
'
).
then
(
m
=>
m
.
MyreservationPageModule
)
loadChildren
:
()
=>
import
(
'
./myreservation/myreservation.module
'
).
then
(
m
=>
m
.
MyreservationPageModule
)
},
},
...
@@ -34,6 +35,10 @@ const routes: Routes = [
...
@@ -34,6 +35,10 @@ const routes: Routes = [
path
:
'
ridehistory
'
,
path
:
'
ridehistory
'
,
loadChildren
:
()
=>
import
(
'
./ridehistory/ridehistory.module
'
).
then
(
m
=>
m
.
RidehistoryPageModule
)
loadChildren
:
()
=>
import
(
'
./ridehistory/ridehistory.module
'
).
then
(
m
=>
m
.
RidehistoryPageModule
)
},
},
{
path
:
'
feedback
'
,
loadChildren
:
()
=>
import
(
'
./feedback/feedback.module
'
).
then
(
m
=>
m
.
FeedbackPageModule
)
},
{
{
path
:
'
help-line
'
,
path
:
'
help-line
'
,
loadChildren
:
()
=>
import
(
'
./help-line/help-line.module
'
).
then
(
m
=>
m
.
HelpLinePageModule
)
loadChildren
:
()
=>
import
(
'
./help-line/help-line.module
'
).
then
(
m
=>
m
.
HelpLinePageModule
)
...
@@ -43,14 +48,14 @@ const routes: Routes = [
...
@@ -43,14 +48,14 @@ const routes: Routes = [
loadChildren
:
()
=>
import
(
'
./reset-password/reset-password.module
'
).
then
(
m
=>
m
.
ResetPasswordPageModule
)
loadChildren
:
()
=>
import
(
'
./reset-password/reset-password.module
'
).
then
(
m
=>
m
.
ResetPasswordPageModule
)
}
}
];
];
@
NgModule
({
@
NgModule
({
imports
:
[
imports
:
[
RouterModule
.
forRoot
(
routes
,
{
preloadingStrategy
:
PreloadAllModules
})
RouterModule
.
forRoot
(
routes
,
{
preloadingStrategy
:
PreloadAllModules
})
],
],
exports
:
[
RouterModule
]
exports
:
[
RouterModule
]
})
})
export
class
AppRoutingModule
{}
export
class
AppRoutingModule
{}
This diff is collapsed.
Click to expand it.
src/app/app.component.ts
+
5
-
0
View file @
e491395d
...
@@ -38,6 +38,11 @@ export class AppComponent {
...
@@ -38,6 +38,11 @@ export class AppComponent {
url
:
'
/ridehistory
'
,
url
:
'
/ridehistory
'
,
icon
:
'
clipboard
'
icon
:
'
clipboard
'
},
},
{
title
:
'
Feedback
'
,
url
:
'
/feedback
'
,
icon
:
'
clipboard
'
},
{
{
title
:
'
Help
'
,
title
:
'
Help
'
,
url
:
'
/help-line
'
,
url
:
'
/help-line
'
,
...
...
This diff is collapsed.
Click to expand it.
src/app/hirebike/hirebike.page.ts
+
1
-
0
View file @
e491395d
...
@@ -217,6 +217,7 @@ export class HirebikePage implements OnInit {
...
@@ -217,6 +217,7 @@ export class HirebikePage implements OnInit {
let
bikeApi
=
this
.
httpClient
.
get
(
url
,
{
headers
});
let
bikeApi
=
this
.
httpClient
.
get
(
url
,
{
headers
});
bikeApi
.
subscribe
((
resp
)
=>
{
bikeApi
.
subscribe
((
resp
)
=>
{
console
.
log
(
'
my data:
'
,
resp
);
console
.
log
(
'
my data:
'
,
resp
);
this
.
feedbackService
.
setBikeid
(
this
.
bikeDetails
.
id
);
this
.
loadingService
.
hideLoader
();
this
.
loadingService
.
hideLoader
();
this
.
toastService
.
showToast
(
"
Trip Started
"
);
this
.
toastService
.
showToast
(
"
Trip Started
"
);
this
.
isBikeHired
=
true
;
this
.
isBikeHired
=
true
;
...
...
This diff is collapsed.
Click to expand it.
src/app/ridehistory/ridehistory.page.scss
+
1
-
1
View file @
e491395d
.ride-list-container
{
.ride-list-container
{
position
:
relative
;
position
:
relative
;
overflow-y
:
scroll
;
.bike-list-expander
{
.bike-list-expander
{
position
:
absolute
;
position
:
absolute
;
font-size
:
32px
;
font-size
:
32px
;
...
...
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