From 8c94c176c973e7b1d26b6db618b6b7daed2e2958 Mon Sep 17 00:00:00 2001 From: ZippyDev Date: Sun, 10 May 2020 12:54:50 -0600 Subject: [PATCH] remove fontawesome kit and update with webpacker. --- .env.docker | 1 + .npmrc | 2 ++ README.md | 3 ++- app/javascript/packs/fontawesome-pro.js | 1 + app/views/layouts/application.html.erb | 6 +++--- config/application.rb | 1 - 6 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 .npmrc create mode 100644 app/javascript/packs/fontawesome-pro.js diff --git a/.env.docker b/.env.docker index fe3c240..73742f0 100644 --- a/.env.docker +++ b/.env.docker @@ -1,5 +1,6 @@ COMPOSE_PROJECT_NAME=app DATABASE_URL=postgres://user:password@postgres:5432 +FONTAWESOME_NPM_AUTH_TOKEN=TODO_CHANGE_ME NODE_ENV=development POSTGRES_USER=user POSTGRES_PASSWORD=password diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..52d5ff0 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +@fortawesome:registry=https://npm.fontawesome.com/ +//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN} diff --git a/README.md b/README.md index e8ecff2..153c1f5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This repo is a designed to be a Dockerized Rails 6 template: - `yarn install --check-files` - `Find/replace all TODO` - `docker-compose up --build` - - `Replace FontAwesome Pro kit id in 'app/views/layouts/application.html.erb'` + - `FONTAWESOME_NPM_AUTH_TOKEN=CHANGE_ME yarn add @fortawesome/fontawesome-pro` ### Dependencies @@ -56,6 +56,7 @@ To start the application using docker compose locally: | `DB_MIN_CONNECTIONS` | Db Minimum Connections | 5 | `DB_SOCKET_TIMEOUT` | Db socket timeout | 5 | `DB_WAIT_QUEUE_TIMEOUT` | Db Wait queue timeout | 5 +| `FONTAWESOME_NPM_AUTH_TOKEN` | FontAwesome Auth token | - | `LOG_LEVEL` | Log level | warn | `REDIS_URL` | Redis Url | redis://localhost:6379/0 | `SMTP_HOST` | Smpt address | `localhost` diff --git a/app/javascript/packs/fontawesome-pro.js b/app/javascript/packs/fontawesome-pro.js new file mode 100644 index 0000000..4c2f935 --- /dev/null +++ b/app/javascript/packs/fontawesome-pro.js @@ -0,0 +1 @@ +import '@fortawesome/fontawesome-pro/js/all.js' diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b493b8b..aa86c9a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,8 +8,8 @@ - <%= stylesheet_link_tag 'application', media: 'all' %> - + <%= stylesheet_link_tag "application", media: "all" %> + <%= javascript_pack_tag "fontawesome-pro" %> @@ -22,6 +22,6 @@ <%= render "shared/footer" %> - <%= javascript_pack_tag 'application' %> + <%= javascript_pack_tag "application" %> <%= javascript_controller_pack_tag_helper %> diff --git a/config/application.rb b/config/application.rb index 797e23d..93b1179 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,7 +26,6 @@ module App APP_NAME = 'app' # TODO: Update name APP_TITLE = 'TODO: Update in config/application.rb' DATABASE_URL = ENV.fetch('DATABASE_URL') { "postgres://localhost:5432/#{APP_NAME}_#{Rails.env}" } - FONT_AWESOME_KIT_ID = ENV.fetch('FONT_AWESOME_KIT_ID') { 'TODO: CHANGE ME' } REDIS_URL = ENV.fetch('REDIS_URL') { 'redis://localhost:6379/0' } SMTP_HOST = ENV.fetch('SMTP_HOST') { 'localhost' } SMTP_PORT = ENV.fetch('SMTP_PORT') { 1025 }