diff --git a/package.json b/package.json
index 71ee059..a144756 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "my-fit",
"version": "5.0.1",
- "author": "Ionic Framework",
- "homepage": "https://ionicframework.com/",
+ "author": "myFit - Personal Health Engine",
+ "homepage": "https://myfir.mermsemr.com/",
"scripts": {
"ng": "ng",
"start": "ng serve",
@@ -61,5 +61,5 @@
"ts-node": "~8.3.0",
"typescript": "~4.8.4"
},
- "description": "An Ionic project"
+ "description": "Merms Users Product"
}
diff --git a/src/app/start-page/start-page.page.html b/src/app/start-page/start-page.page.html
index f102e67..de9ffdf 100644
--- a/src/app/start-page/start-page.page.html
+++ b/src/app/start-page/start-page.page.html
@@ -19,10 +19,10 @@
- Login
+ Login
- Start
+ Start
diff --git a/src/app/start-page/start-page.page.scss b/src/app/start-page/start-page.page.scss
index b9b1561..864acf0 100644
--- a/src/app/start-page/start-page.page.scss
+++ b/src/app/start-page/start-page.page.scss
@@ -8,7 +8,25 @@
position: relative;
top:50%;
.card_sec1{
- background-color: rgb(144, 197, 214);
+ background-color:#1a3544;
+ color: white;
+ ion-card-title{
+ color:white;
+ }
+ ion-card-subtitle{
+ color: white;
+ }
}
}
+ .startb{
+ padding: 0px;
+ font-size: 14px;
+ font-weight: bold;
+ }
+ .start_login{
+
+ }
+ .start_signup{
+ background-color: lightgreen;
+ }
}
diff --git a/src/app/user-signup/user-signup.page.html b/src/app/user-signup/user-signup.page.html
index e1a172d..0ec0058 100644
--- a/src/app/user-signup/user-signup.page.html
+++ b/src/app/user-signup/user-signup.page.html
@@ -1,6 +1,9 @@
- UserSignup
+
+
+
+ Sign up
diff --git a/src/app/userpage/user-dash/user-dash.page.html b/src/app/userpage/user-dash/user-dash.page.html
index ae364f5..7ba6f7b 100644
--- a/src/app/userpage/user-dash/user-dash.page.html
+++ b/src/app/userpage/user-dash/user-dash.page.html
@@ -1,10 +1,5 @@
-
-
- UserDash
-
-
-
+
@@ -28,6 +23,7 @@
fill="outline"
class="slide_c"
outline
+ (click)="selectedMenu(x)"
>{{x.name}}
@@ -36,4 +32,9 @@
+
+ {{what_is_below}}
+
+
+
diff --git a/src/app/userpage/user-dash/user-dash.page.scss b/src/app/userpage/user-dash/user-dash.page.scss
index 52211a4..14df91f 100644
--- a/src/app/userpage/user-dash/user-dash.page.scss
+++ b/src/app/userpage/user-dash/user-dash.page.scss
@@ -1,14 +1,28 @@
-.dash_top{
- position: relative;
- top:50px;
+.dash_top {
+ padding: 20px 0px 0px 0px;
+ position: relative;
+ // top:50px;
}
.slide_c {
//width: 150px;
//background-color: red;
+ padding: 0px;
font-size: 11px;
text-transform: uppercase;
-
}
ion-slide {
width: unset !important;
}
+.box_below {
+ position: relative;
+ // top:65px;
+ background-color: lightcoral;
+ height: 80%;
+}
+
+.dash_box {
+ height: 100%;
+ width: 100%;
+ background-color: yellow;
+ padding: 2px;
+}
diff --git a/src/app/userpage/user-dash/user-dash.page.ts b/src/app/userpage/user-dash/user-dash.page.ts
index c8b802f..4458573 100644
--- a/src/app/userpage/user-dash/user-dash.page.ts
+++ b/src/app/userpage/user-dash/user-dash.page.ts
@@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
styleUrls: ['./user-dash.page.scss'],
})
export class UserDashPage implements OnInit {
-
+ what_is_below:string='';
constructor() { }
slides_items = [
{menu_key: "thisleadto", name: "This Menu 11", extra: "c"},
@@ -20,5 +20,8 @@ export class UserDashPage implements OnInit {
]
ngOnInit() {
}
-
+ selectedMenu(menuData:any){
+ alert(menuData.name);
+ this.what_is_below=menuData.name;
+ }
}
diff --git a/src/index.html b/src/index.html
index 3b0aae1..9112e62 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,7 +3,7 @@
- Ionic App
+ myFit App