Skip to content

Commit af1767d

Browse files
tsmorgantsmorgan
committed
Setting up the front page.
1 parent 365d057 commit af1767d

File tree

8 files changed

+294
-175
lines changed

8 files changed

+294
-175
lines changed

‎Gruntfile.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,21 @@ module.exports = function(grunt){
115115
grunt.loadNpmTasks(task);
116116
});
117117

118-
grunt.registerTask(
119-
'convert_template',
120-
'Converts the govuk_template to use mustache inheritance',
121-
function () {
122-
var script = require(__dirname + '/lib/template-conversion.js');
123-
124-
script.convert();
125-
grunt.log.writeln('govuk_template converted');
126-
}
127-
);
118+
// grunt.registerTask(
119+
// 'convert_template',
120+
// 'Converts the govuk_template to use mustache inheritance',
121+
// function () {
122+
// var script = require(__dirname + '/lib/template-conversion.js');
123+
124+
// script.convert();
125+
// grunt.log.writeln('govuk_template converted');
126+
// }
127+
// );
128128

129129
grunt.registerTask('generate-assets', [
130130
'clean',
131131
'copy',
132-
'convert_template',
132+
// 'convert_template',
133133
'replace',
134134
'sass'
135135
]);

‎app/assets/sass/application.scss

+7-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
padding:4px 6px 1px 5px;
1717
margin-left:0.25em;
1818
}
19+
#global-header-bar {background-color:$turquoise;}
1920

