Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: funswift/medical-web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.1
Choose a base ref
...
head repository: funswift/medical-web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Oct 14, 2017

  1. Copy the full SHA
    5e74786 View commit details
  2. Copy the full SHA
    0ea0505 View commit details
  3. Copy the full SHA
    4c94f77 View commit details

Commits on Oct 17, 2017

  1. Copy the full SHA
    44a11af View commit details
  2. Copy the full SHA
    43067c8 View commit details
  3. Copy the full SHA
    1536c23 View commit details
  4. Merge pull request #29 from 2017pro02/feature/fix_meal_url

    食事のURL構成を変更した
    defaultcf authored Oct 17, 2017
    Copy the full SHA
    4b2a4c6 View commit details

Commits on Oct 18, 2017

  1. Copy the full SHA
    38fbc5f View commit details
  2. Merge pull request #30 from 2017pro02/hotfix/email_localname

    メールアドレスのローカル部の抜き出しが不十分だったので修正
    defaultcf authored Oct 18, 2017
    Copy the full SHA
    1863021 View commit details
  3. Sidekiqを追加した

    defaultcf committed Oct 18, 2017
    Copy the full SHA
    acb69b8 View commit details
  4. Copy the full SHA
    124ea1c View commit details
  5. Copy the full SHA
    638006f View commit details
  6. Copy the full SHA
    d961017 View commit details
  7. 接続数を減らした

    defaultcf committed Oct 18, 2017
    Copy the full SHA
    4128cd7 View commit details
  8. Sidekiqの起動方法をREADMEを追記した

    [ci skip]
    defaultcf committed Oct 18, 2017
    Copy the full SHA
    612bc04 View commit details
  9. Copy the full SHA
    ce027ad View commit details
  10. Merge pull request #33 from 2017pro02/feature/guess_food

    高齢者が食事を撮ったら閲覧者に通知されるようにする
    defaultcf authored Oct 18, 2017
    Copy the full SHA
    b5cabc2 View commit details

Commits on Oct 19, 2017

  1. Copy the full SHA
    2c508b1 View commit details
  2. Merge pull request #36 from 2017pro02/hotfix/meal_model

    CommentのUser周りの外部キー制約に失敗していたのでmigrationを修正した
    defaultcf authored Oct 19, 2017
    Copy the full SHA
    b458d6f View commit details
  3. SeedFuを追加

    defaultcf committed Oct 19, 2017
    Copy the full SHA
    c3b3e6d View commit details
  4. Relationのseedを追加

    defaultcf committed Oct 19, 2017
    Copy the full SHA
    e38a243 View commit details
  5. Merge pull request #38 from 2017pro02/feature/seed

    seedを追加した
    defaultcf authored Oct 19, 2017
    Copy the full SHA
    385e929 View commit details

Commits on Oct 25, 2017

  1. Merge pull request #39 from 2017pro02/release/v0.0.2

    Release/v0.0.2
    defaultcf authored Oct 25, 2017
    Copy the full SHA
    344252b View commit details

Commits on Oct 27, 2017

  1. rails g channel tv

    defaultcf committed Oct 27, 2017
    Copy the full SHA
    c9c61e9 View commit details
  2. Copy the full SHA
    7494c58 View commit details
  3. Copy the full SHA
    a883e75 View commit details

Commits on Nov 1, 2017

  1. Copy the full SHA
    7e6758c View commit details

Commits on Nov 6, 2017

  1. Copy the full SHA
    cfb823b View commit details
  2. Merge pull request #44 from 2017pro02/hotfix/heroku_ac

    HerokuでActionCableできるようにした
    defaultcf authored Nov 6, 2017
    Copy the full SHA
    839521a View commit details

Commits on Nov 8, 2017

  1. Copy the full SHA
    4ae0079 View commit details
  2. viewportを指定していなかったので指定した

    ついでにcharsetも指定しといた。
    defaultcf committed Nov 8, 2017
    Copy the full SHA
    df7db67 View commit details
  3. Merge pull request #48 from 2017pro02/hotfix/viewport

    viewportを指定していなかったので指定した
    defaultcf authored Nov 8, 2017
    Copy the full SHA
    1a0c20f View commit details
  4. Copy the full SHA
    f937a4f View commit details
  5. Copy the full SHA
    e73f5cf View commit details
  6. Merge pull request #49 from 2017pro02/hotfix/rename_existing_username

    既存のユーザー名に変更してもきちんとエラーを出すようにした
    defaultcf authored Nov 8, 2017
    Copy the full SHA
    32cd3f3 View commit details
  7. Copy the full SHA
    31574c5 View commit details
  8. Copy the full SHA
    46f2785 View commit details
  9. Merge pull request #50 from 2017pro02/feature/tv

    とりあえずTVを綺麗にした
    defaultcf authored Nov 8, 2017
    Copy the full SHA
    8f7c00d View commit details

