diff --git a/.gitignore b/.gitignore
index aebd7c9ecef..b18320e46b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,11 +50,17 @@ Vagrantfile
/kitchen/cookbooks
/log/*
/private_certs/*
+/public/*.ico
+/public/*.png
+/public/*.svg
+/public/browserconfig.xml
+/public/manifest.json
/public/system
/public/user_flows
/spec/tmp
/test
/tmp/*
+/vendor/assets/fonts
/vendor/bundle
/node_modules
diff --git a/.travis.yml b/.travis.yml
index 6c27c2712e0..a8d124fb2ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ before_install:
- nvm install stable
- nvm use stable
- npm install
+ - npm run build
# Install PhantomJS 2.1.1 manually
- "export PHANTOMJS_VERSION=2.1.1"
- "phantomjs --version"
diff --git a/Dockerfile b/Dockerfile
index 75f3b3a2a9b..747766aa4a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ WORKDIR /upaya
COPY package.json /upaya
RUN npm install
+RUN npm run build
COPY Gemfile /upaya
COPY Gemfile.lock /upaya
diff --git a/bin/setup b/bin/setup
index 4d0a217f553..4851289229a 100755
--- a/bin/setup
+++ b/bin/setup
@@ -53,6 +53,7 @@ Dir.chdir APP_ROOT do
run 'gem install foreman --conservative && gem update foreman'
run "bundle check || bundle install"
run "npm install"
+ run "npm run build"
run "gem install mailcatcher"
puts "\n== Preparing database =="
diff --git a/package.json b/package.json
index 5e216e62d1e..61621a20dca 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,14 @@
"node": "~4.4.x",
"npm": "~3.8.x"
},
+ "scripts": {
+ "build": "npm run clean && npm run make-dirs && npm run copy",
+ "clean": "rm -rf ./vendor/assets/fonts && rm -f ./public/*.ico && rm -f ./public/*.png && rm -f ./public/*.svg && rm -f ./public/browserconfig.xml && rm -f ./public/manifest.json",
+ "copy": "npm run copy-font && npm run copy-favicons",
+ "copy-favicons": "cp node_modules/identity-style-guide/src/favicons/* ./public",
+ "copy-font": "cp node_modules/identity-style-guide/src/font/* ./vendor/assets/fonts/",
+ "make-dirs": "mkdir -p ./vendor/assets/fonts"
+ },
"dependencies": {
"app": "^0.1.0",
"basscss-sass": "^3.0.0",
@@ -14,6 +22,7 @@
"field-kit": "^2.1.0",
"focus-trap": "^2.3.0",
"hint.css": "^2.3.2",
+ "identity-style-guide": "^0.2.3",
"libphonenumber-js": "^0.4.23",
"normalize.css": "^4.2.0",
"sinon": "^1.17.7",
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
deleted file mode 100644
index ca68c112c39..00000000000
Binary files a/public/android-chrome-192x192.png and /dev/null differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index f1cb06f8693..00000000000
Binary files a/public/apple-touch-icon.png and /dev/null differ
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
deleted file mode 100644
index 4a718762cf5..00000000000
--- a/public/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- #2b5797
-
-
-
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
deleted file mode 100644
index 1d6eb611baa..00000000000
Binary files a/public/favicon-16x16.png and /dev/null differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
deleted file mode 100644
index 238fa1caadb..00000000000
Binary files a/public/favicon-32x32.png and /dev/null differ
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 7edfd94950f..00000000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index f73ffef4e25..00000000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "name": "login.gov",
- "icons": [
- {
- "src": "\/android-chrome-192x192.png",
- "sizes": "192x192",
- "type": "image\/png"
- }
- ],
- "theme_color": "#ffffff",
- "display": "standalone"
-}
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
deleted file mode 100644
index ace52e08cc1..00000000000
Binary files a/public/mstile-150x150.png and /dev/null differ
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
deleted file mode 100644
index 31e814a274f..00000000000
--- a/public/safari-pinned-tab.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/spec/svg_spec.rb b/spec/svg_spec.rb
index 4a16cc669c9..556f2695b40 100644
--- a/spec/svg_spec.rb
+++ b/spec/svg_spec.rb
@@ -1,7 +1,7 @@
require 'rails_helper'
RSpec.describe 'SVG files' do
- Dir[Rails.root.join('**', '*.svg')].each do |svg_path|
+ Dir[Rails.root.join('**', '*.svg')].reject { |f| f.include?('node_modules') }.each do |svg_path|
relative_path = svg_path.sub(Rails.root.to_s, '')
next if %w[vendor node_modules].include?(relative_path.split('/')[1])
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.eot b/vendor/assets/fonts/merriweather-bold-webfont.eot
deleted file mode 100755
index c77b53bdd0c..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.ttf b/vendor/assets/fonts/merriweather-bold-webfont.ttf
deleted file mode 100755
index 44f33c239f2..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.woff b/vendor/assets/fonts/merriweather-bold-webfont.woff
deleted file mode 100755
index a728400d5fd..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.woff2 b/vendor/assets/fonts/merriweather-bold-webfont.woff2
deleted file mode 100755
index ff3bddfbd91..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.eot b/vendor/assets/fonts/merriweather-italic-webfont.eot
deleted file mode 100755
index 8841854416f..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.ttf b/vendor/assets/fonts/merriweather-italic-webfont.ttf
deleted file mode 100755
index 3180e526d96..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.woff b/vendor/assets/fonts/merriweather-italic-webfont.woff
deleted file mode 100755
index d7071e3c233..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.woff2 b/vendor/assets/fonts/merriweather-italic-webfont.woff2
deleted file mode 100755
index f8660d06ff5..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.eot b/vendor/assets/fonts/merriweather-light-webfont.eot
deleted file mode 100755
index 4115d282bbe..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.ttf b/vendor/assets/fonts/merriweather-light-webfont.ttf
deleted file mode 100755
index 03cfa425339..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.woff b/vendor/assets/fonts/merriweather-light-webfont.woff
deleted file mode 100755
index 9b3427536d9..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.woff2 b/vendor/assets/fonts/merriweather-light-webfont.woff2
deleted file mode 100755
index e53e4b531ec..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.eot b/vendor/assets/fonts/merriweather-regular-webfont.eot
deleted file mode 100755
index c4cde6d0159..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.ttf b/vendor/assets/fonts/merriweather-regular-webfont.ttf
deleted file mode 100755
index 3889a606587..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.woff b/vendor/assets/fonts/merriweather-regular-webfont.woff
deleted file mode 100755
index 1969d2ed0da..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.woff2 b/vendor/assets/fonts/merriweather-regular-webfont.woff2
deleted file mode 100755
index 3023ce73c87..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.eot b/vendor/assets/fonts/sourcesanspro-bold-webfont.eot
deleted file mode 100644
index f031b206e42..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf b/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf
deleted file mode 100644
index 02ae55e6e71..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff
deleted file mode 100644
index 1985bc0f19a..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2
deleted file mode 100644
index 59cbda51993..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.eot b/vendor/assets/fonts/sourcesanspro-italic-webfont.eot
deleted file mode 100644
index e01ae4de040..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf b/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf
deleted file mode 100644
index b513caef9b0..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff
deleted file mode 100644
index a512221ddaa..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2
deleted file mode 100644
index c1a6d9f1e8a..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.eot b/vendor/assets/fonts/sourcesanspro-light-webfont.eot
deleted file mode 100644
index 55d1c876c9b..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.ttf b/vendor/assets/fonts/sourcesanspro-light-webfont.ttf
deleted file mode 100644
index a4c674a00f9..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.woff b/vendor/assets/fonts/sourcesanspro-light-webfont.woff
deleted file mode 100644
index eb2fd5ae65c..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-light-webfont.woff2
deleted file mode 100644
index 091b8079af7..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.eot b/vendor/assets/fonts/sourcesanspro-regular-webfont.eot
deleted file mode 100644
index cddebbca5f3..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf b/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf
deleted file mode 100644
index ac42fa1c241..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff
deleted file mode 100644
index e057c48e84e..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2
deleted file mode 100644
index 43ec601dc2c..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 and /dev/null differ