tb · kovson · Apr 27, 2017 · Apr 27, 2017
diff --git a/.gitignore b/.gitignore
@@ -1 +1,18 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore Byebug command history file.
+.byebug_history
 .idea/
diff --git a/server/.rspec → .rspec b/server/.rspec → .rspec
diff --git a/.ruby-gemset b/.ruby-gemset
@@ -0,0 +1 @@
+-rails-json-api
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+-2.3.1
diff --git a/server/Gemfile → Gemfile b/server/Gemfile → Gemfile
@@ -28,6 +28,7 @@ gem 'jsonapi-resources'
 gem 'factory_girl'
 gem 'faker'
 gem 'devise_token_auth'
+gem 'foreman', '~> 0.82.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

diff --git a/server/Gemfile.lock → Gemfile.lock b/server/Gemfile.lock → Gemfile.lock
@@ -59,6 +59,8 @@ GEM
     faker (1.7.3)
       i18n (~> 0.5)
     ffi (1.9.18)
+    foreman (0.82.0)
+      thor (~> 0.19.1)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.8.1)
@@ -165,6 +167,7 @@ DEPENDENCIES
   devise_token_auth
   factory_girl
   faker
+  foreman (~> 0.82.0)
   jsonapi-resources
   listen (~> 3.0.5)
   pg (~> 0.18)

diff --git a/Procfile b/Procfile
@@ -0,0 +1,2 @@
+web: cd client && npm start
+api: bundle exec rails s -p 3000
diff --git a/server/README.md → README.md b/server/README.md → README.md
@@ -11,12 +11,12 @@
     rails g model category name:string
     rails g model post title:string body:text category:references
     rails g model comment body:text post:references
-    
+
 ### Resources
 
     rails generate jsonapi:resource category
     rails generate jsonapi:resource post
-    rails generate jsonapi:resource model    
+    rails generate jsonapi:resource model
 
 ### Controllers
 
@@ -29,3 +29,6 @@
     jsonapi_resources :categories
     jsonapi_resources :posts
     jsonapi_resources :comments
