Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[WIP] Update new UI #13

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .byebug_history
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
c
restaurant.ref_link
c
available_dishes.first.values.first.dig(:status, :valid)
available_dishes.first.values.first
available_dishes.first.values
Expand Down Expand Up @@ -251,6 +253,3 @@ c
notice_params
params
c
p_dishes.last[:name]
p_dishes.last
params
59 changes: 27 additions & 32 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,45 +1,38 @@
source 'https://rubygems.org'

ruby '2.3.3'
ruby '2.6.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.9'
gem 'rails', '~> 5.2.3'

gem 'rails_12factor'

# Use sqlite3 as the database for Active Record
group :development, :test do
gem 'rubocop', '0.53.0', require: false
gem 'sqlite3'
gem 'dotenv-rails'
end

group :production do
gem 'pg'
end
# Use SCSS for stylesheets
gem 'hamlit'
gem 'kaminari'
gem 'simple_form', '~> 4.1.0'


gem 'jquery-rails', '4.3.3'
gem 'pg', '>= 0.18', '< 2.0'
gem 'puma', '~> 3.11'
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
gem 'haml'
gem 'kaminari'
gem 'simple_form'

# Use jquery as the JavaScript library
gem 'jquery-rails', '4.0.4'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
gem 'bootsnap', '>= 1.1.0', require: false
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]


gem 'rest-client'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0', group: :doc

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'
Expand All @@ -51,26 +44,24 @@ group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug'
gem 'factory_bot_rails'
# gem 'factory_girl_rails'
gem 'fuubar'
gem 'rspec-rails', '~> 3.6'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :test do
gem 'capybara', '2.7.1'
gem 'capybara-screenshot'
gem 'capybara-webkit', '1.11.1'
gem 'capybara-webkit', '1.15.1'
gem 'database_cleaner'

gem 'faker', '1.7.3'
gem 'faker', '1.9.3'
gem 'poltergeist'
gem 'rack_session_access'
gem 'selenium-webdriver', '~> 2.53.4'
Expand All @@ -82,7 +73,7 @@ gem 'prawn'

gem 'bcrypt', '3.1.11'
gem 'bootstrap-sass'
gem 'monban-generators'
# gem 'monban-generators'
gem 'prawn-table'
gem 'pry'
# gem 'momentjs-rails', '>= 2.9.0'
Expand All @@ -100,3 +91,7 @@ gem 'grape'
gem 'momentjs-rails', '>= 2.9.0'
gem 'slack-notifier'
gem 'wombat', '~> 2.8.0'

source 'https://rails-assets.org' do
gem 'rails-assets-semantic'
end
Loading