Commits on Nov 9, 2017

  1. Copy the full SHA
    7883fcf View commit details
  2. Copy the full SHA
    48372a6 View commit details
  3. Merge pull request #53 from 2017pro02/feature/foreman

    foremanを追加した
    defaultcf authored Nov 9, 2017
    Copy the full SHA
    0f24176 View commit details
  4. Merge pull request #54 from 2017pro02/feature/webpack

    Webpackを導入した
    defaultcf authored Nov 9, 2017
    Copy the full SHA
    b7037d4 View commit details
  5. foremanを追加した

    defaultcf committed Nov 9, 2017
    Copy the full SHA
    53c539e View commit details
  6. rails webpacker:install

    defaultcf committed Nov 9, 2017
    Copy the full SHA
    fc831bc View commit details
  7. Copy the full SHA
    28a4578 View commit details
  8. Merge pull request #55 from 2017pro02/hotfix/meal_notify

    料理追加時の通知を修正した
    defaultcf authored Nov 9, 2017
    Copy the full SHA
    ddae024 View commit details
  9. Merge pull request #56 from 2017pro02/feature/readme

    READMEのセットアップ方法辺りを更新
    defaultcf authored Nov 9, 2017
    Copy the full SHA
    48a560d View commit details

Commits on Nov 10, 2017

  1. Copy the full SHA
    a003276 View commit details
  2. Copy the full SHA
    222e61b View commit details
  3. Copy the full SHA
    cc681a1 View commit details
