From 4e4d5b5af944bb0f073f3a9c11a5d5ce9698ed8d Mon Sep 17 00:00:00 2001 From: Andreas Finger Date: Tue, 19 Apr 2022 18:16:32 +0200 Subject: [PATCH] Update Ruby to 2.7.5 and fix a few typos in the README --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- README.md | 18 +++++++----------- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.ruby-version b/.ruby-version index 24ba9a3..a603bb5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.0 +2.7.5 diff --git a/.travis.yml b/.travis.yml index 7c9b6c6..f3566fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - '2.4.2' + - '2.7.5' before_script: - cp -v config/database.yml.example config/database.yml - yarn install diff --git a/Gemfile b/Gemfile index a1b314c..5db4f0f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.7.0' +ruby '2.7.5' gem 'rails', '~> 5.1.4' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 46d799b..5cf429d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -553,7 +553,7 @@ DEPENDENCIES webpacker RUBY VERSION - ruby 2.7.0p0 + ruby 2.7.5p203 BUNDLED WITH 2.1.4 diff --git a/README.md b/README.md index 23d2503..041741a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ # WAHLDATENHELFER :ballot_box_with_check: [![Build Status](https://www.travis-ci.com/railslove/wahldatenhelfer.svg?token=rLsyzRs4bH4dqZXw5Aq9&branch=master)](https://www.travis-ci.com/railslove/wahldatenhelfer) -The oroginal name was Wahldatenhelfer, later has been changed to Wahlgenial. -You may find in codebase `wahldatenhelfer`, `Wahlgenial` is for public. +The original name was Wahldatenhelfer, which has been changed to Wahlgenial. +In the codebase `wahldatenhelfer` might still be found, but use `Wahlgenial` for public facing strings. + ## Getting Started ### Requirements: -- Ruby 2.4.2 +- Ruby 2.7.5 - PostgreSQL 9.6 or later. ### Installation: @@ -58,12 +59,11 @@ Run `$ rspec` for running tests. To work in file-change-watch mode, run `$ guard ### React #### Storybook -Run `$ yarn stroybook` for storybook. Stories are located in `/app/javascript/stories/` +Run `$ yarn storybook` for storybook. Stories are located in `/app/javascript/stories/` ### Webpacker Webpacker is used as a pipeline for JavaScript, to run the development server, run `$ webpack-dev-server` - ## Available Assets ### ElectionApps Category Icons Currently the only icons available for `icon_name` field are: @@ -75,10 +75,6 @@ Currently the only icons available for `icon_name` field are: ## Hacks ### Sass for WEBPACKER & STORYBOOK -In `Sass` files, relative paths should be used to point to image assets Ex. `background: url('../javascript/images/arc.png')` instead of `background: url('images/arc.png')` -(path is relative to application.sass) - - - since both `storybook` and `webpacker gem` using same entry point `application.sass`, using absolute path Ex. `images/arc.png` is only possible for `webpacker`, it wasn't successful to setup `~/wahldatenhelfer/app/javaScript` as resolve path for storybook `webpack.config` which +In `Sass` files, relative paths should be used to point to image assets Ex. `background: url('../javascript/images/arc.png')` instead of `background: url('images/arc.png')` (path is relative to application.sass). +Since both `storybook` and `webpacker gem` using same entry point `application.sass`, using absolute path e.g. `images/arc.png` is only possible for `webpacker`, it wasn't successful to setup `~/wahldatenhelfer/app/javaScript` as resolve path for storybook `webpack.config` which tells webpack what directories should be searched when resolving modules. [webpack#resolve-modules](https://webpack.js.org/configuration/resolve/#resolve-modules) -=======