Skip to content

Commit 27ffd5c

Browse files
committed
Update README for latest project changes
* Fixed issue with `rake ci` not linting locally * Renamed files for consistency. * Using `express` to indicate webpack dev server for JS * Added docs folder and took some sections out of the main readme * Fixed some warnings in the JS tests
1 parent 1ece366 commit 27ffd5c

27 files changed

+351
-533
lines changed

.scss-lint.yml

-181
Original file line numberDiff line numberDiff line change
@@ -7,201 +7,20 @@ scss_files:
77
exclude: 'client/node_modules/**'
88

99
linters:
10-
# BangFormat:
11-
# enabled: true
12-
# space_before_bang: true
13-
# space_after_bang: false
14-
#
15-
# BorderZero:
16-
# enabled: true
17-
# convention: zero # or `none`
18-
#
1910
ColorKeyword:
2011
enabled: false
2112
ColorVariable:
2213
enabled: false
23-
#
24-
# Comment:
25-
# enabled: true
26-
#
27-
# DebugStatement:
28-
# enabled: true
29-
#
30-
# DeclarationOrder:
31-
# enabled: true
32-
#
33-
# DuplicateProperty:
34-
# enabled: true
35-
#
36-
# ElsePlacement:
37-
# enabled: true
38-
# style: same_line # or 'new_line'
39-
#
40-
# EmptyLineBetweenBlocks:
41-
# enabled: true
42-
# ignore_single_line_blocks: true
43-
#
44-
# EmptyRule:
45-
# enabled: true
46-
#
47-
# FinalNewline:
48-
# enabled: true
49-
# present: true
50-
#
5114
HexLength:
5215
enabled: true
5316
style: long
54-
5517
HexNotation:
5618
enabled: true
5719
style: uppercase
58-
#
59-
# HexValidation:
60-
# enabled: true
61-
#
6220
IdSelector:
6321
enabled: true
64-
#
65-
# ImportantRule:
66-
# enabled: true
67-
#
68-
# ImportPath:
69-
# enabled: true
70-
# leading_underscore: false
71-
# filename_extension: false
72-
#
73-
# Indentation:
74-
# enabled: true
75-
# allow_non_nested_indentation: false
76-
# character: space # or 'tab'
77-
# width: 2
78-
#
7922
LeadingZero:
8023
enabled: true
8124
style: include_zero
82-
#
83-
# MergeableSelector:
84-
# enabled: true
85-
# force_nesting: true
86-
#
87-
# NameFormat:
88-
# enabled: true
89-
# allow_leading_underscore: true
90-
# convention: hyphenated_lowercase # or 'camel_case', or 'snake_case', or a regex pattern
91-
#
92-
# NestingDepth:
93-
# enabled: true
94-
# max_depth: 3
95-
#
96-
# PlaceholderInExtend:
97-
# enabled: true
98-
#
99-
# PropertyCount:
100-
# enabled: false
101-
# include_nested: false
102-
# max_properties: 10
103-
#
104-
# PropertyUnits:
105-
# enabled: true
106-
# global: [
107-
# 'ch', 'em', 'ex', 'rem', # Font-relative lengths
108-
# 'cm', 'in', 'mm', 'pc', 'pt', 'px', 'q', # Absolute lengths
109-
# 'vh', 'vw', 'vmin', 'vmax', # Viewport-percentage lengths
110-
# 'deg', 'grad', 'rad', 'turn', # Angle
111-
# 'ms', 's', # Duration
112-
# 'Hz', 'kHz', # Frequency
113-
# 'dpi', 'dpcm', 'dppx', # Resolution
114-
# '%', # Other
115-
# ]
116-
# properties: {}
117-
#
118-
# PropertySortOrder:
119-
# enabled: true
120-
# ignore_unspecified: false
121-
# separate_groups: false
122-
#
123-
# PropertySpelling:
124-
# enabled: true
125-
# extra_properties: []
126-
#
127-
# QualifyingElement:
128-
# enabled: true
129-
# allow_element_with_attribute: false
130-
# allow_element_with_class: false
131-
# allow_element_with_id: false
132-
#
133-
# SelectorDepth:
134-
# enabled: true
135-
# max_depth: 3
136-
#
13725
SelectorFormat:
13826
enabled: false
139-
# convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
140-
#
141-
# Shorthand:
142-
# enabled: true
143-
# allowed_shorthands: [1, 2, 3]
144-
#
145-
# SingleLinePerProperty:
146-
# enabled: true
147-
# allow_single_line_rule_sets: true
148-
#
149-
# SingleLinePerSelector:
150-
# enabled: true
151-
#
152-
# SpaceAfterComma:
153-
# enabled: true
154-
#
155-
# SpaceAfterPropertyColon:
156-
# enabled: true
157-
# style: one_space # or 'no_space', or 'at_least_one_space', or 'aligned'
158-
#
159-
# SpaceAfterPropertyName:
160-
# enabled: true
161-
#
162-
# SpaceBeforeBrace:
163-
# enabled: true
164-
# style: space # or 'new_line'
165-
# allow_single_line_padding: false
166-
#
167-
# SpaceBetweenParens:
168-
# enabled: true
169-
# spaces: 0
170-
#
171-
# StringQuotes:
172-
# enabled: true
173-
# style: single_quotes # or double_quotes
174-
#
175-
# TrailingSemicolon:
176-
# enabled: true
177-
#
178-
# TrailingZero:
179-
# enabled: false
180-
#
181-
# UnnecessaryMantissa:
182-
# enabled: true
183-
#
184-
# UnnecessaryParentReference:
185-
# enabled: true
186-
#
187-
# UrlFormat:
188-
# enabled: true
189-
#
190-
# UrlQuotes:
191-
# enabled: true
192-
#
193-
# VariableForProperty:
194-
# enabled: false
195-
# properties: []
196-
#
197-
# VendorPrefix:
198-
# enabled: true
199-
# identifier_list: base
200-
# additional_identifiers: []
201-
# excluded_identifiers: []
202-
#
203-
# ZeroUnit:
204-
# enabled: true
205-
#
206-
# Compass::*:
207-
# enabled: false

Gemfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,12 @@ gem "awesome_print"
5151
# It is critical to not include any of the jquery gems when following this pattern or
5252
# else you might have multiple jQuery versions.
5353

54-
group :development, :test do
54+
group :development do
5555
# Access an IRB console on exceptions page and /console in development
5656
gem "web-console"
57+
end
5758

59+
group :development, :test do
5860
################################################################################
5961
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
6062
gem "spring"
@@ -82,6 +84,10 @@ group :development, :test do
8284
gem "pry-stack_explorer"
8385
gem "pry-rescue"
8486
gem "pry-byebug"
87+
88+
################################################################################
89+
# Color console output
90+
gem "rainbow"
8591
end
8692

8793
group :test do

Gemfile.lock

+19-19
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ GEM
3636
minitest (~> 5.1)
3737
thread_safe (~> 0.3, >= 0.3.4)
3838
tzinfo (~> 1.1)
39-
addressable (2.3.8)
39+
addressable (2.4.0)
4040
archive-zip (0.7.0)
4141
io-like (~> 0.3.0)
4242
arel (6.0.3)
4343
ast (2.1.0)
4444
astrolabe (1.3.1)
4545
parser (~> 2.2)
46-
autoprefixer-rails (6.1.1)
46+
autoprefixer-rails (6.1.2)
4747
execjs
4848
json
4949
awesome_print (1.6.1)
@@ -52,23 +52,23 @@ GEM
5252
bootstrap-sass (3.3.6)
5353
autoprefixer-rails (>= 5.2.1)
5454
sass (>= 3.3.4)
55-
brakeman (3.1.2)
55+
brakeman (3.1.3)
5656
erubis (~> 2.6)
5757
fastercsv (~> 1.5)
5858
haml (>= 3.0, < 5.0)
59-
highline (~> 1.6)
59+
highline (>= 1.6.20, < 2.0)
6060
multi_json (~> 1.2)
6161
ruby2ruby (>= 2.1.1, < 2.3.0)
6262
ruby_parser (~> 3.7.0)
63-
safe_yaml
63+
safe_yaml (>= 1.0)
6464
sass (~> 3.0)
6565
slim (>= 1.3.6, < 4.0)
6666
terminal-table (~> 1.4)
6767
builder (3.2.2)
6868
bundler-audit (0.4.0)
6969
bundler (~> 1.2)
7070
thor (~> 0.18)
71-
byebug (8.2.0)
71+
byebug (8.2.1)
7272
capybara (2.5.0)
7373
mime-types (>= 1.16)
7474
nokogiri (>= 1.3.3)
@@ -93,10 +93,10 @@ GEM
9393
coffee-script-source (1.10.0)
9494
concurrent-ruby (1.0.0)
9595
connection_pool (2.2.0)
96-
coveralls (0.8.9)
96+
coveralls (0.8.10)
9797
json (~> 1.8)
9898
rest-client (>= 1.6.8, < 2)
99-
simplecov (~> 0.10.0)
99+
simplecov (~> 0.11.0)
100100
term-ansicolor (~> 1.3)
101101
thor (~> 0.19.1)
102102
tins (~> 1.6.0)
@@ -204,7 +204,7 @@ GEM
204204
rainbow (2.0.0)
205205
rake (10.4.2)
206206
rdoc (4.2.0)
207-
react_on_rails (1.1.1)
207+
react_on_rails (1.2.0)
208208
connection_pool
209209
execjs (~> 2.5)
210210
rails (>= 3.2)
@@ -250,14 +250,14 @@ GEM
250250
sexp_processor (~> 4.1)
251251
rubyzip (1.1.7)
252252
safe_yaml (1.0.4)
253-
sass (3.4.19)
253+
sass (3.4.20)
254254
sass-rails (5.0.4)
255255
railties (>= 4.0.0, < 5.0)
256256
sass (~> 3.1)
257257
sprockets (>= 2.8, < 4.0)
258258
sprockets-rails (>= 2.0, < 4.0)
259259
tilt (>= 1.1, < 3)
260-
scss_lint (0.43.0)
260+
scss_lint (0.43.2)
261261
rainbow (~> 2.0)
262262
sass (~> 3.4.15)
263263
sdoc (0.4.1)
@@ -269,7 +269,7 @@ GEM
269269
rubyzip (~> 1.0)
270270
websocket (~> 1.0)
271271
sexp_processor (4.6.0)
272-
simplecov (0.10.0)
272+
simplecov (0.11.1)
273273
docile (~> 1.1.0)
274274
json (~> 1.8)
275275
simplecov-html (~> 0.10.0)
@@ -278,10 +278,10 @@ GEM
278278
temple (~> 0.7.3)
279279
tilt (>= 1.3.3, < 2.1)
280280
slop (3.6.0)
281-
spring (1.4.4)
281+
spring (1.5.0)
282282
spring-commands-rspec (1.0.4)
283283
spring (>= 0.9.1)
284-
sprockets (3.5.1)
284+
sprockets (3.5.2)
285285
concurrent-ruby (~> 1.0)
286286
rack (> 1, < 3)
287287
sprockets-rails (2.3.3)
@@ -310,11 +310,10 @@ GEM
310310
unf (0.1.4)
311311
unf_ext
312312
unf_ext (0.0.7.1)
313-
web-console (2.2.1)
314-
activemodel (>= 4.0)
315-
binding_of_caller (>= 0.7.2)
316-
railties (>= 4.0)
317-
sprockets-rails (>= 2.0, < 4.0)
313+
web-console (3.0.0)
314+
activemodel (>= 4.2)
315+
debug_inspector
316+
railties (>= 4.2)
318317
websocket (1.2.2)
319318
xpath (2.0.0)
320319
nokogiri (~> 1.3)
@@ -350,6 +349,7 @@ DEPENDENCIES
350349
rails (~> 4.2)
351350
rails-html-sanitizer
352351
rails_12factor
352+
rainbow
353353
react_on_rails
354354
rspec-rails
355355
rspec-retry