Showing with 21,469 additions and 564 deletions.
  1. +18 −0 .babelrc
  2. +5 −0 .gitignore
  3. +1 −0 .node-version
  4. +3 −0 .postcssrc.yml
  5. +1 −0 .ruby-version
  6. +14 −0 Dockerfile
  7. +18 −4 Gemfile
  8. +123 −62 Gemfile.lock
  9. +2 −0 Procfile
  10. +23 −4 README.md
  11. +17 −0 app/assets/javascripts/channels/tv.coffee
  12. +18 −0 app/assets/javascripts/channels/web_notification.coffee
  13. +75 −0 app/assets/javascripts/meals.coffee
  14. +3 −0 app/assets/javascripts/nutritions.coffee
  15. +19 −0 app/assets/javascripts/pages.coffee
  16. 0 app/assets/sounds/.keep
  17. +2 −0 app/assets/stylesheets/application.scss
  18. +33 −0 app/assets/stylesheets/meals.scss
  19. +10 −0 app/assets/stylesheets/nutritions.scss
  20. +46 −0 app/assets/stylesheets/pages.scss
  21. +0 −84 app/assets/stylesheets/scaffolds.scss
  22. +24 −0 app/assets/stylesheets/sticky-footer.css
  23. +12 −0 app/channels/application_cable/connection.rb
  24. +11 −0 app/channels/tv_channel.rb
  25. +9 −0 app/channels/web_notification_channel.rb
  26. +32 −9 app/controllers/meals_controller.rb
  27. +76 −0 app/controllers/nutritions_controller.rb
  28. +27 −0 app/controllers/pages_controller.rb
  29. +0 −29 app/controllers/user_profile_controller.rb
  30. +29 −0 app/controllers/users_controller.rb
  31. +7 −0 app/helpers/application_helper.rb
  32. +18 −0 app/helpers/meals_helper.rb
  33. +2 −0 app/helpers/nutritions_helper.rb
  34. +85 −0 app/javascript/comment.vue
  35. +88 −0 app/javascript/meal.vue
  36. +10 −0 app/javascript/packs/application.js
  37. +46 −0 app/javascript/packs/hello_vue.js
  38. +55 −0 app/jobs/guess_dish_job.rb
  39. +8 −0 app/mailers/user_mailer.rb
  40. +8 −7 app/models/comment.rb
  41. +17 −0 app/models/dish.rb
  42. +16 −0 app/models/dri.rb
  43. +3 −1 app/models/meal.rb
  44. +33 −0 app/models/nutrition.rb
  45. +7 −1 app/models/user.rb
  46. +8 −0 app/models/user_profile.rb
  47. +6 −2 app/uploaders/avatar_uploader.rb
  48. +42 −14 app/views/devise/registrations/edit.html.erb
  49. +3 −0 app/views/kaminari/_first_page.html.erb
  50. +3 −0 app/views/kaminari/_gap.html.erb
  51. +3 −0 app/views/kaminari/_last_page.html.erb
  52. +3 −0 app/views/kaminari/_next_page.html.erb
  53. +9 −0 app/views/kaminari/_page.html.erb
  54. +17 −0 app/views/kaminari/_paginator.html.erb
  55. +3 −0 app/views/kaminari/_prev_page.html.erb
  56. +44 −12 app/views/layouts/application.html.erb
  57. +1 −1 app/views/meals/_form.html.erb
  58. +4 −1 app/views/meals/_meal.json.jbuilder
  59. +2 −3 app/views/meals/edit.html.erb
  60. +32 −8 app/views/meals/index.html.erb
  61. +2 −2 app/views/meals/new.html.erb
  62. +36 −28 app/views/meals/show.html.erb
  63. +1 −1 app/views/meals/show.json.jbuilder
  64. +95 −0 app/views/nutritions/_form.html.erb
  65. +2 −0 app/views/nutritions/_nutrition.json.jbuilder
  66. +3 −0 app/views/nutritions/edit.html.erb
  67. +25 −0 app/views/nutritions/index.html.erb
  68. +1 −0 app/views/nutritions/index.json.jbuilder
  69. +3 −0 app/views/nutritions/new.html.erb
  70. +37 −0 app/views/nutritions/show.html.erb
  71. +1 −0 app/views/nutritions/show.json.jbuilder
  72. +21 −7 app/views/pages/dashboard.html.erb
  73. +52 −2 app/views/pages/index.html.erb
  74. +10 −0 app/views/pages/tv.html.erb
  75. +19 −0 app/views/pages/tv.json.jbuilder
  76. +33 −0 app/views/simple_calendar/_calendar.html.erb
  77. +44 −0 app/views/simple_calendar/_month_calendar.html.erb
  78. +50 −0 app/views/simple_calendar/_week_calendar.html.erb
  79. +5 −0 app/views/user_mailer/notify_new_meal.html.erb
  80. +0 −32 app/views/user_profile/edit.html.erb
  81. +0 −12 app/views/user_profile/show.html.erb
  82. +78 −0 app/views/users/edit.html.erb
  83. +12 −0 app/views/users/show.html.erb
  84. +21 −0 bin/webpack
  85. +21 −0 bin/webpack-dev-server
  86. +2 −2 bin/yarn
  87. +4 −0 config/application.rb
  88. +26 −6 config/breadcrumbs.rb
  89. +1 −1 config/database.yml
  90. +2 −0 config/environments/development.rb
  91. +14 −2 config/environments/heroku.rb
  92. +1 −0 config/initializers/assets.rb
  93. +4 −4 config/initializers/rails_admin.rb
  94. +9 −0 config/initializers/sidekiq.rb
  95. +10 −0 config/initializers/time_formats.rb
  96. +14 −0 config/locales/models/nutrition.ja.yml
  97. +2 −0 config/locales/models/user_profile.ja.yml
  98. +2 −1 config/pre_commit.yml
  99. +14 −7 config/routes.rb
  100. +6 −0 config/sidekiq.yml
  101. +3 −0 config/webpack/development.js
  102. +3 −0 config/webpack/environment.js
  103. +3 −0 config/webpack/production.js
  104. +3 −0 config/webpack/test.js
  105. +63 −0 config/webpacker.yml
  106. +27 −0 db/fixtures/01_user.rb
  107. +7 −0 db/fixtures/02_relation.rb
  108. +26 −0 db/fixtures/03_nutrition.rb
  109. +26 −0 db/fixtures/04_dri.rb
  110. +926 −0 db/fixtures/dri.json
  111. +12,377 −0 db/fixtures/nutritions.json
  112. +6 −3 db/migrate/20171008055732_create_comments.rb
  113. +16 −0 db/migrate/20171119015726_create_nutritions.rb
  114. +12 −0 db/migrate/20171119071746_create_dishes.rb
  115. +14 −0 db/migrate/20171202084647_create_dris.rb
  116. +6 −0 db/migrate/20171202160308_add_feature_to_user_profiles.rb
  117. +10 −0 db/migrate/20171205211715_change_nutrition.rb
  118. +51 −6 db/schema.rb
  119. +16 −0 docker-compose.yml
  120. BIN erd.pdf
  121. +53 −0 lib/tasks/auto_annotate_models.rake
  122. +6 −0 lib/tasks/auto_generate_diagram.rake
  123. +11 −0 lib/tasks/deploy_sounds.rake
  124. +10 −2 package.json
  125. +1 −144 spec/controllers/meals_controller_spec.rb
  126. +28 −0 spec/controllers/nutritions_controller_spec.rb
  127. +1 −1 spec/controllers/pages_controller_spec.rb
  128. +0 −30 spec/controllers/user_profile_controller_spec.rb
  129. +19 −0 spec/controllers/users_controller_spec.rb
  130. +8 −7 spec/factories/comments.rb
  131. +17 −0 spec/factories/dishes.rb
  132. +21 −0 spec/factories/dris.rb
  133. +1 −1 spec/factories/meals.rb
  134. +28 −0 spec/factories/nutritions.rb
  135. +1 −1 spec/factories/relations.rb
  136. +4 −2 spec/factories/user_profiles.rb
  137. +2 −2 spec/factories/users.rb
  138. +15 −0 spec/helpers/nutritions_helper_spec.rb
  139. +5 −0 spec/jobs/guess_dish_job_spec.rb
  140. +3 −0 spec/mailers/previews/user_mailer_preview.rb
  141. +5 −0 spec/mailers/user_mailer_spec.rb
  142. +7 −6 spec/models/comment_spec.rb
  143. +16 −0 spec/models/dish_spec.rb
  144. +18 −0 spec/models/dri_spec.rb
  145. +22 −0 spec/models/nutrition_spec.rb
  146. +3 −1 spec/models/user_profile_spec.rb
  147. +11 −0 spec/requests/nutritions_spec.rb
  148. +8 −8 spec/routing/meals_routing_spec.rb
  149. +37 −0 spec/routing/nutritions_routing_spec.rb
  150. +25 −0 spec/views/nutritions/edit.html.erb_spec.rb
  151. +32 −0 spec/views/nutritions/index.html.erb_spec.rb
  152. +25 −0 spec/views/nutritions/new.html.erb_spec.rb
  153. +22 −0 spec/views/nutritions/show.html.erb_spec.rb
  154. +5,492 −1 yarn.lock
