IONIC/myFit2023
1
0
Fork 0
Code Issues Pull Requests Releases Activity

conflict merge

Browse Source
This commit is contained in:
Toks Law
2023-06-19 07:44:51 -04:00
parent 1eb42ad727 f29b9cbd05
commit 746fa372d7
19 changed files with 252 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/compo/menu-card/menu-card.component.html
+11
View File
@@ -0,0 +1,11 @@
<ion-card class="menu_card">
<ion-card-header>
<ion-card-subtitle>
<ion-icon name="logo-ionic" size="large" color="primary"></ion-icon>
</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
Here's a small text description for the card content. Nothing more, nothing less.
</ion-card-content>
</ion-card>
src/app/compo/menu-card/menu-card.component.scss
+10
View File
@@ -0,0 +1,10 @@
.menu_card{
//background-image: url('../../../assets/img/myfit_home.jpg');
background-image: linear-gradient(to right, aliceblue , white);
background-repeat: no-repeat;
background-size: cover;
height: 250px;
}
ion-card {
margin: 0;
}
src/app/compo/menu-card/menu-card.component.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { MenuCardComponent } from './menu-card.component';
describe('MenuCardComponent', () => {
let component: MenuCardComponent;
let fixture: ComponentFixture<MenuCardComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ MenuCardComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(MenuCardComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/compo/menu-card/menu-card.component.ts
+14
View File
@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-menu-card',
templateUrl: './menu-card.component.html',
styleUrls: ['./menu-card.component.scss'],
})
export class MenuCardComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
src/app/compo/user-footer/user-footer.component.html
+31
View File
@@ -0,0 +1,31 @@
<ion-toolbar>
<ion-grid>
<ion-row>
<ion-col class="footer-col">
<ion-button fill="clear" size="small">
<ion-icon slot="icon-only" name="home"></ion-icon>
</ion-button>
</ion-col>
<ion-col class="footer-col">
<ion-button fill="clear" size="small">
<ion-icon slot="icon-only" name="star"></ion-icon>
</ion-button>
</ion-col>
<ion-col class="footer-col">
<ion-button fill="clear" size="small">
<ion-icon slot="icon-only" name="star"></ion-icon>
</ion-button>
</ion-col>
<ion-col class="footer-col">
<ion-button fill="clear" size="small">
<ion-icon slot="icon-only" name="star"></ion-icon>
</ion-button>
</ion-col>
<ion-col class="footer-col">
<ion-button fill="clear" size="small">
<ion-icon slot="icon-only" name="settings"></ion-icon>
</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</ion-toolbar>
src/app/compo/user-footer/user-footer.component.scss
+3
View File
@@ -0,0 +1,3 @@
.footer-col{
text-align: center;
}
src/app/compo/user-footer/user-footer.component.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { UserFooterComponent } from './user-footer.component';
describe('UserFooterComponent', () => {
let component: UserFooterComponent;
let fixture: ComponentFixture<UserFooterComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ UserFooterComponent ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(UserFooterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/compo/user-footer/user-footer.component.ts
+14
View File
@@ -0,0 +1,14 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-user-footer',
templateUrl: './user-footer.component.html',
styleUrls: ['./user-footer.component.scss'],
})
export class UserFooterComponent implements OnInit {
constructor() { }
ngOnInit() {}
}
src/app/services/wrench-service.service.spec.ts
+16
View File
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { WrenchServiceService } from './wrench-service.service';
describe('WrenchServiceService', () => {
let service: WrenchServiceService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(WrenchServiceService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
src/app/services/wrench-service.service.ts
+33
View File
@@ -0,0 +1,33 @@
//import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
export interface ApiResult {
page: number;
results: any[];
total_pages: number;
total_results: number;
}
@Injectable({
providedIn: 'root'
})
export class WrenchServiceService {
constructor(private http: HttpClient) {}
getTopRatedMovies(page = 1): Observable<ApiResult> {
return this.http.get<ApiResult>(
`${environment.baseUrl}/movie/popular?page=${page}&api_key=${environment.apiKey}`
);
}
getMovieDetails(id: string): Observable<any> {
return this.http.get<ApiResult>(
`${environment.baseUrl}/movie/${id}?api_key=${environment.apiKey}`
);
}
}
src/app/start-page/start-page.page.html
+1 -1
View File
@@ -11,7 +11,7 @@
<ion-card-header>
<ion-card-title>myFit</ion-card-title>
<ion-card-subtitle>
your Healty Fliestyle Assistant
your Healty LifeStyle Assistant
</ion-card-subtitle>
</ion-card-header>
src/app/start-page/start-page.page.scss
+5 -4
View File
@@ -6,13 +6,14 @@
background-size: cover;
.home_card{
position: relative;
max-width: 400px;
top:50%;
.card_sec1{
background-color:#1a3544;
color: white;
background-color:#1a3544;
color: white;
ion-card-title{
color:white;
}
}
ion-card-subtitle{
color: white;
}
@@ -24,7 +25,7 @@
font-weight: bold;
}
.start_login{
background-color: lightgreen;
}
.start_signup{
background-color: lightgreen;
src/app/user-login/user-login.page.html
+6 -3
View File
@@ -19,9 +19,12 @@
<ion-label position="floating">Password</ion-label>
<ion-input type="password" required></ion-input>
</ion-item>
<ion-item lines="full">
<ion-button type="submit" color="danger" size="small" (click)="completeLogin()">Sign In</ion-button>
</ion-item>
<ion-row>
<ion-col>
<ion-button type="submit" expand="block" shape="round" (click)="completeLogin()">Sign In</ion-button>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<a [routerLink]="['/forgot-password']" class="small-text">Forgot Password?</a>
src/app/user-signup/user-signup.page.html
+35 -2
View File
@@ -3,10 +3,43 @@
<ion-buttons slot="start">
<ion-back-button></ion-back-button>
</ion-buttons>
<ion-title>Sign up</ion-title>
<ion-title>Sign Up</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-content>
<form class="login_box">
<ion-card>
<ion-card-content>
<ion-item lines="full">
<ion-label position="floating">Firstname</ion-label>
<ion-input type="text" required></ion-input>
</ion-item>
<ion-item lines="full">
<ion-label position="floating">Lastname</ion-label>
<ion-input type="text" required></ion-input>
</ion-item>
<ion-item lines="full">
<ion-label position="floating">Email(username)</ion-label>
<ion-input type="text" required></ion-input>
</ion-item>
<ion-item lines="full">
<ion-label position="floating">Password</ion-label>
<ion-input type="password" required></ion-input>
</ion-item>
<ion-row>
<ion-col>
<ion-button type="submit" expand="block" shape="round">Sign Up</ion-button>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<a [routerLink]="['/login']" class="small-text">Already have an account ?</a>
</ion-col>
</ion-row>
</ion-card-content>
</ion-card>
</form>
</ion-content>
src/app/userpage/user-dash/user-dash.module.ts
+3 -2
View File
@@ -7,7 +7,8 @@ import { IonicModule } from '@ionic/angular';
import { UserDashPageRoutingModule } from './user-dash-routing.module';
import { UserDashPage } from './user-dash.page';
import { UserFooterComponent } from './../../compo/user-footer/user-footer.component';
import { MenuCardComponent } from './../../compo/menu-card/menu-card.component';
@NgModule({
imports: [
CommonModule,
@@ -15,6 +16,6 @@ import { UserDashPage } from './user-dash.page';
IonicModule,
UserDashPageRoutingModule
],
declarations: [UserDashPage]
declarations: [UserDashPage,UserFooterComponent,MenuCardComponent]
})
export class UserDashPageModule {}
src/app/userpage/user-dash/user-dash.page.html
+16 -51
View File
@@ -14,83 +14,44 @@
</ion-card-content>
<ion-slides pager="true">
<ion-slide *ngFor="let x of slides_items; let i = index">
<ion-button shape="round" size="default" class="slide_c" outline
<ion-button shape="round" size="default" class="slide_c" outline
(click)="selectedMenu(x)">{{x.name}}</ion-button>
</ion-slide>
</ion-slides>
</ion-card>
<div class="dash_box">
<div class="dash_top">
</div>
<ion-grid class="box_below">
<ion-grid>
</div>
<ion-grid>
<ion-row class="home_box_card">
<ion-col>
<ion-card class="first_card">
<ion-card-header>
<ion-card-subtitle>Card Subtitle</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
Here's a small text description for the card content. Nothing more, nothing less.
</ion-card-content>
</ion-card>
<app-menu-card />
</ion-col>
<ion-col>
<ion-card class="first_card">
<ion-card-header>
<ion-card-subtitle>Card Subtitle</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
Here's a small text description for the card content. Nothing more, nothing less.
</ion-card-content>
</ion-card>
<app-menu-card />
</ion-col>
</ion-row>
<ion-row class="home_box_card">
<ion-col>
<ion-card class="first_card">
<ion-card-header>
<ion-card-subtitle>Card Subtitle</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
Here's a small text description for the card content. Nothing more, nothing less.
</ion-card-content>
</ion-card>
<app-menu-card />
</ion-col>
<ion-col>
<ion-card class="first_card">
<ion-card-header>
<ion-card-subtitle>Card Subtitle</ion-card-subtitle>
</ion-card-header>
<ion-card-content>
Here's a small text description for the card content. Nothing more, nothing less.
</ion-card-content>
</ion-card>
<app-menu-card />
</ion-col>
</ion-row>
</ion-grid>
<ion-grid class="box_below">
<div>{{what_is_below}}</div>
</ion-grid>
</div>
<ion-grid>
<ion-row class="block_list" *ngFor="let item of blogData" (click)="selectedBlog(item)">
<ion-row class="block_list" *ngFor="let item of blogData" (click)="selectedBlog(item)">
<ion-col><img alt={{item.post_title}} src={{item.meta_value}} /></ion-col>
<ion-col>
{{item.post_title}}
@@ -105,9 +66,13 @@
</ion-card-header>
<ion-card-content>
THis is some contatnts to show for noe
</ion-card-content>
</ion-card> -->
</ion-content>
</ion-content>
<ion-footer class="ion-no-border">
<app-user-footer />
</ion-footer>
src/app/userpage/user-dash/user-dash.page.scss
+4 -3
View File
@@ -28,7 +28,7 @@ ion-slide {
margin: 0px;
}
.home_box_card {
background-color: yellow;
//background-color: yellow;
margin: 0px;
// height: 280px;
}
@@ -38,7 +38,8 @@ ion-card {
}
.first_card{
background-image: url('../../../assets/img/myfit_home.jpg');
//background-image: url('../../../assets/img/myfit_home.jpg');
background-image: linear-gradient(to right, red , yellow);
background-repeat: no-repeat;
background-size: cover;
height: 250px;
@@ -48,4 +49,4 @@ ion-card {
background-color: aliceblue;
margin: 10px 5px 5px 5px;
}
}
src/environments/environment.prod.ts
+1 -4
View File
@@ -1,6 +1,3 @@
export const environment = {
production: true,
apiKey: '', // <-- Enter your own key here!'
baseUrl: 'https://devapi.mermsemr.com/en/mobile/api/v2/myfit',
images: 'http://image.tmdb.org/t/p',
production: true
};
src/environments/environment.ts
+1
View File
@@ -2,6 +2,7 @@
// `ng build` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false,
apiKey: '', // <-- Enter your own key here!'