Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
getme
Project
Overview
Details
Activity
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
amal
getme
Commits
31d49272
Commit
31d49272
authored
Mar 09, 2020
by
Arjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
header fix
parent
3501fb56
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
41 additions
and
27 deletions
+41
-27
home.page.html
src/app/home/home.page.html
+9
-1
nearby.page.html
src/app/nearby/nearby.page.html
+2
-0
nearby.page.scss
src/app/nearby/nearby.page.scss
+4
-0
auth.service.ts
src/config/auth.service.ts
+26
-26
No files found.
src/app/home/home.page.html
View file @
31d49272
...
@@ -116,13 +116,21 @@
...
@@ -116,13 +116,21 @@
<div
*
ngIf=
"isShow"
[@
slideInOut
]
>
<div
*
ngIf=
"isShow"
[@
slideInOut
]
>
<ion-header>
<ion-header>
<div
class=
"nav_header"
>
<div
class=
"nav_header"
>
<ion-grid
class=
"no-gutter"
>
<ion-row
class=
"no-gutter"
>
<ion-col
class=
"no-gutter"
size=
"2"
>
<button
class=
"nav_btn nav_back floatLeft"
(
click
)="
istoggle
()"
>
<button
class=
"nav_btn nav_back floatLeft"
(
click
)="
istoggle
()"
>
<img
src=
"../assets/Group17_2.png"
/>
<img
src=
"../assets/Group17_2.png"
/>
</button>
</button>
</ion-col>
<ion-col
class=
"no-gutter"
size=
"8"
>
<div
class=
"nav_title floatLeft"
>
<div
class=
"nav_title floatLeft"
>
<h4>
CHANGE LOCATION
</h4>
<h4>
CHANGE LOCATION
</h4>
</div>
</div>
<div
class=
"clear"
></div>
</ion-col>
<ion-col
class=
"no-gutter"
size=
"2"
></ion-col>
</ion-row>
</ion-grid>
</div>
</div>
</ion-header>
</ion-header>
<ion-content
class=
"sort_wrappper"
>
<ion-content
class=
"sort_wrappper"
>
...
...
src/app/nearby/nearby.page.html
View file @
31d49272
<ion-header>
<ion-header>
<div
class=
"header-cc"
>
<ion-grid
class=
"no-gutter"
>
<ion-grid
class=
"no-gutter"
>
<ion-row
class=
"no-gutter"
>
<ion-row
class=
"no-gutter"
>
<ion-col
class=
"no-gutter"
size=
"2"
>
<ion-col
class=
"no-gutter"
size=
"2"
>
...
@@ -14,6 +15,7 @@
...
@@ -14,6 +15,7 @@
<ion-col
class=
"no-gutter"
size=
"2"
></ion-col>
<ion-col
class=
"no-gutter"
size=
"2"
></ion-col>
</ion-row>
</ion-row>
</ion-grid>
</ion-grid>
</div>
</ion-header>
</ion-header>
<ion-content>
<ion-content>
<div
class=
"nearby_map"
>
<div
class=
"nearby_map"
>
...
...
src/app/nearby/nearby.page.scss
View file @
31d49272
.header-cc
{
background-color
:
#fff
;
}
.nearby_map
{
.nearby_map
{
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
...
...
src/config/auth.service.ts
View file @
31d49272
...
@@ -36,32 +36,32 @@ export class AuthService {
...
@@ -36,32 +36,32 @@ export class AuthService {
this
.
type
=
1
;
this
.
type
=
1
;
this
.
regState
=
true
;
this
.
regState
=
true
;
//
this.afAuth.authState.subscribe(user => {
this
.
afAuth
.
authState
.
subscribe
(
user
=>
{
//
console.log('here');
console
.
log
(
'here'
);
//
console.log(user);
console
.
log
(
user
);
//
if (user) {
if
(
user
)
{
//
this.subjectService.sendLoginData(false);
this
.
subjectService
.
sendLoginData
(
false
);
//
this.userData = user;
this
.
userData
=
user
;
//
console.log(this.userData);
console
.
log
(
this
.
userData
);
//
this.service.set('user', JSON.stringify(this.userData));
this
.
service
.
set
(
'user'
,
JSON
.
stringify
(
this
.
userData
));
//
this.SetUserData(user);
this
.
SetUserData
(
user
);
//
this.loader = false;
this
.
loader
=
false
;
//
if (this.type === 1) {
if
(
this
.
type
===
1
)
{
//
this.regState = true;
this
.
regState
=
true
;
//
this.router.navigateByUrl('home', { replaceUrl: true });
this
.
router
.
navigateByUrl
(
'home'
,
{
replaceUrl
:
true
});
//
} else {
}
else
{
//
this.regState = false;
this
.
regState
=
false
;
//
this.router.navigateByUrl('verification', { replaceUrl: true });
this
.
router
.
navigateByUrl
(
'verification'
,
{
replaceUrl
:
true
});
//
}
}
//
} else {
}
else
{
//
console.log('here too');
console
.
log
(
'here too'
);
//
this.loader = false;
this
.
loader
=
false
;
//
this.subjectService.sendLoginData(true);
this
.
subjectService
.
sendLoginData
(
true
);
//
this.service.set('user', null);
this
.
service
.
set
(
'user'
,
null
);
//
JSON.parse(localStorage.getItem('user'));
JSON
.
parse
(
localStorage
.
getItem
(
'user'
));
//
this.router.navigateByUrl('login', { replaceUrl: true });
this
.
router
.
navigateByUrl
(
'login'
,
{
replaceUrl
:
true
});
//
}
}
//
});
});
}
}
checkLogin
()
{
checkLogin
()
{
...
...
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