merge to master (#122)

* refactor: Modify alert style (#69)

LGTM

* addfunc: Modify image uploader (#71)

LGTM

* refactor:modify_devise_mail_message/#63 (#73)

LGTM

* Modify typographical error body email changed #74

* refactor: Modify sign up form #70 (#76)

LGTM

* addfunc: Add share button #55 (#77)

LGTM

* Addfunc/modify to ajax/#54 (#79)

* addfunc: Split JavaScript files #54

* addfunc: Add function Ajax process to like #54

* addfunc: Add function Ajax process to follow #54

* addfunc: Fix like #54

* addfunc: Fix follow #54

* addfunc: Add function Ajax process to commnent #54

* refactor: Like #54 

LGTM

* fix: Modify image uploader #72 (#80)

LGTM

* addfunc: Add functions private post #53 (#84)

LGTM

* refactor: Refactor gem update nokogiri (#92)

LGTM

* refactor: Modify lodash (#93)

LGTM

* refactor: Update websocket-extensions (#94)

LGTM

* refactor: Update rack (#95)

LGTM

* refactor: Update puma (#96)

LGTM

* Bump puma from 4.3.5 to 5.0.4 (#97)

Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 5.0.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v4.3.5...v5.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump rails from 6.0.2.1 to 6.0.3.4 (#98)

Bumps [rails](https://github.com/rails/rails) from 6.0.2.1 to 6.0.3.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](rails/rails@v6.0.2.1...v6.0.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump dotenv-rails from 2.7.5 to 2.7.6 (#99)

Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.5 to 2.7.6.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](bkeepers/dotenv@v2.7.5...v2.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump bootsnap from 1.4.5 to 1.5.1 (#101)

Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.5.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](Shopify/bootsnap@v1.4.5...v1.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Bump listen from 3.1.5 to 3.3.1 (#100)

Bumps [listen](https://github.com/guard/listen) from 3.1.5 to 3.3.1.
- [Release notes](https://github.com/guard/listen/releases)
- [Commits](guard/listen@v3.1.5...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* refactor: Update package and yarn

* fix: Remove local SSL setting #102 (#105)

LGTM

* fix: Refactor redirect HOME page after sing-in #103 (#106)

LGTM

* Create pull_request_template.md

* Refactor/improve template UI (#117)

* fix: package & yarn

* fix: Font Awsome

* fix: Ajax process

* refactor: Remove reading related Facebook button

* refactor: template #104

* refactor: /posts

* refactor: /posts/show

* refactor: /users

* refactor: /posts/ranking

* refactor: /psots/search

* refactor: /posts when it signout

* refactoring

* fix webpack

* fix webpack

* fix circleci config

* fix webpack

* fix webpack

* fix webpack

* fix webpack

* fix webpack

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

.circleci/config.yml

@@ -13,14 +13,14 @@ jobs:
           aws-access-key-id: AWS_ACCESS_KEY_ID
           aws-secret-access-key: AWS_SECRET_ACCESS_KEY
           aws-region: AWS_REGION
-      - run:
-          name: "db create"
-          command: |
-            aws ecs run-task --region $AWS_REGION \
-              --cluster $ECS_ARN \
-              --task-definition nginx-rails-app \
-              --overrides '{"containerOverrides": [{"name": "rails","command": ["rails", "db:create"]}]}'
-          working_directory: app
+      # - run:
+      #     name: "db create"
+      #     command: |
+      #       aws ecs run-task --region $AWS_REGION \
+      #         --cluster $ECS_ARN \
+      #         --task-definition nginx-rails-app \
+      #         --overrides '{"containerOverrides": [{"name": "rails","command": ["rails", "db:create"]}]}'
+      #     working_directory: app
       - run:
           name: "db migrate"
           command: |

.gitignore

@@ -34,7 +34,6 @@ yarn-debug.log*
 
 /public/uploads
 
-
 /docker/nginx/ssl/server.crt
 /docker/nginx/ssl/server.csr
-/docker/nginx/ssl/server.key
+/docker/nginx/ssl/server.key

app/assets/stylesheets/application.scss

@@ -14,11 +14,37 @@
  *= require_self
  */
 
-@import "./variables";
+$theme-colors: (
+  "primary": #f6b352,
+  "secondary": #fc913a,
+  "tertiary": #f68655,
+  "quaternary": #4c4c4c,
+);
+
+/*正三角形
+------------------------------------------------------*/
+@mixin trianglearrow($direction: right, $size: 12, $color: gray) {
+  $set: left;
+
+  @if $direction == left {
+    $set: right;
+  } @else if $direction == top {
+    $set: bottom;
+  } @else if $direction == bottom {
+    $set: top;
+  } @else {
+    $set: left;
+  }
+  $size: round($size / 2);
+
+  width: 0;
+  height: 0;
+  border: $size + px solid transparent;
+  border-#{$set}-color: $color;
+}
 
-@import "/node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/regular";
-@import "/node_modules/bootstrap/scss/bootstrap";
+@import "../../../modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "../../../modules/bootstrap/scss/bootstrap";
 
 /*related init
 ------------------------------------------------------*/
@@ -1638,3 +1664,59 @@ footer {
     }
   }
 }
+
+/*block-notifications
+------------------------------------------------------*/
+.block-notifications {
+  margin-bottom: 0.5em;
+  padding-bottom: 0.5em;
+  border-bottom: 1px dotted #999;
+
+  a {
+    text-decoration: none;
+    color: #333 !important;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .block-notifications__date {
+    color: #666;
+    font-size: 0.9em;
+    text-align: right;
+  }
+}
+
+/*scroll
+------------------------------------------------------*/
+.scroll {
+  position: relative;
+  height: 250px;
+  margin-top: 0.5rem;
+  overflow: auto;
+  border: 1px solid #f0f0f0;
+  padding: 1rem;
+  margin-top: 1rem;
+}
+
+/*form-signin
+------------------------------------------------------*/
+.form-signin {
+  width: 100%;
+  max-width: 450px;
+  padding: 15px;
+  margin: auto;
+
+  #user_login {
+    margin-bottom: -1px;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  #user_password {
+    margin-bottom: 10px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+}

app/assets/stylesheets/cats.scss

@@ -1,5 +1,3 @@
 // Place all the styles related to the Cats controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";

app/assets/stylesheets/comments.scss

@@ -1,5 +1,3 @@
 // Place all the styles related to the comments controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";

app/assets/stylesheets/home.scss

@@ -2,9 +2,7 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
 
-@import "./variables";
-
-.main-visual{
+.main-visual {
   background-image: image-url("main-visual__bg.jpg");
   background-position: center;
   background-repeat: no-repeat;
@@ -15,22 +13,21 @@
   justify-content: center;
   align-items: center;
 
-
-  .main-visual__inner{
-    background-color: rgba(255, 210, 0, .7);
+  .main-visual__inner {
+    background-color: rgba(255, 210, 0, 0.7);
   }
 
-  .main-visual__logo{
+  .main-visual__logo {
     color: black;
     font-weight: 700;
     text-align: center;
     font-size: 1.8em;
   }
 
-  .main-visual__sub{
+  .main-visual__sub {
     color: black;
     font-weight: 700;
     text-align: center;
-    font-size: .9em;
+    font-size: 0.9em;
   }
-}
+}

app/assets/stylesheets/likes.scss

@@ -1,5 +1,3 @@
 // Place all the styles related to the Likes controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";

app/assets/stylesheets/notifications.scss

@@ -1,26 +1,3 @@
 // Place all the styles related to the notifications controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";
-
-.block-notifications{
-  margin-bottom: .5em;
-  padding-bottom: .5em;
-  border-bottom: 1px dotted #999;
-
-  a{
-    text-decoration: none;
-    color: #333 !important;
-
-    &:hover{
-      text-decoration: underline;
-    }
-  }
-
-  .block-notifications__date{
-    color: #666;
-    font-size: .9em;
-    text-align: right;
-  }
-}

app/assets/stylesheets/posts.scss

@@ -1,15 +1,3 @@
 // Place all the styles related to the Posts controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";
-
-.scroll {
-  position: relative;
-  height: 250px;
-  margin-top: 0.5rem;
-  overflow: auto;
-  border: 1px solid #f0f0f0;
-  padding: 1rem;
-  margin-top: 1rem;
-}

app/assets/stylesheets/relationships.scss

@@ -1,5 +1,3 @@
 // Place all the styles related to the relationships controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";

app/assets/stylesheets/users.scss

@@ -1,23 +1,3 @@
 // Place all the styles related to the users controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: https://sass-lang.com/
-
-@import "./variables";
-.form-signin {
-  width: 100%;
-  max-width: 450px;
-  padding: 15px;
-  margin: auto;
-
-  #user_login {
-    margin-bottom: -1px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  #user_password {
-    margin-bottom: 10px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-  }
-}

app/controllers/application_controller.rb

@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
 
   protected
     def configure_permitted_parameters
-      devise_parameter_sanitizer.permit(:sign_up, keys: [:username, :email, :password, :password_confirmation])
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:name, :username, :email, :password, :password_confirmation])
       devise_parameter_sanitizer.permit(:sign_in, keys: [:login, :password, :password_confirmation, :remember_me])
       devise_parameter_sanitizer.permit(:account_update, keys: [:username, :email, :password, :password_confirmation, :current_password, :image, :image_cache, :name])
     end

app/javascript/packs/application.js

@@ -8,9 +8,9 @@ require("turbolinks").start()
 require("@rails/activestorage").start()
 require("channels")
 
-require("/node_modules/jquery/dist/jquery.js");
-require("/node_modules/@fortawesome/fontawesome-free/js/all.js");
-require("/node_modules/bootstrap/dist/js/bootstrap.js");
+import "../../../modules/jquery/dist/jquery"
+import "../../../modules/bootstrap/dist/js/bootstrap"
+import "../../../modules/@fortawesome/fontawesome-free/js/all"
 
 
 // Uncomment to copy all static images under ../images to the output folder and reference

config/webpack/environment.js

@@ -5,8 +5,8 @@ const webpack = require('webpack')
 environment.plugins.prepend(
   'Provide',
   new webpack.ProvidePlugin({
-    $: 'jquery',
-    jQuery: 'jquery',
+    $: 'jquery/src/jquery',
+    jQuery: 'jquery/src/jquery',
     Popper: 'popper.js'
   })
 )

config/webpack/webpack.config.js

@@ -0,0 +1,14 @@
+const { environment } = require('@rails/webpacker')
+
+//jQuery & Bootstap's JavaScript
+const webpack = require('webpack')
+environment.plugins.prepend(
+  'Provide',
+  new webpack.ProvidePlugin({
+    $: 'jquery/src/jquery',
+    jQuery: 'jquery/src/jquery',
+    Popper: 'popper.js'
+  })
+)
+
+module.exports = environment

docker/mysql/Dockerfile

@@ -1,10 +1,10 @@
 FROM mysql:5.7
 
-RUN apt-get update && \
-  apt-get install -y apt-utils \
+RUN apt-get update && apt-get install -y --no-install-recommends\
+  apt-utils \
   locales && \
   rm -rf /var/lib/apt/lists/* && \
   echo "ja_JP.UTF-8 UTF-8" > /etc/locale.gen && \
   locale-gen ja_JP.UTF-8
 ENV LC_ALL ja_JP.UTF-8
-ADD ./docker/mysql/charset.cnf /etc/mysql/conf.d/charset.cnf
+COPY ./docker/mysql/charset.cnf /etc/mysql/conf.d/charset.cnf

docker/rails/Dockerfile

@@ -5,6 +5,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
   && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+
 # Install nodejs & default-mysql-client, vim
 RUN apt-get update && apt-get install -y --no-install-recommends\
   nodejs \
@@ -14,8 +16,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends\
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-RUN yarn add jquery bootstrap popper.js @fortawesome/fontawesome-free
-
 WORKDIR /app
 
 COPY Gemfile .
@@ -25,4 +25,8 @@ COPY . /app
 EXPOSE 3000
 
 RUN bundle install
+
+RUN yarn install --check-files && \
+  yarn upgrade
+
 RUN bundle exec rake assets:precompile