From 7f683f7b525aff3a0c8910fe06377735a250cc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysiek=20Gre=C5=84?= Date: Thu, 27 Apr 2017 09:37:19 +0200 Subject: [PATCH] moved client inside server, added foreman --- .gitignore | 17 +++++++++++++++++ server/.rspec => .rspec | 0 .ruby-gemset | 1 + .ruby-version | 1 + server/Gemfile => Gemfile | 1 + server/Gemfile.lock => Gemfile.lock | 3 +++ Procfile | 2 ++ server/README.md => README.md | 7 +++++-- server/Rakefile => Rakefile | 0 .../channels/application_cable/channel.rb | 0 .../channels/application_cable/connection.rb | 0 {server/app => app}/concerns/custom_filter.rb | 0 .../controllers/application_controller.rb | 0 .../controllers/authorized_controller.rb | 0 .../controllers/categories_controller.rb | 0 .../controllers/comments_controller.rb | 0 {server/app => app}/controllers/concerns/.keep | 0 .../controllers/posts_controller.rb | 0 .../controllers/users_controller.rb | 0 {server/app => app}/jobs/application_job.rb | 0 .../app => app}/mailers/application_mailer.rb | 0 .../app => app}/models/application_record.rb | 0 {server/app => app}/models/category.rb | 0 {server/app => app}/models/comment.rb | 0 {server/app => app}/models/concerns/.keep | 0 {server/app => app}/models/post.rb | 0 {server/app => app}/models/user.rb | 0 .../app => app}/resources/category_resource.rb | 0 .../app => app}/resources/comment_resource.rb | 0 {server/app => app}/resources/post_resource.rb | 0 {server/app => app}/resources/user_resource.rb | 0 .../app => app}/views/layouts/mailer.html.erb | 0 .../app => app}/views/layouts/mailer.text.erb | 0 {server/bin => bin}/bundle | 0 {server/bin => bin}/rails | 0 {server/bin => bin}/rake | 0 {server/bin => bin}/setup | 0 {server/bin => bin}/spring | 0 {server/bin => bin}/update | 0 server/config.ru => config.ru | 0 {server/config => config}/application.rb | 0 {server/config => config}/boot.rb | 0 {server/config => config}/cable.yml | 0 {server/config => config}/database.yml | 0 {server/config => config}/environment.rb | 0 .../environments/development.rb | 0 .../environments/production.rb | 0 {server/config => config}/environments/test.rb | 0 .../application_controller_renderer.rb | 0 .../initializers/backtrace_silencers.rb | 0 {server/config => config}/initializers/cors.rb | 0 .../initializers/devise_token_auth.rb | 0 .../initializers/filter_parameter_logging.rb | 0 .../initializers/inflections.rb | 0 .../initializers/jsonapi_resources.rb | 0 .../initializers/mime_types.rb | 0 .../initializers/new_framework_defaults.rb | 0 .../initializers/wrap_parameters.rb | 0 {server/config => config}/locales/en.yml | 0 {server/config => config}/puma.rb | 0 {server/config => config}/routes.rb | 0 {server/config => config}/secrets.yml | 0 {server/config => config}/spring.rb | 0 .../20170328190422_create_categories.rb | 0 .../migrate/20170328194723_create_posts.rb | 0 .../migrate/20170328194726_create_comments.rb | 0 ...418135338_devise_token_auth_create_users.rb | 0 {server/db => db}/schema.rb | 0 {server/db => db}/seeds.rb | 0 {server/lib => lib}/tasks/.keep | 0 {server/log => log}/.keep | 0 {server/public => public}/robots.txt | 0 server/.gitignore | 18 ------------------ server/.ruby-gemset | 1 - server/.ruby-version | 1 - {server/spec => spec}/factories/category.rb | 0 {server/spec => spec}/factories/comment.rb | 0 {server/spec => spec}/factories/post.rb | 0 {server/spec => spec}/rails_helper.rb | 0 {server/spec => spec}/spec_helper.rb | 0 tmp/restart.txt | 0 81 files changed, 30 insertions(+), 22 deletions(-) rename server/.rspec => .rspec (100%) create mode 100644 .ruby-gemset create mode 100644 .ruby-version rename server/Gemfile => Gemfile (98%) rename server/Gemfile.lock => Gemfile.lock (98%) create mode 100644 Procfile rename server/README.md => README.md (89%) rename server/Rakefile => Rakefile (100%) rename {server/app => app}/channels/application_cable/channel.rb (100%) rename {server/app => app}/channels/application_cable/connection.rb (100%) rename {server/app => app}/concerns/custom_filter.rb (100%) rename {server/app => app}/controllers/application_controller.rb (100%) rename {server/app => app}/controllers/authorized_controller.rb (100%) rename {server/app => app}/controllers/categories_controller.rb (100%) rename {server/app => app}/controllers/comments_controller.rb (100%) rename {server/app => app}/controllers/concerns/.keep (100%) rename {server/app => app}/controllers/posts_controller.rb (100%) rename {server/app => app}/controllers/users_controller.rb (100%) rename {server/app => app}/jobs/application_job.rb (100%) rename {server/app => app}/mailers/application_mailer.rb (100%) rename {server/app => app}/models/application_record.rb (100%) rename {server/app => app}/models/category.rb (100%) rename {server/app => app}/models/comment.rb (100%) rename {server/app => app}/models/concerns/.keep (100%) rename {server/app => app}/models/post.rb (100%) rename {server/app => app}/models/user.rb (100%) rename {server/app => app}/resources/category_resource.rb (100%) rename {server/app => app}/resources/comment_resource.rb (100%) rename {server/app => app}/resources/post_resource.rb (100%) rename {server/app => app}/resources/user_resource.rb (100%) rename {server/app => app}/views/layouts/mailer.html.erb (100%) rename {server/app => app}/views/layouts/mailer.text.erb (100%) rename {server/bin => bin}/bundle (100%) rename {server/bin => bin}/rails (100%) rename {server/bin => bin}/rake (100%) rename {server/bin => bin}/setup (100%) rename {server/bin => bin}/spring (100%) rename {server/bin => bin}/update (100%) rename server/config.ru => config.ru (100%) rename {server/config => config}/application.rb (100%) rename {server/config => config}/boot.rb (100%) rename {server/config => config}/cable.yml (100%) rename {server/config => config}/database.yml (100%) rename {server/config => config}/environment.rb (100%) rename {server/config => config}/environments/development.rb (100%) rename {server/config => config}/environments/production.rb (100%) rename {server/config => config}/environments/test.rb (100%) rename {server/config => config}/initializers/application_controller_renderer.rb (100%) rename {server/config => config}/initializers/backtrace_silencers.rb (100%) rename {server/config => config}/initializers/cors.rb (100%) rename {server/config => config}/initializers/devise_token_auth.rb (100%) rename {server/config => config}/initializers/filter_parameter_logging.rb (100%) rename {server/config => config}/initializers/inflections.rb (100%) rename {server/config => config}/initializers/jsonapi_resources.rb (100%) rename {server/config => config}/initializers/mime_types.rb (100%) rename {server/config => config}/initializers/new_framework_defaults.rb (100%) rename {server/config => config}/initializers/wrap_parameters.rb (100%) rename {server/config => config}/locales/en.yml (100%) rename {server/config => config}/puma.rb (100%) rename {server/config => config}/routes.rb (100%) rename {server/config => config}/secrets.yml (100%) rename {server/config => config}/spring.rb (100%) rename {server/db => db}/migrate/20170328190422_create_categories.rb (100%) rename {server/db => db}/migrate/20170328194723_create_posts.rb (100%) rename {server/db => db}/migrate/20170328194726_create_comments.rb (100%) rename {server/db => db}/migrate/20170418135338_devise_token_auth_create_users.rb (100%) rename {server/db => db}/schema.rb (100%) rename {server/db => db}/seeds.rb (100%) rename {server/lib => lib}/tasks/.keep (100%) rename {server/log => log}/.keep (100%) rename {server/public => public}/robots.txt (100%) delete mode 100644 server/.gitignore delete mode 100644 server/.ruby-gemset delete mode 100644 server/.ruby-version rename {server/spec => spec}/factories/category.rb (100%) rename {server/spec => spec}/factories/comment.rb (100%) rename {server/spec => spec}/factories/post.rb (100%) rename {server/spec => spec}/rails_helper.rb (100%) rename {server/spec => spec}/spec_helper.rb (100%) create mode 100644 tmp/restart.txt diff --git a/.gitignore b/.gitignore index 9f11b75..d586603 100644 --- 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 b/.rspec similarity index 100% rename from server/.rspec rename to .rspec diff --git a/.ruby-gemset b/.ruby-gemset new file mode 100644 index 0000000..7f6817c --- /dev/null +++ b/.ruby-gemset @@ -0,0 +1 @@ +-rails-json-api diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..56747b0 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +-2.3.1 diff --git a/server/Gemfile b/Gemfile similarity index 98% rename from server/Gemfile rename to Gemfile index 348db50..714c923 100644 --- a/server/Gemfile +++ b/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 b/Gemfile.lock similarity index 98% rename from server/Gemfile.lock rename to Gemfile.lock index aae5f66..2132ae3 100644 --- a/server/Gemfile.lock +++ b/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 new file mode 100644 index 0000000..d1d21fe --- /dev/null +++ b/Procfile @@ -0,0 +1,2 @@ +web: cd client && npm start +api: bundle exec rails s -p 3000 diff --git a/server/README.md b/README.md similarity index 89% rename from server/README.md rename to README.md index 9a8f745..fbe5e61 100644 --- a/server/README.md +++ b/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 b/Rakefile similarity index 100% rename from server/Rakefile rename to Rakefile diff --git a/server/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb similarity index 100% rename from server/app/channels/application_cable/channel.rb rename to app/channels/application_cable/channel.rb diff --git a/server/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb similarity index 100% rename from server/app/channels/application_cable/connection.rb rename to app/channels/application_cable/connection.rb diff --git a/server/app/concerns/custom_filter.rb b/app/concerns/custom_filter.rb similarity index 100% rename from server/app/concerns/custom_filter.rb rename to app/concerns/custom_filter.rb diff --git a/server/app/controllers/application_controller.rb b/app/controllers/application_controller.rb similarity index 100% rename from server/app/controllers/application_controller.rb rename to app/controllers/application_controller.rb diff --git a/server/app/controllers/authorized_controller.rb b/app/controllers/authorized_controller.rb similarity index 100% rename from server/app/controllers/authorized_controller.rb rename to app/controllers/authorized_controller.rb diff --git a/server/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb similarity index 100% rename from server/app/controllers/categories_controller.rb rename to app/controllers/categories_controller.rb diff --git a/server/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb similarity index 100% rename from server/app/controllers/comments_controller.rb rename to app/controllers/comments_controller.rb diff --git a/server/app/controllers/concerns/.keep b/app/controllers/concerns/.keep similarity index 100% rename from server/app/controllers/concerns/.keep rename to app/controllers/concerns/.keep diff --git a/server/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb similarity index 100% rename from server/app/controllers/posts_controller.rb rename to app/controllers/posts_controller.rb diff --git a/server/app/controllers/users_controller.rb b/app/controllers/users_controller.rb similarity index 100% rename from server/app/controllers/users_controller.rb rename to app/controllers/users_controller.rb diff --git a/server/app/jobs/application_job.rb b/app/jobs/application_job.rb similarity index 100% rename from server/app/jobs/application_job.rb rename to app/jobs/application_job.rb diff --git a/server/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb similarity index 100% rename from server/app/mailers/application_mailer.rb rename to app/mailers/application_mailer.rb diff --git a/server/app/models/application_record.rb b/app/models/application_record.rb similarity index 100% rename from server/app/models/application_record.rb rename to app/models/application_record.rb diff --git a/server/app/models/category.rb b/app/models/category.rb similarity index 100% rename from server/app/models/category.rb rename to app/models/category.rb diff --git a/server/app/models/comment.rb b/app/models/comment.rb similarity index 100% rename from server/app/models/comment.rb rename to app/models/comment.rb diff --git a/server/app/models/concerns/.keep b/app/models/concerns/.keep similarity index 100% rename from server/app/models/concerns/.keep rename to app/models/concerns/.keep diff --git a/server/app/models/post.rb b/app/models/post.rb similarity index 100% rename from server/app/models/post.rb rename to app/models/post.rb diff --git a/server/app/models/user.rb b/app/models/user.rb similarity index 100% rename from server/app/models/user.rb rename to app/models/user.rb diff --git a/server/app/resources/category_resource.rb b/app/resources/category_resource.rb similarity index 100% rename from server/app/resources/category_resource.rb rename to app/resources/category_resource.rb diff --git a/server/app/resources/comment_resource.rb b/app/resources/comment_resource.rb similarity index 100% rename from server/app/resources/comment_resource.rb rename to app/resources/comment_resource.rb diff --git a/server/app/resources/post_resource.rb b/app/resources/post_resource.rb similarity index 100% rename from server/app/resources/post_resource.rb rename to app/resources/post_resource.rb diff --git a/server/app/resources/user_resource.rb b/app/resources/user_resource.rb similarity index 100% rename from server/app/resources/user_resource.rb rename to app/resources/user_resource.rb diff --git a/server/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb similarity index 100% rename from server/app/views/layouts/mailer.html.erb rename to app/views/layouts/mailer.html.erb diff --git a/server/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb similarity index 100% rename from server/app/views/layouts/mailer.text.erb rename to app/views/layouts/mailer.text.erb diff --git a/server/bin/bundle b/bin/bundle similarity index 100% rename from server/bin/bundle rename to bin/bundle diff --git a/server/bin/rails b/bin/rails similarity index 100% rename from server/bin/rails rename to bin/rails diff --git a/server/bin/rake b/bin/rake similarity index 100% rename from server/bin/rake rename to bin/rake diff --git a/server/bin/setup b/bin/setup similarity index 100% rename from server/bin/setup rename to bin/setup diff --git a/server/bin/spring b/bin/spring similarity index 100% rename from server/bin/spring rename to bin/spring diff --git a/server/bin/update b/bin/update similarity index 100% rename from server/bin/update rename to bin/update diff --git a/server/config.ru b/config.ru similarity index 100% rename from server/config.ru rename to config.ru diff --git a/server/config/application.rb b/config/application.rb similarity index 100% rename from server/config/application.rb rename to config/application.rb diff --git a/server/config/boot.rb b/config/boot.rb similarity index 100% rename from server/config/boot.rb rename to config/boot.rb diff --git a/server/config/cable.yml b/config/cable.yml similarity index 100% rename from server/config/cable.yml rename to config/cable.yml diff --git a/server/config/database.yml b/config/database.yml similarity index 100% rename from server/config/database.yml rename to config/database.yml diff --git a/server/config/environment.rb b/config/environment.rb similarity index 100% rename from server/config/environment.rb rename to config/environment.rb diff --git a/server/config/environments/development.rb b/config/environments/development.rb similarity index 100% rename from server/config/environments/development.rb rename to config/environments/development.rb diff --git a/server/config/environments/production.rb b/config/environments/production.rb similarity index 100% rename from server/config/environments/production.rb rename to config/environments/production.rb diff --git a/server/config/environments/test.rb b/config/environments/test.rb similarity index 100% rename from server/config/environments/test.rb rename to config/environments/test.rb diff --git a/server/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb similarity index 100% rename from server/config/initializers/application_controller_renderer.rb rename to config/initializers/application_controller_renderer.rb diff --git a/server/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb similarity index 100% rename from server/config/initializers/backtrace_silencers.rb rename to config/initializers/backtrace_silencers.rb diff --git a/server/config/initializers/cors.rb b/config/initializers/cors.rb similarity index 100% rename from server/config/initializers/cors.rb rename to config/initializers/cors.rb diff --git a/server/config/initializers/devise_token_auth.rb b/config/initializers/devise_token_auth.rb similarity index 100% rename from server/config/initializers/devise_token_auth.rb rename to config/initializers/devise_token_auth.rb diff --git a/server/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb similarity index 100% rename from server/config/initializers/filter_parameter_logging.rb rename to config/initializers/filter_parameter_logging.rb diff --git a/server/config/initializers/inflections.rb b/config/initializers/inflections.rb similarity index 100% rename from server/config/initializers/inflections.rb rename to config/initializers/inflections.rb diff --git a/server/config/initializers/jsonapi_resources.rb b/config/initializers/jsonapi_resources.rb similarity index 100% rename from server/config/initializers/jsonapi_resources.rb rename to config/initializers/jsonapi_resources.rb diff --git a/server/config/initializers/mime_types.rb b/config/initializers/mime_types.rb similarity index 100% rename from server/config/initializers/mime_types.rb rename to config/initializers/mime_types.rb diff --git a/server/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb similarity index 100% rename from server/config/initializers/new_framework_defaults.rb rename to config/initializers/new_framework_defaults.rb diff --git a/server/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb similarity index 100% rename from server/config/initializers/wrap_parameters.rb rename to config/initializers/wrap_parameters.rb diff --git a/server/config/locales/en.yml b/config/locales/en.yml similarity index 100% rename from server/config/locales/en.yml rename to config/locales/en.yml diff --git a/server/config/puma.rb b/config/puma.rb similarity index 100% rename from server/config/puma.rb rename to config/puma.rb diff --git a/server/config/routes.rb b/config/routes.rb similarity index 100% rename from server/config/routes.rb rename to config/routes.rb diff --git a/server/config/secrets.yml b/config/secrets.yml similarity index 100% rename from server/config/secrets.yml rename to config/secrets.yml diff --git a/server/config/spring.rb b/config/spring.rb similarity index 100% rename from server/config/spring.rb rename to config/spring.rb diff --git a/server/db/migrate/20170328190422_create_categories.rb b/db/migrate/20170328190422_create_categories.rb similarity index 100% rename from server/db/migrate/20170328190422_create_categories.rb rename to db/migrate/20170328190422_create_categories.rb diff --git a/server/db/migrate/20170328194723_create_posts.rb b/db/migrate/20170328194723_create_posts.rb similarity index 100% rename from server/db/migrate/20170328194723_create_posts.rb rename to db/migrate/20170328194723_create_posts.rb diff --git a/server/db/migrate/20170328194726_create_comments.rb b/db/migrate/20170328194726_create_comments.rb similarity index 100% rename from server/db/migrate/20170328194726_create_comments.rb rename to db/migrate/20170328194726_create_comments.rb diff --git a/server/db/migrate/20170418135338_devise_token_auth_create_users.rb b/db/migrate/20170418135338_devise_token_auth_create_users.rb similarity index 100% rename from server/db/migrate/20170418135338_devise_token_auth_create_users.rb rename to db/migrate/20170418135338_devise_token_auth_create_users.rb diff --git a/server/db/schema.rb b/db/schema.rb similarity index 100% rename from server/db/schema.rb rename to db/schema.rb diff --git a/server/db/seeds.rb b/db/seeds.rb similarity index 100% rename from server/db/seeds.rb rename to db/seeds.rb diff --git a/server/lib/tasks/.keep b/lib/tasks/.keep similarity index 100% rename from server/lib/tasks/.keep rename to lib/tasks/.keep diff --git a/server/log/.keep b/log/.keep similarity index 100% rename from server/log/.keep rename to log/.keep diff --git a/server/public/robots.txt b/public/robots.txt similarity index 100% rename from server/public/robots.txt rename to public/robots.txt diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index d586603..0000000 --- a/server/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# 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/.ruby-gemset b/server/.ruby-gemset deleted file mode 100644 index 18e13b8..0000000 --- a/server/.ruby-gemset +++ /dev/null @@ -1 +0,0 @@ -rails-json-api diff --git a/server/.ruby-version b/server/.ruby-version deleted file mode 100644 index 2bf1c1c..0000000 --- a/server/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.3.1 diff --git a/server/spec/factories/category.rb b/spec/factories/category.rb similarity index 100% rename from server/spec/factories/category.rb rename to spec/factories/category.rb diff --git a/server/spec/factories/comment.rb b/spec/factories/comment.rb similarity index 100% rename from server/spec/factories/comment.rb rename to spec/factories/comment.rb diff --git a/server/spec/factories/post.rb b/spec/factories/post.rb similarity index 100% rename from server/spec/factories/post.rb rename to spec/factories/post.rb diff --git a/server/spec/rails_helper.rb b/spec/rails_helper.rb similarity index 100% rename from server/spec/rails_helper.rb rename to spec/rails_helper.rb diff --git a/server/spec/spec_helper.rb b/spec/spec_helper.rb similarity index 100% rename from server/spec/spec_helper.rb rename to spec/spec_helper.rb diff --git a/tmp/restart.txt b/tmp/restart.txt new file mode 100644 index 0000000..e69de29