Skip to content

Commit 7016c12

Browse files
tans105tans105
authored
Production Ready. Towards Release v1.0.0. MVP only (#22)
1 parent 03ee07a commit 7016c12

21 files changed

+249
-227
lines changed

‎src/app/common/footer/footer.component.html‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,32 @@
22
<footer class="site-footer">
33
<div class="container-fluid">
44
<div class="row">
5-
<div class="col-xs-12 col-md-8">
6-
<h4 class="site-footer-header">About Us</h4>
7-
<p class="text-justify">'{{data.brand}}' is established to fullfil vision to eradicate the myths
8-
related to Astrology and Vastu . The Knowledge should bring light and prosperity in individual
9-
life..</p>
10-
</div>
11-
12-
<div class="col-xs-6 col-md-4">
13-
<h6 class="site-footer-header">Site Links</h6>
14-
<ul class="footer-links">
15-
<li><a routerLink="/submit-query" role="button">Post Query</a></li>
16-
<li><a routerLink="/contact-us">Contact Us</a></li>
17-
<li><a routerLink="/terms-and-conditions">Terms And Conditions</a></li>
18-
<li><a routerLink="/privacy-policy">Privacy Policy</a></li>
19-
<li><a routerLink="/disclaimer">Disclaimer</a></li>
20-
<li><a routerLink="/login" role="button">Admin Panel</a></li>
21-
</ul>
22-
</div>
23-
</div>
24-
<hr>
25-
</div>
26-
<div class="container-fluid">
27-
<div class="row">
28-
<div class="col-md-8 col-sm-6 col-xs-12">
5+
<div class="col-md-8 col-sm-6">
6+
<div class="social-icons">
7+
<p class="follow-us">Follow us </p>
8+
<a target="_blank" class="facebook" href="https://www.facebook.com/mangalambhav/"><i class="fa fa-facebook"></i></a>
9+
<a target="_blank" class="instagram" href="#"><i class="fa fa-instagram"></i></a>
10+
</div>
2911
<p class="copyright-text">Copyright &copy; {{year}} All Rights Reserved by
3012
<a href="#">{{data.brand}}</a>.
3113
</p>
14+
<pre>{{version}}</pre>
3215
</div>
33-
34-
<div class="col-md-4 col-sm-6 col-xs-12">
35-
36-
<ul class="social-icons">
37-
<li><a class="facebook" href="https://www.facebook.com/mangalambhav/"><i class="fa fa-facebook"></i></a>
38-
</li>
39-
<li><a class="instagram" href="#"><i class="fa fa-instagram"></i></a></li>
16+
<div class="col-md-4 col-sm-6">
17+
<h5 class="footer-links-header">Site Links</h5>
18+
<ul class="footer-links">
19+
<li class="site-link"><a routerLink="/submit-query" role="button">Post Query</a></li>
20+
<li class="site-link"><a routerLink="/contact-us">Contact Us</a></li>
21+
<li class="site-link"><a routerLink="/terms-and-conditions">Terms And Conditions</a></li>
22+
<li class="site-link"><a routerLink="/privacy-policy">Privacy Policy</a></li>
23+
<li class="site-link"><a routerLink="/disclaimer">Disclaimer</a></li>
24+
<li class="site-link"><a routerLink="/login" role="button">Admin Panel</a></li>
4025
</ul>
4126
</div>
4227
</div>
28+
<div class="dev-info">
29+
<span>Have a business to expand? Contact our website </span>
30+
<a target="_blank" href="https://www.linkedin.com/in/tanmayawasthi105/">Developer</a>.
31+
</div>
4332
</div>
4433
</footer>

‎src/app/common/footer/footer.component.scss‎

Lines changed: 51 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,34 @@
11
@import "src/utilities/colorpalette";
22

33
.site-footer {
4-
padding: 45px 0 20px;
54
font-size: 15px;
65
line-height: 24px;
76

8-
.site-footer hr {
9-
border-top-color: $gray-600;
10-
opacity: 0.5
11-
}
12-
13-
.site-footer hr.small {
14-
margin: 20px 0
15-
}
16-
17-
.site-footer h6 {
18-
color: #fff;
19-
font-size: 16px;
20-
text-transform: uppercase;
21-
margin-top: 5px;
22-
letter-spacing: 2px
23-
}
24-
257
.site-footer a {
268
color: $gray-800;
9+
10+
&:hover {
11+
color: $blue-dark;
12+
text-decoration: none;
13+
}
2714
}
2815

29-
.site-footer a:hover {
30-
color: $blue-dark;
31-
text-decoration: none;
16+
.footer-links-header {
17+
color: $primary !important;
18+
text-decoration: underline;
3219
}
3320

3421
.footer-links {
3522
padding-left: 0;
36-
list-style: none
37-
}
38-
39-
.site-footer-header {
40-
color: $primary;
41-
}
42-
43-
.footer-links li {
44-
display: block
23+
list-style: none;
24+
display: flex;
25+
justify-content: space-between;
26+
flex-wrap: wrap;
27+
flex-direction: column;
28+
29+
.site-link {
30+
font-size: 14px;
31+
}
4532
}
4633

4734
.footer-links a {
@@ -53,85 +40,26 @@
5340
text-decoration: none;
5441
}
5542

56-
.footer-links.inline li {
57-
display: inline-block
58-
}
59-
60-
.site-footer .social-icons {
61-
text-align: right
62-
}
63-
64-
.site-footer .social-icons a {
65-
width: 40px;
66-
height: 40px;
67-
line-height: 40px;
68-
margin-left: 6px;
69-
margin-right: 0;
70-
border-radius: 100%;
71-
background-color: $dark
72-
}
73-
7443
.copyright-text {
7544
padding-top: 10px;
7645
margin: 0
7746
}
7847

79-
@media (max-width: 991px) {
80-
.site-footer [class^=col-] {
81-
margin-bottom: 30px
82-
}
83-
}
84-
85-
@media (max-width: 767px) {
86-
.site-footer {
87-
padding-bottom: 0
88-
}
89-
.site-footer .copyright-text, .site-footer .social-icons {
90-
text-align: center
91-
}
92-
}
93-
9448
.social-icons {
95-
padding-left: 0;
96-
margin-bottom: 0;
97-
list-style: none
98-
}
99-
100-
.social-icons li {
101-
display: inline-block;
102-
margin-bottom: 4px
103-
}
104-
105-
.social-icons li.title {
106-
margin-right: 15px;
107-
text-transform: uppercase;
108-
color: $gray-100;
109-
font-weight: 700;
110-
font-size: 13px
111-
}
112-
113-
.social-icons a {
114-
font-size: 30px;
115-
display: inline-block;
116-
line-height: 44px;
117-
width: 44px;
118-
height: 44px;
119-
text-align: center;
120-
margin-right: 8px;
121-
border-radius: 100%;
122-
-webkit-transition: all .2s linear;
123-
-o-transition: all .2s linear;
124-
transition: all .2s linear
125-
}
126-
127-
.social-icons.size-sm a {
128-
line-height: 34px;
129-
height: 34px;
130-
width: 34px;
131-
font-size: 14px
132-
}
49+
a {
50+
font-size: 30px;
51+
display: inline-block;
52+
line-height: 44px;
53+
width: 44px;
54+
height: 44px;
55+
text-align: center;
56+
margin-right: 8px;
57+
border-radius: 100%;
58+
-webkit-transition: all .2s linear;
59+
-o-transition: all .2s linear;
60+
transition: all .2s linear
61+
}
13362

134-
.social-icons {
13563
a.facebook {
13664
color: $facebook;
13765

@@ -169,4 +97,25 @@
16997
}
17098
}
17199

100+
.dev-info {
101+
border-top: 1px solid white;
102+
text-align: center;
103+
padding: 12px;
104+
font-weight: 400;
105+
font-size: 14px;
106+
color: white;
107+
108+
a {
109+
text-decoration: underline;
110+
font-weight: 600;
111+
}
112+
}
113+
114+
.follow-us {
115+
display: inline;
116+
position: relative;
117+
bottom: 6px;
118+
color: white;
119+
font-weight: 600;
120+
}
172121
}

‎src/app/common/footer/footer.component.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {Component, Input} from '@angular/core';
22
import { AppService } from "../../services/app.service";
3+
import {environment} from "../../../environments/environment";
34

45
@Component({
56
selector: 'app-footer',
@@ -9,4 +10,5 @@ import { AppService } from "../../services/app.service";
910
export class FooterComponent{
1011
@Input() data: any;
1112
year = new Date().getFullYear();
13+
version = environment.version
1214
}

‎src/app/common/header/header.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<span class="lang-screen-size">
2-
<app-language-widget></app-language-widget>
3-
</span>
1+
<!--<span class="lang-screen-size">-->
2+
<!-- <app-language-widget></app-language-widget>-->
3+
<!-- </span>-->
44
<div class="text-align-center">
55
<a routerLink="/"><img src="assets/images/logo/logo.png" alt="{{data.brand}}"/></a>
66
</div>

‎src/app/common/message-box/message-box.component.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.message-body {
2-
background-color: antiquewhite;
32
padding: 15px;
43
}
54

‎src/app/modules/contact-us/contact-us.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</div>
2828
</div>
2929
<div class="form-group text-align-center">
30-
<button [disabled]="!f.valid" type="submit" class="btn btn-lg btn-primary" name="help">
30+
<button [disabled]="!f.valid" type="submit" class="btn btn-primary" name="help">
3131
<span *ngIf="!disableForm">Send message</span>
3232
<span *ngIf="disableForm"><span class="fa fa-spinner fa-spin"></span></span>
3333
</button>

‎src/app/modules/home/home.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
<!-- About Us -->
33
<h2 class="title">{{data.aboutUs}}</h2>
44
<hr>
5-
<p *ngFor="let para of data.aboutUsPara" class="lead">{{para}}</p>
5+
<p class="lead" [innerHTML]="data.aboutUsPara"></p>
66

77
<!-- <div class="home-carousal">-->
88
<!-- <app-carousel [button]="common.knowMore" [models]="appServices" size="lg"></app-carousel>-->
99
<!-- </div>-->
1010

1111
<!-- How we work -->
12-
<app-details [cards]=data.cards [title]=data.howItWorksButton></app-details>
12+
<!-- <app-details [cards]=data.cards [title]=data.howItWorksButton></app-details>-->
1313

1414
<app-services [data]=data></app-services>
1515

‎src/app/modules/home/home.component.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,4 @@
1212
.home-carousal {
1313
border-top: 2px solid white;
1414
margin-top: 10px;
15-
}
16-
17-
.my-btn {
18-
width: 200px;
1915
}

‎src/app/modules/query/query.component.html‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<fieldset [disabled]="disableForm">
55
<div class="form-group row">
66
<label class="col-md-12 col-form-label">
7-
<h3><u>Note :</u></h3>
8-
<li *ngFor="let condition of data.noteConditions">{{condition}}</li>
7+
<li *ngFor="let condition of data.noteConditions" [innerHTML]="condition"></li>
98
</label>
109
</div>
1110

@@ -198,24 +197,24 @@ <h3><u>Note :</u></h3>
198197
</div>
199198
</div>
200199

201-
<div class="form-group mt-5">
202-
<div class="row">
203-
<label class="col-md-1 col-form-label">Cost</label>
204-
<div class="col-md-3">
205-
<input type="text" formControlName="amount" class="form-control" readonly>
206-
</div>
207-
</div>
208-
</div>
200+
<!-- <div class="form-group mt-5">-->
201+
<!-- <div class="row">-->
202+
<!-- <label class="col-md-1 col-form-label">Cost (₹)</label>-->
203+
<!-- <div class="col-md-3">-->
204+
<!-- <input type="text" formControlName="amount" class="form-control" readonly>-->
205+
<!-- </div>-->
206+
<!-- </div>-->
207+
<!-- </div>-->
209208

210209
<div class="form-group row mt-5">
211210
<div class="col-sm-12 text-center">
212-
<button type="submit" [disabled]="!queryForm.valid" class="btn btn-primary mt-1">
211+
<button type="submit" class="btn btn-primary mt-1">
213212
<span *ngIf="!disableForm">{{data.queryForm.submitQuery}}</span>
214213
<span *ngIf="disableForm"><span class="fa fa-spinner fa-spin"></span></span>
215214
</button>
216-
<a class="btn btn-info ml-1 mt-1" target="_self" href="assets/report/report.pdf" download="Report.pdf">
217-
<span>{{data.queryForm.downloadSampleReport}}&nbsp;&nbsp;<span class="fa fa-download"></span></span>
218-
</a>
215+
<!-- <a class="btn btn-info ml-1 mt-1" target="_self" href="assets/report/report.pdf" download="Report.pdf">-->
216+
<!-- <span>{{data.queryForm.downloadSampleReport}}&nbsp;&nbsp;<span class="fa fa-download"></span></span>-->
217+
<!-- </a>-->
219218
</div>
220219
</div>
221220
</fieldset>

‎src/app/modules/query/query.component.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,12 @@ form label {
3232
border-top: 1px solid white;
3333
padding: 10px 0;
3434
}
35+
36+
.calendar {
37+
background: linear-gradient(to bottom right, #ef7f00, #f7b200);
38+
}
39+
40+
.btn-primary {
41+
width: 25%;
42+
background: linear-gradient(to bottom right, #ef7f00, #f7b200);
43+
}

0 commit comments

Comments
 (0)