Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use NPM style guide package #1619

Merged
merged 1 commit into from
Aug 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ WORKDIR /upaya

COPY package.json /upaya
RUN npm install
RUN npm run build

COPY Gemfile /upaya
COPY Gemfile.lock /upaya
Expand Down
1 change: 1 addition & 0 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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 =="
Expand Down
9 changes: 9 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Binary file removed public/android-chrome-192x192.png
Binary file not shown.
Binary file removed public/apple-touch-icon.png
Binary file not shown.
9 changes: 0 additions & 9 deletions public/browserconfig.xml

This file was deleted.

Binary file removed public/favicon-16x16.png
Binary file not shown.
Binary file removed public/favicon-32x32.png
Binary file not shown.
Binary file removed public/favicon.ico
Binary file not shown.
12 changes: 0 additions & 12 deletions public/manifest.json

This file was deleted.

Binary file removed public/mstile-150x150.png
Binary file not shown.
22 changes: 0 additions & 22 deletions public/safari-pinned-tab.svg

This file was deleted.

2 changes: 1 addition & 1 deletion spec/svg_spec.rb
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
Binary file removed vendor/assets/fonts/merriweather-bold-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-bold-webfont.ttf
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-bold-webfont.woff
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-bold-webfont.woff2
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-italic-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-italic-webfont.ttf
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-italic-webfont.woff
Binary file not shown.
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-light-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-light-webfont.ttf
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-light-webfont.woff
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-light-webfont.woff2
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-regular-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/merriweather-regular-webfont.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-bold-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-bold-webfont.ttf
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-bold-webfont.woff
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-bold-webfont.woff2
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-italic-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-italic-webfont.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-light-webfont.eot
Binary file not shown.
Binary file removed vendor/assets/fonts/sourcesanspro-light-webfont.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.