Skip to content

M
Moments
Commit c7e6cc67 by abraham
Options

Merge branch 'master' into abraham

parents 556abe2a 033de085
Showing with 277 additions and 43 deletions
package.json
...@@ -19,8 +19,10 @@ ...@@ -19,8 +19,10 @@
"@angular/platform-browser": "~7.2.0", "@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0", "@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0", "@angular/router": "~7.2.0",
"angular-font-awesome": "^3.1.2",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"font-awesome": "^4.7.0",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"ng5-slider": "^1.2.4", "ng5-slider": "^1.2.4",
"ngx-slick-carousel": "^0.4.4", "ngx-slick-carousel": "^0.4.4",
......
src/app/app.module.ts
...@@ -6,6 +6,7 @@ import { AppComponent } from './app.component'; ...@@ -6,6 +6,7 @@ import { AppComponent } from './app.component';
import { HeaderComponent } from './header/header.component'; import { HeaderComponent } from './header/header.component';
import{ BodyModule } from './body/body.module'; import{ BodyModule } from './body/body.module';
import { FooterComponent } from './footer/footer.component'; import { FooterComponent } from './footer/footer.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
...@@ -16,6 +17,7 @@ import { FooterComponent } from './footer/footer.component'; ...@@ -16,6 +17,7 @@ import { FooterComponent } from './footer/footer.component';
BrowserModule, BrowserModule,
AppRoutingModule, AppRoutingModule,
BodyModule BodyModule
], ],
providers: [], providers: [],
bootstrap: [AppComponent] bootstrap: [AppComponent]
......
src/app/body/aboutservice/aboutservice.component.spec.ts 0 → 100644
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AboutserviceComponent } from './aboutservice.component';
describe('AboutserviceComponent', () => {
let component: AboutserviceComponent;
let fixture: ComponentFixture<AboutserviceComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AboutserviceComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(AboutserviceComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/body/aboutservice/aboutservice.component.ts 0 → 100644
import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-aboutservice',
templateUrl: './aboutservice.component.html',
styleUrls: ['./aboutservice.component.scss']
})
export class AboutserviceComponent implements OnInit {
constructor(private route: ActivatedRoute, private router: Router) { }
ngOnInit() {
}
/*slideConfig = {"slidesToShow": 1, "slidesToScroll": 1,"arrow": false,"dots":true,"autoplay":false,"autoplaySpeed":2000};*/
goto(path,data=null){
this.router.navigateByUrl(path,{queryParams:data});
}
}
src/app/body/body-routing.module.ts
...@@ -10,6 +10,7 @@ import { LoginvendorsComponent } from './loginvendors/loginvendors.component'; ...@@ -10,6 +10,7 @@ import { LoginvendorsComponent } from './loginvendors/loginvendors.component';
import { PaymentComponent } from './payment/payment.component'; import { PaymentComponent } from './payment/payment.component';
import { VenuesComponent } from './venues/venues.component'; import { VenuesComponent } from './venues/venues.component';
import { VendorsListComponent } from './vendors-list/vendors-list.component'; import { VendorsListComponent } from './vendors-list/vendors-list.component';
import { AboutserviceComponent } from './aboutservice/aboutservice.component';
const ModuleRoutes: Routes = [ const ModuleRoutes: Routes = [
{ {
path:'login',component: LoginComponent path:'login',component: LoginComponent
...@@ -40,6 +41,9 @@ const ModuleRoutes: Routes = [ ...@@ -40,6 +41,9 @@ const ModuleRoutes: Routes = [
}, },
{ {
path:'vendors-list',component: VendorsListComponent path:'vendors-list',component: VendorsListComponent
},
{
path:'aboutservice',component: AboutserviceComponent
} }
]; ];
......
src/app/body/body.module.ts
...@@ -12,16 +12,18 @@ import { PlanningComponent } from './planning/planning.component'; ...@@ -12,16 +12,18 @@ import { PlanningComponent } from './planning/planning.component';
import { VenuesComponent } from './venues/venues.component'; import { VenuesComponent } from './venues/venues.component';
import { VendorsListComponent } from './vendors-list/vendors-list.component'; import { VendorsListComponent } from './vendors-list/vendors-list.component';
import { Ng5SliderModule } from 'ng5-slider'; import { Ng5SliderModule } from 'ng5-slider';
import { AboutserviceComponent } from './aboutservice/aboutservice.component';
import { AngularFontAwesomeModule } from 'angular-font-awesome';
@NgModule({ @NgModule({
declarations: [LoginComponent, JoinComponent, HomeComponent, LoginaccountComponent, LoginvendorsComponent, PaymentComponent, VenuesComponent, VendorsListComponent,PlanningComponent], declarations: [LoginComponent, JoinComponent, HomeComponent, LoginaccountComponent, LoginvendorsComponent, PaymentComponent, VenuesComponent, VendorsListComponent,PlanningComponent, AboutserviceComponent],
imports: [ imports: [
CommonModule, CommonModule,
moduleRouting, moduleRouting,
SlickCarouselModule, SlickCarouselModule,
Ng5SliderModule Ng5SliderModule,
AngularFontAwesomeModule
] ]
}) })
export class BodyModule { } export class BodyModule { }
src/app/body/vendors-list/vendors-list.component.scss
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
outline: none; outline: none;
cursor: pointer; cursor: pointer;
option{ option{
font-size: 16px; font-size: 14px;
color: #b638b6; color: #b638b6;
display: block; display: block;
line-height: 22px; line-height: 22px;
...@@ -136,13 +136,129 @@ ...@@ -136,13 +136,129 @@
margin-bottom: 15px; margin-bottom: 15px;
} }
p{
padding: 18px;
}
.input-dfprav .input-dfprav
{ {
margin-left: 15px; margin-left: 15px;
} }
.ng5-slider{
width: 90%;
margin: 35px 15px 15px;
.ng5-slider-span {
.ng5-slider-bubble {
font-size: 12px;
.ng5-slider-limit {
.ng5-slider-floor{
display: none;
}
}
}
}
}
} }
.m_vendors_left_rev{
.tab_img{
// height: 100%;
// width: 100%;
img{
max-width: 100%;
height: 235px;
}
h4{
color: #4c4c4c;
font-family: 'Roboto', sans-serif;
font-weight: 600;
font-size: 16px;
margin: 5px 0;
}
}
.m_rate_cnt{
h3{
color: #848484;
font-family: 'Roboto', sans-serif;
font-weight: 400;
font-size: 15px;
margin: 5px 0;
}
p{
font-size: 13px;
color: #848484;
font-family: 'Roboto', sans-serif;
font-weight: 400;
margin: 0 0 15px 0;
}
.rev_m{
font-size: 14px;
color: #b0b0b0;
font-family: 'Roboto', sans-serif;
font-weight: 400;
position: relative;
bottom: 8px;
margin-left: 9px;
}
} }
.rat_box{
overflow: auto;
/****** Style Star Rating Widget *****/
.rating {
border: none;
float: left;
}
.rating > input { display: none; }
.rating > label:before {
margin: 5px;
font-size: 1.25em;
font-family: FontAwesome;
display: inline-block;
content: "\f005";
}
.rating > .half:before {
content: "\f089";
position: absolute;
}
.rating > label {
color: #ddd;
float: right;
margin-bottom: 0px;
}
/***** CSS Magic to Highlight Stars on Hover *****/
.rating > input:checked ~ label, /* show gold star when clicked */
.rating:not(:checked) > label:hover, /* hover current star */
.rating:not(:checked) > label:hover ~ label { color: #FFD700; } /* hover previous stars in list */
.rating > input:checked + label:hover, /* hover current star when changing rating */
.rating > input:checked ~ label:hover,
.rating > label:hover ~ input:checked ~ label, /* lighten current selection */
.rating > input:checked ~ label:hover ~ label { color: #FFED85; }
}
/* .rat_cont{
p{
font-weight: 400;
font-size: 15px;
color: #b0b0b0;
margin-bottom: 0px;
padding-bottom: 5px;
}
h4{
font-weight: 400;
font-size: 16px;
color: #646464;
margin-bottom: 0px;
padding-bottom: 5px;
}
}*/
}
}
} }
} }
} }
......
src/app/body/vendors-list/vendors-list.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Options } from 'ng5-slider'; import { Options } from 'ng5-slider';
import { Router, ActivatedRoute } from '@angular/router';
@Component({ @Component({
selector: 'app-vendors-list', selector: 'app-vendors-list',
templateUrl: './vendors-list.component.html', templateUrl: './vendors-list.component.html',
styleUrls: ['./vendors-list.component.scss'] styleUrls: ['./vendors-list.component.scss']
}) })
export class VendorsListComponent implements OnInit { export class VendorsListComponent implements OnInit {
value: number = 123; dist: number = 50;
options: Options = { count: Options = {
floor: 0, floor: 0,
ceil: 250 ceil: 100
};
pricevalue: number = 5000;
rate: Options = {
floor: 0,
ceil: 10000
}; };
constructor() { } constructor(private route: ActivatedRoute, private router: Router) { }
ngOnInit() { ngOnInit() {
} }
goto(path,data=null){
this.router.navigateByUrl(path,{queryParams:data});
}
} }
src/app/body/venues/venues.component.html
...@@ -20,42 +20,42 @@ ...@@ -20,42 +20,42 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/museums.jpg"> <img class="venues_halls_img" src="../../../assets/img/museums.jpg">
<p>Museums</p> <p>Museums</p>
</a> </a>
</div> </div>
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/fams.jpg"> <img class="venues_halls_img" src="../../../assets/img/fams.jpg">
<p>Fams</p> <p>Fams</p>
</a> </a>
</div> </div>
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/restaurants.jpg"> <img class="venues_halls_img" src="../../../assets/img/restaurants.jpg">
<p>Restaurants</p> <p>Restaurants</p>
</a></div> </a></div>
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/hotels.jpg"> <img class="venues_halls_img" src="../../../assets/img/hotels.jpg">
<p>Hotels</p> <p>Hotels</p>
</a></div> </a></div>
</div> </div>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/bedBreakfasts.jpg"> <img class="venues_halls_img" src="../../../assets/img/bedBreakfasts.jpg">
<p>Bed & Breakfasts</p> <p>Bed & Breakfasts</p>
</a></div> </a></div>
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/banquetHalls.jpg"> <img class="venues_halls_img" src="../../../assets/img/banquetHalls.jpg">
<p>Banquet Halls</p> <p>Banquet Halls</p>
</a></div> </a></div>
<div class="col"> <div class="col">
<a> <a (click)="goto('vendors-list')">
<img class="venues_halls_img" src="../../../assets/img/seashores.jpg"> <img class="venues_halls_img" src="../../../assets/img/seashores.jpg">
<p>Seashores</p> <p>Seashores</p>
</a></div> </a></div>
......
src/app/body/venues/venues.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
@Component({ @Component({
selector: 'app-venues', selector: 'app-venues',
templateUrl: './venues.component.html', templateUrl: './venues.component.html',
...@@ -7,9 +7,12 @@ import { Component, OnInit } from '@angular/core'; ...@@ -7,9 +7,12 @@ import { Component, OnInit } from '@angular/core';
}) })
export class VenuesComponent implements OnInit { export class VenuesComponent implements OnInit {
constructor() { } constructor(private route: ActivatedRoute, private router: Router) { }
ngOnInit() { ngOnInit() {
} }
goto(path,data=null){
this.router.navigateByUrl(path,{queryParams:data});
}
} }
src/app/header/header.component.html
...@@ -58,29 +58,29 @@ ...@@ -58,29 +58,29 @@
<div class="col"> <div class="col">
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1507722456_56cdf37898bb3bb1b3356fad8831dc1a--on-your-wedding-day-pre-wedding.jpg"> <img src="../../../assets/img/1507722456_56cdf37898bb3bb1b3356fad8831dc1a--on-your-wedding-day-pre-wedding.jpg">
<a href="vendors-list">Wedding Photographers</a> <a (click)="goto('vendors-list')">Wedding Photographers</a>
</div> </div>
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1508740269_marriage-marry-009-256.png"> <img src="../../../assets/img/1508740269_marriage-marry-009-256.png">
<a href="vendors-list">Wedding DJs</a> <a (click)="goto('vendors-list')">Wedding DJs</a>
</div> </div>
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1509360077_images.png"> <img src="../../../assets/img/1509360077_images.png">
<a href="vendors-list">Wedding Favors & Gifts</a> <a (click)="goto('vendors-list')">Wedding Favors & Gifts</a>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1507875334_wedding-icon-12670446.jpg"> <img src="../../../assets/img/1507875334_wedding-icon-12670446.jpg">
<a href="vendors-list">Wedding Venues</a> <a (click)="goto('vendors-list')">Wedding Venues</a>
</div> </div>
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1509359880_under-new-management-marriage-note-foldable-design-with-black-text-and-icon-decoration-classic-black-and-white-funny-wedding-thank-you-cards.jpg"> <img src="../../../assets/img/1509359880_under-new-management-marriage-note-foldable-design-with-black-text-and-icon-decoration-classic-black-and-white-funny-wedding-thank-you-cards.jpg">
<a href="vendors-list">Wedding Invitations</a> <a (click)="goto('vendors-list')">Wedding Invitations</a>
</div> </div>
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1509360090_wedding_17-512.png"> <img src="../../../assets/img/1509360090_wedding_17-512.png">
<a href="vendors-list">Wedding Jewelry</a> <a (click)="goto('vendors-list')">Wedding Jewelry</a>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</div> </div>
<div class="vendors_drop_item"> <div class="vendors_drop_item">
<img src="../../../assets/img/1509359943_8819003-Illustration-of-a-cook-in-black-and-white-Stock-Vector-chef-cooking-hat.jpg"> <img src="../../../assets/img/1509359943_8819003-Illustration-of-a-cook-in-black-and-white-Stock-Vector-chef-cooking-hat.jpg">
<a href="vendors-list">Wedding Caterers</a> <a (click)="goto('vendors-list')">Wedding Caterers</a>
</div> </div>
</div> </div>
</div> </div>
......
src/index.html
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://kit.fontawesome.com/d37b6e51ed.js"></script> <script src="https://kit.fontawesome.com/d37b6e51ed.js"></script>
<link rel="icon" type="image/x-icon" href="./assets/img/Moments__tinylogo.png"> <link rel="icon" type="image/x-icon" href="./assets/img/Moments__tinylogo.png">
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
......
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