diff --git a/.github/workflows/deploy_heroku.yml b/.github/workflows/deploy_heroku.yml index 417968f2..932f143d 100644 --- a/.github/workflows/deploy_heroku.yml +++ b/.github/workflows/deploy_heroku.yml @@ -7,7 +7,7 @@ on: branches: - master - main - - development + - develop types: - completed workflow_dispatch: @@ -15,7 +15,7 @@ on: env: DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }} DOCKER_REGISTRY_USERNAME: ${{ github.repository_owner }} - DOCKER_REGISTRY_TOKEN: ${{ secrets.DOCKER_REGISTRY_TOKEN }} + DOCKER_REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_IMAGE: ${{ github.repository }} HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }} @@ -42,9 +42,9 @@ jobs: run: | if [[ $BRANCH_TAG = "latest" ]] then - echo "HEROKU_APP=google_search_ruby" >> $GITHUB_ENV + echo "HEROKU_APP=google-search-ruby" >> $GITHUB_ENV else - echo "HEROKU_APP=google_search_ruby-staging" >> $GITHUB_ENV + echo "HEROKU_APP=google-search-ruby-staging" >> $GITHUB_ENV fi - name: Login to Docker registry diff --git a/.github/workflows/test_production_build.yml b/.github/workflows/test_production_build.yml index 2e2b780a..5aa2f398 100644 --- a/.github/workflows/test_production_build.yml +++ b/.github/workflows/test_production_build.yml @@ -5,7 +5,7 @@ on: branches-ignore: - master - main - - development + - develop env: DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }} diff --git a/README.md b/README.md index 5921cb76..9b52ac48 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,12 @@ > Google Search Ruby is a Web app that extract large amounts of data from the Google search results page. > Feed it with a CSV File containing your keywords, and the app will do the rest for you! +## Web Application + +[Staging](https://google-search-ruby-staging.herokuapp.com/) + +[Production](https://google-search-ruby.herokuapp.com/) + ## Project Setup ### Prerequisites @@ -114,3 +120,11 @@ rspec [rspec-params] - Create a [Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) from bot account with `public_repo` scope, and set it as `DANGER_GITHUB_API_TOKEN` secret on the CI Environment Settings. + + +## About +![Nimble](https://assets.nimblehq.co/logo/dark/logo-dark-text-160.png) + +This project is created to complete **Web Certification Path** using **Ruby** at [Nimble][nimble] + +[nimble]: https://nimblehq.co diff --git a/app/controllers/keywords_controller.rb b/app/controllers/keywords_controller.rb new file mode 100644 index 00000000..22006d8a --- /dev/null +++ b/app/controllers/keywords_controller.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class KeywordsController < ApplicationController + def index; end +end diff --git a/app/views/keywords/index.html.erb b/app/views/keywords/index.html.erb new file mode 100644 index 00000000..6d0bb5a1 --- /dev/null +++ b/app/views/keywords/index.html.erb @@ -0,0 +1,2 @@ +

Keywords#index

+

Find me in app/views/keyword/index.html.erb

diff --git a/config/database.yml b/config/database.yml index 7d986fdf..e93efb37 100644 --- a/config/database.yml +++ b/config/database.yml @@ -18,4 +18,5 @@ test: database: <%= ENV['DB_NAME'] %>_test production: + <<: *default url: <%= ENV['DATABASE_URL'] %> diff --git a/config/routes.rb b/config/routes.rb index c06383a1..fdbc5d0a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,6 @@ Rails.application.routes.draw do + root to: 'keywords#index' + + resources :keywords, only: :index # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/spec/helpers/.keep b/spec/helpers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/spec/views/.keep b/spec/views/.keep new file mode 100644 index 00000000..e69de29b