+
+### Start app
+    foreman start
diff --git a/server/Rakefile → Rakefile b/server/Rakefile → Rakefile
diff --git a/...app/channels/application_cable/channel.rb → app/channels/application_cable/channel.rb b/...app/channels/application_cable/channel.rb → app/channels/application_cable/channel.rb
diff --git a/.../channels/application_cable/connection.rb → app/channels/application_cable/connection.rb b/.../channels/application_cable/connection.rb → app/channels/application_cable/connection.rb
diff --git a/server/app/concerns/custom_filter.rb → app/concerns/custom_filter.rb b/server/app/concerns/custom_filter.rb → app/concerns/custom_filter.rb
diff --git a/...app/controllers/application_controller.rb → app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → app/controllers/application_controller.rb
diff --git a/.../app/controllers/authorized_controller.rb → app/controllers/authorized_controller.rb b/.../app/controllers/authorized_controller.rb → app/controllers/authorized_controller.rb
diff --git a/.../app/controllers/categories_controller.rb → app/controllers/categories_controller.rb b/.../app/controllers/categories_controller.rb → app/controllers/categories_controller.rb
diff --git a/...er/app/controllers/comments_controller.rb → app/controllers/comments_controller.rb b/...er/app/controllers/comments_controller.rb → app/controllers/comments_controller.rb
diff --git a/server/app/controllers/concerns/.keep → app/controllers/concerns/.keep b/server/app/controllers/concerns/.keep → app/controllers/concerns/.keep
diff --git a/server/app/controllers/posts_controller.rb → app/controllers/posts_controller.rb b/server/app/controllers/posts_controller.rb → app/controllers/posts_controller.rb
diff --git a/server/app/controllers/users_controller.rb → app/controllers/users_controller.rb b/server/app/controllers/users_controller.rb → app/controllers/users_controller.rb
diff --git a/server/app/jobs/application_job.rb → app/jobs/application_job.rb b/server/app/jobs/application_job.rb → app/jobs/application_job.rb
diff --git a/server/app/mailers/application_mailer.rb → app/mailers/application_mailer.rb b/server/app/mailers/application_mailer.rb → app/mailers/application_mailer.rb
diff --git a/server/app/models/application_record.rb → app/models/application_record.rb b/server/app/models/application_record.rb → app/models/application_record.rb
diff --git a/server/app/models/category.rb → app/models/category.rb b/server/app/models/category.rb → app/models/category.rb
diff --git a/server/app/models/comment.rb → app/models/comment.rb b/server/app/models/comment.rb → app/models/comment.rb
diff --git a/server/app/models/concerns/.keep → app/models/concerns/.keep b/server/app/models/concerns/.keep → app/models/concerns/.keep
diff --git a/server/app/models/post.rb → app/models/post.rb b/server/app/models/post.rb → app/models/post.rb
diff --git a/server/app/models/user.rb → app/models/user.rb b/server/app/models/user.rb → app/models/user.rb
diff --git a/server/app/resources/category_resource.rb → app/resources/category_resource.rb b/server/app/resources/category_resource.rb → app/resources/category_resource.rb
diff --git a/server/app/resources/comment_resource.rb → app/resources/comment_resource.rb b/server/app/resources/comment_resource.rb → app/resources/comment_resource.rb
diff --git a/server/app/resources/post_resource.rb → app/resources/post_resource.rb b/server/app/resources/post_resource.rb → app/resources/post_resource.rb
diff --git a/server/app/resources/user_resource.rb → app/resources/user_resource.rb b/server/app/resources/user_resource.rb → app/resources/user_resource.rb
diff --git a/server/app/views/layouts/mailer.html.erb → app/views/layouts/mailer.html.erb b/server/app/views/layouts/mailer.html.erb → app/views/layouts/mailer.html.erb
diff --git a/server/app/views/layouts/mailer.text.erb → app/views/layouts/mailer.text.erb b/server/app/views/layouts/mailer.text.erb → app/views/layouts/mailer.text.erb
diff --git a/server/bin/bundle → bin/bundle b/server/bin/bundle → bin/bundle
diff --git a/server/bin/rails → bin/rails b/server/bin/rails → bin/rails
diff --git a/server/bin/rake → bin/rake b/server/bin/rake → bin/rake
diff --git a/server/bin/setup → bin/setup b/server/bin/setup → bin/setup
diff --git a/server/bin/spring → bin/spring b/server/bin/spring → bin/spring
diff --git a/server/bin/update → bin/update b/server/bin/update → bin/update
diff --git a/server/config.ru → config.ru b/server/config.ru → config.ru
diff --git a/server/config/application.rb → config/application.rb b/server/config/application.rb → config/application.rb
diff --git a/server/config/boot.rb → config/boot.rb b/server/config/boot.rb → config/boot.rb
diff --git a/server/config/cable.yml → config/cable.yml b/server/config/cable.yml → config/cable.yml
diff --git a/server/config/database.yml → config/database.yml b/server/config/database.yml → config/database.yml
diff --git a/server/config/environment.rb → config/environment.rb b/server/config/environment.rb → config/environment.rb
diff --git a/server/config/environments/development.rb → config/environments/development.rb b/server/config/environments/development.rb → config/environments/development.rb
diff --git a/server/config/environments/production.rb → config/environments/production.rb b/server/config/environments/production.rb → config/environments/production.rb
diff --git a/server/config/environments/test.rb → config/environments/test.rb b/server/config/environments/test.rb → config/environments/test.rb
diff --git a/...lizers/application_controller_renderer.rb → ...lizers/application_controller_renderer.rb b/...lizers/application_controller_renderer.rb → ...lizers/application_controller_renderer.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → config/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → config/initializers/backtrace_silencers.rb
diff --git a/server/config/initializers/cors.rb → config/initializers/cors.rb b/server/config/initializers/cors.rb → config/initializers/cors.rb
diff --git a/.../config/initializers/devise_token_auth.rb → config/initializers/devise_token_auth.rb b/.../config/initializers/devise_token_auth.rb → config/initializers/devise_token_auth.rb
diff --git a/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb b/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb
diff --git a/server/config/initializers/inflections.rb → config/initializers/inflections.rb b/server/config/initializers/inflections.rb → config/initializers/inflections.rb
diff --git a/.../config/initializers/jsonapi_resources.rb → config/initializers/jsonapi_resources.rb b/.../config/initializers/jsonapi_resources.rb → config/initializers/jsonapi_resources.rb
diff --git a/server/config/initializers/mime_types.rb → config/initializers/mime_types.rb b/server/config/initializers/mime_types.rb → config/initializers/mime_types.rb
diff --git a/...ig/initializers/new_framework_defaults.rb → ...ig/initializers/new_framework_defaults.rb b/...ig/initializers/new_framework_defaults.rb → ...ig/initializers/new_framework_defaults.rb
diff --git a/...er/config/initializers/wrap_parameters.rb → config/initializers/wrap_parameters.rb b/...er/config/initializers/wrap_parameters.rb → config/initializers/wrap_parameters.rb
diff --git a/server/config/locales/en.yml → config/locales/en.yml b/server/config/locales/en.yml → config/locales/en.yml
diff --git a/server/config/puma.rb → config/puma.rb b/server/config/puma.rb → config/puma.rb
diff --git a/server/config/routes.rb → config/routes.rb b/server/config/routes.rb → config/routes.rb
diff --git a/server/config/secrets.yml → config/secrets.yml b/server/config/secrets.yml → config/secrets.yml
diff --git a/server/config/spring.rb → config/spring.rb b/server/config/spring.rb → config/spring.rb
diff --git a/...grate/20170328190422_create_categories.rb → ...grate/20170328190422_create_categories.rb b/...grate/20170328190422_create_categories.rb → ...grate/20170328190422_create_categories.rb
diff --git a/...db/migrate/20170328194723_create_posts.rb → db/migrate/20170328194723_create_posts.rb b/...db/migrate/20170328194723_create_posts.rb → db/migrate/20170328194723_create_posts.rb
diff --git a/...migrate/20170328194726_create_comments.rb → db/migrate/20170328194726_create_comments.rb b/...migrate/20170328194726_create_comments.rb → db/migrate/20170328194726_create_comments.rb
diff --git a/...8135338_devise_token_auth_create_users.rb → ...8135338_devise_token_auth_create_users.rb b/...8135338_devise_token_auth_create_users.rb → ...8135338_devise_token_auth_create_users.rb
diff --git a/server/db/schema.rb → db/schema.rb b/server/db/schema.rb → db/schema.rb
diff --git a/server/db/seeds.rb → db/seeds.rb b/server/db/seeds.rb → db/seeds.rb
diff --git a/server/lib/tasks/.keep → lib/tasks/.keep b/server/lib/tasks/.keep → lib/tasks/.keep
diff --git a/server/log/.keep → log/.keep b/server/log/.keep → log/.keep
diff --git a/server/public/robots.txt → public/robots.txt b/server/public/robots.txt → public/robots.txt
diff --git a/server/.gitignore b/server/.gitignore
diff --git a/server/.ruby-gemset b/server/.ruby-gemset
diff --git a/server/.ruby-version b/server/.ruby-version
diff --git a/server/spec/factories/category.rb → spec/factories/category.rb b/server/spec/factories/category.rb → spec/factories/category.rb
diff --git a/server/spec/factories/comment.rb → spec/factories/comment.rb b/server/spec/factories/comment.rb → spec/factories/comment.rb
diff --git a/server/spec/factories/post.rb → spec/factories/post.rb b/server/spec/factories/post.rb → spec/factories/post.rb
diff --git a/server/spec/rails_helper.rb → spec/rails_helper.rb b/server/spec/rails_helper.rb → spec/rails_helper.rb
diff --git a/server/spec/spec_helper.rb → spec/spec_helper.rb b/server/spec/spec_helper.rb → spec/spec_helper.rb
diff --git a/tmp/restart.txt b/tmp/restart.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		web: cd client && npm start
		api: bundle exec rails s -p 3000