Skip to content

D
dcarfixers_angular
Commit 98b712b8 by Jansa Jose
Options

Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa

# Conflicts: # src/assets/images/asset_landing_background.png # src/assets/images/asset_login_bg.png # src/assets/images/asset_title_background.png # src/assets/images/order_banner.png
parents ca37e119 1576e39f
Showing with 247 additions and 23 deletions
src/app/home/dashboard/dashboard.component.html
......@@ -12,23 +12,44 @@
<div class="container-fluid">
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link active profile" data-toggle="tab" href="#profile">Profile
<a class="nav-link active profile" data-toggle="tab" href="#profile">
<span>
Profile
</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link vehicle" data-toggle="tab" href="#vehicle">My Vehicle
<div class="notification" *ngIf="vehDetails">{{ vehDetails?.length || '0' }}</div>
<a class="nav-link vehicle" data-toggle="tab" href="#vehicle">
<span>
My Vehicle
<div class="notification" *ngIf="vehDetails">{{ vehDetails?.length || '0' }}</div>
</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link appointment" data-toggle="tab" href="#appointment" #appointmentTab>Appointments
<div class="notification" *ngIf="successBookDtls">{{ successBookDtls?.length || '0' }}</div>
<a class="nav-link appointment" data-toggle="tab" href="#appointment" #appointmentTab>
<span>
Appointments
<div class="notification" *ngIf="successBookDtls">{{ successBookDtls?.length || '0' }}</div>
</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link time" data-toggle="tab" href="#service" #serviceHistoryTab>
Service History
<div class="notification" *ngIf="bookingDetails">{{ bookingDetails?.length || '0' }}</div>
<span>
Service History
<div class="notification" *ngIf="bookingDetails">{{ bookingDetails?.length || '0' }}</div>
</span>
</a>
</li>
<li class="nav-item">
<a class="nav-link reminder" data-toggle="tab" href="#reminder">
<span>
Reminder
</span>
</a>
</li>
</ul>
......@@ -404,6 +425,58 @@
</div>
</div>
</div>
<div class="tab-pane container fade" id="reminder">
<div class="row">
<div class="col-md-12">
<div class="row line_row">
<div class="col-md-12">
<h3>Set reminder for service booking</h3>
<hr>
</div>
</div>
<div class="row line_row">
<div class="col-md-12">
<div class="vehicle_list">
<ul>
<li>
<div class="car_details">
<h5><strong>UI458792</strong>booking name</h5>
<div class="row">
<div class="col-md-3">Booking id</div>
<div class="col-md-1">:</div>
<div class="col-md-7">UI458792</div>
</div>
<div class="row">
<div class="col-md-3">Date</div>
<div class="col-md-1">:</div>
<div class="col-md-7">12 June 2019</div>
</div>
<div class="row">
<div class="col-md-3">Time</div>
<div class="col-md-1">:</div>
<div class="col-md-7">13:00:00</div>
</div>
<div class="row">
<div class="col-md-3">Snooze time</div>
<div class="col-md-1">:</div>
<div class="col-md-7">10 minutes</div>
</div>
</div>
<div class="clear"></div>
<div class="button_bay">
<div class="btn-group-justified" role="group" aria-label="Basic example">
<button type="button" class="btn book btn-sm">Enable reminder</button>
<button type="button" class="btn btn-danger btn-sm">Cancel reminder</button>
</div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
......
src/app/home/dashboard/dashboard.component.scss
......@@ -19,7 +19,7 @@
li {
list-style: none;
display: inline-block;
width: 25%;
width: 20%;
color: #fff;
background: transparent;
cursor: pointer;
......@@ -41,6 +41,9 @@
a.time {
background-image: url("/assets/images/asset_time.png");
}
a.reminder {
background-image: url("/assets/images/asset_reminder.png");
}
a {
color: #fff;
padding: 20px;
......@@ -58,7 +61,10 @@
background-repeat: no-repeat;
background-position: 20px;
padding-left: 65px;
position: relative;
span{
position: relative;
}
&:focus {
background-color: rgba(273, 273, 273, 0.2);
}
......@@ -67,15 +73,16 @@
}
.notification{
position: absolute;
top:15px;
right:15px;
width:35px;
height:35px;
font-size: 14px;
top: -10px;
right: -25px;
width:20px;
height:20px;
background: #fff;
border-radius: 50%;
color: #1e1e1e;
text-align: center;
padding: 4px;
padding:0px;
}
}
}
......
src/app/home/getapp/getapp.component.html 0 → 100644
<div class="getApp_wrapper">
<section class="module parallax parallax_title">
<div class="overlay">
<div class="container">
<div class="row">
<div class="col-md-8">
<div class="download_inner">
<h1><strong>The Carfixxers</strong><br>
Lorem Ipsum is simply dummy text of the printing and typesetting industry.
</h1>
<p>
It is a long established fact that a reader will be distracted by the readable content of
a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less
normal distribution of letters, as opposed to using 'Content here, content here', making it look
like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as
their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy.
</p>
<div class="store">
<img src="../../../assets/images/asset_playstore.png">
<img src="../../../assets/images/asset_applestore.png">
</div>
</div>
</div>
<div class="col-md-4">
<div class="phone_img">
<img src="../../../assets/images/asset_phone_img.png">
</div>
</div>
</div>
</div>
</div>
</section>
</div>
src/app/home/getapp/getapp.component.scss 0 → 100644
.getApp_wrapper{
.parallax_title {
background: url("/assets/images/asset_landing_background.png");
position: relative;
.overlay{
top:0px;
left:0px;
right:0px;
bottom:0px;
padding-top:85px;
background-color: rgba(0,0,0,0.7);
.download_inner{
padding-top:20%;
padding-bottom: 20%;
h1{
color: #fff;
font-weight: 300;
padding-bottom: 20px;
font-size: 25px;
strong{
font-size: 40px;
font-weight: 300;
}
}
p{
color: #fff;
font-weight: 400;
font-size: 16px;
}
.store{
padding-top: 20px;
img{
margin-right: 20px;
}
}
}
.phone_img{
padding-top:30px;
img{
width: 117%;
}
}
}
}
}
\ No newline at end of file
src/app/home/getapp/getapp.component.spec.ts 0 → 100644
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { GetappComponent } from './getapp.component';
describe('GetappComponent', () => {
let component: GetappComponent;
let fixture: ComponentFixture<GetappComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ GetappComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(GetappComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/home/getapp/getapp.component.ts 0 → 100644
import { Component, OnInit } from '@angular/core';
import { Router,ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-getapp',
templateUrl: './getapp.component.html',
styleUrls: ['./getapp.component.scss']
})
export class GetappComponent implements OnInit {
constructor(
private router : Router,
private route : ActivatedRoute
) { }
ngOnInit() {
}
goToPage(path,data=null){
this.router.navigateByUrl(path,{queryParams:data});
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
}
src/app/home/home.module.ts
......@@ -16,6 +16,7 @@ import { TncComponent } from './tnc/tnc.component';
import { PrivacyComponent } from './privacy/privacy.component';
import { TnsComponent } from './tns/tns.component';
import { TooltipModule } from 'ng2-tooltip-directive';
import { GetappComponent } from './getapp/getapp.component';
@NgModule({
......@@ -25,7 +26,8 @@ import { TooltipModule } from 'ng2-tooltip-directive';
ForgotComponent,
TncComponent,
PrivacyComponent,
TnsComponent
TnsComponent,
GetappComponent
],
imports: [
FormsModule,
......
src/app/home/home.routing.ts
......@@ -5,13 +5,15 @@ import { DashboardComponent } from './dashboard/dashboard.component';
import { TncComponent } from './tnc/tnc.component';
import { PrivacyComponent } from './privacy/privacy.component';
import { TnsComponent } from './tns/tns.component';
import {GetappComponent} from './getapp/getapp.component';
const ModuleRoutes: Routes = [
{ path: 'index', component: IndexComponent },
{ path: 'privacy', component: PrivacyComponent },
{ path: 'dashboard', component: DashboardComponent },
{ path: 'termsservice', component: TnsComponent },
{ path: 'termscondition', component: TncComponent }
{ path: 'termscondition', component: TncComponent },
{ path: 'getapp', component: GetappComponent}
];
export const moduleRouting: ModuleWithProviders = RouterModule.forChild(ModuleRoutes)
......
src/app/navbar/navbar.component.html
......@@ -55,6 +55,11 @@
AUTO SERVICE PROVIDER
</a>
</li>
<li class="nav-item">
<a class="nav-link" (click)="goToPage('getapp')">
GET THE APP
</a>
</li>
<li class="nav-item" *ngIf="!loginDetails">
<button (click)="resetForm()" class="sign_btn" data-toggle="modal" data-target="#login">
<img src="assets/images/asset_signin.png">SIGN IN
......@@ -65,7 +70,7 @@
<img src="assets/images/asset_signup.png">SIGN UP
</button>
</li>
<li class="nav-item" *ngIf="loginDetails">
<a class="nav-link dropdown">
<div class="account_div dropdown-toggle" data-toggle="dropdown">
......
src/assets/css/responsive.scss
......@@ -37,6 +37,12 @@
@media only screen and (min-device-width: 320px) and (max-device-width: 480px) {
.phone_img{
img{
width:100% !important;
}
}
.purchase_filter_section{
width: 100% !important;
}
......
src/environments/server.config.ts
let apiConfigUrl,imageStorageUrl;
// // Localhost
// apiConfigUrl = 'http://localhost/dcarfixers/Webservices/';
// imageStorageUrl = 'http://localhost/dcarfixers/';
// Localhost
apiConfigUrl = 'http://localhost/dcarfixers/Webservices/';
imageStorageUrl = 'http://localhost/dcarfixers/';
// // Techlabz
apiConfigUrl = 'https://techlabz.in/dcarfixers/Webservices/';
imageStorageUrl = 'https://techlabz.in/dcarfixers/';
// apiConfigUrl = 'https://techlabz.in/dcarfixers/Webservices/';
// imageStorageUrl = 'https://techlabz.in/dcarfixers/';
// carfixxers.com
// // carfixxers.com
// apiConfigUrl = 'https://carfixxers.com/admin/Webservices/';
// imageStorageUrl = 'https://carfixxers.com/admin/';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment