Skip to content

Commit 283f6c1

Browse files
author
Iain J McCallum
committed
updated paths to match new location
1 parent 0b41a2c commit 283f6c1

27 files changed

Lines changed: 66 additions & 64 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Directories:
2424
- `_component-name.js` if it needs JS to do it's thing. Added to main.js like this: `window.threeOneOne.map = require('./components/map/_map.js');` then add a `<script> threeOneOne.burndown.init(); </script>` in the html file for the component.
2525
- `_component-name.scss` the styling for the component. By convention the class prefix is the same as the name and we're using the [BEM](https://css-tricks.com/bem-101/) methodology.
2626
- **layouts/** Markup (HTML) for the head, header, footer, meta. The basic top and bottom for every page, written with [handlebars](http://handlebarsjs.com/).
27-
- **web_root/** This drives the structure of the site (a directory as a sitemap if you will). Also written with [handlebars](http://handlebarsjs.com/).
27+
- **pages/** This drives the structure of the site (a directory as a sitemap if you will). Also written with [handlebars](http://handlebarsjs.com/).
2828
- `main.js` This is the "entry point" for all the JS.
2929
- `style-base.scss` This pulls all the base styles into a css file that will be loaded, the critical css.
3030
- `style-components.scss` This pulls all the component styles into a different css file that will be loaded.

_build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Metalsmith(__dirname)
2727
generator: "Metalsmith",
2828
url: "http://www.metalsmith.io/"
2929
})
30-
.source('./_write-your-code-in-here/web_root')
30+
.source('./_write-your-code-in-here/pages')
3131
.destination('./philly311')
3232
.clean(false)
3333
.use(sanityCheck())

_write-your-code-in-here/components/burn-down/_burn-down.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616

1717
function buildChart(){
1818

19-
d3.json('/data/burn_total.json', function(error, data) {
19+
d3.json('/philly311/data/burn_total.json', function(error, data) {
2020
// =================================== Variables
2121
var svgWidth = document.getElementById('burnchart').clientWidth;
2222
var svgHeight = Math.min( (svgWidth * 0.5), (screen.height - 90) ); console.log('SCREEN HEIGHT', svgHeight);

_write-your-code-in-here/components/nav-main/_nav-main.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<nav class="main-nav">
22

3-
<a href="/submit-request" class="main-nav__link">
3+
<a href="/philly311/submit-request" class="main-nav__link">
44
Submit Request
55
</a>
66

7-
<a href="/find-requests-by-address" class="main-nav__link">
7+
<a href="/philly311/find-requests-by-address" class="main-nav__link">
88
Your Neighbourhood
99
</a>
1010

11-
<a href="/stats" class="main-nav__link">
11+
<a href="/philly311/stats" class="main-nav__link">
1212
Stats
1313
</a>
1414

15-
<form class="main-nav__search" action="/find-request-by-id" method="GET">
15+
<form class="main-nav__search" action="/philly311/find-request-by-id" method="GET">
1616
<input type="text" name="id" class="main-nav__search-input" placeholder="Enter Request ID">
1717
<input type="submit" class="main-nav__search-submit" value="Search">
1818
</form>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<nav class="stats-nav">
2-
<a href="/stats/total-over-time" class="stats-nav__link button">
2+
<a href="/philly311/stats/total-over-time" class="stats-nav__link button">
33
Total over time
44
</a>
55

6-
<a href="/stats/total-by-dept" class="stats-nav__link button">
6+
<a href="/philly311/stats/total-by-dept" class="stats-nav__link button">
77
Total requests by Dept
88
</a>
99

10-
<a href="/stats/burndown" class="stats-nav__link button">
10+
<a href="/philly311/stats/burndown" class="stats-nav__link button">
1111
Burndown
1212
</a>
1313
</nav>

_write-your-code-in-here/components/total-requests-by-dept/_total-requests-by-dept.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414

1515
function buildChart(){
1616

17-
d3.json('/data/eg_dept_requests.json', function(error, data) {
17+
d3.json('/philly311/data/eg_dept_requests.json', function(error, data) {
1818
var w = document.getElementById('requests-barchart').clientWidth;
1919
var barHeight = 30;
2020
var outerBarHeight = barHeight + bargin + 2; //plus 2 for the bar stroke

_write-your-code-in-here/layouts/main.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
<title>{{ title }}</title>
66
<meta name="description" content="{{ description }}">
77
<link href='https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.css' rel='stylesheet' /><!-- hello, you should probably be popped into a component :P -->
8-
<link rel="stylesheet" type="text/css" href="/style-base.css">
9-
<link rel="stylesheet" type="text/css" href="/style-components.css" defer="true"> <!-- http://www.growingwiththeweb.com/2014/02/async-vs-defer-attributes.html -->
10-
<link rel="apple-touch-icon" sizes="57x57" href="/icon/apple-icon-57x57.png">
11-
<link rel="apple-touch-icon" sizes="60x60" href="/icon/apple-icon-60x60.png">
12-
<link rel="apple-touch-icon" sizes="72x72" href="/icon/apple-icon-72x72.png">
13-
<link rel="apple-touch-icon" sizes="76x76" href="/icon/apple-icon-76x76.png">
14-
<link rel="apple-touch-icon" sizes="114x114" href="/icon/apple-icon-114x114.png">
15-
<link rel="apple-touch-icon" sizes="120x120" href="/icon/apple-icon-120x120.png">
16-
<link rel="apple-touch-icon" sizes="144x144" href="/icon/apple-icon-144x144.png">
17-
<link rel="apple-touch-icon" sizes="152x152" href="/icon/apple-icon-152x152.png">
18-
<link rel="apple-touch-icon" sizes="180x180" href="/icon/apple-icon-180x180.png">
19-
<link rel="icon" type="image/png" sizes="192x192" href="/icon/android-icon-192x192.png">
20-
<link rel="icon" type="image/png" sizes="32x32" href="/icon/favicon-32x32.png">
21-
<link rel="icon" type="image/png" sizes="96x96" href="/icon/favicon-96x96.png">
22-
<link rel="icon" type="image/png" sizes="16x16" href="/icon/favicon-16x16.png">
8+
<link rel="stylesheet" type="text/css" href="/philly311/style-base.css">
9+
<link rel="stylesheet" type="text/css" href="/philly311/style-components.css" defer="true"> <!-- http://www.growingwiththeweb.com/2014/02/async-vs-defer-attributes.html -->
10+
<link rel="apple-touch-icon" sizes="57x57" href="/philly311/icon/apple-icon-57x57.png">
11+
<link rel="apple-touch-icon" sizes="60x60" href="/philly311/icon/apple-icon-60x60.png">
12+
<link rel="apple-touch-icon" sizes="72x72" href="/philly311/icon/apple-icon-72x72.png">
13+
<link rel="apple-touch-icon" sizes="76x76" href="/philly311/icon/apple-icon-76x76.png">
14+
<link rel="apple-touch-icon" sizes="114x114" href="/philly311/icon/apple-icon-114x114.png">
15+
<link rel="apple-touch-icon" sizes="120x120" href="/philly311/icon/apple-icon-120x120.png">
16+
<link rel="apple-touch-icon" sizes="144x144" href="/philly311/icon/apple-icon-144x144.png">
17+
<link rel="apple-touch-icon" sizes="152x152" href="/philly311/icon/apple-icon-152x152.png">
18+
<link rel="apple-touch-icon" sizes="180x180" href="/philly311/icon/apple-icon-180x180.png">
19+
<link rel="icon" type="image/png" sizes="192x192" href="/philly311/icon/android-icon-192x192.png">
20+
<link rel="icon" type="image/png" sizes="32x32" href="/philly311/icon/favicon-32x32.png">
21+
<link rel="icon" type="image/png" sizes="96x96" href="/philly311/icon/favicon-96x96.png">
22+
<link rel="icon" type="image/png" sizes="16x16" href="/philly311/icon/favicon-16x16.png">
2323
<link rel="manifest" href="manifest.json">
2424
<meta name="msapplication-TileColor" content="#0074c9">
25-
<meta name="msapplication-TileImage" content="/icon/ms-icon-144x144.png">
25+
<meta name="msapplication-TileImage" content="/philly311/icon/ms-icon-144x144.png">
2626
<meta name="theme-color" content="#0074c9">
2727
<meta name="viewport" content="width=device-width, initial-scale=1">
2828

@@ -39,7 +39,7 @@
3939
ga('send', 'pageview');
4040

4141
</script>
42-
<script type="text/javascript" src="/main.js"></script>
42+
<script type="text/javascript" src="/philly311/main.js"></script>
4343
</head>
4444
<body>
4545

_write-your-code-in-here/layouts/stats.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55
<title>{{ title }}</title>
66
<meta name="description" content="{{ description }}">
77
<link href='https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.css' rel='stylesheet' /><!-- hello, you should probably be popped into a component :P -->
8-
<link rel="stylesheet" type="text/css" href="/style-base.css">
9-
<link rel="stylesheet" type="text/css" href="/style-components.css" defer="true"> <!-- http://www.growingwiththeweb.com/2014/02/async-vs-defer-attributes.html -->
10-
<link rel="apple-touch-icon" sizes="57x57" href="/icon/apple-icon-57x57.png">
11-
<link rel="apple-touch-icon" sizes="60x60" href="/icon/apple-icon-60x60.png">
12-
<link rel="apple-touch-icon" sizes="72x72" href="/icon/apple-icon-72x72.png">
13-
<link rel="apple-touch-icon" sizes="76x76" href="/icon/apple-icon-76x76.png">
14-
<link rel="apple-touch-icon" sizes="114x114" href="/icon/apple-icon-114x114.png">
15-
<link rel="apple-touch-icon" sizes="120x120" href="/icon/apple-icon-120x120.png">
16-
<link rel="apple-touch-icon" sizes="144x144" href="/icon/apple-icon-144x144.png">
17-
<link rel="apple-touch-icon" sizes="152x152" href="/icon/apple-icon-152x152.png">
18-
<link rel="apple-touch-icon" sizes="180x180" href="/icon/apple-icon-180x180.png">
19-
<link rel="icon" type="image/png" sizes="192x192" href="/icon/android-icon-192x192.png">
20-
<link rel="icon" type="image/png" sizes="32x32" href="/icon/favicon-32x32.png">
21-
<link rel="icon" type="image/png" sizes="96x96" href="/icon/favicon-96x96.png">
22-
<link rel="icon" type="image/png" sizes="16x16" href="/icon/favicon-16x16.png">
8+
<link rel="stylesheet" type="text/css" href="/philly311/style-base.css">
9+
<link rel="stylesheet" type="text/css" href="/philly311/style-components.css" defer="true"> <!-- http://www.growingwiththeweb.com/2014/02/async-vs-defer-attributes.html -->
10+
<link rel="apple-touch-icon" sizes="57x57" href="/philly311/icon/apple-icon-57x57.png">
11+
<link rel="apple-touch-icon" sizes="60x60" href="/philly311/icon/apple-icon-60x60.png">
12+
<link rel="apple-touch-icon" sizes="72x72" href="/philly311/icon/apple-icon-72x72.png">
13+
<link rel="apple-touch-icon" sizes="76x76" href="/philly311/icon/apple-icon-76x76.png">
14+
<link rel="apple-touch-icon" sizes="114x114" href="/philly311/icon/apple-icon-114x114.png">
15+
<link rel="apple-touch-icon" sizes="120x120" href="/philly311/icon/apple-icon-120x120.png">
16+
<link rel="apple-touch-icon" sizes="144x144" href="/philly311/icon/apple-icon-144x144.png">
17+
<link rel="apple-touch-icon" sizes="152x152" href="/philly311/icon/apple-icon-152x152.png">
18+
<link rel="apple-touch-icon" sizes="180x180" href="/philly311/icon/apple-icon-180x180.png">
19+
<link rel="icon" type="image/png" sizes="192x192" href="/philly311/icon/android-icon-192x192.png">
20+
<link rel="icon" type="image/png" sizes="32x32" href="/philly311/icon/favicon-32x32.png">
21+
<link rel="icon" type="image/png" sizes="96x96" href="/philly311/icon/favicon-96x96.png">
22+
<link rel="icon" type="image/png" sizes="16x16" href="/philly311/icon/favicon-16x16.png">
2323
<link rel="manifest" href="manifest.json">
2424
<meta name="msapplication-TileColor" content="#0074c9">
25-
<meta name="msapplication-TileImage" content="/icon/ms-icon-144x144.png">
25+
<meta name="msapplication-TileImage" content="/philly311/icon/ms-icon-144x144.png">
2626
<meta name="theme-color" content="#0074c9">
2727
<meta name="viewport" content="width=device-width, initial-scale=1">
2828

@@ -39,7 +39,7 @@
3939
ga('send', 'pageview');
4040

4141
</script>
42-
<script type="text/javascript" src="/main.js"></script>
42+
<script type="text/javascript" src="/philly311/main.js"></script>
4343
</head>
4444
<body>
4545

_write-your-code-in-here/web_root/find-request-by-id.html renamed to _write-your-code-in-here/pages/find-request-by-id.html

File renamed without changes.

_write-your-code-in-here/web_root/find-requests-by-address.html renamed to _write-your-code-in-here/pages/find-requests-by-address.html

File renamed without changes.

0 commit comments

Comments
 (0)