Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
baru8 committed Jan 19, 2022
1 parent e0c6810 commit 2ae8790
Show file tree
Hide file tree
Showing 82 changed files with 14 additions and 9 deletions.
4 changes: 4 additions & 0 deletions app/forms/analyze_result_form.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class AnalyzeResultForm
include ActiveModel::Model
attr_accessor :total_points, :alcohol_strongness, :next_motivation, :total_alcohol_amounts, :alcohol_first, :alcohol_second, :alcohol_third, :alcohol_forth,:user_id, :alcohol_in_vein_id, :description_id
end
2 changes: 2 additions & 0 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,7 @@
# config.action_cable.disable_request_forgery_protection = true
Rails.application.routes.default_url_options[:host] = 'localhost'
Rails.application.routes.default_url_options[:port] = 3000
config.web_console.whitelisted_ips = '172.27.0.1'
config.web_console.whitelisted_ips = '0.0.0.0/0'
config.assets.precompile += %w( '.svg' '.png' '.jpg' '.jpeg')
end
7 changes: 2 additions & 5 deletions config/initializers/cors.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@

Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do
origins "http://localhost:3000", "https://www.zeroken.site", "http://0.0.0.0:3000", "https://zeroken.herokuapp.com", "https://www.zeroken.site", "http://localhost:3035"
resource "*",
headers: :any, methods: [:get, :post, :patch, :put],
expose: ['Access-Control-Allow-Origin'],
max_age: 600
origins '*'
resource '*', headers: :any, methods: [:get, :post, :patch, :put]
end
end
4 changes: 3 additions & 1 deletion config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"


# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
bind 'tcp://localhost:3000'
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch("PORT") { 3000 }
port ENV.fetch("PORT") { 3000 }, 'localhost'
# bind "unix://#{Rails.root}/tmp/sockets/puma.sock"
# Specifies the `environment` that Puma will run in.
#
Expand Down
6 changes: 3 additions & 3 deletions config/webpacker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ development:
# Reference: https://webpack.js.org/configuration/dev-server/
dev_server:
https: false
host: localhost
host: 0.0.0.0
port: 3035
public: localhost:3035
public: 0.0.0.0:3035
hmr: false
# Inline should be set to true if using HMR
inline: true
Expand All @@ -69,7 +69,7 @@ development:
pretty: false
headers:
'Access-Control-Allow-Origin': '*'

'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept'
watch_options:
ignored: '**/node_modules/**'

Expand Down
Binary file added public/uploads/alcohol/image/1/beer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/1/thumb_beer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/10/highball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/11/highball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/12/highball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/13/highball.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/14/taru.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/14/thumb_taru.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/16/wine_bottle.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/2/jokki_beer.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/20/reishu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/20/thumb_reishu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/21/reishu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/uploads/alcohol/image/21/thumb_reishu.png
Binary file added public/uploads/alcohol/image/22/highball.png
Binary file added public/uploads/alcohol/image/23/otokoume.png
Binary file added public/uploads/alcohol/image/24/highball.png
Binary file added public/uploads/alcohol/image/25/nagomimizu.png
Binary file added public/uploads/alcohol/image/26/koori.png
Binary file added public/uploads/alcohol/image/26/thumb_koori.png
Binary file added public/uploads/alcohol/image/27/softdrink.png
Binary file added public/uploads/alcohol/image/28/softdrink.png
Binary file added public/uploads/alcohol/image/29/softdrink.png
Binary file added public/uploads/alcohol/image/3/premol.jpg
Binary file added public/uploads/alcohol/image/3/thumb_premol.png
Binary file added public/uploads/alcohol/image/30/softdrink.png
Binary file added public/uploads/alcohol/image/31/softdrink.png
Binary file added public/uploads/alcohol/image/32/ocha.png
Binary file added public/uploads/alcohol/image/32/thumb_ocha.png
Binary file added public/uploads/alcohol/image/33/ocha.png
Binary file added public/uploads/alcohol/image/33/thumb_ocha.png
Binary file added public/uploads/alcohol/image/34/kajitushu.png
Binary file added public/uploads/alcohol/image/35/kajitushu.png
Binary file added public/uploads/alcohol/image/36/cocktail.png
Binary file added public/uploads/alcohol/image/37/cocktail.png
Binary file added public/uploads/alcohol/image/38/cocktail.png
Binary file added public/uploads/alcohol/image/39/megakinmugi.png
Binary file added public/uploads/alcohol/image/4/wine_bottle.jpg
Binary file added public/uploads/alcohol/image/5/wine_bottle.jpg
Binary file added public/uploads/alcohol/image/6/jin_tonic.png
Binary file added public/uploads/alcohol/image/7/jin_tonic.png
Binary file added public/uploads/alcohol/image/8/jin_tonic.png
Binary file added public/uploads/alcohol/image/9/highball.png
Binary file added public/uploads/alcohol/image/9/thumb_highball.png
Binary file added public/uploads/user/avatar/2/sample.png

0 comments on commit 2ae8790

Please sign in to comment.