summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZara Gebru <zgebru@thoughtworks.com>2016-12-02 17:55:02 +0100
committerZara Gebru <zgebru@thoughtworks.com>2016-12-02 17:55:02 +0100
commita0de084e04f02a5f09d5a14b86ece156f4f6df5f (patch)
treeac30e784628a6c967529d0a1fcefc14ad136b90c
parentb14833fbb56bcd5bff0750c16fd9214009b955be (diff)
[refactor] use static url instead of assets url
Diffstat
-rw-r--r--README.md2
-rw-r--r--service/MANIFEST.in2
-rw-r--r--service/test/unit/resources/test_root_resource.py2
-rw-r--r--web-ui/.jshintignore1
-rw-r--r--web-ui/package.json2
-rw-r--r--web-ui/public/index.html44
-rw-r--r--web-ui/public/js/main.js2
-rw-r--r--web-ui/public/js/page/default.js2
-rw-r--r--web-ui/public/scss/base/_fonts.scss22
9 files changed, 40 insertions, 39 deletions
diff --git a/README.md b/README.md
index eb3c44c1..158ca3af 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Here's a [podcast](https://soundcloud.com/thoughtworks/pixelated-why-secure-comm
**Pixelated is still in early development state!**
-![High level architecture User Agent](https://raw.githubusercontent.com/pixelated/website/master/assets/images/pixelated-user-agent.png)
+![High level architecture User Agent](https://raw.githubusercontent.com/pixelated/website/master/static/images/pixelated-user-agent.png)
## Try it!
diff --git a/service/MANIFEST.in b/service/MANIFEST.in
index a4fb90be..81d25913 100644
--- a/service/MANIFEST.in
+++ b/service/MANIFEST.in
@@ -1,5 +1,5 @@
include README.md
recursive-include pixelated/certificates *.*
-recursive-include pixelated/assets *.*
+recursive-include pixelated/static *.*
recursive-include debian *
diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py
index e72efe59..d42a4b38 100644
--- a/service/test/unit/resources/test_root_resource.py
+++ b/service/test/unit/resources/test_root_resource.py
@@ -300,7 +300,7 @@ class TestRootResource(unittest.TestCase):
def test_assets_should_be_publicly_available(self, *mocks):
self.root_resource.initialize(provider=mock(), authenticator=mock())
- request = DummyRequest(['assets', 'dummy.json'])
+ request = DummyRequest(['static', 'dummy.json'])
request.addCookie = MagicMock(return_value='stubbed')
d = self.web.get(request)
diff --git a/web-ui/.jshintignore b/web-ui/.jshintignore
index 8dfe4354..473c9c23 100644
--- a/web-ui/.jshintignore
+++ b/web-ui/.jshintignore
@@ -2,3 +2,4 @@ public/node_modules
public/bower_components
public/js/lib
public/js/generated
+public/signup.js
diff --git a/web-ui/package.json b/web-ui/package.json
index 3fa1d294..b10ff51e 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -42,7 +42,7 @@
"buildmain": "node_modules/requirejs/bin/r.js -o config/buildoptions.js",
"package": "/bin/bash config/package.sh",
"imagemin": "node config/imagemin.js",
- "minify_html": "node_modules/.bin/html-minifier public/index.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"assets/app.min.js\" type=\"text/javascript\"></script>|' > dist/index.html",
+ "minify_html": "node_modules/.bin/html-minifier public/index.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"static/app.min.js\" type=\"text/javascript\"></script>|' > dist/index.html",
"minify_sandbox": "node_modules/.bin/html-minifier public/sandbox.html --collapse-whitespace | sed 's|<!--usemin_start-->.*<!--usemin_end-->|<script src=\"sandbox.min.js\" type=\"text/javascript\"></script>|' > dist/sandbox.html",
"add_git_version": "/bin/bash config/add_git_version.sh"
},
diff --git a/web-ui/public/index.html b/web-ui/public/index.html
index 4b6a81a0..0a6303b2 100644
--- a/web-ui/public/index.html
+++ b/web-ui/public/index.html
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html>
<head>
-<link rel="icon" type="image/png" href="assets/images/Favicon.png">
+<link rel="icon" type="image/png" href="static/images/Favicon.png">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>$account_email - Pixelated Mail</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
-<link href="assets/bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-<link href="assets/bower_components/jquery-file-upload/css/jquery.fileupload.css" rel="stylesheet" type="text/css">
-<link rel="stylesheet" href="assets/css/style.css">
+<link href="static/bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
+<link href="static/bower_components/jquery-file-upload/css/jquery.fileupload.css" rel="stylesheet" type="text/css">
+<link rel="stylesheet" href="static/css/style.css">
</head>
<body>
@@ -25,15 +25,15 @@
<path fill="#3E3B38" d="M233.8,678.3h-24v71.2h16.2v-26.5h7.8c14,0,24.3-8,24.3-22.9C258.1,685.6,247.6,678.3,233.8,678.3z
M230.6,710.2h-4.6v-18.8h4.6c6.5,0,12.5,2.2,12.5,9.5C243,708.1,237.1,710.2,230.6,710.2z"/>
<rect x="263.5" y="678.3" fill="#3E3B38" width="16.2" height="71.2"/>
- <polygon fill="#3E3B38" points="350.4,678.3 330.1,678.3 316.9,697.7 303.7,678.3 284.6,678.3 307,711.1 282.6,749.5 302.9,749.5
+ <polygon fill="#3E3B38" points="350.4,678.3 330.1,678.3 316.9,697.7 303.7,678.3 284.6,678.3 307,711.1 282.6,749.5 302.9,749.5
316.9,725.3 331,749.5 352.1,749.5 326.9,711.1 "/>
- <polygon fill="#3E3B38" points="354.7,749.5 395.5,749.5 395.5,735.2 370.9,735.2 370.9,721 394.4,721 394.4,706.6 370.9,706.6
+ <polygon fill="#3E3B38" points="354.7,749.5 395.5,749.5 395.5,735.2 370.9,735.2 370.9,721 394.4,721 394.4,706.6 370.9,706.6
370.9,692.5 395.5,692.5 395.5,678.3 354.7,678.3 "/>
<path fill="#3E3B38" d="M456.1,678.3l-22.9,57h-15.9v-57h-16.2v71.2h26.5h14.3h3.2l5.4-14.3h27l5.4,14.3h17.5l-28.9-71.2H456.1z
M455.7,721l7.8-20.7h0.2l7.8,20.7H455.7z"/>
- <polygon fill="#3E3B38" points="486.4,692.5 503.4,692.5 503.4,749.5 519.6,749.5 519.6,692.5 536.6,692.5 536.6,678.3
+ <polygon fill="#3E3B38" points="486.4,692.5 503.4,692.5 503.4,749.5 519.6,749.5 519.6,692.5 536.6,692.5 536.6,678.3
486.4,678.3 "/>
- <polygon fill="#3E3B38" points="542,749.5 582.8,749.5 582.8,735.2 558.4,735.2 558.4,721 581.9,721 581.9,706.6 558.4,706.6
+ <polygon fill="#3E3B38" points="542,749.5 582.8,749.5 582.8,735.2 558.4,735.2 558.4,721 581.9,721 581.9,706.6 558.4,706.6
558.4,692.5 582.8,692.5 582.8,678.3 542,678.3 "/>
<path fill="#3E3B38" d="M606.5,678.3h-17.9v71.2h17.9c19.7,0,35.9-14.9,35.9-35.6C642.4,693.1,625.9,678.3,606.5,678.3z M607,735
h-2.4v-42.1h2.4c12.1,0,20.3,9.1,20.3,21.1C627.3,725.8,619.1,735,607,735z"/>
@@ -93,20 +93,20 @@
</div>
<!--usemin_start-->
-<script src="assets/bower_components/modernizr/modernizr.js"></script>
-<script src="assets/bower_components/lodash/dist/lodash.js"></script>
-<script src="assets/bower_components/jquery/dist/jquery.js"></script>
-<script src="assets/bower_components/jquery-ui/jquery-ui.min.js"></script>
-<script src="assets/bower_components/jquery-file-upload/js/jquery.fileupload.js"></script>
-<script src="assets/js/lib/highlightRegex.js"></script>
-<script src="assets/bower_components/handlebars/handlebars.min.js"></script>
-<script src="assets/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script>
-<script src="assets/bower_components/foundation/js/foundation.js" ></script>
-<script src="assets/bower_components/foundation/js/foundation/foundation.reveal.js" ></script>
-<script src="assets/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script>
-<script src="assets/js/foundation/initialize_foundation.js"></script>
-<script src="assets/bower_components/iframe-resizer/js/iframeResizer.min.js"></script>
-<script src="assets/bower_components/requirejs/require.js" data-main="assets/js/main.js"></script>
+<script src="static/bower_components/modernizr/modernizr.js"></script>
+<script src="static/bower_components/lodash/dist/lodash.js"></script>
+<script src="static/bower_components/jquery/dist/jquery.js"></script>
+<script src="static/bower_components/jquery-ui/jquery-ui.min.js"></script>
+<script src="static/bower_components/jquery-file-upload/js/jquery.fileupload.js"></script>
+<script src="static/js/lib/highlightRegex.js"></script>
+<script src="static/bower_components/handlebars/handlebars.min.js"></script>
+<script src="static/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script>
+<script src="static/bower_components/foundation/js/foundation.js" ></script>
+<script src="static/bower_components/foundation/js/foundation/foundation.reveal.js" ></script>
+<script src="static/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script>
+<script src="static/js/foundation/initialize_foundation.js"></script>
+<script src="static/bower_components/iframe-resizer/js/iframeResizer.min.js"></script>
+<script src="static/bower_components/requirejs/require.js" data-main="static/js/main.js"></script>
<!--usemin_end-->
</body>
diff --git a/web-ui/public/js/main.js b/web-ui/public/js/main.js
index b8836a6b..1aeb1a63 100644
--- a/web-ui/public/js/main.js
+++ b/web-ui/public/js/main.js
@@ -16,7 +16,7 @@
*/
requirejs.config({
- baseUrl: '../assets/',
+ baseUrl: '../static/',
paths: {
'mail_list': 'js/mail_list',
'page': 'js/page',
diff --git a/web-ui/public/js/page/default.js b/web-ui/public/js/page/default.js
index ecaedfd8..5d52e06c 100644
--- a/web-ui/public/js/page/default.js
+++ b/web-ui/public/js/page/default.js
@@ -96,7 +96,7 @@ define(
'use strict';
function initialize(path) {
- viewI18n.init(path + '/assets/');
+ viewI18n.init(path + '/static/');
viewI18n.loaded(function() {
paneContractExpand.attachTo(document);
diff --git a/web-ui/public/scss/base/_fonts.scss b/web-ui/public/scss/base/_fonts.scss
index dfc56dd8..a8f2d7da 100644
--- a/web-ui/public/scss/base/_fonts.scss
+++ b/web-ui/public/scss/base/_fonts.scss
@@ -2,67 +2,67 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 300;
- src: local('Open Sans Light'), local('OpenSans-Light'), url('/assets/fonts/OpenSans-Light.woff') format('woff');
+ src: local('Open Sans Light'), local('OpenSans-Light'), url('/static/fonts/OpenSans-Light.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
- src: local('Open Sans'), local('OpenSans'), url('/assets/fonts/OpenSans.woff') format('woff');
+ src: local('Open Sans'), local('OpenSans'), url('/static/fonts/OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 600;
- src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('/assets/fonts/OpenSans-Semibold.woff') format('woff');
+ src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('/static/fonts/OpenSans-Semibold.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 700;
- src: local('Open Sans Bold'), local('OpenSans-Bold'), url('/assets/fonts/OpenSans-Bold.woff') format('woff');
+ src: local('Open Sans Bold'), local('OpenSans-Bold'), url('/static/fonts/OpenSans-Bold.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 800;
- src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('/assets/fonts/OpenSans-Extrabold.woff') format('woff');
+ src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('/static/fonts/OpenSans-Extrabold.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 300;
- src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url('/assets/fonts/OpenSansLight-Italic.woff') format('woff');
+ src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url('/static/fonts/OpenSansLight-Italic.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 400;
- src: local('Open Sans Italic'), local('OpenSans-Italic'), url('/assets/fonts/OpenSans-Italic.woff') format('woff');
+ src: local('Open Sans Italic'), local('OpenSans-Italic'), url('/static/fonts/OpenSans-Italic.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 600;
- src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url('/assets/fonts/OpenSans-SemiboldItalic.woff') format('woff');
+ src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url('/static/fonts/OpenSans-SemiboldItalic.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 700;
- src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url('/assets/fonts/OpenSans-BoldItalic.woff') format('woff');
+ src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url('/static/fonts/OpenSans-BoldItalic.woff') format('woff');
}
@font-face {
font-family: 'Open Sans';
font-style: italic;
font-weight: 800;
- src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('/assets/fonts/OpenSans-ExtraboldItalic.woff') format('woff');
+ src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('/static/fonts/OpenSans-ExtraboldItalic.woff') format('woff');
}
@font-face {
font-family: 'icomoon';
font-style: normal;
font-weight: 400;
- src: url('/assets/fonts/icomoon.woff') format('woff'), url('/assets/fonts/icomoon.ttf') format('truetype'), ;
+ src: url('/static/fonts/icomoon.woff') format('woff'), url('/static/fonts/icomoon.ttf') format('truetype'), ;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 17:12:54 +0000