From 1e4169a4df1caadd51b216f707e2b339b80ec83a Mon Sep 17 00:00:00 2001 From: valkovik15 Date: Thu, 28 Feb 2019 17:32:43 +0300 Subject: [PATCH 1/3] First --- 2/Tracker/.gitignore | 27 ++ 2/Tracker/.ruby-version | 1 + 2/Tracker/Gemfile | 72 +++ 2/Tracker/Gemfile.lock | 323 +++++++++++++ 2/Tracker/README.md | 24 + 2/Tracker/Rakefile | 6 + 2/Tracker/app/assets/config/manifest.js | 3 + 2/Tracker/app/assets/images/.keep | 0 .../app/assets/javascripts/application.js | 21 + 2/Tracker/app/assets/javascripts/cable.js | 13 + .../app/assets/javascripts/channels/.keep | 0 .../app/assets/javascripts/dishes.coffee | 3 + .../app/assets/javascripts/ingestions.coffee | 3 + .../app/assets/stylesheets/application.scss | 16 + 2/Tracker/app/assets/stylesheets/dishes.scss | 3 + .../app/assets/stylesheets/ingestions.scss | 3 + .../app/assets/stylesheets/scaffolds.scss | 84 ++++ .../app/channels/application_cable/channel.rb | 4 + .../channels/application_cable/connection.rb | 4 + .../app/controllers/application_controller.rb | 15 + 2/Tracker/app/controllers/concerns/.keep | 0 .../app/controllers/dishes_controller.rb | 74 +++ .../app/controllers/ingestions_controller.rb | 74 +++ .../users/confirmations_controller.rb | 30 ++ .../users/omniauth_callbacks_controller.rb | 30 ++ .../controllers/users/passwords_controller.rb | 34 ++ .../users/registrations_controller.rb | 62 +++ .../controllers/users/sessions_controller.rb | 27 ++ .../controllers/users/unlocks_controller.rb | 30 ++ 2/Tracker/app/helpers/application_helper.rb | 2 + 2/Tracker/app/helpers/dishes_helper.rb | 2 + 2/Tracker/app/helpers/ingestions_helper.rb | 2 + 2/Tracker/app/jobs/application_job.rb | 2 + 2/Tracker/app/mailers/application_mailer.rb | 4 + 2/Tracker/app/models/application_record.rb | 3 + 2/Tracker/app/models/concerns/.keep | 0 2/Tracker/app/models/dish.rb | 13 + 2/Tracker/app/models/dish_ingestion.rb | 4 + 2/Tracker/app/models/ingestion.rb | 5 + 2/Tracker/app/models/user.rb | 10 + .../views/devise/confirmations/new.html.erb | 20 + .../mailer/confirmation_instructions.html.erb | 5 + .../devise/mailer/email_changed.html.erb | 7 + .../devise/mailer/password_change.html.erb | 3 + .../reset_password_instructions.html.erb | 8 + .../mailer/unlock_instructions.html.erb | 7 + .../app/views/devise/passwords/edit.html.erb | 24 + .../app/views/devise/passwords/new.html.erb | 18 + .../views/devise/registrations/edit.html.erb | 46 ++ .../views/devise/registrations/new.html.erb | 45 ++ .../app/views/devise/sessions/new.html.erb | 20 + .../devise/shared/_error_messages.html.erb | 15 + .../app/views/devise/shared/_links.html.erb | 25 + .../app/views/devise/unlocks/new.html.erb | 19 + .../app/views/dishes/_dish.json.jbuilder | 2 + 2/Tracker/app/views/dishes/_form.html.slim | 14 + 2/Tracker/app/views/dishes/edit.html.slim | 8 + 2/Tracker/app/views/dishes/index.html.slim | 28 ++ .../app/views/dishes/index.json.jbuilder | 1 + 2/Tracker/app/views/dishes/new.html.slim | 5 + 2/Tracker/app/views/dishes/show.html.slim | 27 ++ 2/Tracker/app/views/dishes/show.json.jbuilder | 1 + .../app/views/ingestions/_form.html.slim | 10 + .../views/ingestions/_ingestion.json.jbuilder | 2 + 2/Tracker/app/views/ingestions/edit.html.slim | 8 + .../app/views/ingestions/index.html.slim | 26 ++ .../app/views/ingestions/index.json.jbuilder | 1 + 2/Tracker/app/views/ingestions/new.html.slim | 5 + 2/Tracker/app/views/ingestions/show.html.slim | 20 + .../app/views/ingestions/show.json.jbuilder | 1 + .../app/views/layouts/application.html.erb | 53 +++ 2/Tracker/app/views/layouts/mailer.html.erb | 13 + 2/Tracker/app/views/layouts/mailer.text.erb | 1 + 2/Tracker/app/views/users/_form.html.slim | 8 + 2/Tracker/app/views/users/edit.html.slim | 8 + 2/Tracker/app/views/users/index.html.slim | 19 + 2/Tracker/app/views/users/new.html.slim | 5 + 2/Tracker/app/views/users/show.html.slim | 6 + 2/Tracker/bin/bundle | 3 + 2/Tracker/bin/rails | 9 + 2/Tracker/bin/rake | 9 + 2/Tracker/bin/setup | 36 ++ 2/Tracker/bin/spring | 17 + 2/Tracker/bin/update | 31 ++ 2/Tracker/bin/yarn | 11 + 2/Tracker/config.ru | 5 + 2/Tracker/config/application.rb | 19 + 2/Tracker/config/boot.rb | 4 + 2/Tracker/config/cable.yml | 10 + 2/Tracker/config/credentials.yml.enc | 1 + 2/Tracker/config/database.yml | 86 ++++ 2/Tracker/config/environment.rb | 5 + 2/Tracker/config/environments/development.rb | 62 +++ 2/Tracker/config/environments/production.rb | 94 ++++ 2/Tracker/config/environments/test.rb | 46 ++ .../application_controller_renderer.rb | 8 + 2/Tracker/config/initializers/assets.rb | 14 + .../initializers/backtrace_silencers.rb | 7 + 2/Tracker/config/initializers/chartkick.rb | 3 + .../initializers/content_security_policy.rb | 25 + .../config/initializers/cookies_serializer.rb | 5 + 2/Tracker/config/initializers/devise.rb | 299 ++++++++++++ .../initializers/filter_parameter_logging.rb | 4 + 2/Tracker/config/initializers/inflections.rb | 16 + 2/Tracker/config/initializers/mime_types.rb | 4 + 2/Tracker/config/initializers/rails_admin.rb | 42 ++ 2/Tracker/config/initializers/simple_form.rb | 179 +++++++ .../initializers/simple_form_bootstrap.rb | 439 ++++++++++++++++++ .../config/initializers/wrap_parameters.rb | 14 + 2/Tracker/config/locales/devise.en.yml | 65 +++ 2/Tracker/config/locales/en.yml | 33 ++ 2/Tracker/config/locales/simple_form.en.yml | 31 ++ 2/Tracker/config/puma.rb | 34 ++ 2/Tracker/config/routes.rb | 8 + 2/Tracker/config/spring.rb | 6 + 2/Tracker/config/storage.yml | 34 ++ .../20190224192900_devise_create_users.rb | 44 ++ .../20190224193133_add_firstname_to_users.rb | 5 + .../20190224193239_add_lastname_to_users.rb | 5 + .../20190224193301_add_age_to_users.rb | 5 + .../20190224193313_add_weight_to_users.rb | 5 + .../20190224193327_add_height_to_users.rb | 5 + .../migrate/20190226193152_create_dishes.rb | 15 + ...190227163338_remove_integer_from_dishes.rb | 5 + .../20190227201447_add_admin_to_users.rb | 5 + .../20190227205238_create_ingestions.rb | 11 + .../20190227210940_create_dish_ingestions.rb | 10 + 2/Tracker/db/schema.rb | 70 +++ 2/Tracker/db/seeds.rb | 7 + 2/Tracker/lib/assets/.keep | 0 2/Tracker/lib/tasks/.keep | 0 .../templates/slim/scaffold/_form.html.slim | 11 + 2/Tracker/log/.keep | 0 2/Tracker/package.json | 5 + 2/Tracker/public/404.html | 67 +++ 2/Tracker/public/422.html | 67 +++ 2/Tracker/public/500.html | 66 +++ .../public/apple-touch-icon-precomposed.png | 0 2/Tracker/public/apple-touch-icon.png | 0 2/Tracker/public/favicon.ico | 0 2/Tracker/public/robots.txt | 1 + 2/Tracker/storage/.keep | 0 .../test/application_system_test_case.rb | 5 + 2/Tracker/test/controllers/.keep | 0 .../controllers/dishes_controller_test.rb | 48 ++ .../controllers/ingestions_controller_test.rb | 48 ++ 2/Tracker/test/fixtures/.keep | 0 2/Tracker/test/fixtures/dish_ingestions.yml | 9 + 2/Tracker/test/fixtures/dishes.yml | 19 + 2/Tracker/test/fixtures/files/.keep | 0 2/Tracker/test/fixtures/ingestions.yml | 11 + 2/Tracker/test/fixtures/users.yml | 11 + 2/Tracker/test/helpers/.keep | 0 2/Tracker/test/integration/.keep | 0 2/Tracker/test/mailers/.keep | 0 2/Tracker/test/models/.keep | 0 2/Tracker/test/models/dish_ingestion_test.rb | 7 + 2/Tracker/test/models/dish_test.rb | 7 + 2/Tracker/test/models/ingestion_test.rb | 7 + 2/Tracker/test/models/user_test.rb | 7 + 2/Tracker/test/system/.keep | 0 2/Tracker/test/system/dishes_test.rb | 55 +++ 2/Tracker/test/system/ingestions_test.rb | 47 ++ 2/Tracker/test/test_helper.rb | 10 + 2/Tracker/tmp/.keep | 0 2/Tracker/vendor/.keep | 0 166 files changed, 3985 insertions(+) create mode 100644 2/Tracker/.gitignore create mode 100644 2/Tracker/.ruby-version create mode 100644 2/Tracker/Gemfile create mode 100644 2/Tracker/Gemfile.lock create mode 100644 2/Tracker/README.md create mode 100644 2/Tracker/Rakefile create mode 100644 2/Tracker/app/assets/config/manifest.js create mode 100644 2/Tracker/app/assets/images/.keep create mode 100644 2/Tracker/app/assets/javascripts/application.js create mode 100644 2/Tracker/app/assets/javascripts/cable.js create mode 100644 2/Tracker/app/assets/javascripts/channels/.keep create mode 100644 2/Tracker/app/assets/javascripts/dishes.coffee create mode 100644 2/Tracker/app/assets/javascripts/ingestions.coffee create mode 100644 2/Tracker/app/assets/stylesheets/application.scss create mode 100644 2/Tracker/app/assets/stylesheets/dishes.scss create mode 100644 2/Tracker/app/assets/stylesheets/ingestions.scss create mode 100644 2/Tracker/app/assets/stylesheets/scaffolds.scss create mode 100644 2/Tracker/app/channels/application_cable/channel.rb create mode 100644 2/Tracker/app/channels/application_cable/connection.rb create mode 100644 2/Tracker/app/controllers/application_controller.rb create mode 100644 2/Tracker/app/controllers/concerns/.keep create mode 100644 2/Tracker/app/controllers/dishes_controller.rb create mode 100644 2/Tracker/app/controllers/ingestions_controller.rb create mode 100644 2/Tracker/app/controllers/users/confirmations_controller.rb create mode 100644 2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb create mode 100644 2/Tracker/app/controllers/users/passwords_controller.rb create mode 100644 2/Tracker/app/controllers/users/registrations_controller.rb create mode 100644 2/Tracker/app/controllers/users/sessions_controller.rb create mode 100644 2/Tracker/app/controllers/users/unlocks_controller.rb create mode 100644 2/Tracker/app/helpers/application_helper.rb create mode 100644 2/Tracker/app/helpers/dishes_helper.rb create mode 100644 2/Tracker/app/helpers/ingestions_helper.rb create mode 100644 2/Tracker/app/jobs/application_job.rb create mode 100644 2/Tracker/app/mailers/application_mailer.rb create mode 100644 2/Tracker/app/models/application_record.rb create mode 100644 2/Tracker/app/models/concerns/.keep create mode 100644 2/Tracker/app/models/dish.rb create mode 100644 2/Tracker/app/models/dish_ingestion.rb create mode 100644 2/Tracker/app/models/ingestion.rb create mode 100644 2/Tracker/app/models/user.rb create mode 100644 2/Tracker/app/views/devise/confirmations/new.html.erb create mode 100644 2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb create mode 100644 2/Tracker/app/views/devise/mailer/email_changed.html.erb create mode 100644 2/Tracker/app/views/devise/mailer/password_change.html.erb create mode 100644 2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb create mode 100644 2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb create mode 100644 2/Tracker/app/views/devise/passwords/edit.html.erb create mode 100644 2/Tracker/app/views/devise/passwords/new.html.erb create mode 100644 2/Tracker/app/views/devise/registrations/edit.html.erb create mode 100644 2/Tracker/app/views/devise/registrations/new.html.erb create mode 100644 2/Tracker/app/views/devise/sessions/new.html.erb create mode 100644 2/Tracker/app/views/devise/shared/_error_messages.html.erb create mode 100644 2/Tracker/app/views/devise/shared/_links.html.erb create mode 100644 2/Tracker/app/views/devise/unlocks/new.html.erb create mode 100644 2/Tracker/app/views/dishes/_dish.json.jbuilder create mode 100644 2/Tracker/app/views/dishes/_form.html.slim create mode 100644 2/Tracker/app/views/dishes/edit.html.slim create mode 100644 2/Tracker/app/views/dishes/index.html.slim create mode 100644 2/Tracker/app/views/dishes/index.json.jbuilder create mode 100644 2/Tracker/app/views/dishes/new.html.slim create mode 100644 2/Tracker/app/views/dishes/show.html.slim create mode 100644 2/Tracker/app/views/dishes/show.json.jbuilder create mode 100644 2/Tracker/app/views/ingestions/_form.html.slim create mode 100644 2/Tracker/app/views/ingestions/_ingestion.json.jbuilder create mode 100644 2/Tracker/app/views/ingestions/edit.html.slim create mode 100644 2/Tracker/app/views/ingestions/index.html.slim create mode 100644 2/Tracker/app/views/ingestions/index.json.jbuilder create mode 100644 2/Tracker/app/views/ingestions/new.html.slim create mode 100644 2/Tracker/app/views/ingestions/show.html.slim create mode 100644 2/Tracker/app/views/ingestions/show.json.jbuilder create mode 100644 2/Tracker/app/views/layouts/application.html.erb create mode 100644 2/Tracker/app/views/layouts/mailer.html.erb create mode 100644 2/Tracker/app/views/layouts/mailer.text.erb create mode 100644 2/Tracker/app/views/users/_form.html.slim create mode 100644 2/Tracker/app/views/users/edit.html.slim create mode 100644 2/Tracker/app/views/users/index.html.slim create mode 100644 2/Tracker/app/views/users/new.html.slim create mode 100644 2/Tracker/app/views/users/show.html.slim create mode 100755 2/Tracker/bin/bundle create mode 100755 2/Tracker/bin/rails create mode 100755 2/Tracker/bin/rake create mode 100755 2/Tracker/bin/setup create mode 100755 2/Tracker/bin/spring create mode 100755 2/Tracker/bin/update create mode 100755 2/Tracker/bin/yarn create mode 100644 2/Tracker/config.ru create mode 100644 2/Tracker/config/application.rb create mode 100644 2/Tracker/config/boot.rb create mode 100644 2/Tracker/config/cable.yml create mode 100644 2/Tracker/config/credentials.yml.enc create mode 100644 2/Tracker/config/database.yml create mode 100644 2/Tracker/config/environment.rb create mode 100644 2/Tracker/config/environments/development.rb create mode 100644 2/Tracker/config/environments/production.rb create mode 100644 2/Tracker/config/environments/test.rb create mode 100644 2/Tracker/config/initializers/application_controller_renderer.rb create mode 100644 2/Tracker/config/initializers/assets.rb create mode 100644 2/Tracker/config/initializers/backtrace_silencers.rb create mode 100644 2/Tracker/config/initializers/chartkick.rb create mode 100644 2/Tracker/config/initializers/content_security_policy.rb create mode 100644 2/Tracker/config/initializers/cookies_serializer.rb create mode 100644 2/Tracker/config/initializers/devise.rb create mode 100644 2/Tracker/config/initializers/filter_parameter_logging.rb create mode 100644 2/Tracker/config/initializers/inflections.rb create mode 100644 2/Tracker/config/initializers/mime_types.rb create mode 100644 2/Tracker/config/initializers/rails_admin.rb create mode 100644 2/Tracker/config/initializers/simple_form.rb create mode 100644 2/Tracker/config/initializers/simple_form_bootstrap.rb create mode 100644 2/Tracker/config/initializers/wrap_parameters.rb create mode 100644 2/Tracker/config/locales/devise.en.yml create mode 100644 2/Tracker/config/locales/en.yml create mode 100644 2/Tracker/config/locales/simple_form.en.yml create mode 100644 2/Tracker/config/puma.rb create mode 100644 2/Tracker/config/routes.rb create mode 100644 2/Tracker/config/spring.rb create mode 100644 2/Tracker/config/storage.yml create mode 100644 2/Tracker/db/migrate/20190224192900_devise_create_users.rb create mode 100644 2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb create mode 100644 2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb create mode 100644 2/Tracker/db/migrate/20190224193301_add_age_to_users.rb create mode 100644 2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb create mode 100644 2/Tracker/db/migrate/20190224193327_add_height_to_users.rb create mode 100644 2/Tracker/db/migrate/20190226193152_create_dishes.rb create mode 100644 2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb create mode 100644 2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb create mode 100644 2/Tracker/db/migrate/20190227205238_create_ingestions.rb create mode 100644 2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb create mode 100644 2/Tracker/db/schema.rb create mode 100644 2/Tracker/db/seeds.rb create mode 100644 2/Tracker/lib/assets/.keep create mode 100644 2/Tracker/lib/tasks/.keep create mode 100644 2/Tracker/lib/templates/slim/scaffold/_form.html.slim create mode 100644 2/Tracker/log/.keep create mode 100644 2/Tracker/package.json create mode 100644 2/Tracker/public/404.html create mode 100644 2/Tracker/public/422.html create mode 100644 2/Tracker/public/500.html create mode 100644 2/Tracker/public/apple-touch-icon-precomposed.png create mode 100644 2/Tracker/public/apple-touch-icon.png create mode 100644 2/Tracker/public/favicon.ico create mode 100644 2/Tracker/public/robots.txt create mode 100644 2/Tracker/storage/.keep create mode 100644 2/Tracker/test/application_system_test_case.rb create mode 100644 2/Tracker/test/controllers/.keep create mode 100644 2/Tracker/test/controllers/dishes_controller_test.rb create mode 100644 2/Tracker/test/controllers/ingestions_controller_test.rb create mode 100644 2/Tracker/test/fixtures/.keep create mode 100644 2/Tracker/test/fixtures/dish_ingestions.yml create mode 100644 2/Tracker/test/fixtures/dishes.yml create mode 100644 2/Tracker/test/fixtures/files/.keep create mode 100644 2/Tracker/test/fixtures/ingestions.yml create mode 100644 2/Tracker/test/fixtures/users.yml create mode 100644 2/Tracker/test/helpers/.keep create mode 100644 2/Tracker/test/integration/.keep create mode 100644 2/Tracker/test/mailers/.keep create mode 100644 2/Tracker/test/models/.keep create mode 100644 2/Tracker/test/models/dish_ingestion_test.rb create mode 100644 2/Tracker/test/models/dish_test.rb create mode 100644 2/Tracker/test/models/ingestion_test.rb create mode 100644 2/Tracker/test/models/user_test.rb create mode 100644 2/Tracker/test/system/.keep create mode 100644 2/Tracker/test/system/dishes_test.rb create mode 100644 2/Tracker/test/system/ingestions_test.rb create mode 100644 2/Tracker/test/test_helper.rb create mode 100644 2/Tracker/tmp/.keep create mode 100644 2/Tracker/vendor/.keep diff --git a/2/Tracker/.gitignore b/2/Tracker/.gitignore new file mode 100644 index 0000000..18b43c9 --- /dev/null +++ b/2/Tracker/.gitignore @@ -0,0 +1,27 @@ +# 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 uploaded files in development +/storage/* +!/storage/.keep + +/node_modules +/yarn-error.log + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/2/Tracker/.ruby-version b/2/Tracker/.ruby-version new file mode 100644 index 0000000..10ff272 --- /dev/null +++ b/2/Tracker/.ruby-version @@ -0,0 +1 @@ +ruby-2.6.0 \ No newline at end of file diff --git a/2/Tracker/Gemfile b/2/Tracker/Gemfile new file mode 100644 index 0000000..4c03575 --- /dev/null +++ b/2/Tracker/Gemfile @@ -0,0 +1,72 @@ +source 'https://rubygems.org' +git_source(:github) {|repo| "https://github.com/#{repo}.git"} + +ruby '2.6.0' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 5.2.2' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 3.11' +# Use SCSS for stylesheets +gem 'sass-rails', '~> 5.0' +# Use Uglifier as compressor for JavaScript assets +gem 'uglifier', '>= 1.3.0' +# See https://github.com/rails/execjs#readme for more supported runtimes +# gem 'mini_racer', platforms: :ruby + +# Use CoffeeScript for .coffee assets and views +gem 'coffee-rails', '~> 4.2' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.5' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use ActiveModel has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use ActiveStorage variant +# gem 'mini_magick', '~> 4.8' + +# Use Capistrano for deployment +# gem 'capistrano-rails', group: :development + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.1.0', require: false + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of chromedriver to run system tests with Chrome + gem 'chromedriver-helper' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'devise' +gem 'bootstrap', '~> 4.3.1' +gem 'slim-rails' +gem 'jquery-rails' +gem 'simple_form' +gem 'chartkick' + +gem 'remotipart', github: 'mshibuya/remotipart' +gem 'rails_admin', github: 'sferik/rails_admin' +gem 'rails_admin_rollincode', '~> 1.0' \ No newline at end of file diff --git a/2/Tracker/Gemfile.lock b/2/Tracker/Gemfile.lock new file mode 100644 index 0000000..5cf06a4 --- /dev/null +++ b/2/Tracker/Gemfile.lock @@ -0,0 +1,323 @@ +GIT + remote: https://github.com/mshibuya/remotipart.git + revision: e08ea9a3aa8db9a8b2b97b6c9e7b078ed08915f2 + specs: + remotipart (1.4.2) + +GIT + remote: https://github.com/sferik/rails_admin.git + revision: f592d68f2c611cee3733ce3f1ef1085a89a1b898 + specs: + rails_admin (1.4.2) + builder (~> 3.1) + coffee-rails (~> 4.0) + font-awesome-rails (>= 3.0, < 5) + haml (>= 4.0, < 6) + jquery-rails (>= 3.0, < 5) + jquery-ui-rails (>= 5.0, < 7) + kaminari (>= 0.14, < 2.0) + nested_form (~> 0.3) + rack-pjax (>= 0.7) + rails (>= 4.0, < 6) + remotipart (~> 1.3) + sass-rails (>= 4.0, < 6) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.2) + actionpack (= 5.2.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.2) + actionview (= 5.2.2) + activesupport (= 5.2.2) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.2) + activesupport (= 5.2.2) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.2) + activesupport (= 5.2.2) + globalid (>= 0.3.6) + activemodel (5.2.2) + activesupport (= 5.2.2) + activerecord (5.2.2) + activemodel (= 5.2.2) + activesupport (= 5.2.2) + arel (>= 9.0) + activestorage (5.2.2) + actionpack (= 5.2.2) + activerecord (= 5.2.2) + marcel (~> 0.3.1) + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.6.0) + public_suffix (>= 2.0.2, < 4.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) + arel (9.0.0) + autoprefixer-rails (9.4.8) + execjs + bcrypt (3.1.12) + bindex (0.5.0) + bootsnap (1.4.0) + msgpack (~> 1.0) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) + builder (3.2.3) + byebug (11.0.0) + capybara (3.13.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (~> 1.2) + xpath (~> 3.2) + chartkick (3.0.2) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) + coffee-rails (4.2.2) + coffee-script (>= 2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.1.4) + crass (1.0.4) + devise (4.6.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 6.0) + responders + warden (~> 1.2.3) + erubi (1.8.0) + execjs (2.7.0) + ffi (1.9.25) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + haml (5.0.4) + temple (>= 0.8.0) + tilt + i18n (1.5.3) + concurrent-ruby (~> 1.0) + io-like (0.3.0) + jbuilder (2.8.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + jquery-ui-rails (6.0.1) + railties (>= 3.2.16) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mimemagic (0.3.3) + mini_mime (1.0.1) + mini_portile2 (2.4.0) + minitest (5.11.3) + msgpack (1.2.6) + multi_json (1.13.1) + nested_form (0.3.2) + nio4r (2.3.1) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + orm_adapter (0.5.0) + pg (1.1.4) + popper_js (1.14.5) + public_suffix (3.0.3) + puma (3.12.0) + rack (2.0.6) + rack-pjax (1.0.0) + nokogiri (~> 1.5) + rack (>= 1.1) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.2) + actioncable (= 5.2.2) + actionmailer (= 5.2.2) + actionpack (= 5.2.2) + actionview (= 5.2.2) + activejob (= 5.2.2) + activemodel (= 5.2.2) + activerecord (= 5.2.2) + activestorage (= 5.2.2) + activesupport (= 5.2.2) + bundler (>= 1.3.0) + railties (= 5.2.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + rails_admin_rollincode (1.2.1) + rails (>= 4.0, < 6) + railties (5.2.2) + actionpack (= 5.2.2) + activesupport (= 5.2.2) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (12.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) + regexp_parser (1.3.0) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) + ruby_dep (1.5.0) + rubyzip (1.2.2) + sass (3.7.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sassc (2.0.0) + ffi (~> 1.9.6) + rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + selenium-webdriver (3.141.0) + childprocess (~> 0.5) + rubyzip (~> 1.2, >= 1.2.2) + simple_form (4.1.0) + actionpack (>= 5.0) + activemodel (>= 5.0) + slim (4.0.1) + temple (>= 0.7.6, < 0.9) + tilt (>= 2.0.6, < 2.1) + slim-rails (3.2.0) + actionpack (>= 3.1) + railties (>= 3.1) + slim (>= 3.0, < 5.0) + spring (2.0.2) + activesupport (>= 4.2) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + temple (0.8.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.9) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.20) + execjs (>= 0.3.0, < 3) + warden (1.2.8) + rack (>= 2.0.6) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.1.0) + bootstrap (~> 4.3.1) + byebug + capybara (>= 2.15) + chartkick + chromedriver-helper + coffee-rails (~> 4.2) + devise + jbuilder (~> 2.5) + jquery-rails + listen (>= 3.0.5, < 3.2) + pg (>= 0.18, < 2.0) + puma (~> 3.11) + rails (~> 5.2.2) + rails_admin! + rails_admin_rollincode (~> 1.0) + remotipart! + sass-rails (~> 5.0) + selenium-webdriver + simple_form + slim-rails + spring + spring-watcher-listen (~> 2.0.0) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +RUBY VERSION + ruby 2.6.0p0 + +BUNDLED WITH + 1.17.2 diff --git a/2/Tracker/README.md b/2/Tracker/README.md new file mode 100644 index 0000000..7db80e4 --- /dev/null +++ b/2/Tracker/README.md @@ -0,0 +1,24 @@ +# README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... diff --git a/2/Tracker/Rakefile b/2/Tracker/Rakefile new file mode 100644 index 0000000..e85f913 --- /dev/null +++ b/2/Tracker/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/2/Tracker/app/assets/config/manifest.js b/2/Tracker/app/assets/config/manifest.js new file mode 100644 index 0000000..b16e53d --- /dev/null +++ b/2/Tracker/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/2/Tracker/app/assets/images/.keep b/2/Tracker/app/assets/images/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/app/assets/javascripts/application.js b/2/Tracker/app/assets/javascripts/application.js new file mode 100644 index 0000000..ae1d0d3 --- /dev/null +++ b/2/Tracker/app/assets/javascripts/application.js @@ -0,0 +1,21 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's +// vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require rails-ujs +//= require activestorage +//= require turbolinks +//= require_tree . +//= require jquery3 +//= require popper +//= require bootstrap +//= require Chart.bundle +//= require chartkick \ No newline at end of file diff --git a/2/Tracker/app/assets/javascripts/cable.js b/2/Tracker/app/assets/javascripts/cable.js new file mode 100644 index 0000000..739aa5f --- /dev/null +++ b/2/Tracker/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// Action Cable provides the framework to deal with WebSockets in Rails. +// You can generate new channels where WebSocket features live using the `rails generate channel` command. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/2/Tracker/app/assets/javascripts/channels/.keep b/2/Tracker/app/assets/javascripts/channels/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/app/assets/javascripts/dishes.coffee b/2/Tracker/app/assets/javascripts/dishes.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/2/Tracker/app/assets/javascripts/dishes.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/2/Tracker/app/assets/javascripts/ingestions.coffee b/2/Tracker/app/assets/javascripts/ingestions.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/2/Tracker/app/assets/javascripts/ingestions.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/2/Tracker/app/assets/stylesheets/application.scss b/2/Tracker/app/assets/stylesheets/application.scss new file mode 100644 index 0000000..c5d88ba --- /dev/null +++ b/2/Tracker/app/assets/stylesheets/application.scss @@ -0,0 +1,16 @@ + +/* + * This is a manifest file that'll be compiled into application.css, which will include all the files + * listed below. + * + * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's + * vendor/assets/stylesheets directory can be referenced here using a relative path. + * + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. + * + */ +// Custom bootstrap variables must be set or imported *before* bootstrap. +@import "bootstrap"; \ No newline at end of file diff --git a/2/Tracker/app/assets/stylesheets/dishes.scss b/2/Tracker/app/assets/stylesheets/dishes.scss new file mode 100644 index 0000000..5770eeb --- /dev/null +++ b/2/Tracker/app/assets/stylesheets/dishes.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Dishes controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/2/Tracker/app/assets/stylesheets/ingestions.scss b/2/Tracker/app/assets/stylesheets/ingestions.scss new file mode 100644 index 0000000..03441c0 --- /dev/null +++ b/2/Tracker/app/assets/stylesheets/ingestions.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Ingestions controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/2/Tracker/app/assets/stylesheets/scaffolds.scss b/2/Tracker/app/assets/stylesheets/scaffolds.scss new file mode 100644 index 0000000..6045188 --- /dev/null +++ b/2/Tracker/app/assets/stylesheets/scaffolds.scss @@ -0,0 +1,84 @@ +body { + background-color: #fff; + color: #333; + margin: 33px; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +pre { + background-color: #eee; + padding: 10px; + font-size: 11px; +} + +a { + color: #000; + + &:visited { + color: #666; + } + + &:hover { + color: #fff; + background-color: #000; + } +} + +th { + padding-bottom: 5px; +} + +td { + padding: 0 5px 7px; +} + +div { + &.field, &.actions { + margin-bottom: 10px; + } +} + +#notice { + color: green; +} + +.field_with_errors { + padding: 2px; + background-color: red; + display: table; +} + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px 7px 0; + margin-bottom: 20px; + background-color: #f0f0f0; + + h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px -7px 0; + background-color: #c00; + color: #fff; + } + + ul li { + font-size: 12px; + list-style: square; + } +} + +label { + display: block; +} diff --git a/2/Tracker/app/channels/application_cable/channel.rb b/2/Tracker/app/channels/application_cable/channel.rb new file mode 100644 index 0000000..d672697 --- /dev/null +++ b/2/Tracker/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/2/Tracker/app/channels/application_cable/connection.rb b/2/Tracker/app/channels/application_cable/connection.rb new file mode 100644 index 0000000..0ff5442 --- /dev/null +++ b/2/Tracker/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/2/Tracker/app/controllers/application_controller.rb b/2/Tracker/app/controllers/application_controller.rb new file mode 100644 index 0000000..d885f84 --- /dev/null +++ b/2/Tracker/app/controllers/application_controller.rb @@ -0,0 +1,15 @@ +class ApplicationController < ActionController::Base + protect_from_forgery with: :exception + + before_action :authenticate_user! + before_action :configure_permitted_parameters, if: :devise_controller? + + protected + + def configure_permitted_parameters + devise_parameter_sanitizer.permit(:sign_up) {|u| u.permit(:firstname, :lastname, :age, :weight, :height, :email, :password)} + + devise_parameter_sanitizer.permit(:account_update) {|u| u.permit(:firstname, :lastname, :age, :weight, :height, :email, :password, :current_password)} + + end +end \ No newline at end of file diff --git a/2/Tracker/app/controllers/concerns/.keep b/2/Tracker/app/controllers/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/app/controllers/dishes_controller.rb b/2/Tracker/app/controllers/dishes_controller.rb new file mode 100644 index 0000000..72af34a --- /dev/null +++ b/2/Tracker/app/controllers/dishes_controller.rb @@ -0,0 +1,74 @@ +class DishesController < ApplicationController + before_action :set_dish, only: [:show, :edit, :update, :destroy] + + # GET /dishes + # GET /dishes.json + def index + @dishes = Dish.all + end + + # GET /dishes/1 + # GET /dishes/1.json + def show + end + + # GET /dishes/new + def new + @dish = Dish.new + end + + # GET /dishes/1/edit + def edit + end + + # POST /dishes + # POST /dishes.json + def create + @dish = Dish.new(dish_params) + + respond_to do |format| + if @dish.save + format.html { redirect_to @dish, notice: 'Dish was successfully created.' } + format.json { render :show, status: :created, location: @dish } + else + format.html { render :new } + format.json { render json: @dish.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /dishes/1 + # PATCH/PUT /dishes/1.json + def update + respond_to do |format| + if @dish.update(dish_params) + format.html { redirect_to @dish, notice: 'Dish was successfully updated.' } + format.json { render :show, status: :ok, location: @dish } + else + format.html { render :edit } + format.json { render json: @dish.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /dishes/1 + # DELETE /dishes/1.json + def destroy + @dish.destroy + respond_to do |format| + format.html { redirect_to dishes_url, notice: 'Dish was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_dish + @dish = Dish.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def dish_params + params.require(:dish).permit(:name, :weight, :calorie_value, :integer, :proteins, :carbohydrates, :fats) + end +end diff --git a/2/Tracker/app/controllers/ingestions_controller.rb b/2/Tracker/app/controllers/ingestions_controller.rb new file mode 100644 index 0000000..cc52869 --- /dev/null +++ b/2/Tracker/app/controllers/ingestions_controller.rb @@ -0,0 +1,74 @@ +class IngestionsController < ApplicationController + before_action :set_ingestion, only: [:show, :edit, :update, :destroy] + + # GET /ingestions + # GET /ingestions.json + def index + @ingestions = Ingestion.all + end + + # GET /ingestions/1 + # GET /ingestions/1.json + def show + end + + # GET /ingestions/new + def new + @ingestion = Ingestion.new + end + + # GET /ingestions/1/edit + def edit + end + + # POST /ingestions + # POST /ingestions.json + def create + @ingestion = current_user.ingestions.new(ingestion_params) + + respond_to do |format| + if @ingestion.save + format.html { redirect_to @ingestion, notice: 'Ingestion was successfully created.' } + format.json { render :show, status: :created, location: @ingestion } + else + format.html { render :new } + format.json { render json: @ingestion.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /ingestions/1 + # PATCH/PUT /ingestions/1.json + def update + respond_to do |format| + if @ingestion.update(ingestion_params) + format.html { redirect_to @ingestion, notice: 'Ingestion was successfully updated.' } + format.json { render :show, status: :ok, location: @ingestion } + else + format.html { render :edit } + format.json { render json: @ingestion.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /ingestions/1 + # DELETE /ingestions/1.json + def destroy + @ingestion.destroy + respond_to do |format| + format.html { redirect_to ingestions_url, notice: 'Ingestion was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_ingestion + @ingestion = Ingestion.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def ingestion_params + params.require(:ingestion).permit(:user_id, :name, :dish_ids=>[]) + end +end diff --git a/2/Tracker/app/controllers/users/confirmations_controller.rb b/2/Tracker/app/controllers/users/confirmations_controller.rb new file mode 100644 index 0000000..fa535c0 --- /dev/null +++ b/2/Tracker/app/controllers/users/confirmations_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Users::ConfirmationsController < Devise::ConfirmationsController + # GET /resource/confirmation/new + # def new + # super + # end + + # POST /resource/confirmation + # def create + # super + # end + + # GET /resource/confirmation?confirmation_token=abcdef + # def show + # super + # end + + # protected + + # The path used after resending confirmation instructions. + # def after_resending_confirmation_instructions_path_for(resource_name) + # super(resource_name) + # end + + # The path used after confirmation. + # def after_confirmation_path_for(resource_name, resource) + # super(resource_name, resource) + # end +end diff --git a/2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb b/2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb new file mode 100644 index 0000000..565c6ed --- /dev/null +++ b/2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController + # You should configure your model like this: + # devise :omniauthable, omniauth_providers: [:twitter] + + # You should also create an action method in this controller like this: + # def twitter + # end + + # More info at: + # https://github.com/plataformatec/devise#omniauth + + # GET|POST /resource/auth/twitter + # def passthru + # super + # end + + # GET|POST /users/auth/twitter/callback + # def failure + # super + # end + + # protected + + # The path used when OmniAuth fails + # def after_omniauth_failure_path_for(scope) + # super(scope) + # end +end diff --git a/2/Tracker/app/controllers/users/passwords_controller.rb b/2/Tracker/app/controllers/users/passwords_controller.rb new file mode 100644 index 0000000..259dbb0 --- /dev/null +++ b/2/Tracker/app/controllers/users/passwords_controller.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +class Users::PasswordsController < Devise::PasswordsController + # GET /resource/password/new + # def new + # super + # end + + # POST /resource/password + # def create + # super + # end + + # GET /resource/password/edit?reset_password_token=abcdef + # def edit + # super + # end + + # PUT /resource/password + # def update + # super + # end + + # protected + + # def after_resetting_password_path_for(resource) + # super(resource) + # end + + # The path used after sending reset password instructions + # def after_sending_reset_password_instructions_path_for(resource_name) + # super(resource_name) + # end +end diff --git a/2/Tracker/app/controllers/users/registrations_controller.rb b/2/Tracker/app/controllers/users/registrations_controller.rb new file mode 100644 index 0000000..b9e664f --- /dev/null +++ b/2/Tracker/app/controllers/users/registrations_controller.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +class Users::RegistrationsController < Devise::RegistrationsController + # before_action :configure_sign_up_params, only: [:create] + # before_action :configure_account_update_params, only: [:update] + + # GET /resource/sign_up + # def new + # super + # end + + # POST /resource + # def create + # super + # end + + # GET /resource/edit + # def edit + # super + # end + + # PUT /resource + # def update + # super + # end + + # DELETE /resource + # def destroy + # super + # end + + # GET /resource/cancel + # Forces the session data which is usually expired after sign + # in to be expired now. This is useful if the user wants to + # cancel oauth signing in/up in the middle of the process, + # removing all OAuth session data. + # def cancel + # super + # end + + # protected + + # If you have extra params to permit, append them to the sanitizer. + # def configure_sign_up_params + # devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute]) + # end + + # If you have extra params to permit, append them to the sanitizer. + # def configure_account_update_params + # devise_parameter_sanitizer.permit(:account_update, keys: [:attribute]) + # end + + # The path used after sign up. + # def after_sign_up_path_for(resource) + # super(resource) + # end + + # The path used after sign up for inactive accounts. + # def after_inactive_sign_up_path_for(resource) + # super(resource) + # end +end diff --git a/2/Tracker/app/controllers/users/sessions_controller.rb b/2/Tracker/app/controllers/users/sessions_controller.rb new file mode 100644 index 0000000..a0f9b48 --- /dev/null +++ b/2/Tracker/app/controllers/users/sessions_controller.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class Users::SessionsController < Devise::SessionsController + # before_action :configure_sign_in_params, only: [:create] + + # GET /resource/sign_in + # def new + # super + # end + + # POST /resource/sign_in + # def create + # super + # end + + # DELETE /resource/sign_out + # def destroy + # super + # end + + # protected + + # If you have extra params to permit, append them to the sanitizer. + # def configure_sign_in_params + # devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute]) + # end +end diff --git a/2/Tracker/app/controllers/users/unlocks_controller.rb b/2/Tracker/app/controllers/users/unlocks_controller.rb new file mode 100644 index 0000000..2c410dc --- /dev/null +++ b/2/Tracker/app/controllers/users/unlocks_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class Users::UnlocksController < Devise::UnlocksController + # GET /resource/unlock/new + # def new + # super + # end + + # POST /resource/unlock + # def create + # super + # end + + # GET /resource/unlock?unlock_token=abcdef + # def show + # super + # end + + # protected + + # The path used after sending unlock password instructions + # def after_sending_unlock_instructions_path_for(resource) + # super(resource) + # end + + # The path used after unlocking the resource + # def after_unlock_path_for(resource) + # super(resource) + # end +end diff --git a/2/Tracker/app/helpers/application_helper.rb b/2/Tracker/app/helpers/application_helper.rb new file mode 100644 index 0000000..de6be79 --- /dev/null +++ b/2/Tracker/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/2/Tracker/app/helpers/dishes_helper.rb b/2/Tracker/app/helpers/dishes_helper.rb new file mode 100644 index 0000000..2d544e3 --- /dev/null +++ b/2/Tracker/app/helpers/dishes_helper.rb @@ -0,0 +1,2 @@ +module DishesHelper +end diff --git a/2/Tracker/app/helpers/ingestions_helper.rb b/2/Tracker/app/helpers/ingestions_helper.rb new file mode 100644 index 0000000..4c390a6 --- /dev/null +++ b/2/Tracker/app/helpers/ingestions_helper.rb @@ -0,0 +1,2 @@ +module IngestionsHelper +end diff --git a/2/Tracker/app/jobs/application_job.rb b/2/Tracker/app/jobs/application_job.rb new file mode 100644 index 0000000..a009ace --- /dev/null +++ b/2/Tracker/app/jobs/application_job.rb @@ -0,0 +1,2 @@ +class ApplicationJob < ActiveJob::Base +end diff --git a/2/Tracker/app/mailers/application_mailer.rb b/2/Tracker/app/mailers/application_mailer.rb new file mode 100644 index 0000000..286b223 --- /dev/null +++ b/2/Tracker/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/2/Tracker/app/models/application_record.rb b/2/Tracker/app/models/application_record.rb new file mode 100644 index 0000000..10a4cba --- /dev/null +++ b/2/Tracker/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/2/Tracker/app/models/concerns/.keep b/2/Tracker/app/models/concerns/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/app/models/dish.rb b/2/Tracker/app/models/dish.rb new file mode 100644 index 0000000..fb36238 --- /dev/null +++ b/2/Tracker/app/models/dish.rb @@ -0,0 +1,13 @@ +class Dish < ApplicationRecord + has_many :dish_ingestions, dependent: :destroy + has_many :ingestions, through: :dish_ingestions + validates :name, :presence => true + validates :weight, :presence => true + validates :fats, :presence => true + validates :proteins, :presence => true + validates :carbohydrates, :presence => true + validates :calorie_value, :presence => true + def to_s + self.name + end +end diff --git a/2/Tracker/app/models/dish_ingestion.rb b/2/Tracker/app/models/dish_ingestion.rb new file mode 100644 index 0000000..88d554d --- /dev/null +++ b/2/Tracker/app/models/dish_ingestion.rb @@ -0,0 +1,4 @@ +class DishIngestion < ApplicationRecord + belongs_to :dish + belongs_to :ingestion +end diff --git a/2/Tracker/app/models/ingestion.rb b/2/Tracker/app/models/ingestion.rb new file mode 100644 index 0000000..3fdb609 --- /dev/null +++ b/2/Tracker/app/models/ingestion.rb @@ -0,0 +1,5 @@ +class Ingestion < ApplicationRecord + belongs_to :user + has_many :dish_ingestions, dependent: :destroy + has_many :dishes, through: :dish_ingestions +end diff --git a/2/Tracker/app/models/user.rb b/2/Tracker/app/models/user.rb new file mode 100644 index 0000000..9e51bc1 --- /dev/null +++ b/2/Tracker/app/models/user.rb @@ -0,0 +1,10 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :validatable + has_many :ingestions, dependent: :destroy + def to_s + self.firstname+" "+self.lastname + end +end diff --git a/2/Tracker/app/views/devise/confirmations/new.html.erb b/2/Tracker/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000..f7b4a65 --- /dev/null +++ b/2/Tracker/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,20 @@ +

