Skip to content

Commit 65882e8

Browse files
authored
Create Contact Us Section on Info Page (#253)
* Create Contact Us Area on Information Page containing Email and Phone Number * Fix Budgeting Issue * Raise Budgets * more budgeting
1 parent 94b27f6 commit 65882e8

File tree

5 files changed

+55
-22
lines changed

5 files changed

+55
-22
lines changed

web-app/angular.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
},
8888
{
8989
"type": "anyComponentStyle",
90-
"maximumWarning": "6kb",
91-
"maximumError": "10kb"
90+
"maximumWarning": "18kb",
91+
"maximumError": "30kb"
9292
}
9393
]
9494
},
@@ -250,8 +250,8 @@
250250
},
251251
{
252252
"type": "anyComponentStyle",
253-
"maximumWarning": "6kb",
254-
"maximumError": "10kb"
253+
"maximumWarning": "18kb",
254+
"maximumError": "30kb"
255255
}
256256
]
257257
},
@@ -416,8 +416,8 @@
416416
},
417417
{
418418
"type": "anyComponentStyle",
419-
"maximumWarning": "6kb",
420-
"maximumError": "10kb"
419+
"maximumWarning": "18kb",
420+
"maximumError": "30kb"
421421
}
422422
]
423423
},

web-app/package-lock.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web-app/src/app/about/about.component.html

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
<button mat-icon-button (click)="onBack()">
44
<mat-icon>arrow_back</mat-icon>
55
</button>
6-
7-
<span class="title">About</span>
6+
<span class="title">About MAGE</span>
87
</div>
98
</mat-toolbar>
109

1110
<div class="content">
1211
<div>
13-
<div class="mat-h1">About</div>
1412
<p>
1513
Mage is a dynamic, secure, mobile situational awareness and field data collection platform that supports
1614
low-bandwidth and disconnected users. Mage can integrate with existing command centers and common operating
@@ -23,31 +21,43 @@
2321
</p>
2422

2523
<div class="app-store">
26-
<a href="https://itunes.apple.com/us/app/m.a.g.e./id1032815042?mt=8">
24+
<a
25+
class="center-content"
26+
href="https://itunes.apple.com/us/app/m.a.g.e./id1032815042?mt=8"
27+
>
2728
<img class="app-store-icon" src="/assets/images/ios_app_store_black.svg">
2829
</a>
29-
<a href="https://play.google.com/store/apps/details?id=mil.nga.giat.mage&hl=en">
30+
<a
31+
class="center-content"
32+
href="https://play.google.com/store/apps/details?id=mil.nga.giat.mage&hl=en"
33+
>
3034
<img class="app-store-icon" src="/assets/images/google-play-badge.png">
3135
</a>
32-
</div>
36+
</div>
3337
</div>
3438

3539
<div>
36-
<div class="mat-h1">API</div>
40+
<h3>
41+
<span>API</span>
42+
</h3>
3743
<div>
3844
Browse and try the Mage API live with <a href="#/swagger">Swagger UI.</a> Swagger interactive documentation will modify Mage data via API calls; please be careful with <strong>POST/PUT/DELETE</strong> operations.
3945
</div>
4046
</div>
4147

4248
<div>
43-
<div class="mat-h1">System</div>
49+
<h3>
50+
<span>System</span>
51+
</h3>
4452
<div>Server Version {{mageVersion?.major}}.{{mageVersion?.minor}}.{{mageVersion?.micro}}</div>
4553
<div>Node Version {{nodeVersion}}</div>
4654
<div>MongoDB Version {{mongoVersion}}</div>
4755
</div>
4856

4957
<div>
50-
<div class="mat-h1">Acknowledgements</div>
58+
<h3>
59+
<span>Acknowledgements</span>
60+
</h3>
5161
<div>Mage is built with the MEAN stack
5262
<a href="https://www.mongodb.org/" target="_blank">MongoDB</a>,
5363
<a href="https://expressjs.com/" target="_blank">Express</a>,
@@ -63,5 +73,11 @@
6373
<a href="https://leafletjs.com/" target="_blank">Leaflet</a>
6474
</div>
6575
</div>
66-
76+
<div>
77+
<h3>
78+
<span>Contact Us</span>
79+
</h3>
80+
<p><i class="fa fa-phone"></i> +1-571-557-1121</p>
81+
<p><i class="fa fa-envelope"></i><a href="mailto:[email protected]"> [email protected]</a></p>
82+
</div>
6783
</div>

web-app/src/app/about/about.component.scss

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,35 @@
22
@import "variables.scss";
33

44
.content {
5-
width: 50vw;
5+
width: 75vw;
66
margin: 0 auto;
77
padding: 32px 0;
88
display: flex;
99
flex-direction: column;
1010
gap: 32px;
1111
}
1212

13-
.mat-h1 {
14-
color: mat.get-color-from-palette($app-primary);
15-
}
16-
1713
.container {
1814
display: flex;
1915
flex-direction: row;
2016
align-items: center;
2117
justify-content: center;
2218
}
2319

20+
h3 {
21+
width:100%;
22+
text-align:left;
23+
border-bottom: 1px solid #000;
24+
line-height:0.1em;
25+
margin:10px 0 20px;
26+
color: mat.get-color-from-palette($app-primary);
27+
}
28+
h3 span {
29+
background:#fff;
30+
padding:0 10px;
31+
border: none;
32+
}
33+
2434
.title {
2535
margin-left: 16px;
2636
}
@@ -30,8 +40,13 @@
3040
flex-direction: row;
3141
gap: 16px;
3242
align-items: center;
43+
margin-top: 20px;
3344
}
3445

3546
.app-store-icon {
3647
height: 48px;
48+
}
49+
50+
.center-content{
51+
margin: 0 auto !important;
3752
}

web-app/src/app/about/about.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
55
@Component({
66
selector: 'about',
77
templateUrl: './about.component.html',
8-
styleUrls: ['./about.component.scss']
8+
styleUrls: ['./about.component.scss', '../../../node_modules/font-awesome/css/font-awesome.min.css']
99
})
1010
export class AboutComponent implements OnInit {
1111
mageVersion: {

0 commit comments

Comments
 (0)