Skip to content

Commit 2eccd9d

Browse files
ElGrecodeElGrecode
committed
styles and mocks data of admin page
1 parent 69f2a13 commit 2eccd9d

File tree

7 files changed

+177
-4
lines changed

7 files changed

+177
-4
lines changed

‎client/app/app.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* App-wide Styles
33
*/
44

5+
@import 'reset';
6+
@import 'mainStyles';
7+
58
.browsehappy {
69
margin: 0.2em 0;
710
background: #ccc;

‎client/app/mainStyles.scss‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
body {
2+
font-family: 'Gotham SSm A', 'Gotham SSm B', Arial, sans-serif;
3+
color: #222;
4+
line-height: 1.7;
5+
letter-spacing: normal;
6+
font-size: 100%;
7+
background: #F6F7FA;
8+
}
9+
10+
h1 {
11+
font-size: 2em;
12+
}
13+
14+
15+
header {
16+
position: relative;
17+
top: 0px;
18+
width: 100%;
19+
background: #201F21;
20+
height: 80px;
21+
}
22+
23+
.contain {
24+
width: 80%;
25+
margin: 0 auto;
26+
}
27+
28+
nav {
29+
30+
31+
.logo {
32+
padding-top: 1.25em;
33+
}
34+
}
35+
36+
.btn {
37+
border-radius: 10px;
38+
padding: 1em;
39+
text-align: center;
40+
border: 2px solid black;
41+
cursor: pointer;
42+
font-weight: 700;
43+
}
44+
45+
// Admin Styles
46+
.save {
47+
width: 275px;
48+
height: 1.4em;
49+
}
50+
51+
52+
.adminWrapper {
53+
section {
54+
margin-top: 40px;
55+
}
56+
57+
table {
58+
59+
th {
60+
min-width: 175px;
61+
max-width: 275px;
62+
}
63+
}
64+
65+
66+
67+
}
68+

‎client/app/reset.scss‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/* http://meyerweb.com/eric/tools/css/reset/
2+
v2.0 | 20110126
3+
License: none (public domain)
4+
*/
5+
6+
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
7+
margin: 0;
8+
padding: 0;
9+
border: 0;
10+
font-size: 100%;
11+
font: inherit;
12+
vertical-align: baseline; }
13+
14+
/* HTML5 display-role reset for older browsers */
15+
16+
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
17+
display: block; }
18+
19+
body {
20+
line-height: 1; }
21+
22+
ol, ul {
23+
list-style: none; }
24+
25+
blockquote, q {
26+
quotes: none; }
27+
28+
blockquote {
29+
&:before, &:after {
30+
content: '';
31+
content: none; } }
32+
33+
q {
34+
&:before, &:after {
35+
content: '';
36+
content: none; } }
37+
38+
table {
39+
border-collapse: collapse;
40+
border-spacing: 0; }

‎client/assets/images/logo.svg‎

Lines changed: 26 additions & 0 deletions
Loading

‎client/index.html‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,15 @@
2222
<!-- endbuild -->
2323
</head>
2424
<body ng-app="frontendEngineeringChallengeApp">
25-
<header>Header dictated by index.html</header>
25+
<header>
26+
<nav>
27+
<div class="contain">
28+
<a href="index.html" class="logo" alt="Back to Home">
29+
<img src="assets/images/logo.svg" alt="CitizeNet" class="logo">
30+
</a>
31+
</div>
32+
</nav>
33+
</header>
2634
<!--[if lt IE 7]>
2735
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
2836
<![endif]-->

‎client/partials/admin.html‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,30 @@
1-
<h1>This is the Admin section that saves information nightly</h1>
2-
<p>{{hello}}</p>
1+
<div class="contain adminWrapper">
2+
<h1>API Administration</h1>
3+
<p>{{hello}}</p>
4+
<section class="saveInfo">
5+
<div class="lastSave">Last Save was on {{lastTimestamp}}</div>
6+
<div class="save btn">Save Information</div>
7+
</section>
8+
9+
<section class="previousSaves">
10+
<h3>Previous Saves</h3>
11+
<hr>
12+
<table>
13+
<tbody>
14+
<tr>
15+
<th>Date</th>
16+
<th>Time</th>
17+
<th>Success</th>
18+
<th>id</th>
19+
</tr>
20+
<tr>
21+
<th>Sample 01/04/2012</th>
22+
<th>Sample 12:10pm</th>
23+
<th>Sample Successful</th>
24+
<th>Sample 1</th>
25+
</tr>
26+
</tbody>
27+
28+
</table>
29+
</section>
30+
</div>

‎client/scripts/controllers/AdminCtrl.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
.controller('AdminCtrl', function ($scope) {
66

77
$scope.hello = 'This is a hello dictated by the Admin controller';
8-
8+
$scope.lastTimestamp = 'Mocked 01/04/2012 at 11:36pm';
99
});
1010
}(window.angular));

0 commit comments

Comments
 (0)