Resend confirmation instructions

+ +<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :confirmation_token %> + +
+ <%= f.input :email, + required: true, + autofocus: true, + value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), + input_html: { autocomplete: "email" } %> +
+ +
+ <%= f.button :submit, "Resend confirmation instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb b/2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 0000000..dc55f64 --- /dev/null +++ b/2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @email %>!

+ +

You can confirm your account email through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/2/Tracker/app/views/devise/mailer/email_changed.html.erb b/2/Tracker/app/views/devise/mailer/email_changed.html.erb new file mode 100644 index 0000000..32f4ba8 --- /dev/null +++ b/2/Tracker/app/views/devise/mailer/email_changed.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @email %>!

+ +<% if @resource.try(:unconfirmed_email?) %> +

We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.

+<% else %> +

We're contacting you to notify you that your email has been changed to <%= @resource.email %>.

+<% end %> diff --git a/2/Tracker/app/views/devise/mailer/password_change.html.erb b/2/Tracker/app/views/devise/mailer/password_change.html.erb new file mode 100644 index 0000000..b41daf4 --- /dev/null +++ b/2/Tracker/app/views/devise/mailer/password_change.html.erb @@ -0,0 +1,3 @@ +

Hello <%= @resource.email %>!

+ +

We're contacting you to notify you that your password has been changed.