2021
/*
2122
Top of the page phase banner bits.
@@ -55,4 +56,9 @@
5556
.link-list-discovery {border-color:$discovery-colour;}
5657
.link-list-alpha {border-color:$alpha-colour;}
5758
.link-list-beta {border-color:$beta-colour;}
58-
.link-list-live {border-color:$live-colour;}
59+
.link-list-live {border-color:$live-colour;}
60+
61+
.service-area {
62+
border-bottom:1px solid $border-colour;
63+
margin-bottom:10px;
64+
}

‎app/routes.js

+31-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,36 @@
1-
var express = require('express');
2-
var router = express.Router();
1+
var express = require('express'),
2+
router = express.Router(),
3+
_ = require('underscore');
34

4-
router.get('/', function (req, res) {
5-
res.render('index');
6-
});
5+
router.get('/', function (req, res)
6+
{
7+
var data = _.groupBy(req.app.locals.data, 'theme');
8+
var newd = {};
9+
_.each(data, function(value, key, list)
10+
{
11+
var item = _.groupBy(value,'phase');
12+
newd[key] = item;
13+
});
14+
var phases = _.countBy(req.app.locals.data, 'phase');
15+
res.render('index', {"data":newd, "counts":phases});
16+
});
717

8-
router.get('/examples/template-data', function (req, res) {
9-
res.render('examples/template-data', { 'name' : 'Foo' });
10-
});
18+
router.get('/location/', function (req, res)
19+
{
20+
var data = _.groupBy(req.app.locals.data, 'location');
21+
var newd = {};
22+
_.each(data, function(value, key, list)
23+
{
24+
var item = _.groupBy(value,'phase');
25+
newd[key] = item;
26+
});
27+
var phases = _.countBy(req.app.locals.data, 'phase');
28+
res.render('index', {"data":newd, "counts":phases});
29+
});
1130

12-
// add your routes here
31+
router.get('/location/', function (req, res)
32+
{
33+
34+
});
1335

1436
module.exports = router;

‎app/views/index.html

+52-118
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
{{<layout}}
1+
{% extends "layout.html" %}
22

3-
{{$pageTitle}}
4-
DWP Digital Portfolio - Home page
5-
{{/pageTitle}}
3+
{% block pageTitle %}
4+
GOV.UK prototyping kit
5+
{% endblock %}
66

7-
{{$content}}
7+
{% block content %}
88

99
<main id="content" role="main">
1010

@@ -13,131 +13,65 @@
1313
<div class="grid-row">
1414
<section class="column-quarter">
1515
<div class="phase phase-discovery">Discovery</div>
16-
<div class="big_number txt-discovery">4</div>
16+
<div class="big_number txt-discovery">{{ counts.discovery }}</div>
1717
</section>
1818
<section class="column-quarter">
1919
<div class="phase phase-alpha">Alpha</div>
20-
<div class="big_number txt-alpha">3</div>
20+
<div class="big_number txt-alpha">{{ counts.alpha }}</div>
2121
</section>
2222
<section class="column-quarter">
2323
<div class="phase phase-beta">Beta</div>
24-
<div class="big_number txt-beta">10</div>
24+
<div class="big_number txt-beta">{{ counts.beta }}</div>
2525
</section>
2626
<section class="column-quarter">
2727
<div class="phase phase-live">Live</div>
28-
<div class="big_number txt-live">1</div>
28+
<div class="big_number txt-live">{{ counts.live }}</div>
2929
</section>
3030
</div>
3131

32-
<h2 class="heading-large">Retirement &amp; Pensions</h2>
33-
<p>We're helping users to:</p>
34-
<div class="grid-row">
35-
<section class="column-quarter"> &nbsp; </section>
36-
<section class="column-quarter">
37-
<ul class="link-list link-list-alpha">
38-
<li><a href="">Get your State Pension</a></li>
39-
</ul>
40-
</section>
41-
<section class="column-quarter">
42-
<ul class="link-list link-list-beta">
43-
<li><a href="">Check your State Pension</a></li>
44-
<li><a href="">Find a lost Pension</a></li>
45-
</ul>
46-
</section>
47-
<section class="column-quarter"> &nbsp; </section>
48-
</div>
49-
50-
<h2 class="heading-large">Health &amp; Disability</h2>
51-
<p>We're helping users to:</p>
52-
<div class="grid-row">
53-
<section class="column-quarter">
54-
<ul class="link-list link-list-discovery">
55-
<li><a href="">Apply for Employment Support Allowance</a></li>
56-
</ul>
57-
</section>
58-
<section class="column-quarter">
59-
<ul class="link-list link-list-alpha">
60-
<li><a href="">Make a complaint</a></li>
61-
</ul>
62-
</section>
63-
<section class="column-quarter">
64-
<ul class="link-list link-list-beta">
65-
<li><a href="">Apply for an Access To Work Grant</a></li>
66-
<li><a href="">Apply for a Personal Independance Payment</a></li>
67-
</ul>
68-
</section>
69-
<section class="column-quarter">
70-
<ul class="link-list link-list-live">
71-
<li><a href="">Apply for Carer&rsquo;s Allowance</a></li>
72-
</ul>
73-
</section>
74-
</div>
75-
76-
<h2 class="heading-large">Fraud &amp; Debt</h2>
77-
<p>We're helping users to:</p>
78-
<div class="grid-row">
79-
<section class="column-quarter">
80-
<ul class="link-list link-list-discovery">
81-
<li><a href="">Report Benefit Fraud</a></li>
82-
</ul>
83-
</section>
84-
<section class="column-quarter"> &nbsp; </section>
85-
<section class="column-quarter">
86-
<ul class="link-list link-list-beta">
87-
<li><a href="">Repay a benefit debt</a></li>
88-
<li><a href="">Real time earnings</a></li>
89-
</ul>
90-
</section>
91-
<section class="column-quarter"> &nbsp; </section>
92-
</div>
93-
94-
<h2 class="heading-large">Unemployment</h2>
95-
<p>We're helping users to:</p>
96-
<div class="grid-row">
97-
<section class="column-quarter">
98-
<ul class="link-list link-list-discovery">
99-
<li><a href="">Digital service centres</a></li>
100-
</ul>
101-
</section>
102-
<section class="column-quarter">
103-
<ul class="link-list link-list-alpha">
104-
<li><a href="">Universal Job Match replacement</a></li>
105-
</ul>
106-
</section>
107-
<section class="column-quarter">
108-
<ul class="link-list link-list-beta">
109-
<li><a href="">Universal Credit</a></li>
110-
<li><a href="">Jobseeker Services</a></li>
111-
<li><a href="">Apply for a budgeting loan</a></li>
112-
</ul>
113-
</section>
114-
<section class="column-quarter"> &nbsp; </section>
115-
</div>
116-
117-
<h2 class="heading-large">Digital Delivery</h2>
118-
<p>We're helping users to:</p>
119-
<div class="grid-row">
120-
<section class="column-quarter">
121-
<ul class="link-list link-list-discovery">
122-
<li><a href="">Send payment details as evidence (Enhanced Data)</a></li>
123-
</ul>
124-
</section>
125-
<section class="column-quarter">
126-
<ul class="link-list link-list-alpha">
127-
<li><a href="">ID / Verification</a></li>
128-
</ul>
129-
</section>
130-
<section class="column-quarter">
131-
<ul class="link-list link-list-beta">
132-
<li><a href="">Send information securely</a></li>
133-
<li><a href="">Jobseeker Services</a></li>
134-
</ul>
135-
</section>
136-
<section class="column-quarter"> &nbsp; </section>
137-
</div>
32+
{% for name, item in data %}
33+
<h2 class="heading-large service-area">{{ name }}</h2>
34+
<p>We're helping users to:</p>
35+
<div class="grid-row">
36+
<section class="column-quarter">
37+
{% if item.discovery %}
38+
<ul class="link-list link-list-discovery">
39+
{% for bit in item.discovery %}
40+
<li><a href="{{ bit.id }}/{{ bit.name | lower | replace(' ','_') }}">{{ bit.name }}</a></li>
41+
{% endfor %}
42+
</ul>
43+
{% else %}&nbsp;{% endif %}
44+
</section>
45+
<section class="column-quarter">
46+
{% if item.alpha %}
47+
<ul class="link-list link-list-alpha">
48+
{% for bit in item.alpha %}
49+
<li><a href="{{ bit.id }}/{{ bit.name | lower | replace(' ','_') }}">{{ bit.name }}</a></li>
50+
{% endfor %}
51+
</ul>
52+
{% else %}&nbsp;{% endif %}
53+
</section>
54+
<section class="column-quarter">
55+
{% if item.beta %}
56+
<ul class="link-list link-list-beta">
57+
{% for bit in item.beta %}
58+
<li><a href="{{ bit.id }}/{{ bit.name | lower | replace(' ','_') }}">{{ bit.name }}</a></li>
59+
{% endfor %}
60+
</ul>
61+
{% else %}&nbsp;{% endif %}
62+
</section>
63+
<section class="column-quarter">
64+
{% if item.live %}
65+
<ul class="link-list link-list-live">
66+
{% for bit in item.live %}
67+
<li><a href="{{ bit.id }}/{{ bit.name | lower | replace(' ','_') }}">{{ bit.name }}</a></li>
68+
{% endfor %}
69+
</ul>
70+
{% else %}&nbsp;{% endif %}
71+
</section>
72+
</div>
73+
{% endfor %}
13874

13975
</main>
14076

141-
{{/content}}
142-
143-
{{/layout}}
77+
{% endblock %}

‎app/views/layout.html

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
{{<govuk_template}}
1+
{% extends "govuk_template.html" %}
22

3-
{{$head}}
4-
{{>includes/head}}
5-
{{/head}}
3+
{% block head %}
64

7-
{{$propositionHeader}}
8-
{{>includes/propositional_navigation_alpha}}
9-
{{/propositionHeader}}
5+
{% include "includes/head.html" %}
106

11-
{{$headerClass}}with-proposition{{/headerClass}}
7+
{% endblock %}
128

13-
{{$bodyEnd}}
14-
{{>includes/scripts}}
15-
{{/bodyEnd}}
169

17-
{{/govuk_template}}
10+
{% block bodyEnd %}
11+
12+
bodyEnd
13+
14+
{% endblock %}

0 commit comments

Comments
 (0)