18 changes: 18 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"presets": [
["env", {
"modules": false,
"targets": {
"browsers": "> 1%",
"uglify": true
},
"useBuiltIns": true
}]
],

"plugins": [
"syntax-dynamic-import",
"transform-object-rest-spread",
["transform-class-properties", { "spec": true }]
]
}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -28,3 +28,8 @@
/public/uploads

.env
/public/packs
/public/packs-test
/node_modules

/app/assets/sounds/*
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.9.0
3 changes: 3 additions & 0 deletions .postcssrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins:
postcss-smart-import: {}
postcss-cssnext: {}
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.4.2
14 changes: 14 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM ruby:2.4.2-alpine

RUN apk add --update --no-cache alpine-sdk make gcc postgresql-dev

RUN gem install bundler && \
bundle config --global path vendor/bundle && \
bundle config --global jobs 4

RUN echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \
apk add --update --no-cache libuv@edge nodejs@edge && \
npm i -g yarn

RUN apk add --no-cache tzdata && \
ln -sf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
22 changes: 18 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -25,38 +25,50 @@ 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', '~> 3.0'
gem "redis", "~> 3.0"
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# プロセスマネージャー
gem "foreman"
# フロントエンドを美しくしたかった
gem "webpacker", "~> 3.0"
# .envでヤバい情報を管理する
gem "dotenv-rails"
# ジョブ管理
gem "sidekiq"
gem "sinatra", require: false
# 管理画面
gem "rails_admin", "~> 1.2"
# ユーザー認証
gem "devise"
gem "devise-i18n"
# Seed
gem "seed-fu", "~> 2.3"
# ファイルアップロード
gem "carrierwave", "~> 1.0"
gem "carrierwave-i18n"
# 検索
gem "ransack"
gem "fog-aws"
# httpクライアント
gem "faraday"
# 渋々bootstrap
gem "bootstrap"
gem "jquery-rails"
# パンくず
gem "gretel"
# ページネーション
gem "kaminari"
# カレンダー表示
gem "simple_calendar", "~> 2.0"

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]
# Testing framework
gem "factory_girl_rails", "~> 4.8"
gem "factory_bot_rails", "~> 4.8"
gem "rspec-rails", "~> 3.6"
end

@@ -75,6 +87,8 @@ group :development do
gem "letter_opener_web"
# スキーマを分かりやすくする
gem "annotate", require: false
# ER図を生成
gem "rails-erd"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Loading