diff --git a/2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb b/2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..f667dc1 --- /dev/null +++ b/2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password. You can do this through the link below.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

+ +

If you didn't request this, please ignore this email.

+

Your password won't change until you access the link above and create a new one.

diff --git a/2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb b/2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..41e148b --- /dev/null +++ b/2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @resource.email %>!

+ +

Your account has been locked due to an excessive number of unsuccessful sign in attempts.

+ +

Click the link below to unlock your account:

+ +

<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>

diff --git a/2/Tracker/app/views/devise/passwords/edit.html.erb b/2/Tracker/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000..b43dc15 --- /dev/null +++ b/2/Tracker/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,24 @@ +

Change your password

+ +<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= f.error_notification %> + + <%= f.input :reset_password_token, as: :hidden %> + <%= f.full_error :reset_password_token %> + +
+ <%= f.input :password, + label: "New password", + required: true, + autofocus: true, + hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length), + input_html: { autocomplete: "new-password" } %> + <%= f.input :password_confirmation, label: "Confirm your new password", required: true %> +
+ +
+ <%= f.button :submit, "Change my password" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/2/Tracker/app/views/devise/passwords/new.html.erb b/2/Tracker/app/views/devise/passwords/new.html.erb new file mode 100644 index 0000000..01ce0b8 --- /dev/null +++ b/2/Tracker/app/views/devise/passwords/new.html.erb @@ -0,0 +1,18 @@ +

Forgot your password?

+ +<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, + required: true, + autofocus: true, + input_html: { autocomplete: "email" } %> +
+ +
+ <%= f.button :submit, "Send me reset password instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/2/Tracker/app/views/devise/registrations/edit.html.erb b/2/Tracker/app/views/devise/registrations/edit.html.erb new file mode 100644 index 0000000..a3d6593 --- /dev/null +++ b/2/Tracker/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,46 @@ +

Edit <%= resource_name.to_s.humanize %>

+ +<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, required: true, autofocus: true %> + + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> +

Currently waiting confirmation for: <%= resource.unconfirmed_email %>

+ <% end %> + + <%= f.input :password, + hint: "leave it blank if you don't want to change it", + required: false, + input_html: { autocomplete: "new-password" } %> + <%= f.input :firstname, + hint: "leave it blank if you don't want to change it", + required: false%> + <%= f.input :lastname, + hint: "leave it blank if you don't want to change it", + required: false%> + <%= f.input :age, + hint: "leave it blank if you don't want to change it", + required: false%> + <%= f.input :weight, + hint: "leave it blank if you don't want to change it", + required: false%> + <%= f.input :height, + hint: "leave it blank if you don't want to change it", + required: false%> + <%= f.input :password_confirmation, + required: false, + input_html: { autocomplete: "new-password" } %> + <%= f.input :current_password, + hint: "we need your current password to confirm your changes", + required: true, + input_html: { autocomplete: "current-password" } %> +
+ +
+ <%= f.button :submit, "Update", :class=>"btn btn-primary" %> + <%= link_to "Back", :back, :class=>"btn btn-space"%> +
+<% end %> + diff --git a/2/Tracker/app/views/devise/registrations/new.html.erb b/2/Tracker/app/views/devise/registrations/new.html.erb new file mode 100644 index 0000000..7bd5d83 --- /dev/null +++ b/2/Tracker/app/views/devise/registrations/new.html.erb @@ -0,0 +1,45 @@ +

Sign up

+ +<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, + required: true, + autofocus: true, + input_html: { autocomplete: "email" }%> + <%= f.input :firstname, + required: true, + autofocus: true, + input_html: { autocomplete: "Ivan" }%> + <%= f.input :lastname, + required: true, + autofocus: true, + input_html: { autocomplete: "Doe" }%> + <%= f.input :age, + required: false, + autofocus: true, + input_html: { autocomplete: "23" }%> + <%= f.input :weight, + required: false, + autofocus: true, + input_html: { autocomplete: "65" }%> + <%= f.input :height, + required: false, + autofocus: true, + input_html: { autocomplete: "176" }%> + <%= f.input :password, + required: true, + hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length), + input_html: { autocomplete: "new-password" } %> + <%= f.input :password_confirmation, + required: true, + input_html: { autocomplete: "new-password" } %> +
+ +
+ <%= f.button :submit, "Sign up" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/2/Tracker/app/views/devise/sessions/new.html.erb b/2/Tracker/app/views/devise/sessions/new.html.erb new file mode 100644 index 0000000..e542e61 --- /dev/null +++ b/2/Tracker/app/views/devise/sessions/new.html.erb @@ -0,0 +1,20 @@ +

Log in

+ +<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+ <%= f.input :email, + required: false, + autofocus: true, + input_html: { autocomplete: "email" } %> + <%= f.input :password, + required: false, + input_html: { autocomplete: "current-password" } %> + <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %> +
+ +
+ <%= f.button :submit, "Log in" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/2/Tracker/app/views/devise/shared/_error_messages.html.erb b/2/Tracker/app/views/devise/shared/_error_messages.html.erb new file mode 100644 index 0000000..ba7ab88 --- /dev/null +++ b/2/Tracker/app/views/devise/shared/_error_messages.html.erb @@ -0,0 +1,15 @@ +<% if resource.errors.any? %> +
+

+ <%= I18n.t("errors.messages.not_saved", + count: resource.errors.count, + resource: resource.class.model_name.human.downcase) + %> +

+ +
+<% end %> diff --git a/2/Tracker/app/views/devise/shared/_links.html.erb b/2/Tracker/app/views/devise/shared/_links.html.erb new file mode 100644 index 0000000..084af70 --- /dev/null +++ b/2/Tracker/app/views/devise/shared/_links.html.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Log in", new_session_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %>
+ <% end %> +<% end %> diff --git a/2/Tracker/app/views/devise/unlocks/new.html.erb b/2/Tracker/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000..c42de17 --- /dev/null +++ b/2/Tracker/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,19 @@ +

Resend unlock instructions

+ +<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :unlock_token %> + +
+ <%= f.input :email, + required: true, + autofocus: true, + input_html: { autocomplete: "email" } %> +
+ +
+ <%= f.button :submit, "Resend unlock instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/2/Tracker/app/views/dishes/_dish.json.jbuilder b/2/Tracker/app/views/dishes/_dish.json.jbuilder new file mode 100644 index 0000000..6998024 --- /dev/null +++ b/2/Tracker/app/views/dishes/_dish.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! dish, :id, :name, :weight, :calorie_value, :integer, :proteins, :carbohydrates, :fats, :created_at, :updated_at +json.url dish_url(dish, format: :json) diff --git a/2/Tracker/app/views/dishes/_form.html.slim b/2/Tracker/app/views/dishes/_form.html.slim new file mode 100644 index 0000000..35d8d86 --- /dev/null +++ b/2/Tracker/app/views/dishes/_form.html.slim @@ -0,0 +1,14 @@ += simple_form_for(@dish) do |f| + = f.error_notification + = f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? + + .form-inputs + = f.input :name, required: true + = f.input :weight, required: true + = f.input :calorie_value, required: true + = f.input :proteins, required: true + = f.input :carbohydrates, required: true + = f.input :fats, required: true + + .form-actions + = f.button :submit, :class=>"btn btn-primary" diff --git a/2/Tracker/app/views/dishes/edit.html.slim b/2/Tracker/app/views/dishes/edit.html.slim new file mode 100644 index 0000000..e5295f9 --- /dev/null +++ b/2/Tracker/app/views/dishes/edit.html.slim @@ -0,0 +1,8 @@ +h1 Editing dish + +== render 'form' + +=> link_to 'Show', @dish +'| +=< link_to 'Back', dishes_path, + diff --git a/2/Tracker/app/views/dishes/index.html.slim b/2/Tracker/app/views/dishes/index.html.slim new file mode 100644 index 0000000..56801b2 --- /dev/null +++ b/2/Tracker/app/views/dishes/index.html.slim @@ -0,0 +1,28 @@ +h1 class="text-center" Listing dishes +table class="table table-bordered text-center" + thead + tr + th scope="col" Name + th scope="col" Diagram + th Calorie value + th Weight + th + th + th + + tbody + - @dishes.each do |dish| + tr + td class="align-middle" = dish.name + td height="50"= pie_chart ({'Carbohydrates' => dish.carbohydrates, 'Proteins' => dish.proteins, 'Fats' =>dish.fats}) + td class="align-middle"= dish.calorie_value + td class="align-middle"= dish.weight + td class="align-middle"= link_to 'Show', dish + td class="align-middle"= link_to 'Edit', edit_dish_path(dish) + td class="align-middle"= link_to 'Destroy', dish, data: { confirm: 'Are you sure?' }, method: :delete + + + +br + += link_to 'New Dish', new_dish_path diff --git a/2/Tracker/app/views/dishes/index.json.jbuilder b/2/Tracker/app/views/dishes/index.json.jbuilder new file mode 100644 index 0000000..9e3bb09 --- /dev/null +++ b/2/Tracker/app/views/dishes/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @dishes, partial: 'dishes/dish', as: :dish diff --git a/2/Tracker/app/views/dishes/new.html.slim b/2/Tracker/app/views/dishes/new.html.slim new file mode 100644 index 0000000..c99f2b9 --- /dev/null +++ b/2/Tracker/app/views/dishes/new.html.slim @@ -0,0 +1,5 @@ +h1 New dish + +== render 'form' + += link_to 'Back', dishes_path diff --git a/2/Tracker/app/views/dishes/show.html.slim b/2/Tracker/app/views/dishes/show.html.slim new file mode 100644 index 0000000..cd65e47 --- /dev/null +++ b/2/Tracker/app/views/dishes/show.html.slim @@ -0,0 +1,27 @@ +p#notice = notice +div class="card mx-auto" style="width: 18rem;" + div class="card-body" + h5 class="card-title" + strong Name: + = @dish.name + ul class="list-group list-group-flush" + li class="list-group-item" + strong Weight: + = @dish.weight + li class="list-group-item" + strong Calorie value: + = @dish.calorie_value + + li class="list-group-item" + strong Proteins: + = @dish.proteins + li class="list-group-item" + strong Carbohydrates: + = @dish.carbohydrates + li class="list-group-item" + strong Fats: + = @dish.fats + +=> link_to 'Edit', edit_dish_path(@dish) +'| +=< link_to 'Back', dishes_path diff --git a/2/Tracker/app/views/dishes/show.json.jbuilder b/2/Tracker/app/views/dishes/show.json.jbuilder new file mode 100644 index 0000000..1216570 --- /dev/null +++ b/2/Tracker/app/views/dishes/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "dishes/dish", dish: @dish diff --git a/2/Tracker/app/views/ingestions/_form.html.slim b/2/Tracker/app/views/ingestions/_form.html.slim new file mode 100644 index 0000000..12820b2 --- /dev/null +++ b/2/Tracker/app/views/ingestions/_form.html.slim @@ -0,0 +1,10 @@ += simple_form_for(@ingestion) do |f| + = f.error_notification + = f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? + + .form-inputs + = f.association :dishes, :collection => Dish.all + = f.input :name + + .form-actions + = f.button :submit, :class=>"btn btn-primary" diff --git a/2/Tracker/app/views/ingestions/_ingestion.json.jbuilder b/2/Tracker/app/views/ingestions/_ingestion.json.jbuilder new file mode 100644 index 0000000..9764224 --- /dev/null +++ b/2/Tracker/app/views/ingestions/_ingestion.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! ingestion, :id, :user_id, :dish_id, :name, :created_at, :updated_at +json.url ingestion_url(ingestion, format: :json) diff --git a/2/Tracker/app/views/ingestions/edit.html.slim b/2/Tracker/app/views/ingestions/edit.html.slim new file mode 100644 index 0000000..965e847 --- /dev/null +++ b/2/Tracker/app/views/ingestions/edit.html.slim @@ -0,0 +1,8 @@ +h1 Editing ingestion + +== render 'form' + +=> link_to 'Show', @ingestion +'| +=< link_to 'Back', ingestions_path + diff --git a/2/Tracker/app/views/ingestions/index.html.slim b/2/Tracker/app/views/ingestions/index.html.slim new file mode 100644 index 0000000..bb1ce08 --- /dev/null +++ b/2/Tracker/app/views/ingestions/index.html.slim @@ -0,0 +1,26 @@ +h1 class="text-center" Listing your ingestions + +table class="table table-bordered text-center" + thead + tr + th User + th Dish + th Name + th + th + th + + tbody + - @ingestions.each do |ingestion| + - if ingestion.user== current_user + tr + td class="align-middle" = ingestion.user + td class="align-middle" = options_from_collection_for_select(ingestion.dishes, 'id', 'name') + td class="align-middle" = ingestion.name + td class="align-middle" = link_to 'Show', ingestion + td class="align-middle" = link_to 'Edit', edit_ingestion_path(ingestion) + td class="align-middle" = link_to 'Destroy', ingestion, data: {confirm: 'Are you sure?'}, method: :delete + +br + += link_to 'New Ingestion', new_ingestion_path diff --git a/2/Tracker/app/views/ingestions/index.json.jbuilder b/2/Tracker/app/views/ingestions/index.json.jbuilder new file mode 100644 index 0000000..246c0e0 --- /dev/null +++ b/2/Tracker/app/views/ingestions/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @ingestions, partial: 'ingestions/ingestion', as: :ingestion diff --git a/2/Tracker/app/views/ingestions/new.html.slim b/2/Tracker/app/views/ingestions/new.html.slim new file mode 100644 index 0000000..85b3322 --- /dev/null +++ b/2/Tracker/app/views/ingestions/new.html.slim @@ -0,0 +1,5 @@ +h1 New ingestion + +== render 'form' + += link_to 'Back', ingestions_path diff --git a/2/Tracker/app/views/ingestions/show.html.slim b/2/Tracker/app/views/ingestions/show.html.slim new file mode 100644 index 0000000..a01fdae --- /dev/null +++ b/2/Tracker/app/views/ingestions/show.html.slim @@ -0,0 +1,20 @@ +p#notice = notice +div class="card mx-auto" style="width: 18rem;" + div class="card-body" + h5 class="card-title" + strong User: + = @ingestion.user + ul class="list-group list-group-flush" + li class="list-group-item" + strong Dishes: + = options_from_collection_for_select(@ingestion.dishes, 'id', 'name') + li class="list-group-item" + strong Name: + = @ingestion.name + li class="list-group-item" + = link_to 'Edit', edit_ingestion_path(@ingestion), :class => "card-link" + = link_to 'Back', ingestions_path, :class => "card-link" + + + + diff --git a/2/Tracker/app/views/ingestions/show.json.jbuilder b/2/Tracker/app/views/ingestions/show.json.jbuilder new file mode 100644 index 0000000..4708a92 --- /dev/null +++ b/2/Tracker/app/views/ingestions/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "ingestions/ingestion", ingestion: @ingestion diff --git a/2/Tracker/app/views/layouts/application.html.erb b/2/Tracker/app/views/layouts/application.html.erb new file mode 100644 index 0000000..8f1c4da --- /dev/null +++ b/2/Tracker/app/views/layouts/application.html.erb @@ -0,0 +1,53 @@ + + + + Tracker + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + + + + +<% if notice %> +

