diff --git a/Capfile b/Capfile index 466e3399b..b0fbd7942 100644 --- a/Capfile +++ b/Capfile @@ -11,6 +11,5 @@ require "capistrano/passenger" require "capistrano/rails_tail_log" require "capistrano/rails" require "capistrano/rvm" -# require "capistrano/rbenv" Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r } diff --git a/README.md b/README.md index 0f6a65d4f..9f0b6bcbe 100644 --- a/README.md +++ b/README.md @@ -12,25 +12,17 @@ Zero Waste Lviv is a Public Organization that works on the implementation of was In order to attract attention to financial and ecological consequences of disposable diaper usage it is planned to create a module that will calculate budget spent on diapers and calculations of the future expenses. As visual representation it is planned to show the volume of waste that was made during usage of disposable diapers for one child. - [Deployed Apps and Environments](#deployed-apps-and-environments) +- [Required to install](#required-to-install) - [Installation](#installation) - - [Required to install](#Required-to-install) - - [Clone](#Clone) - - [Local setup](#Setup) - - [How to run local](#How-to-run-local) -- [Usage](#Usage) - - [How to run Rubocop](#How-to-run-Rubocop) - - [Git-hook pre-commit](#Git-hook-pre-commit) +- [Usage](#usage) +- [Contributing](#contributing) ## Deployed Apps and Environments -The latest version from the 'develop' branch is automatically deployed to stage environment in Render, [staging link](https://zero-waste-staging.onrender.com/). +The latest version from the 'develop' branch is automatically deployed to stage environment in Render, [staging link](http://51.44.25.104/en). The latest version from the release branch 'master' is automatically deployed to Production environment, [production link](http://calc.zerowastelviv.org.ua/). -## Installation - -- Start the project locally - -# Required to install +## Required to install - Ruby 3.3.5 - Ruby on Rails 7.1.2 @@ -38,6 +30,8 @@ The latest version from the release branch 'master' is automatically deployed to - Puma as a web server - Yarn - Bootstrap + +## Installation ## Clone @@ -161,7 +155,7 @@ $ `yarn install` # Usage -# How to run Rubocop +### Rubocop Running rubocop with no arguments will check all Ruby source files in the current folder: @@ -175,7 +169,7 @@ For more details check the available command-line options: $ `rubocop -h` -# Git-hook pre-commit +### Git-hook pre-commit Before using `git-hook-pre-commit` you need to install `sudo apt-get install cmake`