Procfile.dev

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1-
web: rails s
1+
# Basic procfile for dev work.
2+
# Runs all processes. Development is faster if you pick one of the other Procfiles if you don't need
3+
# some of the processes: Procfile.rails or Procfile.express
24

5+
# Development rails requires both rails and rails-assets
6+
# (and rails-server-assets if server rendering)
7+
rails: rails s
38
# Run the hot reload server for client development
4-
client: sh -c 'rm app/assets/webpack/* || true && cd client && HOT_RAILS_PORT=3500 npm run build:dev:client'
9+
rails-assets: sh -c 'rm app/assets/webpack/* || true && HOT_RAILS_PORT=3500 npm run build:dev:client'
10+
# Keep the JS fresh for server rendering. Remove if not server rendering
11+
rails-server-assets: sh -c 'npm run build:dev:server'
512

6-
# Keep the JS fresh for specs
7-
client-spec: sh -c 'cd client && npm run build:test:client'
13+
# If you don't keep this process going, you will rebuild the assets per spec run. This is configured
14+
# in rails_helper.rb.
15+
rails-spec: sh -c 'npm run build:test:client'
816

9-
# Keep the JS fresh for server rendering
10-
server: sh -c 'cd client && npm run build:dev:server'
11-
hot: sh -c 'cd client && HOT_PORT=4000 npm start'
17+
# Run an express server if you want to mock out your endpoints. No Rails involved!
18+
# Disable this if you are not using it.
19+
# It's a great way to prototype UI especially with non-Rails developers!
20+
express: sh -c 'HOT_PORT=4000 npm start'

Procfile.express

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Basic procfile for express server dev work.
2+
# Only run the express server!
3+
# Use this if you want to mock out your endpoints.
4+
# It's a great way to prototype UI especially with non-Rails developers!
5+
# You can still run tests, and they will build the webpack file for each test run.
6+
# Hot reloading of JS and CSS is enabled!
7+
8+
express: sh -c 'HOT_PORT=4000 npm start'

0 commit comments

Comments
 (0)