<%= notice %>

+<% end %> +<% if alert %> +

<%= alert %>

+<% end %> +<%= yield %> + + diff --git a/2/Tracker/app/views/layouts/mailer.html.erb b/2/Tracker/app/views/layouts/mailer.html.erb new file mode 100644 index 0000000..cbd34d2 --- /dev/null +++ b/2/Tracker/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/2/Tracker/app/views/layouts/mailer.text.erb b/2/Tracker/app/views/layouts/mailer.text.erb new file mode 100644 index 0000000..37f0bdd --- /dev/null +++ b/2/Tracker/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/2/Tracker/app/views/users/_form.html.slim b/2/Tracker/app/views/users/_form.html.slim new file mode 100644 index 0000000..adb8b96 --- /dev/null +++ b/2/Tracker/app/views/users/_form.html.slim @@ -0,0 +1,8 @@ += simple_form_for(@user) do |f| + = f.error_notification + = f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? + + .form-inputs + + .form-actions + = f.button :submit diff --git a/2/Tracker/app/views/users/edit.html.slim b/2/Tracker/app/views/users/edit.html.slim new file mode 100644 index 0000000..1feb7b0 --- /dev/null +++ b/2/Tracker/app/views/users/edit.html.slim @@ -0,0 +1,8 @@ +h1 Editing user + +== render 'form' + +=> link_to 'Show', @user +'| +=< link_to 'Back', users_path + diff --git a/2/Tracker/app/views/users/index.html.slim b/2/Tracker/app/views/users/index.html.slim new file mode 100644 index 0000000..5bda4f4 --- /dev/null +++ b/2/Tracker/app/views/users/index.html.slim @@ -0,0 +1,19 @@ +h1 Listing users + +table + thead + tr + th + th + th + + tbody + - @users.each do |user| + tr + td = link_to 'Show', user + td = link_to 'Edit', edit_user_path(user) + td = link_to 'Destroy', user, data: { confirm: 'Are you sure?' }, method: :delete + +br + += link_to 'New User', new_user_path diff --git a/2/Tracker/app/views/users/new.html.slim b/2/Tracker/app/views/users/new.html.slim new file mode 100644 index 0000000..2ee9549 --- /dev/null +++ b/2/Tracker/app/views/users/new.html.slim @@ -0,0 +1,5 @@ +h1 New user + +== render 'form' + += link_to 'Back', users_path diff --git a/2/Tracker/app/views/users/show.html.slim b/2/Tracker/app/views/users/show.html.slim new file mode 100644 index 0000000..54330a4 --- /dev/null +++ b/2/Tracker/app/views/users/show.html.slim @@ -0,0 +1,6 @@ +p#notice = notice + + +=> link_to 'Edit', edit_user_path(@user) +'| +=< link_to 'Back', users_path diff --git a/2/Tracker/bin/bundle b/2/Tracker/bin/bundle new file mode 100755 index 0000000..f19acf5 --- /dev/null +++ b/2/Tracker/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +load Gem.bin_path('bundler', 'bundle') diff --git a/2/Tracker/bin/rails b/2/Tracker/bin/rails new file mode 100755 index 0000000..5badb2f --- /dev/null +++ b/2/Tracker/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/2/Tracker/bin/rake b/2/Tracker/bin/rake new file mode 100755 index 0000000..d87d5f5 --- /dev/null +++ b/2/Tracker/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/2/Tracker/bin/setup b/2/Tracker/bin/setup new file mode 100755 index 0000000..94fd4d7 --- /dev/null +++ b/2/Tracker/bin/setup @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a starting point to setup your application. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:setup' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/2/Tracker/bin/spring b/2/Tracker/bin/spring new file mode 100755 index 0000000..fb2ec2e --- /dev/null +++ b/2/Tracker/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/2/Tracker/bin/update b/2/Tracker/bin/update new file mode 100755 index 0000000..58bfaed --- /dev/null +++ b/2/Tracker/bin/update @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +require 'fileutils' +include FileUtils + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +chdir APP_ROOT do + # This script is a way to update your development environment automatically. + # Add necessary update steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + + puts "\n== Updating database ==" + system! 'bin/rails db:migrate' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/2/Tracker/bin/yarn b/2/Tracker/bin/yarn new file mode 100755 index 0000000..460dd56 --- /dev/null +++ b/2/Tracker/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/2/Tracker/config.ru b/2/Tracker/config.ru new file mode 100644 index 0000000..f7ba0b5 --- /dev/null +++ b/2/Tracker/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/2/Tracker/config/application.rb b/2/Tracker/config/application.rb new file mode 100644 index 0000000..2d35cc5 --- /dev/null +++ b/2/Tracker/config/application.rb @@ -0,0 +1,19 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module Tracker + class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 5.2 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + end +end diff --git a/2/Tracker/config/boot.rb b/2/Tracker/config/boot.rb new file mode 100644 index 0000000..b9e460c --- /dev/null +++ b/2/Tracker/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/2/Tracker/config/cable.yml b/2/Tracker/config/cable.yml new file mode 100644 index 0000000..d794806 --- /dev/null +++ b/2/Tracker/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: async + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: Tracker_production diff --git a/2/Tracker/config/credentials.yml.enc b/2/Tracker/config/credentials.yml.enc new file mode 100644 index 0000000..0b6dc6c --- /dev/null +++ b/2/Tracker/config/credentials.yml.enc @@ -0,0 +1 @@ +AfQzEaaD+n9v8FuWYWoSQsEcEJN5LLoV2fLBwdeZIO4wx4xBSm+VdN5uCNhoh3WCQygxeiePe8JLj/fkMSM+CZI1FCmwang7LWrHFB2EcfBA/1ZoRAS3DoMam42j7NdTS4gpf5oCOAcjgzvVybmbhEL2WXXsz9xtt64JtxupUIYaEDFF1mZ7ooyuyt4wb+z9n/BR/Qo8L5EpKA+URruDrTXh8F3ZeT6wV4xaEWZF7bPPfZQ1A/pzZ2pOnxvpQb+iU/mm5EIqiLCRUTlmvgd6QX95R1eeCtAAhpU7oy14OP+CEVK6HKEY6j8ZpYAeYu5wVEMG2uE5UJfGc50GYNKzDar6PErGWdQYFZWu51Y/PuwE9pl/fijshJ/7gnc4Upyzh5LlH6ZB5vNNJmF7K9E/Iay09j6kXF35hpeP--UFRN68lknu1ENoj1--gytBcnypXgn3Cn9PZ/yqkg== \ No newline at end of file diff --git a/2/Tracker/config/database.yml b/2/Tracker/config/database.yml new file mode 100644 index 0000000..6848c00 --- /dev/null +++ b/2/Tracker/config/database.yml @@ -0,0 +1,86 @@ +# PostgreSQL. Versions 9.1 and up are supported. +# +# Install the pg driver: +# gem install pg +# On OS X with Homebrew: +# gem install pg -- --with-pg-config=/usr/local/bin/pg_config +# On OS X with MacPorts: +# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config +# On Windows: +# gem install pg +# Choose the win32 build. +# Install PostgreSQL and put its /bin directory on your path. +# +# Configure Using Gemfile +# gem 'pg' +# +default: &default + adapter: postgresql + encoding: unicode + # For details on connection pooling, see Rails configuration guide + # http://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + user: valentin + +development: + <<: *default + database: Tracker_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: Tracker + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: Tracker_test + +# As with config/secrets.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: Tracker_production + username: Tracker + password: <%= ENV['TRACKER_DATABASE_PASSWORD'] %> diff --git a/2/Tracker/config/environment.rb b/2/Tracker/config/environment.rb new file mode 100644 index 0000000..426333b --- /dev/null +++ b/2/Tracker/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/2/Tracker/config/environments/development.rb b/2/Tracker/config/environments/development.rb new file mode 100644 index 0000000..0cedac7 --- /dev/null +++ b/2/Tracker/config/environments/development.rb @@ -0,0 +1,62 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.action_controller.perform_caching = true + + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = true + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/2/Tracker/config/environments/production.rb b/2/Tracker/config/environments/production.rb new file mode 100644 index 0000000..bcac464 --- /dev/null +++ b/2/Tracker/config/environments/production.rb @@ -0,0 +1,94 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options) + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment) + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "Tracker_#{Rails.env}" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false +end diff --git a/2/Tracker/config/environments/test.rb b/2/Tracker/config/environments/test.rb new file mode 100644 index 0000000..0a38fd3 --- /dev/null +++ b/2/Tracker/config/environments/test.rb @@ -0,0 +1,46 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true +end diff --git a/2/Tracker/config/initializers/application_controller_renderer.rb b/2/Tracker/config/initializers/application_controller_renderer.rb new file mode 100644 index 0000000..89d2efa --- /dev/null +++ b/2/Tracker/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/2/Tracker/config/initializers/assets.rb b/2/Tracker/config/initializers/assets.rb new file mode 100644 index 0000000..b1539ef --- /dev/null +++ b/2/Tracker/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.scss, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/2/Tracker/config/initializers/backtrace_silencers.rb b/2/Tracker/config/initializers/backtrace_silencers.rb new file mode 100644 index 0000000..59385cd --- /dev/null +++ b/2/Tracker/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/2/Tracker/config/initializers/chartkick.rb b/2/Tracker/config/initializers/chartkick.rb new file mode 100644 index 0000000..77843a2 --- /dev/null +++ b/2/Tracker/config/initializers/chartkick.rb @@ -0,0 +1,3 @@ +Chartkick.options = { + height: "130px", +} diff --git a/2/Tracker/config/initializers/content_security_policy.rb b/2/Tracker/config/initializers/content_security_policy.rb new file mode 100644 index 0000000..d3bcaa5 --- /dev/null +++ b/2/Tracker/config/initializers/content_security_policy.rb @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff --git a/2/Tracker/config/initializers/cookies_serializer.rb b/2/Tracker/config/initializers/cookies_serializer.rb new file mode 100644 index 0000000..5a6a32d --- /dev/null +++ b/2/Tracker/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Specify a serializer for the signed and encrypted cookie jars. +# Valid options are :json, :marshal, and :hybrid. +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/2/Tracker/config/initializers/devise.rb b/2/Tracker/config/initializers/devise.rb new file mode 100644 index 0000000..a84e4b3 --- /dev/null +++ b/2/Tracker/config/initializers/devise.rb @@ -0,0 +1,299 @@ +# frozen_string_literal: true + +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '3cd4042c23f49de4fee2064b61818c8aa9e14e462dff431a3542382ce8d514f2f733ffc92e8e0bc93ec96d0ed0478f6b301e4e30f6058deba7098861e3d8b046' + + # ==> Controller configuration + # Configure the parent class to the devise controllers. + # config.parent_controller = 'DeviseController' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 11. If + # using other algorithms, it sets how many times you want the password to be hashed. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 11 + + # Set up a pepper to generate the hashed password. + # config.pepper = '03082c7f6bc4cd44143e8c2d055227491fb7120fb659aa07137a2bc5f4ac7020669a63b2b53594278952163c416f2c394530fa61afe171c90ce30ae3b69b70d2' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. + # You can also set it to nil, which will allow the user to access the website + # without confirming their account. + # Default is 0.days, meaning the user cannot access the website without + # confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' + + # ==> Turbolinks configuration + # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: + # + # ActiveSupport.on_load(:devise_failure_app) do + # include Turbolinks::Controller + # end + + # ==> Configuration for :registerable + + # When set to false, does not sign a user in automatically after their password is + # changed. Defaults to true, so a user is signed in automatically after changing a password. + # config.sign_in_after_change_password = true +end diff --git a/2/Tracker/config/initializers/filter_parameter_logging.rb b/2/Tracker/config/initializers/filter_parameter_logging.rb new file mode 100644 index 0000000..4a994e1 --- /dev/null +++ b/2/Tracker/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/2/Tracker/config/initializers/inflections.rb b/2/Tracker/config/initializers/inflections.rb new file mode 100644 index 0000000..ac033bf --- /dev/null +++ b/2/Tracker/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/2/Tracker/config/initializers/mime_types.rb b/2/Tracker/config/initializers/mime_types.rb new file mode 100644 index 0000000..dc18996 --- /dev/null +++ b/2/Tracker/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/2/Tracker/config/initializers/rails_admin.rb b/2/Tracker/config/initializers/rails_admin.rb new file mode 100644 index 0000000..0c76fb3 --- /dev/null +++ b/2/Tracker/config/initializers/rails_admin.rb @@ -0,0 +1,42 @@ +RailsAdmin.config do |config| + + ### Popular gems integration + + ## == Devise == + config.authenticate_with do + warden.authenticate! scope: :user + #redirect_to main_app.root_path unless current_user.try(:admin?) + end + config.current_user_method(&:current_user) + + ## == Cancan == + # config.authorize_with :cancan + + ## == Pundit == + # config.authorize_with :pundit + + ## == PaperTrail == + # config.audit_with :paper_trail, 'User', 'PaperTrail::Version' # PaperTrail >= 3.0.0 + + ### More at https://github.com/sferik/rails_admin/wiki/Base-configuration + + ## == Gravatar integration == + ## To disable Gravatar integration in Navigation Bar set to false + # config.show_gravatar = true + + config.actions do + dashboard # mandatory + index # mandatory + new + export + bulk_delete + show + edit + delete + show_in_app + + ## With an audit adapter, you can add: + # history_index + # history_show + end +end diff --git a/2/Tracker/config/initializers/simple_form.rb b/2/Tracker/config/initializers/simple_form.rb new file mode 100644 index 0000000..bb43c33 --- /dev/null +++ b/2/Tracker/config/initializers/simple_form.rb @@ -0,0 +1,179 @@ +# frozen_string_literal: true +# +# Uncomment this and change the path if necessary to include your own +# components. +# See https://github.com/plataformatec/simple_form#custom-components to know +# more about custom components. +# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } +# +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. + + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder + + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => true` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + # and/or database column lengths + b.optional :maxlength + + # Calculate minlength from length validations for string inputs + b.optional :minlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs + # b.use :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + + ## full_messages_for + # If you want to display the full error message for the attribute, you can + # use the component :full_error, like: + # + # b.use :full_error, wrap_with: { tag: :span, class: :error } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = 'error_notification' + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + # config.label_class = nil + + # You can define the default class to be used on forms. Can be overriden + # with `html: { :class }`. Defaulting to none. + # config.default_form_class = nil + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + # config.wrapper_mappings = { string: :prepend } + + # Namespaces where SimpleForm should look for custom input classes that + # override default inputs. + # config.custom_inputs_namespaces << "CustomInputs" + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'checkbox' + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + # config.include_default_input_wrapper_class = true + + # Defines which i18n scope will be used in Simple Form. + # config.i18n_scope = 'simple_form' + + # Defines validation classes to the input_field. By default it's nil. + # config.input_field_valid_class = 'is-valid' + # config.input_field_error_class = 'is-invalid' +end diff --git a/2/Tracker/config/initializers/simple_form_bootstrap.rb b/2/Tracker/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 0000000..0178fd5 --- /dev/null +++ b/2/Tracker/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,439 @@ +# frozen_string_literal: true + +# Please do not make direct changes to this file! +# This generator is maintained by the community around simple_form-bootstrap: +# https://github.com/rafaelfranca/simple_form-bootstrap +# All future development, tests, and organization should happen there. +# Background history: https://github.com/plataformatec/simple_form/issues/1561 + +# Uncomment this and change the path if necessary to include your own +# components. +# See https://github.com/plataformatec/simple_form#custom-components +# to know more about custom components. +# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f } + +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Default class for buttons + config.button_class = 'btn' + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'form-check-label' + + # How the label text should be generated altogether with the required text. + config.label_text = lambda { |label, required, explicit_label| "#{label} #{required}" } + + # Define the way to render check boxes / radio buttons with labels. + config.boolean_style = :inline + + # You can wrap each item in a collection of radio/check boxes with a tag + config.item_wrapper_tag = :div + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + config.include_default_input_wrapper_class = false + + # CSS class to add for error notification helper. + config.error_notification_class = 'alert alert-danger' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # :to_sentence to list all errors for each field. + config.error_method = :to_sentence + + # add validation classes to `input_field` + config.input_field_error_class = 'is-invalid' + config.input_field_valid_class = 'is-valid' + + + # vertical forms + # + # vertical default_wrapper + config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'form-control-label' + b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical input for boolean + config.wrappers :vertical_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb| + bb.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'form-check-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # vertical input for radio buttons and check boxes + config.wrappers :vertical_collection, item_wrapper_class: 'form-check', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical input for inline radio buttons and check boxes + config.wrappers :vertical_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical file input + config.wrappers :vertical_file, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label + b.use :input, class: 'form-control-file', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical multi select + config.wrappers :vertical_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'form-control-label' + b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba| + ba.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid' + end + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # vertical range input + config.wrappers :vertical_range, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + b.optional :step + b.use :label + b.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # horizontal forms + # + # horizontal default_wrapper + config.wrappers :horizontal_form, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'col-sm-3 col-form-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal input for boolean + config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper tag: 'label', class: 'col-sm-3' do |ba| + ba.use :label_text + end + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |wr| + wr.wrapper :form_check_wrapper, tag: 'div', class: 'form-check' do |bb| + bb.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'form-check-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + end + + # horizontal input for radio buttons and check boxes + config.wrappers :horizontal_collection, item_wrapper_class: 'form-check', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal input for inline radio buttons and check boxes + config.wrappers :horizontal_collection_inline, item_wrapper_class: 'form-check form-check-inline', tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal file input + config.wrappers :horizontal_file, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal multi select + config.wrappers :horizontal_multi_select, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |bb| + bb.use :input, class: 'form-control mx-1', error_class: 'is-invalid', valid_class: 'is-valid' + end + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # horizontal range input + config.wrappers :horizontal_range, tag: 'div', class: 'form-group row', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + b.optional :step + b.use :label, class: 'col-sm-3 form-control-label' + b.wrapper :grid_wrapper, tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control-range', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + ba.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + + # inline forms + # + # inline default_wrapper + config.wrappers :inline_form, tag: 'span', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'sr-only' + + b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.optional :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # inline input for boolean + config.wrappers :inline_boolean, tag: 'span', class: 'form-check flex-wrap justify-content-start mr-sm-2', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :input, class: 'form-check-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label, class: 'form-check-label' + b.use :error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.optional :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # bootstrap custom forms + # + # custom input for boolean + config.wrappers :custom_boolean, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox' do |bb| + bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'custom-control-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + config.wrappers :custom_boolean_switch, tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :form_check_wrapper, tag: 'div', class: 'custom-control custom-checkbox-switch' do |bb| + bb.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + bb.use :label, class: 'custom-control-label' + bb.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + bb.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + end + + # custom input for radio buttons and check boxes + config.wrappers :custom_collection, item_wrapper_class: 'custom-control', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom input for inline radio buttons and check boxes + config.wrappers :custom_collection_inline, item_wrapper_class: 'custom-control custom-control-inline', tag: 'fieldset', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.wrapper :legend_tag, tag: 'legend', class: 'col-form-label pt-0' do |ba| + ba.use :label_text + end + b.use :input, class: 'custom-control-input', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom file input + config.wrappers :custom_file, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :readonly + b.use :label, class: 'form-control-label' + b.wrapper :custom_file_wrapper, tag: 'div', class: 'custom-file' do |ba| + ba.use :input, class: 'custom-file-input', error_class: 'is-invalid', valid_class: 'is-valid' + ba.use :label, class: 'custom-file-label' + ba.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + end + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom multi select + config.wrappers :custom_multi_select, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'form-control-label' + b.wrapper tag: 'div', class: 'd-flex flex-row justify-content-between align-items-center' do |ba| + ba.use :input, class: 'custom-select mx-1', error_class: 'is-invalid', valid_class: 'is-valid' + end + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom range input + config.wrappers :custom_range, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :readonly + b.optional :step + b.use :label, class: 'form-control-label' + b.use :input, class: 'custom-range', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # Input Group - custom component + # see example app and config at https://github.com/rafaelfranca/simple_form-bootstrap + # config.wrappers :input_group, tag: 'div', class: 'form-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + # b.use :html5 + # b.use :placeholder + # b.optional :maxlength + # b.optional :minlength + # b.optional :pattern + # b.optional :min_max + # b.optional :readonly + # b.use :label, class: 'form-control-label' + # b.wrapper :input_group_tag, tag: 'div', class: 'input-group' do |ba| + # ba.optional :prepend + # ba.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + # ba.optional :append + # end + # b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback d-block' } + # b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + # end + + + # Floating Labels form + # + # floating labels default_wrapper + config.wrappers :floating_labels_form, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :minlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :input, class: 'form-control', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label, class: 'form-control-label' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + # custom multi select + config.wrappers :floating_labels_select, tag: 'div', class: 'form-label-group', error_class: 'form-group-invalid', valid_class: 'form-group-valid' do |b| + b.use :html5 + b.optional :readonly + b.use :input, class: 'custom-select custom-select-lg', error_class: 'is-invalid', valid_class: 'is-valid' + b.use :label, class: 'form-control-label' + b.use :full_error, wrap_with: { tag: 'div', class: 'invalid-feedback' } + b.use :hint, wrap_with: { tag: 'small', class: 'form-text text-muted' } + end + + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :vertical_form + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + config.wrapper_mappings = { + boolean: :vertical_boolean, + check_boxes: :vertical_collection, + date: :vertical_multi_select, + datetime: :vertical_multi_select, + file: :vertical_file, + radio_buttons: :vertical_collection, + range: :vertical_range, + time: :vertical_multi_select + } + + # enable custom form wrappers + # config.wrapper_mappings = { + # boolean: :custom_boolean, + # check_boxes: :custom_collection, + # date: :custom_multi_select, + # datetime: :custom_multi_select, + # file: :custom_file, + # radio_buttons: :custom_collection, + # range: :custom_range, + # time: :custom_multi_select + # } +end diff --git a/2/Tracker/config/initializers/wrap_parameters.rb b/2/Tracker/config/initializers/wrap_parameters.rb new file mode 100644 index 0000000..bbfc396 --- /dev/null +++ b/2/Tracker/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/2/Tracker/config/locales/devise.en.yml b/2/Tracker/config/locales/devise.en.yml new file mode 100644 index 0000000..55617bd --- /dev/null +++ b/2/Tracker/config/locales/devise.en.yml @@ -0,0 +1,65 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + email_changed: + subject: "Email Changed" + password_change: + subject: "Password Changed" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." + updated: "Your account has been updated successfully." + updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again" + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/2/Tracker/config/locales/en.yml b/2/Tracker/config/locales/en.yml new file mode 100644 index 0000000..decc5a8 --- /dev/null +++ b/2/Tracker/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at http://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/2/Tracker/config/locales/simple_form.en.yml b/2/Tracker/config/locales/simple_form.en.yml new file mode 100644 index 0000000..2374383 --- /dev/null +++ b/2/Tracker/config/locales/simple_form.en.yml @@ -0,0 +1,31 @@ +en: + simple_form: + "yes": 'Yes' + "no": 'No' + required: + text: 'required' + mark: '*' + # You can uncomment the line below if you need to overwrite the whole required html. + # When using html, text and mark won't be used. + # html: '*' + error_notification: + default_message: "Please review the problems below:" + # Examples + # labels: + # defaults: + # password: 'Password' + # user: + # new: + # email: 'E-mail to sign in.' + # edit: + # email: 'E-mail.' + # hints: + # defaults: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + # include_blanks: + # defaults: + # age: 'Rather not say' + # prompts: + # defaults: + # age: 'Select your age' diff --git a/2/Tracker/config/puma.rb b/2/Tracker/config/puma.rb new file mode 100644 index 0000000..a5eccf8 --- /dev/null +++ b/2/Tracker/config/puma.rb @@ -0,0 +1,34 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +threads threads_count, threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked webserver processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/2/Tracker/config/routes.rb b/2/Tracker/config/routes.rb new file mode 100644 index 0000000..064b309 --- /dev/null +++ b/2/Tracker/config/routes.rb @@ -0,0 +1,8 @@ +Rails.application.routes.draw do + resources :ingestions + mount RailsAdmin::Engine => '/admin', as: 'rails_admin' + resources :dishes + devise_for :users + root to:'ingestions#index' + # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html +end diff --git a/2/Tracker/config/spring.rb b/2/Tracker/config/spring.rb new file mode 100644 index 0000000..9fa7863 --- /dev/null +++ b/2/Tracker/config/spring.rb @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff --git a/2/Tracker/config/storage.yml b/2/Tracker/config/storage.yml new file mode 100644 index 0000000..d32f76e --- /dev/null +++ b/2/Tracker/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/2/Tracker/db/migrate/20190224192900_devise_create_users.rb b/2/Tracker/db/migrate/20190224192900_devise_create_users.rb new file mode 100644 index 0000000..e4fe133 --- /dev/null +++ b/2/Tracker/db/migrate/20190224192900_devise_create_users.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +class DeviseCreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + # t.integer :sign_in_count, default: 0, null: false + # t.datetime :current_sign_in_at + # t.datetime :last_sign_in_at + # t.inet :current_sign_in_ip + # t.inet :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb b/2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb new file mode 100644 index 0000000..7b3e7e2 --- /dev/null +++ b/2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb @@ -0,0 +1,5 @@ +class AddFirstnameToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :firstname, :string + end +end diff --git a/2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb b/2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb new file mode 100644 index 0000000..e0fc958 --- /dev/null +++ b/2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb @@ -0,0 +1,5 @@ +class AddLastnameToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :lastname, :string + end +end diff --git a/2/Tracker/db/migrate/20190224193301_add_age_to_users.rb b/2/Tracker/db/migrate/20190224193301_add_age_to_users.rb new file mode 100644 index 0000000..f4e7fca --- /dev/null +++ b/2/Tracker/db/migrate/20190224193301_add_age_to_users.rb @@ -0,0 +1,5 @@ +class AddAgeToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :age, :integer + end +end diff --git a/2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb b/2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb new file mode 100644 index 0000000..2b900b1 --- /dev/null +++ b/2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb @@ -0,0 +1,5 @@ +class AddWeightToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :weight, :integer + end +end diff --git a/2/Tracker/db/migrate/20190224193327_add_height_to_users.rb b/2/Tracker/db/migrate/20190224193327_add_height_to_users.rb new file mode 100644 index 0000000..99e9e81 --- /dev/null +++ b/2/Tracker/db/migrate/20190224193327_add_height_to_users.rb @@ -0,0 +1,5 @@ +class AddHeightToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :height, :integer + end +end diff --git a/2/Tracker/db/migrate/20190226193152_create_dishes.rb b/2/Tracker/db/migrate/20190226193152_create_dishes.rb new file mode 100644 index 0000000..972a396 --- /dev/null +++ b/2/Tracker/db/migrate/20190226193152_create_dishes.rb @@ -0,0 +1,15 @@ +class CreateDishes < ActiveRecord::Migration[5.2] + def change + create_table :dishes do |t| + t.string :name + t.integer :weight + t.string :calorie_value + t.string :integer + t.float :proteins + t.float :carbohydrates + t.float :fats + + t.timestamps + end + end +end diff --git a/2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb b/2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb new file mode 100644 index 0000000..bea5d5d --- /dev/null +++ b/2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb @@ -0,0 +1,5 @@ +class RemoveIntegerFromDishes < ActiveRecord::Migration[5.2] + def change + remove_column :dishes, :integer + end +end diff --git a/2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb b/2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb new file mode 100644 index 0000000..cef5974 --- /dev/null +++ b/2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb @@ -0,0 +1,5 @@ +class AddAdminToUsers < ActiveRecord::Migration[5.2] + def change + add_column :users, :admin, :boolean + end +end diff --git a/2/Tracker/db/migrate/20190227205238_create_ingestions.rb b/2/Tracker/db/migrate/20190227205238_create_ingestions.rb new file mode 100644 index 0000000..001e369 --- /dev/null +++ b/2/Tracker/db/migrate/20190227205238_create_ingestions.rb @@ -0,0 +1,11 @@ +class CreateIngestions < ActiveRecord::Migration[5.2] + def change + create_table :ingestions do |t| + t.belongs_to :user, foreign_key: true + t.references :dish, foreign_key: true + t.string :name + + t.timestamps + end + end +end diff --git a/2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb b/2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb new file mode 100644 index 0000000..cf64171 --- /dev/null +++ b/2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb @@ -0,0 +1,10 @@ +class CreateDishIngestions < ActiveRecord::Migration[5.2] + def change + create_table :dish_ingestions do |t| + t.references :dish, foreign_key: true + t.references :ingestion, foreign_key: true + + t.timestamps + end + end +end diff --git a/2/Tracker/db/schema.rb b/2/Tracker/db/schema.rb new file mode 100644 index 0000000..3fc2653 --- /dev/null +++ b/2/Tracker/db/schema.rb @@ -0,0 +1,70 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2019_02_27_210940) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "dish_ingestions", force: :cascade do |t| + t.bigint "dish_id" + t.bigint "ingestion_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["dish_id"], name: "index_dish_ingestions_on_dish_id" + t.index ["ingestion_id"], name: "index_dish_ingestions_on_ingestion_id" + end + + create_table "dishes", force: :cascade do |t| + t.string "name" + t.integer "weight" + t.string "calorie_value" + t.float "proteins" + t.float "carbohydrates" + t.float "fats" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "ingestions", force: :cascade do |t| + t.bigint "user_id" + t.bigint "dish_id" + t.string "name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["dish_id"], name: "index_ingestions_on_dish_id" + t.index ["user_id"], name: "index_ingestions_on_user_id" + end + + create_table "users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "firstname" + t.string "lastname" + t.integer "age" + t.integer "weight" + t.integer "height" + t.boolean "admin" + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end + + add_foreign_key "dish_ingestions", "dishes" + add_foreign_key "dish_ingestions", "ingestions" + add_foreign_key "ingestions", "dishes" + add_foreign_key "ingestions", "users" +end diff --git a/2/Tracker/db/seeds.rb b/2/Tracker/db/seeds.rb new file mode 100644 index 0000000..1beea2a --- /dev/null +++ b/2/Tracker/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/2/Tracker/lib/assets/.keep b/2/Tracker/lib/assets/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/lib/tasks/.keep b/2/Tracker/lib/tasks/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/lib/templates/slim/scaffold/_form.html.slim b/2/Tracker/lib/templates/slim/scaffold/_form.html.slim new file mode 100644 index 0000000..3427928 --- /dev/null +++ b/2/Tracker/lib/templates/slim/scaffold/_form.html.slim @@ -0,0 +1,11 @@ += simple_form_for(@<%= singular_table_name %>) do |f| + = f.error_notification + = f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? + + .form-inputs +<%- attributes.each do |attribute| -%> + = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> +<%- end -%> + + .form-actions + = f.button :submit diff --git a/2/Tracker/log/.keep b/2/Tracker/log/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/package.json b/2/Tracker/package.json new file mode 100644 index 0000000..55ccc6f --- /dev/null +++ b/2/Tracker/package.json @@ -0,0 +1,5 @@ +{ + "name": "Tracker", + "private": true, + "dependencies": {} +} diff --git a/2/Tracker/public/404.html b/2/Tracker/public/404.html new file mode 100644 index 0000000..2be3af2 --- /dev/null +++ b/2/Tracker/public/404.html @@ -0,0 +1,67 @@ + + + + The page you were looking for doesn't exist (404) + + + + + + +
+
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/2/Tracker/public/422.html b/2/Tracker/public/422.html new file mode 100644 index 0000000..c08eac0 --- /dev/null +++ b/2/Tracker/public/422.html @@ -0,0 +1,67 @@ + + + + The change you wanted was rejected (422) + + + + + + +
+
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/2/Tracker/public/500.html b/2/Tracker/public/500.html new file mode 100644 index 0000000..78a030a --- /dev/null +++ b/2/Tracker/public/500.html @@ -0,0 +1,66 @@ + + + + We're sorry, but something went wrong (500) + + + + + + +
+
+

We're sorry, but something went wrong.

+
+

If you are the application owner check the logs for more information.

+
+ + diff --git a/2/Tracker/public/apple-touch-icon-precomposed.png b/2/Tracker/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/public/apple-touch-icon.png b/2/Tracker/public/apple-touch-icon.png new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/public/favicon.ico b/2/Tracker/public/favicon.ico new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/public/robots.txt b/2/Tracker/public/robots.txt new file mode 100644 index 0000000..37b576a --- /dev/null +++ b/2/Tracker/public/robots.txt @@ -0,0 +1 @@ +# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/2/Tracker/storage/.keep b/2/Tracker/storage/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/application_system_test_case.rb b/2/Tracker/test/application_system_test_case.rb new file mode 100644 index 0000000..d19212a --- /dev/null +++ b/2/Tracker/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/2/Tracker/test/controllers/.keep b/2/Tracker/test/controllers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/controllers/dishes_controller_test.rb b/2/Tracker/test/controllers/dishes_controller_test.rb new file mode 100644 index 0000000..4f066a9 --- /dev/null +++ b/2/Tracker/test/controllers/dishes_controller_test.rb @@ -0,0 +1,48 @@ +require 'test_helper' + +class DishesControllerTest < ActionDispatch::IntegrationTest + setup do + @dish = dishes(:one) + end + + test "should get index" do + get dishes_url + assert_response :success + end + + test "should get new" do + get new_dish_url + assert_response :success + end + + test "should create dish" do + assert_difference('Dish.count') do + post dishes_url, params: { dish: { calorie_value: @dish.calorie_value, carbohydrates: @dish.carbohydrates, fats: @dish.fats, integer: @dish.integer, name: @dish.name, proteins: @dish.proteins, weight: @dish.weight } } + end + + assert_redirected_to dish_url(Dish.last) + end + + test "should show dish" do + get dish_url(@dish) + assert_response :success + end + + test "should get edit" do + get edit_dish_url(@dish) + assert_response :success + end + + test "should update dish" do + patch dish_url(@dish), params: { dish: { calorie_value: @dish.calorie_value, carbohydrates: @dish.carbohydrates, fats: @dish.fats, integer: @dish.integer, name: @dish.name, proteins: @dish.proteins, weight: @dish.weight } } + assert_redirected_to dish_url(@dish) + end + + test "should destroy dish" do + assert_difference('Dish.count', -1) do + delete dish_url(@dish) + end + + assert_redirected_to dishes_url + end +end diff --git a/2/Tracker/test/controllers/ingestions_controller_test.rb b/2/Tracker/test/controllers/ingestions_controller_test.rb new file mode 100644 index 0000000..9b33407 --- /dev/null +++ b/2/Tracker/test/controllers/ingestions_controller_test.rb @@ -0,0 +1,48 @@ +require 'test_helper' + +class IngestionsControllerTest < ActionDispatch::IntegrationTest + setup do + @ingestion = ingestions(:one) + end + + test "should get index" do + get ingestions_url + assert_response :success + end + + test "should get new" do + get new_ingestion_url + assert_response :success + end + + test "should create ingestion" do + assert_difference('Ingestion.count') do + post ingestions_url, params: { ingestion: { dish_id: @ingestion.dish_id, name: @ingestion.name, user_id: @ingestion.user_id } } + end + + assert_redirected_to ingestion_url(Ingestion.last) + end + + test "should show ingestion" do + get ingestion_url(@ingestion) + assert_response :success + end + + test "should get edit" do + get edit_ingestion_url(@ingestion) + assert_response :success + end + + test "should update ingestion" do + patch ingestion_url(@ingestion), params: { ingestion: { dish_id: @ingestion.dish_id, name: @ingestion.name, user_id: @ingestion.user_id } } + assert_redirected_to ingestion_url(@ingestion) + end + + test "should destroy ingestion" do + assert_difference('Ingestion.count', -1) do + delete ingestion_url(@ingestion) + end + + assert_redirected_to ingestions_url + end +end diff --git a/2/Tracker/test/fixtures/.keep b/2/Tracker/test/fixtures/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/fixtures/dish_ingestions.yml b/2/Tracker/test/fixtures/dish_ingestions.yml new file mode 100644 index 0000000..8cab6ef --- /dev/null +++ b/2/Tracker/test/fixtures/dish_ingestions.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + dish: one + ingestion: one + +two: + dish: two + ingestion: two diff --git a/2/Tracker/test/fixtures/dishes.yml b/2/Tracker/test/fixtures/dishes.yml new file mode 100644 index 0000000..263c7ec --- /dev/null +++ b/2/Tracker/test/fixtures/dishes.yml @@ -0,0 +1,19 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + weight: 1 + calorie_value: MyString + integer: MyString + proteins: 1.5 + carbohydrates: 1.5 + fats: 1.5 + +two: + name: MyString + weight: 1 + calorie_value: MyString + integer: MyString + proteins: 1.5 + carbohydrates: 1.5 + fats: 1.5 diff --git a/2/Tracker/test/fixtures/files/.keep b/2/Tracker/test/fixtures/files/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/fixtures/ingestions.yml b/2/Tracker/test/fixtures/ingestions.yml new file mode 100644 index 0000000..c511559 --- /dev/null +++ b/2/Tracker/test/fixtures/ingestions.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + user: one + dish: one + name: MyString + +two: + user: two + dish: two + name: MyString diff --git a/2/Tracker/test/fixtures/users.yml b/2/Tracker/test/fixtures/users.yml new file mode 100644 index 0000000..80aed36 --- /dev/null +++ b/2/Tracker/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/2/Tracker/test/helpers/.keep b/2/Tracker/test/helpers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/integration/.keep b/2/Tracker/test/integration/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/mailers/.keep b/2/Tracker/test/mailers/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/models/.keep b/2/Tracker/test/models/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/models/dish_ingestion_test.rb b/2/Tracker/test/models/dish_ingestion_test.rb new file mode 100644 index 0000000..89e89a0 --- /dev/null +++ b/2/Tracker/test/models/dish_ingestion_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class DishIngestionTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/2/Tracker/test/models/dish_test.rb b/2/Tracker/test/models/dish_test.rb new file mode 100644 index 0000000..a73e35e --- /dev/null +++ b/2/Tracker/test/models/dish_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class DishTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/2/Tracker/test/models/ingestion_test.rb b/2/Tracker/test/models/ingestion_test.rb new file mode 100644 index 0000000..97ddc10 --- /dev/null +++ b/2/Tracker/test/models/ingestion_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class IngestionTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/2/Tracker/test/models/user_test.rb b/2/Tracker/test/models/user_test.rb new file mode 100644 index 0000000..82f61e0 --- /dev/null +++ b/2/Tracker/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/2/Tracker/test/system/.keep b/2/Tracker/test/system/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/test/system/dishes_test.rb b/2/Tracker/test/system/dishes_test.rb new file mode 100644 index 0000000..e315fd9 --- /dev/null +++ b/2/Tracker/test/system/dishes_test.rb @@ -0,0 +1,55 @@ +require "application_system_test_case" + +class DishesTest < ApplicationSystemTestCase + setup do + @dish = dishes(:one) + end + + test "visiting the index" do + visit dishes_url + assert_selector "h1", text: "Dishes" + end + + test "creating a Dish" do + visit dishes_url + click_on "New Dish" + + fill_in "Calorie value", with: @dish.calorie_value + fill_in "Carbohydrates", with: @dish.carbohydrates + fill_in "Fats", with: @dish.fats + fill_in "Integer", with: @dish.integer + fill_in "Name", with: @dish.name + fill_in "Proteins", with: @dish.proteins + fill_in "Weight", with: @dish.weight + click_on "Create Dish" + + assert_text "Dish was successfully created" + click_on "Back" + end + + test "updating a Dish" do + visit dishes_url + click_on "Edit", match: :first + + fill_in "Calorie value", with: @dish.calorie_value + fill_in "Carbohydrates", with: @dish.carbohydrates + fill_in "Fats", with: @dish.fats + fill_in "Integer", with: @dish.integer + fill_in "Name", with: @dish.name + fill_in "Proteins", with: @dish.proteins + fill_in "Weight", with: @dish.weight + click_on "Update Dish" + + assert_text "Dish was successfully updated" + click_on "Back" + end + + test "destroying a Dish" do + visit dishes_url + page.accept_confirm do + click_on "Destroy", match: :first + end + + assert_text "Dish was successfully destroyed" + end +end diff --git a/2/Tracker/test/system/ingestions_test.rb b/2/Tracker/test/system/ingestions_test.rb new file mode 100644 index 0000000..0bb7b37 --- /dev/null +++ b/2/Tracker/test/system/ingestions_test.rb @@ -0,0 +1,47 @@ +require "application_system_test_case" + +class IngestionsTest < ApplicationSystemTestCase + setup do + @ingestion = ingestions(:one) + end + + test "visiting the index" do + visit ingestions_url + assert_selector "h1", text: "Ingestions" + end + + test "creating a Ingestion" do + visit ingestions_url + click_on "New Ingestion" + + fill_in "Dish", with: @ingestion.dish_id + fill_in "Name", with: @ingestion.name + fill_in "User", with: @ingestion.user_id + click_on "Create Ingestion" + + assert_text "Ingestion was successfully created" + click_on "Back" + end + + test "updating a Ingestion" do + visit ingestions_url + click_on "Edit", match: :first + + fill_in "Dish", with: @ingestion.dish_id + fill_in "Name", with: @ingestion.name + fill_in "User", with: @ingestion.user_id + click_on "Update Ingestion" + + assert_text "Ingestion was successfully updated" + click_on "Back" + end + + test "destroying a Ingestion" do + visit ingestions_url + page.accept_confirm do + click_on "Destroy", match: :first + end + + assert_text "Ingestion was successfully destroyed" + end +end diff --git a/2/Tracker/test/test_helper.rb b/2/Tracker/test/test_helper.rb new file mode 100644 index 0000000..3ab84e3 --- /dev/null +++ b/2/Tracker/test/test_helper.rb @@ -0,0 +1,10 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/2/Tracker/tmp/.keep b/2/Tracker/tmp/.keep new file mode 100644 index 0000000..e69de29 diff --git a/2/Tracker/vendor/.keep b/2/Tracker/vendor/.keep new file mode 100644 index 0000000..e69de29 From de28c65c5730a9b1c85214f2d47353006654423b Mon Sep 17 00:00:00 2001 From: valkovik15 Date: Thu, 28 Feb 2019 17:41:19 +0300 Subject: [PATCH 2/3] First_1 --- {2 => Valentine Kopotchel/2}/Tracker/.gitignore | 0 {2 => Valentine Kopotchel/2}/Tracker/.ruby-version | 0 {2 => Valentine Kopotchel/2}/Tracker/Gemfile | 0 {2 => Valentine Kopotchel/2}/Tracker/Gemfile.lock | 0 {2 => Valentine Kopotchel/2}/Tracker/README.md | 0 {2 => Valentine Kopotchel/2}/Tracker/Rakefile | 0 .../2}/Tracker/app/assets/config/manifest.js | 0 {2 => Valentine Kopotchel/2}/Tracker/app/assets/images/.keep | 0 .../2}/Tracker/app/assets/javascripts/application.js | 0 .../2}/Tracker/app/assets/javascripts/cable.js | 0 .../2}/Tracker/app/assets/javascripts/channels/.keep | 0 .../2}/Tracker/app/assets/javascripts/dishes.coffee | 0 .../2}/Tracker/app/assets/javascripts/ingestions.coffee | 0 .../2}/Tracker/app/assets/stylesheets/application.scss | 0 .../2}/Tracker/app/assets/stylesheets/dishes.scss | 0 .../2}/Tracker/app/assets/stylesheets/ingestions.scss | 0 .../2}/Tracker/app/assets/stylesheets/scaffolds.scss | 0 .../2}/Tracker/app/channels/application_cable/channel.rb | 0 .../2}/Tracker/app/channels/application_cable/connection.rb | 0 .../2}/Tracker/app/controllers/application_controller.rb | 0 .../2}/Tracker/app/controllers/concerns/.keep | 0 .../2}/Tracker/app/controllers/dishes_controller.rb | 0 .../2}/Tracker/app/controllers/ingestions_controller.rb | 0 .../2}/Tracker/app/controllers/users/confirmations_controller.rb | 0 .../app/controllers/users/omniauth_callbacks_controller.rb | 0 .../2}/Tracker/app/controllers/users/passwords_controller.rb | 0 .../2}/Tracker/app/controllers/users/registrations_controller.rb | 0 .../2}/Tracker/app/controllers/users/sessions_controller.rb | 0 .../2}/Tracker/app/controllers/users/unlocks_controller.rb | 0 .../2}/Tracker/app/helpers/application_helper.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/app/helpers/dishes_helper.rb | 0 .../2}/Tracker/app/helpers/ingestions_helper.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/app/jobs/application_job.rb | 0 .../2}/Tracker/app/mailers/application_mailer.rb | 0 .../2}/Tracker/app/models/application_record.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/app/models/concerns/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/app/models/dish.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/app/models/dish_ingestion.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/app/models/ingestion.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/app/models/user.rb | 0 .../2}/Tracker/app/views/devise/confirmations/new.html.erb | 0 .../app/views/devise/mailer/confirmation_instructions.html.erb | 0 .../2}/Tracker/app/views/devise/mailer/email_changed.html.erb | 0 .../2}/Tracker/app/views/devise/mailer/password_change.html.erb | 0 .../app/views/devise/mailer/reset_password_instructions.html.erb | 0 .../Tracker/app/views/devise/mailer/unlock_instructions.html.erb | 0 .../2}/Tracker/app/views/devise/passwords/edit.html.erb | 0 .../2}/Tracker/app/views/devise/passwords/new.html.erb | 0 .../2}/Tracker/app/views/devise/registrations/edit.html.erb | 0 .../2}/Tracker/app/views/devise/registrations/new.html.erb | 0 .../2}/Tracker/app/views/devise/sessions/new.html.erb | 0 .../2}/Tracker/app/views/devise/shared/_error_messages.html.erb | 0 .../2}/Tracker/app/views/devise/shared/_links.html.erb | 0 .../2}/Tracker/app/views/devise/unlocks/new.html.erb | 0 .../2}/Tracker/app/views/dishes/_dish.json.jbuilder | 0 .../2}/Tracker/app/views/dishes/_form.html.slim | 0 .../2}/Tracker/app/views/dishes/edit.html.slim | 0 .../2}/Tracker/app/views/dishes/index.html.slim | 0 .../2}/Tracker/app/views/dishes/index.json.jbuilder | 0 .../2}/Tracker/app/views/dishes/new.html.slim | 0 .../2}/Tracker/app/views/dishes/show.html.slim | 0 .../2}/Tracker/app/views/dishes/show.json.jbuilder | 0 .../2}/Tracker/app/views/ingestions/_form.html.slim | 0 .../2}/Tracker/app/views/ingestions/_ingestion.json.jbuilder | 0 .../2}/Tracker/app/views/ingestions/edit.html.slim | 0 .../2}/Tracker/app/views/ingestions/index.html.slim | 0 .../2}/Tracker/app/views/ingestions/index.json.jbuilder | 0 .../2}/Tracker/app/views/ingestions/new.html.slim | 0 .../2}/Tracker/app/views/ingestions/show.html.slim | 0 .../2}/Tracker/app/views/ingestions/show.json.jbuilder | 0 .../2}/Tracker/app/views/layouts/application.html.erb | 0 .../2}/Tracker/app/views/layouts/mailer.html.erb | 0 .../2}/Tracker/app/views/layouts/mailer.text.erb | 0 .../2}/Tracker/app/views/users/_form.html.slim | 0 .../2}/Tracker/app/views/users/edit.html.slim | 0 .../2}/Tracker/app/views/users/index.html.slim | 0 .../2}/Tracker/app/views/users/new.html.slim | 0 .../2}/Tracker/app/views/users/show.html.slim | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/bundle | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/rails | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/rake | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/setup | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/spring | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/update | 0 {2 => Valentine Kopotchel/2}/Tracker/bin/yarn | 0 {2 => Valentine Kopotchel/2}/Tracker/config.ru | 0 {2 => Valentine Kopotchel/2}/Tracker/config/application.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/boot.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/cable.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/config/credentials.yml.enc | 0 {2 => Valentine Kopotchel/2}/Tracker/config/database.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/config/environment.rb | 0 .../2}/Tracker/config/environments/development.rb | 0 .../2}/Tracker/config/environments/production.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/environments/test.rb | 0 .../config/initializers/application_controller_renderer.rb | 0 .../2}/Tracker/config/initializers/assets.rb | 0 .../2}/Tracker/config/initializers/backtrace_silencers.rb | 0 .../2}/Tracker/config/initializers/chartkick.rb | 0 .../2}/Tracker/config/initializers/content_security_policy.rb | 0 .../2}/Tracker/config/initializers/cookies_serializer.rb | 0 .../2}/Tracker/config/initializers/devise.rb | 0 .../2}/Tracker/config/initializers/filter_parameter_logging.rb | 0 .../2}/Tracker/config/initializers/inflections.rb | 0 .../2}/Tracker/config/initializers/mime_types.rb | 0 .../2}/Tracker/config/initializers/rails_admin.rb | 0 .../2}/Tracker/config/initializers/simple_form.rb | 0 .../2}/Tracker/config/initializers/simple_form_bootstrap.rb | 0 .../2}/Tracker/config/initializers/wrap_parameters.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/locales/devise.en.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/config/locales/en.yml | 0 .../2}/Tracker/config/locales/simple_form.en.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/config/puma.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/routes.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/spring.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/config/storage.yml | 0 .../2}/Tracker/db/migrate/20190224192900_devise_create_users.rb | 0 .../Tracker/db/migrate/20190224193133_add_firstname_to_users.rb | 0 .../2}/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb | 0 .../2}/Tracker/db/migrate/20190224193301_add_age_to_users.rb | 0 .../2}/Tracker/db/migrate/20190224193313_add_weight_to_users.rb | 0 .../2}/Tracker/db/migrate/20190224193327_add_height_to_users.rb | 0 .../2}/Tracker/db/migrate/20190226193152_create_dishes.rb | 0 .../db/migrate/20190227163338_remove_integer_from_dishes.rb | 0 .../2}/Tracker/db/migrate/20190227201447_add_admin_to_users.rb | 0 .../2}/Tracker/db/migrate/20190227205238_create_ingestions.rb | 0 .../Tracker/db/migrate/20190227210940_create_dish_ingestions.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/db/schema.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/db/seeds.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/lib/assets/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/lib/tasks/.keep | 0 .../2}/Tracker/lib/templates/slim/scaffold/_form.html.slim | 0 {2 => Valentine Kopotchel/2}/Tracker/log/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/package.json | 0 {2 => Valentine Kopotchel/2}/Tracker/public/404.html | 0 {2 => Valentine Kopotchel/2}/Tracker/public/422.html | 0 {2 => Valentine Kopotchel/2}/Tracker/public/500.html | 0 .../2}/Tracker/public/apple-touch-icon-precomposed.png | 0 {2 => Valentine Kopotchel/2}/Tracker/public/apple-touch-icon.png | 0 {2 => Valentine Kopotchel/2}/Tracker/public/favicon.ico | 0 {2 => Valentine Kopotchel/2}/Tracker/public/robots.txt | 0 {2 => Valentine Kopotchel/2}/Tracker/storage/.keep | 0 .../2}/Tracker/test/application_system_test_case.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/test/controllers/.keep | 0 .../2}/Tracker/test/controllers/dishes_controller_test.rb | 0 .../2}/Tracker/test/controllers/ingestions_controller_test.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/.keep | 0 .../2}/Tracker/test/fixtures/dish_ingestions.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/dishes.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/files/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/ingestions.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/users.yml | 0 {2 => Valentine Kopotchel/2}/Tracker/test/helpers/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/test/integration/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/test/mailers/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/test/models/.keep | 0 .../2}/Tracker/test/models/dish_ingestion_test.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/test/models/dish_test.rb | 0 .../2}/Tracker/test/models/ingestion_test.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/test/models/user_test.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/test/system/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/test/system/dishes_test.rb | 0 .../2}/Tracker/test/system/ingestions_test.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/test/test_helper.rb | 0 {2 => Valentine Kopotchel/2}/Tracker/tmp/.keep | 0 {2 => Valentine Kopotchel/2}/Tracker/vendor/.keep | 0 166 files changed, 0 insertions(+), 0 deletions(-) rename {2 => Valentine Kopotchel/2}/Tracker/.gitignore (100%) rename {2 => Valentine Kopotchel/2}/Tracker/.ruby-version (100%) rename {2 => Valentine Kopotchel/2}/Tracker/Gemfile (100%) rename {2 => Valentine Kopotchel/2}/Tracker/Gemfile.lock (100%) rename {2 => Valentine Kopotchel/2}/Tracker/README.md (100%) rename {2 => Valentine Kopotchel/2}/Tracker/Rakefile (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/config/manifest.js (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/images/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/javascripts/application.js (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/javascripts/cable.js (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/javascripts/channels/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/javascripts/dishes.coffee (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/javascripts/ingestions.coffee (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/stylesheets/application.scss (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/stylesheets/dishes.scss (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/stylesheets/ingestions.scss (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/assets/stylesheets/scaffolds.scss (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/channels/application_cable/channel.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/channels/application_cable/connection.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/application_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/concerns/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/dishes_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/ingestions_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/users/confirmations_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/users/omniauth_callbacks_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/users/passwords_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/users/registrations_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/users/sessions_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/controllers/users/unlocks_controller.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/helpers/application_helper.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/helpers/dishes_helper.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/helpers/ingestions_helper.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/jobs/application_job.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/mailers/application_mailer.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/models/application_record.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/models/concerns/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/models/dish.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/models/dish_ingestion.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/models/ingestion.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/models/user.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/confirmations/new.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/mailer/email_changed.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/mailer/password_change.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/mailer/unlock_instructions.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/passwords/edit.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/passwords/new.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/registrations/edit.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/registrations/new.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/sessions/new.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/shared/_error_messages.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/shared/_links.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/devise/unlocks/new.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/_dish.json.jbuilder (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/_form.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/edit.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/index.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/index.json.jbuilder (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/new.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/show.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/dishes/show.json.jbuilder (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/_form.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/_ingestion.json.jbuilder (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/edit.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/index.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/index.json.jbuilder (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/new.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/show.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/ingestions/show.json.jbuilder (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/layouts/application.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/layouts/mailer.html.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/layouts/mailer.text.erb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/users/_form.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/users/edit.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/users/index.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/users/new.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/app/views/users/show.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/bundle (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/rails (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/rake (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/setup (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/spring (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/update (100%) rename {2 => Valentine Kopotchel/2}/Tracker/bin/yarn (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config.ru (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/application.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/boot.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/cable.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/credentials.yml.enc (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/database.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/environment.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/environments/development.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/environments/production.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/environments/test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/application_controller_renderer.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/assets.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/backtrace_silencers.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/chartkick.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/content_security_policy.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/cookies_serializer.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/devise.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/filter_parameter_logging.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/inflections.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/mime_types.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/rails_admin.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/simple_form.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/simple_form_bootstrap.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/initializers/wrap_parameters.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/locales/devise.en.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/locales/en.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/locales/simple_form.en.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/puma.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/routes.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/spring.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/config/storage.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190224192900_devise_create_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190224193301_add_age_to_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190224193313_add_weight_to_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190224193327_add_height_to_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190226193152_create_dishes.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190227201447_add_admin_to_users.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190227205238_create_ingestions.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/schema.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/db/seeds.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/lib/assets/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/lib/tasks/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/lib/templates/slim/scaffold/_form.html.slim (100%) rename {2 => Valentine Kopotchel/2}/Tracker/log/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/package.json (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/404.html (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/422.html (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/500.html (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/apple-touch-icon-precomposed.png (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/apple-touch-icon.png (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/favicon.ico (100%) rename {2 => Valentine Kopotchel/2}/Tracker/public/robots.txt (100%) rename {2 => Valentine Kopotchel/2}/Tracker/storage/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/application_system_test_case.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/controllers/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/controllers/dishes_controller_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/controllers/ingestions_controller_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/dish_ingestions.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/dishes.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/files/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/ingestions.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/fixtures/users.yml (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/helpers/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/integration/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/mailers/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/models/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/models/dish_ingestion_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/models/dish_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/models/ingestion_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/models/user_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/system/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/system/dishes_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/system/ingestions_test.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/test/test_helper.rb (100%) rename {2 => Valentine Kopotchel/2}/Tracker/tmp/.keep (100%) rename {2 => Valentine Kopotchel/2}/Tracker/vendor/.keep (100%) diff --git a/2/Tracker/.gitignore b/Valentine Kopotchel/2/Tracker/.gitignore similarity index 100% rename from 2/Tracker/.gitignore rename to Valentine Kopotchel/2/Tracker/.gitignore diff --git a/2/Tracker/.ruby-version b/Valentine Kopotchel/2/Tracker/.ruby-version similarity index 100% rename from 2/Tracker/.ruby-version rename to Valentine Kopotchel/2/Tracker/.ruby-version diff --git a/2/Tracker/Gemfile b/Valentine Kopotchel/2/Tracker/Gemfile similarity index 100% rename from 2/Tracker/Gemfile rename to Valentine Kopotchel/2/Tracker/Gemfile diff --git a/2/Tracker/Gemfile.lock b/Valentine Kopotchel/2/Tracker/Gemfile.lock similarity index 100% rename from 2/Tracker/Gemfile.lock rename to Valentine Kopotchel/2/Tracker/Gemfile.lock diff --git a/2/Tracker/README.md b/Valentine Kopotchel/2/Tracker/README.md similarity index 100% rename from 2/Tracker/README.md rename to Valentine Kopotchel/2/Tracker/README.md diff --git a/2/Tracker/Rakefile b/Valentine Kopotchel/2/Tracker/Rakefile similarity index 100% rename from 2/Tracker/Rakefile rename to Valentine Kopotchel/2/Tracker/Rakefile diff --git a/2/Tracker/app/assets/config/manifest.js b/Valentine Kopotchel/2/Tracker/app/assets/config/manifest.js similarity index 100% rename from 2/Tracker/app/assets/config/manifest.js rename to Valentine Kopotchel/2/Tracker/app/assets/config/manifest.js diff --git a/2/Tracker/app/assets/images/.keep b/Valentine Kopotchel/2/Tracker/app/assets/images/.keep similarity index 100% rename from 2/Tracker/app/assets/images/.keep rename to Valentine Kopotchel/2/Tracker/app/assets/images/.keep diff --git a/2/Tracker/app/assets/javascripts/application.js b/Valentine Kopotchel/2/Tracker/app/assets/javascripts/application.js similarity index 100% rename from 2/Tracker/app/assets/javascripts/application.js rename to Valentine Kopotchel/2/Tracker/app/assets/javascripts/application.js diff --git a/2/Tracker/app/assets/javascripts/cable.js b/Valentine Kopotchel/2/Tracker/app/assets/javascripts/cable.js similarity index 100% rename from 2/Tracker/app/assets/javascripts/cable.js rename to Valentine Kopotchel/2/Tracker/app/assets/javascripts/cable.js diff --git a/2/Tracker/app/assets/javascripts/channels/.keep b/Valentine Kopotchel/2/Tracker/app/assets/javascripts/channels/.keep similarity index 100% rename from 2/Tracker/app/assets/javascripts/channels/.keep rename to Valentine Kopotchel/2/Tracker/app/assets/javascripts/channels/.keep diff --git a/2/Tracker/app/assets/javascripts/dishes.coffee b/Valentine Kopotchel/2/Tracker/app/assets/javascripts/dishes.coffee similarity index 100% rename from 2/Tracker/app/assets/javascripts/dishes.coffee rename to Valentine Kopotchel/2/Tracker/app/assets/javascripts/dishes.coffee diff --git a/2/Tracker/app/assets/javascripts/ingestions.coffee b/Valentine Kopotchel/2/Tracker/app/assets/javascripts/ingestions.coffee similarity index 100% rename from 2/Tracker/app/assets/javascripts/ingestions.coffee rename to Valentine Kopotchel/2/Tracker/app/assets/javascripts/ingestions.coffee diff --git a/2/Tracker/app/assets/stylesheets/application.scss b/Valentine Kopotchel/2/Tracker/app/assets/stylesheets/application.scss similarity index 100% rename from 2/Tracker/app/assets/stylesheets/application.scss rename to Valentine Kopotchel/2/Tracker/app/assets/stylesheets/application.scss diff --git a/2/Tracker/app/assets/stylesheets/dishes.scss b/Valentine Kopotchel/2/Tracker/app/assets/stylesheets/dishes.scss similarity index 100% rename from 2/Tracker/app/assets/stylesheets/dishes.scss rename to Valentine Kopotchel/2/Tracker/app/assets/stylesheets/dishes.scss diff --git a/2/Tracker/app/assets/stylesheets/ingestions.scss b/Valentine Kopotchel/2/Tracker/app/assets/stylesheets/ingestions.scss similarity index 100% rename from 2/Tracker/app/assets/stylesheets/ingestions.scss rename to Valentine Kopotchel/2/Tracker/app/assets/stylesheets/ingestions.scss diff --git a/2/Tracker/app/assets/stylesheets/scaffolds.scss b/Valentine Kopotchel/2/Tracker/app/assets/stylesheets/scaffolds.scss similarity index 100% rename from 2/Tracker/app/assets/stylesheets/scaffolds.scss rename to Valentine Kopotchel/2/Tracker/app/assets/stylesheets/scaffolds.scss diff --git a/2/Tracker/app/channels/application_cable/channel.rb b/Valentine Kopotchel/2/Tracker/app/channels/application_cable/channel.rb similarity index 100% rename from 2/Tracker/app/channels/application_cable/channel.rb rename to Valentine Kopotchel/2/Tracker/app/channels/application_cable/channel.rb diff --git a/2/Tracker/app/channels/application_cable/connection.rb b/Valentine Kopotchel/2/Tracker/app/channels/application_cable/connection.rb similarity index 100% rename from 2/Tracker/app/channels/application_cable/connection.rb rename to Valentine Kopotchel/2/Tracker/app/channels/application_cable/connection.rb diff --git a/2/Tracker/app/controllers/application_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/application_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/application_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/application_controller.rb diff --git a/2/Tracker/app/controllers/concerns/.keep b/Valentine Kopotchel/2/Tracker/app/controllers/concerns/.keep similarity index 100% rename from 2/Tracker/app/controllers/concerns/.keep rename to Valentine Kopotchel/2/Tracker/app/controllers/concerns/.keep diff --git a/2/Tracker/app/controllers/dishes_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/dishes_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/dishes_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/dishes_controller.rb diff --git a/2/Tracker/app/controllers/ingestions_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/ingestions_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/ingestions_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/ingestions_controller.rb diff --git a/2/Tracker/app/controllers/users/confirmations_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/users/confirmations_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/users/confirmations_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/users/confirmations_controller.rb diff --git a/2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/users/omniauth_callbacks_controller.rb diff --git a/2/Tracker/app/controllers/users/passwords_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/users/passwords_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/users/passwords_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/users/passwords_controller.rb diff --git a/2/Tracker/app/controllers/users/registrations_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/users/registrations_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/users/registrations_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/users/registrations_controller.rb diff --git a/2/Tracker/app/controllers/users/sessions_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/users/sessions_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/users/sessions_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/users/sessions_controller.rb diff --git a/2/Tracker/app/controllers/users/unlocks_controller.rb b/Valentine Kopotchel/2/Tracker/app/controllers/users/unlocks_controller.rb similarity index 100% rename from 2/Tracker/app/controllers/users/unlocks_controller.rb rename to Valentine Kopotchel/2/Tracker/app/controllers/users/unlocks_controller.rb diff --git a/2/Tracker/app/helpers/application_helper.rb b/Valentine Kopotchel/2/Tracker/app/helpers/application_helper.rb similarity index 100% rename from 2/Tracker/app/helpers/application_helper.rb rename to Valentine Kopotchel/2/Tracker/app/helpers/application_helper.rb diff --git a/2/Tracker/app/helpers/dishes_helper.rb b/Valentine Kopotchel/2/Tracker/app/helpers/dishes_helper.rb similarity index 100% rename from 2/Tracker/app/helpers/dishes_helper.rb rename to Valentine Kopotchel/2/Tracker/app/helpers/dishes_helper.rb diff --git a/2/Tracker/app/helpers/ingestions_helper.rb b/Valentine Kopotchel/2/Tracker/app/helpers/ingestions_helper.rb similarity index 100% rename from 2/Tracker/app/helpers/ingestions_helper.rb rename to Valentine Kopotchel/2/Tracker/app/helpers/ingestions_helper.rb diff --git a/2/Tracker/app/jobs/application_job.rb b/Valentine Kopotchel/2/Tracker/app/jobs/application_job.rb similarity index 100% rename from 2/Tracker/app/jobs/application_job.rb rename to Valentine Kopotchel/2/Tracker/app/jobs/application_job.rb diff --git a/2/Tracker/app/mailers/application_mailer.rb b/Valentine Kopotchel/2/Tracker/app/mailers/application_mailer.rb similarity index 100% rename from 2/Tracker/app/mailers/application_mailer.rb rename to Valentine Kopotchel/2/Tracker/app/mailers/application_mailer.rb diff --git a/2/Tracker/app/models/application_record.rb b/Valentine Kopotchel/2/Tracker/app/models/application_record.rb similarity index 100% rename from 2/Tracker/app/models/application_record.rb rename to Valentine Kopotchel/2/Tracker/app/models/application_record.rb diff --git a/2/Tracker/app/models/concerns/.keep b/Valentine Kopotchel/2/Tracker/app/models/concerns/.keep similarity index 100% rename from 2/Tracker/app/models/concerns/.keep rename to Valentine Kopotchel/2/Tracker/app/models/concerns/.keep diff --git a/2/Tracker/app/models/dish.rb b/Valentine Kopotchel/2/Tracker/app/models/dish.rb similarity index 100% rename from 2/Tracker/app/models/dish.rb rename to Valentine Kopotchel/2/Tracker/app/models/dish.rb diff --git a/2/Tracker/app/models/dish_ingestion.rb b/Valentine Kopotchel/2/Tracker/app/models/dish_ingestion.rb similarity index 100% rename from 2/Tracker/app/models/dish_ingestion.rb rename to Valentine Kopotchel/2/Tracker/app/models/dish_ingestion.rb diff --git a/2/Tracker/app/models/ingestion.rb b/Valentine Kopotchel/2/Tracker/app/models/ingestion.rb similarity index 100% rename from 2/Tracker/app/models/ingestion.rb rename to Valentine Kopotchel/2/Tracker/app/models/ingestion.rb diff --git a/2/Tracker/app/models/user.rb b/Valentine Kopotchel/2/Tracker/app/models/user.rb similarity index 100% rename from 2/Tracker/app/models/user.rb rename to Valentine Kopotchel/2/Tracker/app/models/user.rb diff --git a/2/Tracker/app/views/devise/confirmations/new.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/confirmations/new.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/confirmations/new.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/confirmations/new.html.erb diff --git a/2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/mailer/confirmation_instructions.html.erb diff --git a/2/Tracker/app/views/devise/mailer/email_changed.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/mailer/email_changed.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/mailer/email_changed.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/mailer/email_changed.html.erb diff --git a/2/Tracker/app/views/devise/mailer/password_change.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/mailer/password_change.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/mailer/password_change.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/mailer/password_change.html.erb diff --git a/2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/mailer/reset_password_instructions.html.erb diff --git a/2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/mailer/unlock_instructions.html.erb diff --git a/2/Tracker/app/views/devise/passwords/edit.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/passwords/edit.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/passwords/edit.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/passwords/edit.html.erb diff --git a/2/Tracker/app/views/devise/passwords/new.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/passwords/new.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/passwords/new.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/passwords/new.html.erb diff --git a/2/Tracker/app/views/devise/registrations/edit.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/registrations/edit.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/registrations/edit.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/registrations/edit.html.erb diff --git a/2/Tracker/app/views/devise/registrations/new.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/registrations/new.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/registrations/new.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/registrations/new.html.erb diff --git a/2/Tracker/app/views/devise/sessions/new.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/sessions/new.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/sessions/new.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/sessions/new.html.erb diff --git a/2/Tracker/app/views/devise/shared/_error_messages.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/shared/_error_messages.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/shared/_error_messages.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/shared/_error_messages.html.erb diff --git a/2/Tracker/app/views/devise/shared/_links.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/shared/_links.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/shared/_links.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/shared/_links.html.erb diff --git a/2/Tracker/app/views/devise/unlocks/new.html.erb b/Valentine Kopotchel/2/Tracker/app/views/devise/unlocks/new.html.erb similarity index 100% rename from 2/Tracker/app/views/devise/unlocks/new.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/devise/unlocks/new.html.erb diff --git a/2/Tracker/app/views/dishes/_dish.json.jbuilder b/Valentine Kopotchel/2/Tracker/app/views/dishes/_dish.json.jbuilder similarity index 100% rename from 2/Tracker/app/views/dishes/_dish.json.jbuilder rename to Valentine Kopotchel/2/Tracker/app/views/dishes/_dish.json.jbuilder diff --git a/2/Tracker/app/views/dishes/_form.html.slim b/Valentine Kopotchel/2/Tracker/app/views/dishes/_form.html.slim similarity index 100% rename from 2/Tracker/app/views/dishes/_form.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/dishes/_form.html.slim diff --git a/2/Tracker/app/views/dishes/edit.html.slim b/Valentine Kopotchel/2/Tracker/app/views/dishes/edit.html.slim similarity index 100% rename from 2/Tracker/app/views/dishes/edit.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/dishes/edit.html.slim diff --git a/2/Tracker/app/views/dishes/index.html.slim b/Valentine Kopotchel/2/Tracker/app/views/dishes/index.html.slim similarity index 100% rename from 2/Tracker/app/views/dishes/index.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/dishes/index.html.slim diff --git a/2/Tracker/app/views/dishes/index.json.jbuilder b/Valentine Kopotchel/2/Tracker/app/views/dishes/index.json.jbuilder similarity index 100% rename from 2/Tracker/app/views/dishes/index.json.jbuilder rename to Valentine Kopotchel/2/Tracker/app/views/dishes/index.json.jbuilder diff --git a/2/Tracker/app/views/dishes/new.html.slim b/Valentine Kopotchel/2/Tracker/app/views/dishes/new.html.slim similarity index 100% rename from 2/Tracker/app/views/dishes/new.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/dishes/new.html.slim diff --git a/2/Tracker/app/views/dishes/show.html.slim b/Valentine Kopotchel/2/Tracker/app/views/dishes/show.html.slim similarity index 100% rename from 2/Tracker/app/views/dishes/show.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/dishes/show.html.slim diff --git a/2/Tracker/app/views/dishes/show.json.jbuilder b/Valentine Kopotchel/2/Tracker/app/views/dishes/show.json.jbuilder similarity index 100% rename from 2/Tracker/app/views/dishes/show.json.jbuilder rename to Valentine Kopotchel/2/Tracker/app/views/dishes/show.json.jbuilder diff --git a/2/Tracker/app/views/ingestions/_form.html.slim b/Valentine Kopotchel/2/Tracker/app/views/ingestions/_form.html.slim similarity index 100% rename from 2/Tracker/app/views/ingestions/_form.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/_form.html.slim diff --git a/2/Tracker/app/views/ingestions/_ingestion.json.jbuilder b/Valentine Kopotchel/2/Tracker/app/views/ingestions/_ingestion.json.jbuilder similarity index 100% rename from 2/Tracker/app/views/ingestions/_ingestion.json.jbuilder rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/_ingestion.json.jbuilder diff --git a/2/Tracker/app/views/ingestions/edit.html.slim b/Valentine Kopotchel/2/Tracker/app/views/ingestions/edit.html.slim similarity index 100% rename from 2/Tracker/app/views/ingestions/edit.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/edit.html.slim diff --git a/2/Tracker/app/views/ingestions/index.html.slim b/Valentine Kopotchel/2/Tracker/app/views/ingestions/index.html.slim similarity index 100% rename from 2/Tracker/app/views/ingestions/index.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/index.html.slim diff --git a/2/Tracker/app/views/ingestions/index.json.jbuilder b/Valentine Kopotchel/2/Tracker/app/views/ingestions/index.json.jbuilder similarity index 100% rename from 2/Tracker/app/views/ingestions/index.json.jbuilder rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/index.json.jbuilder diff --git a/2/Tracker/app/views/ingestions/new.html.slim b/Valentine Kopotchel/2/Tracker/app/views/ingestions/new.html.slim similarity index 100% rename from 2/Tracker/app/views/ingestions/new.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/new.html.slim diff --git a/2/Tracker/app/views/ingestions/show.html.slim b/Valentine Kopotchel/2/Tracker/app/views/ingestions/show.html.slim similarity index 100% rename from 2/Tracker/app/views/ingestions/show.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/show.html.slim diff --git a/2/Tracker/app/views/ingestions/show.json.jbuilder b/Valentine Kopotchel/2/Tracker/app/views/ingestions/show.json.jbuilder similarity index 100% rename from 2/Tracker/app/views/ingestions/show.json.jbuilder rename to Valentine Kopotchel/2/Tracker/app/views/ingestions/show.json.jbuilder diff --git a/2/Tracker/app/views/layouts/application.html.erb b/Valentine Kopotchel/2/Tracker/app/views/layouts/application.html.erb similarity index 100% rename from 2/Tracker/app/views/layouts/application.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/layouts/application.html.erb diff --git a/2/Tracker/app/views/layouts/mailer.html.erb b/Valentine Kopotchel/2/Tracker/app/views/layouts/mailer.html.erb similarity index 100% rename from 2/Tracker/app/views/layouts/mailer.html.erb rename to Valentine Kopotchel/2/Tracker/app/views/layouts/mailer.html.erb diff --git a/2/Tracker/app/views/layouts/mailer.text.erb b/Valentine Kopotchel/2/Tracker/app/views/layouts/mailer.text.erb similarity index 100% rename from 2/Tracker/app/views/layouts/mailer.text.erb rename to Valentine Kopotchel/2/Tracker/app/views/layouts/mailer.text.erb diff --git a/2/Tracker/app/views/users/_form.html.slim b/Valentine Kopotchel/2/Tracker/app/views/users/_form.html.slim similarity index 100% rename from 2/Tracker/app/views/users/_form.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/users/_form.html.slim diff --git a/2/Tracker/app/views/users/edit.html.slim b/Valentine Kopotchel/2/Tracker/app/views/users/edit.html.slim similarity index 100% rename from 2/Tracker/app/views/users/edit.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/users/edit.html.slim diff --git a/2/Tracker/app/views/users/index.html.slim b/Valentine Kopotchel/2/Tracker/app/views/users/index.html.slim similarity index 100% rename from 2/Tracker/app/views/users/index.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/users/index.html.slim diff --git a/2/Tracker/app/views/users/new.html.slim b/Valentine Kopotchel/2/Tracker/app/views/users/new.html.slim similarity index 100% rename from 2/Tracker/app/views/users/new.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/users/new.html.slim diff --git a/2/Tracker/app/views/users/show.html.slim b/Valentine Kopotchel/2/Tracker/app/views/users/show.html.slim similarity index 100% rename from 2/Tracker/app/views/users/show.html.slim rename to Valentine Kopotchel/2/Tracker/app/views/users/show.html.slim diff --git a/2/Tracker/bin/bundle b/Valentine Kopotchel/2/Tracker/bin/bundle similarity index 100% rename from 2/Tracker/bin/bundle rename to Valentine Kopotchel/2/Tracker/bin/bundle diff --git a/2/Tracker/bin/rails b/Valentine Kopotchel/2/Tracker/bin/rails similarity index 100% rename from 2/Tracker/bin/rails rename to Valentine Kopotchel/2/Tracker/bin/rails diff --git a/2/Tracker/bin/rake b/Valentine Kopotchel/2/Tracker/bin/rake similarity index 100% rename from 2/Tracker/bin/rake rename to Valentine Kopotchel/2/Tracker/bin/rake diff --git a/2/Tracker/bin/setup b/Valentine Kopotchel/2/Tracker/bin/setup similarity index 100% rename from 2/Tracker/bin/setup rename to Valentine Kopotchel/2/Tracker/bin/setup diff --git a/2/Tracker/bin/spring b/Valentine Kopotchel/2/Tracker/bin/spring similarity index 100% rename from 2/Tracker/bin/spring rename to Valentine Kopotchel/2/Tracker/bin/spring diff --git a/2/Tracker/bin/update b/Valentine Kopotchel/2/Tracker/bin/update similarity index 100% rename from 2/Tracker/bin/update rename to Valentine Kopotchel/2/Tracker/bin/update diff --git a/2/Tracker/bin/yarn b/Valentine Kopotchel/2/Tracker/bin/yarn similarity index 100% rename from 2/Tracker/bin/yarn rename to Valentine Kopotchel/2/Tracker/bin/yarn diff --git a/2/Tracker/config.ru b/Valentine Kopotchel/2/Tracker/config.ru similarity index 100% rename from 2/Tracker/config.ru rename to Valentine Kopotchel/2/Tracker/config.ru diff --git a/2/Tracker/config/application.rb b/Valentine Kopotchel/2/Tracker/config/application.rb similarity index 100% rename from 2/Tracker/config/application.rb rename to Valentine Kopotchel/2/Tracker/config/application.rb diff --git a/2/Tracker/config/boot.rb b/Valentine Kopotchel/2/Tracker/config/boot.rb similarity index 100% rename from 2/Tracker/config/boot.rb rename to Valentine Kopotchel/2/Tracker/config/boot.rb diff --git a/2/Tracker/config/cable.yml b/Valentine Kopotchel/2/Tracker/config/cable.yml similarity index 100% rename from 2/Tracker/config/cable.yml rename to Valentine Kopotchel/2/Tracker/config/cable.yml diff --git a/2/Tracker/config/credentials.yml.enc b/Valentine Kopotchel/2/Tracker/config/credentials.yml.enc similarity index 100% rename from 2/Tracker/config/credentials.yml.enc rename to Valentine Kopotchel/2/Tracker/config/credentials.yml.enc diff --git a/2/Tracker/config/database.yml b/Valentine Kopotchel/2/Tracker/config/database.yml similarity index 100% rename from 2/Tracker/config/database.yml rename to Valentine Kopotchel/2/Tracker/config/database.yml diff --git a/2/Tracker/config/environment.rb b/Valentine Kopotchel/2/Tracker/config/environment.rb similarity index 100% rename from 2/Tracker/config/environment.rb rename to Valentine Kopotchel/2/Tracker/config/environment.rb diff --git a/2/Tracker/config/environments/development.rb b/Valentine Kopotchel/2/Tracker/config/environments/development.rb similarity index 100% rename from 2/Tracker/config/environments/development.rb rename to Valentine Kopotchel/2/Tracker/config/environments/development.rb diff --git a/2/Tracker/config/environments/production.rb b/Valentine Kopotchel/2/Tracker/config/environments/production.rb similarity index 100% rename from 2/Tracker/config/environments/production.rb rename to Valentine Kopotchel/2/Tracker/config/environments/production.rb diff --git a/2/Tracker/config/environments/test.rb b/Valentine Kopotchel/2/Tracker/config/environments/test.rb similarity index 100% rename from 2/Tracker/config/environments/test.rb rename to Valentine Kopotchel/2/Tracker/config/environments/test.rb diff --git a/2/Tracker/config/initializers/application_controller_renderer.rb b/Valentine Kopotchel/2/Tracker/config/initializers/application_controller_renderer.rb similarity index 100% rename from 2/Tracker/config/initializers/application_controller_renderer.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/application_controller_renderer.rb diff --git a/2/Tracker/config/initializers/assets.rb b/Valentine Kopotchel/2/Tracker/config/initializers/assets.rb similarity index 100% rename from 2/Tracker/config/initializers/assets.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/assets.rb diff --git a/2/Tracker/config/initializers/backtrace_silencers.rb b/Valentine Kopotchel/2/Tracker/config/initializers/backtrace_silencers.rb similarity index 100% rename from 2/Tracker/config/initializers/backtrace_silencers.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/backtrace_silencers.rb diff --git a/2/Tracker/config/initializers/chartkick.rb b/Valentine Kopotchel/2/Tracker/config/initializers/chartkick.rb similarity index 100% rename from 2/Tracker/config/initializers/chartkick.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/chartkick.rb diff --git a/2/Tracker/config/initializers/content_security_policy.rb b/Valentine Kopotchel/2/Tracker/config/initializers/content_security_policy.rb similarity index 100% rename from 2/Tracker/config/initializers/content_security_policy.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/content_security_policy.rb diff --git a/2/Tracker/config/initializers/cookies_serializer.rb b/Valentine Kopotchel/2/Tracker/config/initializers/cookies_serializer.rb similarity index 100% rename from 2/Tracker/config/initializers/cookies_serializer.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/cookies_serializer.rb diff --git a/2/Tracker/config/initializers/devise.rb b/Valentine Kopotchel/2/Tracker/config/initializers/devise.rb similarity index 100% rename from 2/Tracker/config/initializers/devise.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/devise.rb diff --git a/2/Tracker/config/initializers/filter_parameter_logging.rb b/Valentine Kopotchel/2/Tracker/config/initializers/filter_parameter_logging.rb similarity index 100% rename from 2/Tracker/config/initializers/filter_parameter_logging.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/filter_parameter_logging.rb diff --git a/2/Tracker/config/initializers/inflections.rb b/Valentine Kopotchel/2/Tracker/config/initializers/inflections.rb similarity index 100% rename from 2/Tracker/config/initializers/inflections.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/inflections.rb diff --git a/2/Tracker/config/initializers/mime_types.rb b/Valentine Kopotchel/2/Tracker/config/initializers/mime_types.rb similarity index 100% rename from 2/Tracker/config/initializers/mime_types.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/mime_types.rb diff --git a/2/Tracker/config/initializers/rails_admin.rb b/Valentine Kopotchel/2/Tracker/config/initializers/rails_admin.rb similarity index 100% rename from 2/Tracker/config/initializers/rails_admin.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/rails_admin.rb diff --git a/2/Tracker/config/initializers/simple_form.rb b/Valentine Kopotchel/2/Tracker/config/initializers/simple_form.rb similarity index 100% rename from 2/Tracker/config/initializers/simple_form.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/simple_form.rb diff --git a/2/Tracker/config/initializers/simple_form_bootstrap.rb b/Valentine Kopotchel/2/Tracker/config/initializers/simple_form_bootstrap.rb similarity index 100% rename from 2/Tracker/config/initializers/simple_form_bootstrap.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/simple_form_bootstrap.rb diff --git a/2/Tracker/config/initializers/wrap_parameters.rb b/Valentine Kopotchel/2/Tracker/config/initializers/wrap_parameters.rb similarity index 100% rename from 2/Tracker/config/initializers/wrap_parameters.rb rename to Valentine Kopotchel/2/Tracker/config/initializers/wrap_parameters.rb diff --git a/2/Tracker/config/locales/devise.en.yml b/Valentine Kopotchel/2/Tracker/config/locales/devise.en.yml similarity index 100% rename from 2/Tracker/config/locales/devise.en.yml rename to Valentine Kopotchel/2/Tracker/config/locales/devise.en.yml diff --git a/2/Tracker/config/locales/en.yml b/Valentine Kopotchel/2/Tracker/config/locales/en.yml similarity index 100% rename from 2/Tracker/config/locales/en.yml rename to Valentine Kopotchel/2/Tracker/config/locales/en.yml diff --git a/2/Tracker/config/locales/simple_form.en.yml b/Valentine Kopotchel/2/Tracker/config/locales/simple_form.en.yml similarity index 100% rename from 2/Tracker/config/locales/simple_form.en.yml rename to Valentine Kopotchel/2/Tracker/config/locales/simple_form.en.yml diff --git a/2/Tracker/config/puma.rb b/Valentine Kopotchel/2/Tracker/config/puma.rb similarity index 100% rename from 2/Tracker/config/puma.rb rename to Valentine Kopotchel/2/Tracker/config/puma.rb diff --git a/2/Tracker/config/routes.rb b/Valentine Kopotchel/2/Tracker/config/routes.rb similarity index 100% rename from 2/Tracker/config/routes.rb rename to Valentine Kopotchel/2/Tracker/config/routes.rb diff --git a/2/Tracker/config/spring.rb b/Valentine Kopotchel/2/Tracker/config/spring.rb similarity index 100% rename from 2/Tracker/config/spring.rb rename to Valentine Kopotchel/2/Tracker/config/spring.rb diff --git a/2/Tracker/config/storage.yml b/Valentine Kopotchel/2/Tracker/config/storage.yml similarity index 100% rename from 2/Tracker/config/storage.yml rename to Valentine Kopotchel/2/Tracker/config/storage.yml diff --git a/2/Tracker/db/migrate/20190224192900_devise_create_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190224192900_devise_create_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190224192900_devise_create_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190224192900_devise_create_users.rb diff --git a/2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190224193133_add_firstname_to_users.rb diff --git a/2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190224193239_add_lastname_to_users.rb diff --git a/2/Tracker/db/migrate/20190224193301_add_age_to_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190224193301_add_age_to_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190224193301_add_age_to_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190224193301_add_age_to_users.rb diff --git a/2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190224193313_add_weight_to_users.rb diff --git a/2/Tracker/db/migrate/20190224193327_add_height_to_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190224193327_add_height_to_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190224193327_add_height_to_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190224193327_add_height_to_users.rb diff --git a/2/Tracker/db/migrate/20190226193152_create_dishes.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190226193152_create_dishes.rb similarity index 100% rename from 2/Tracker/db/migrate/20190226193152_create_dishes.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190226193152_create_dishes.rb diff --git a/2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb similarity index 100% rename from 2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190227163338_remove_integer_from_dishes.rb diff --git a/2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb similarity index 100% rename from 2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190227201447_add_admin_to_users.rb diff --git a/2/Tracker/db/migrate/20190227205238_create_ingestions.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190227205238_create_ingestions.rb similarity index 100% rename from 2/Tracker/db/migrate/20190227205238_create_ingestions.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190227205238_create_ingestions.rb diff --git a/2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb b/Valentine Kopotchel/2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb similarity index 100% rename from 2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb rename to Valentine Kopotchel/2/Tracker/db/migrate/20190227210940_create_dish_ingestions.rb diff --git a/2/Tracker/db/schema.rb b/Valentine Kopotchel/2/Tracker/db/schema.rb similarity index 100% rename from 2/Tracker/db/schema.rb rename to Valentine Kopotchel/2/Tracker/db/schema.rb diff --git a/2/Tracker/db/seeds.rb b/Valentine Kopotchel/2/Tracker/db/seeds.rb similarity index 100% rename from 2/Tracker/db/seeds.rb rename to Valentine Kopotchel/2/Tracker/db/seeds.rb diff --git a/2/Tracker/lib/assets/.keep b/Valentine Kopotchel/2/Tracker/lib/assets/.keep similarity index 100% rename from 2/Tracker/lib/assets/.keep rename to Valentine Kopotchel/2/Tracker/lib/assets/.keep diff --git a/2/Tracker/lib/tasks/.keep b/Valentine Kopotchel/2/Tracker/lib/tasks/.keep similarity index 100% rename from 2/Tracker/lib/tasks/.keep rename to Valentine Kopotchel/2/Tracker/lib/tasks/.keep diff --git a/2/Tracker/lib/templates/slim/scaffold/_form.html.slim b/Valentine Kopotchel/2/Tracker/lib/templates/slim/scaffold/_form.html.slim similarity index 100% rename from 2/Tracker/lib/templates/slim/scaffold/_form.html.slim rename to Valentine Kopotchel/2/Tracker/lib/templates/slim/scaffold/_form.html.slim diff --git a/2/Tracker/log/.keep b/Valentine Kopotchel/2/Tracker/log/.keep similarity index 100% rename from 2/Tracker/log/.keep rename to Valentine Kopotchel/2/Tracker/log/.keep diff --git a/2/Tracker/package.json b/Valentine Kopotchel/2/Tracker/package.json similarity index 100% rename from 2/Tracker/package.json rename to Valentine Kopotchel/2/Tracker/package.json diff --git a/2/Tracker/public/404.html b/Valentine Kopotchel/2/Tracker/public/404.html similarity index 100% rename from 2/Tracker/public/404.html rename to Valentine Kopotchel/2/Tracker/public/404.html diff --git a/2/Tracker/public/422.html b/Valentine Kopotchel/2/Tracker/public/422.html similarity index 100% rename from 2/Tracker/public/422.html rename to Valentine Kopotchel/2/Tracker/public/422.html diff --git a/2/Tracker/public/500.html b/Valentine Kopotchel/2/Tracker/public/500.html similarity index 100% rename from 2/Tracker/public/500.html rename to Valentine Kopotchel/2/Tracker/public/500.html diff --git a/2/Tracker/public/apple-touch-icon-precomposed.png b/Valentine Kopotchel/2/Tracker/public/apple-touch-icon-precomposed.png similarity index 100% rename from 2/Tracker/public/apple-touch-icon-precomposed.png rename to Valentine Kopotchel/2/Tracker/public/apple-touch-icon-precomposed.png diff --git a/2/Tracker/public/apple-touch-icon.png b/Valentine Kopotchel/2/Tracker/public/apple-touch-icon.png similarity index 100% rename from 2/Tracker/public/apple-touch-icon.png rename to Valentine Kopotchel/2/Tracker/public/apple-touch-icon.png diff --git a/2/Tracker/public/favicon.ico b/Valentine Kopotchel/2/Tracker/public/favicon.ico similarity index 100% rename from 2/Tracker/public/favicon.ico rename to Valentine Kopotchel/2/Tracker/public/favicon.ico diff --git a/2/Tracker/public/robots.txt b/Valentine Kopotchel/2/Tracker/public/robots.txt similarity index 100% rename from 2/Tracker/public/robots.txt rename to Valentine Kopotchel/2/Tracker/public/robots.txt diff --git a/2/Tracker/storage/.keep b/Valentine Kopotchel/2/Tracker/storage/.keep similarity index 100% rename from 2/Tracker/storage/.keep rename to Valentine Kopotchel/2/Tracker/storage/.keep diff --git a/2/Tracker/test/application_system_test_case.rb b/Valentine Kopotchel/2/Tracker/test/application_system_test_case.rb similarity index 100% rename from 2/Tracker/test/application_system_test_case.rb rename to Valentine Kopotchel/2/Tracker/test/application_system_test_case.rb diff --git a/2/Tracker/test/controllers/.keep b/Valentine Kopotchel/2/Tracker/test/controllers/.keep similarity index 100% rename from 2/Tracker/test/controllers/.keep rename to Valentine Kopotchel/2/Tracker/test/controllers/.keep diff --git a/2/Tracker/test/controllers/dishes_controller_test.rb b/Valentine Kopotchel/2/Tracker/test/controllers/dishes_controller_test.rb similarity index 100% rename from 2/Tracker/test/controllers/dishes_controller_test.rb rename to Valentine Kopotchel/2/Tracker/test/controllers/dishes_controller_test.rb diff --git a/2/Tracker/test/controllers/ingestions_controller_test.rb b/Valentine Kopotchel/2/Tracker/test/controllers/ingestions_controller_test.rb similarity index 100% rename from 2/Tracker/test/controllers/ingestions_controller_test.rb rename to Valentine Kopotchel/2/Tracker/test/controllers/ingestions_controller_test.rb diff --git a/2/Tracker/test/fixtures/.keep b/Valentine Kopotchel/2/Tracker/test/fixtures/.keep similarity index 100% rename from 2/Tracker/test/fixtures/.keep rename to Valentine Kopotchel/2/Tracker/test/fixtures/.keep diff --git a/2/Tracker/test/fixtures/dish_ingestions.yml b/Valentine Kopotchel/2/Tracker/test/fixtures/dish_ingestions.yml similarity index 100% rename from 2/Tracker/test/fixtures/dish_ingestions.yml rename to Valentine Kopotchel/2/Tracker/test/fixtures/dish_ingestions.yml diff --git a/2/Tracker/test/fixtures/dishes.yml b/Valentine Kopotchel/2/Tracker/test/fixtures/dishes.yml similarity index 100% rename from 2/Tracker/test/fixtures/dishes.yml rename to Valentine Kopotchel/2/Tracker/test/fixtures/dishes.yml diff --git a/2/Tracker/test/fixtures/files/.keep b/Valentine Kopotchel/2/Tracker/test/fixtures/files/.keep similarity index 100% rename from 2/Tracker/test/fixtures/files/.keep rename to Valentine Kopotchel/2/Tracker/test/fixtures/files/.keep diff --git a/2/Tracker/test/fixtures/ingestions.yml b/Valentine Kopotchel/2/Tracker/test/fixtures/ingestions.yml similarity index 100% rename from 2/Tracker/test/fixtures/ingestions.yml rename to Valentine Kopotchel/2/Tracker/test/fixtures/ingestions.yml diff --git a/2/Tracker/test/fixtures/users.yml b/Valentine Kopotchel/2/Tracker/test/fixtures/users.yml similarity index 100% rename from 2/Tracker/test/fixtures/users.yml rename to Valentine Kopotchel/2/Tracker/test/fixtures/users.yml diff --git a/2/Tracker/test/helpers/.keep b/Valentine Kopotchel/2/Tracker/test/helpers/.keep similarity index 100% rename from 2/Tracker/test/helpers/.keep rename to Valentine Kopotchel/2/Tracker/test/helpers/.keep diff --git a/2/Tracker/test/integration/.keep b/Valentine Kopotchel/2/Tracker/test/integration/.keep similarity index 100% rename from 2/Tracker/test/integration/.keep rename to Valentine Kopotchel/2/Tracker/test/integration/.keep diff --git a/2/Tracker/test/mailers/.keep b/Valentine Kopotchel/2/Tracker/test/mailers/.keep similarity index 100% rename from 2/Tracker/test/mailers/.keep rename to Valentine Kopotchel/2/Tracker/test/mailers/.keep diff --git a/2/Tracker/test/models/.keep b/Valentine Kopotchel/2/Tracker/test/models/.keep similarity index 100% rename from 2/Tracker/test/models/.keep rename to Valentine Kopotchel/2/Tracker/test/models/.keep diff --git a/2/Tracker/test/models/dish_ingestion_test.rb b/Valentine Kopotchel/2/Tracker/test/models/dish_ingestion_test.rb similarity index 100% rename from 2/Tracker/test/models/dish_ingestion_test.rb rename to Valentine Kopotchel/2/Tracker/test/models/dish_ingestion_test.rb diff --git a/2/Tracker/test/models/dish_test.rb b/Valentine Kopotchel/2/Tracker/test/models/dish_test.rb similarity index 100% rename from 2/Tracker/test/models/dish_test.rb rename to Valentine Kopotchel/2/Tracker/test/models/dish_test.rb diff --git a/2/Tracker/test/models/ingestion_test.rb b/Valentine Kopotchel/2/Tracker/test/models/ingestion_test.rb similarity index 100% rename from 2/Tracker/test/models/ingestion_test.rb rename to Valentine Kopotchel/2/Tracker/test/models/ingestion_test.rb diff --git a/2/Tracker/test/models/user_test.rb b/Valentine Kopotchel/2/Tracker/test/models/user_test.rb similarity index 100% rename from 2/Tracker/test/models/user_test.rb rename to Valentine Kopotchel/2/Tracker/test/models/user_test.rb diff --git a/2/Tracker/test/system/.keep b/Valentine Kopotchel/2/Tracker/test/system/.keep similarity index 100% rename from 2/Tracker/test/system/.keep rename to Valentine Kopotchel/2/Tracker/test/system/.keep diff --git a/2/Tracker/test/system/dishes_test.rb b/Valentine Kopotchel/2/Tracker/test/system/dishes_test.rb similarity index 100% rename from 2/Tracker/test/system/dishes_test.rb rename to Valentine Kopotchel/2/Tracker/test/system/dishes_test.rb diff --git a/2/Tracker/test/system/ingestions_test.rb b/Valentine Kopotchel/2/Tracker/test/system/ingestions_test.rb similarity index 100% rename from 2/Tracker/test/system/ingestions_test.rb rename to Valentine Kopotchel/2/Tracker/test/system/ingestions_test.rb diff --git a/2/Tracker/test/test_helper.rb b/Valentine Kopotchel/2/Tracker/test/test_helper.rb similarity index 100% rename from 2/Tracker/test/test_helper.rb rename to Valentine Kopotchel/2/Tracker/test/test_helper.rb diff --git a/2/Tracker/tmp/.keep b/Valentine Kopotchel/2/Tracker/tmp/.keep similarity index 100% rename from 2/Tracker/tmp/.keep rename to Valentine Kopotchel/2/Tracker/tmp/.keep diff --git a/2/Tracker/vendor/.keep b/Valentine Kopotchel/2/Tracker/vendor/.keep similarity index 100% rename from 2/Tracker/vendor/.keep rename to Valentine Kopotchel/2/Tracker/vendor/.keep From 82443eb37cd855a21cbad62f8d14eb42d9466eb2 Mon Sep 17 00:00:00 2001 From: valkovik15 Date: Thu, 28 Feb 2019 19:47:48 +0300 Subject: [PATCH 3/3] Commentary from initializer removed --- .../2/Tracker/config/initializers/rails_admin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Valentine Kopotchel/2/Tracker/config/initializers/rails_admin.rb b/Valentine Kopotchel/2/Tracker/config/initializers/rails_admin.rb index 0c76fb3..c998603 100644 --- a/Valentine Kopotchel/2/Tracker/config/initializers/rails_admin.rb +++ b/Valentine Kopotchel/2/Tracker/config/initializers/rails_admin.rb @@ -5,7 +5,7 @@ ## == Devise == config.authenticate_with do warden.authenticate! scope: :user - #redirect_to main_app.root_path unless current_user.try(:admin?) + redirect_to main_app.root_path unless current_user.try(:admin?) end config.current_user_method(&:current_user)