Skip to content

Commit

Permalink
Merge pull request #50 from Botnbot/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@frocher
frocher authored Feb 10, 2021
2 parents b0310b5 + 4a98b0b commit 978e46b
Show file tree
Hide file tree
Showing 5 changed files with 5,735 additions and 4,923 deletions.
1 change: 1 addition & 0 deletions backend/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ gem 'slim'
gem 'chronic_duration'

# Auth
gem 'omniauth', '=1.9.1'
gem 'devise_token_auth', '>= 0.1.42'
gem 'omniauth-github'
gem 'omniauth-facebook'
Expand Down
14 changes: 6 additions & 8 deletions backend/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,14 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (2.0.2)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
rack-protection
omniauth-facebook (8.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (2.0.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-github (1.4.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-google-oauth2 (0.8.1)
jwt (>= 2.0)
oauth2 (~> 1.1)
Expand All @@ -178,8 +177,6 @@ GEM
rack (2.2.3)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-protection (2.1.0)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.4)
Expand Down Expand Up @@ -248,7 +245,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
stripe (5.29.0)
stripe (5.29.1)
temple (0.8.2)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
Expand Down Expand Up @@ -286,6 +283,7 @@ DEPENDENCIES
kaminari (>= 1.1.1)
listen (>= 3.0.5, < 3.3)
mysql2
omniauth (= 1.9.1)
omniauth-facebook
omniauth-github
omniauth-google-oauth2
Expand Down
122 changes: 61 additions & 61 deletions backend/config/routes.rb
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
# == Route Map
#
# Prefix Verb URI Pattern Controller#Action
# new_user_session GET /auth/sign_in(.:format) devise_token_auth/sessions#new
# user_session POST /auth/sign_in(.:format) devise_token_auth/sessions#create
# destroy_user_session DELETE /auth/sign_out(.:format) devise_token_auth/sessions#destroy
# new_user_password GET /auth/password/new(.:format) devise_token_auth/passwords#new
# edit_user_password GET /auth/password/edit(.:format) devise_token_auth/passwords#edit
# user_password PATCH /auth/password(.:format) devise_token_auth/passwords#update
# PUT /auth/password(.:format) devise_token_auth/passwords#update
# POST /auth/password(.:format) devise_token_auth/passwords#create
# cancel_user_registration GET /auth/cancel(.:format) devise_token_auth/registrations#cancel
# new_user_registration GET /auth/sign_up(.:format) devise_token_auth/registrations#new
# edit_user_registration GET /auth/edit(.:format) devise_token_auth/registrations#edit
# user_registration PATCH /auth(.:format) devise_token_auth/registrations#update
# PUT /auth(.:format) devise_token_auth/registrations#update
# DELETE /auth(.:format) devise_token_auth/registrations#destroy
# POST /auth(.:format) devise_token_auth/registrations#create
# new_user_confirmation GET /auth/confirmation/new(.:format) devise_token_auth/confirmations#new
# user_confirmation GET /auth/confirmation(.:format) devise_token_auth/confirmations#show
# POST /auth/confirmation(.:format) devise_token_auth/confirmations#create
# auth_validate_token GET /auth/validate_token(.:format) devise_token_auth/token_validations#validate_token
# auth_failure GET /auth/failure(.:format) users/omniauth_callbacks#omniauth_failure
# GET /auth/:provider/callback(.:format) users/omniauth_callbacks#omniauth_success
# GET|POST /omniauth/:provider/callback(.:format) users/omniauth_callbacks#redirect_callbacks
# omniauth_failure GET|POST /omniauth/failure(.:format) users/omniauth_callbacks#omniauth_failure
# GET /auth/:provider(.:format) redirect(301)
# environment_index GET /environment(.:format) environment#index
# page_owner GET /pages/:page_id/owner(.:format) pages/owners#show
# PATCH /pages/:page_id/owner(.:format) pages/owners#update
# PUT /pages/:page_id/owner(.:format) pages/owners#update
# page_members GET /pages/:page_id/members(.:format) pages/members#index
# POST /pages/:page_id/members(.:format) pages/members#create
# page_member PATCH /pages/:page_id/members/:id(.:format) pages/members#update
# PUT /pages/:page_id/members/:id(.:format) pages/members#update
# DELETE /pages/:page_id/members/:id(.:format) pages/members#destroy
# page_assets GET /pages/:page_id/assets(.:format) pages/assets#index
# page_asset GET /pages/:page_id/assets/:id(.:format) pages/assets#show
# page_lighthouse_index GET /pages/:page_id/lighthouse(.:format) pages/lighthouse#index
# page_lighthouse GET /pages/:page_id/lighthouse/:id(.:format) pages/lighthouse#show
# page_budgets GET /pages/:page_id/budgets(.:format) pages/budgets#index
# POST /pages/:page_id/budgets(.:format) pages/budgets#create
# page_budget DELETE /pages/:page_id/budgets/:id(.:format) pages/budgets#destroy
# page_stats GET /pages/:page_id/stats(.:format) pages/stats#index
# page_uptime_index GET /pages/:page_id/uptime(.:format) pages/uptime#index
# page_uptime GET /pages/:page_id/uptime/:id(.:format) pages/uptime#show
# pages GET /pages(.:format) pages#index
# POST /pages(.:format) pages#create
# page GET /pages/:id(.:format) pages#show
# PATCH /pages/:id(.:format) pages#update
# PUT /pages/:id(.:format) pages#update
# DELETE /pages/:id(.:format) pages#destroy
# plans GET /plans(.:format) plans#index
# user_subscription GET /users/:user_id/subscription(.:format) users/subscriptions#show
# PATCH /users/:user_id/subscription(.:format) users/subscriptions#update
# PUT /users/:user_id/subscription(.:format) users/subscriptions#update
# DELETE /users/:user_id/subscription(.:format) users/subscriptions#destroy
# user GET /users/:id(.:format) users#show
# PATCH /users/:id(.:format) users#update
# PUT /users/:id(.:format) users#update
# DELETE /users/:id(.:format) users#destroy
# GET /pages/:id/screenshot(.:format) pages#screenshot
# POST /users/:id/save-subscription(.:format) users#save_subscription
# Prefix Verb URI Pattern Controller#Action
# new_user_session GET /auth/sign_in(.:format) devise_token_auth/sessions#new
# user_session POST /auth/sign_in(.:format) devise_token_auth/sessions#create
# destroy_user_session DELETE /auth/sign_out(.:format) devise_token_auth/sessions#destroy
# new_user_password GET /auth/password/new(.:format) devise_token_auth/passwords#new
# edit_user_password GET /auth/password/edit(.:format) devise_token_auth/passwords#edit
# user_password PATCH /auth/password(.:format) devise_token_auth/passwords#update
# PUT /auth/password(.:format) devise_token_auth/passwords#update
# POST /auth/password(.:format) devise_token_auth/passwords#create
# cancel_user_registration GET /auth/cancel(.:format) devise_token_auth/registrations#cancel
# new_user_registration GET /auth/sign_up(.:format) devise_token_auth/registrations#new
# edit_user_registration GET /auth/edit(.:format) devise_token_auth/registrations#edit
# user_registration PATCH /auth(.:format) devise_token_auth/registrations#update
# PUT /auth(.:format) devise_token_auth/registrations#update
# DELETE /auth(.:format) devise_token_auth/registrations#destroy
# POST /auth(.:format) devise_token_auth/registrations#create
# new_user_confirmation GET /auth/confirmation/new(.:format) devise_token_auth/confirmations#new
# user_confirmation GET /auth/confirmation(.:format) devise_token_auth/confirmations#show
# POST /auth/confirmation(.:format) devise_token_auth/confirmations#create
# auth_validate_token GET /auth/validate_token(.:format) devise_token_auth/token_validations#validate_token
# auth_failure GET /auth/failure(.:format) users/omniauth_callbacks#omniauth_failure
# GET /auth/:provider/callback(.:format) users/omniauth_callbacks#omniauth_success
# GET|POST /omniauth/:provider/callback(.:format) users/omniauth_callbacks#redirect_callbacks
# omniauth_failure GET|POST /omniauth/failure(.:format) users/omniauth_callbacks#omniauth_failure
# GET /auth/:provider(.:format) redirect(301)
# environment_index GET /environment(.:format) environment#index
# page_owner GET /pages/:page_id/owner(.:format) pages/owners#show
# PATCH /pages/:page_id/owner(.:format) pages/owners#update
# PUT /pages/:page_id/owner(.:format) pages/owners#update
# page_members GET /pages/:page_id/members(.:format) pages/members#index
# POST /pages/:page_id/members(.:format) pages/members#create
# page_member PATCH /pages/:page_id/members/:id(.:format) pages/members#update
# PUT /pages/:page_id/members/:id(.:format) pages/members#update
# DELETE /pages/:page_id/members/:id(.:format) pages/members#destroy
# page_assets GET /pages/:page_id/assets(.:format) pages/assets#index
# page_asset GET /pages/:page_id/assets/:id(.:format) pages/assets#show
# page_lighthouse_index GET /pages/:page_id/lighthouse(.:format) pages/lighthouse#index
# page_lighthouse GET /pages/:page_id/lighthouse/:id(.:format) pages/lighthouse#show
# page_budgets GET /pages/:page_id/budgets(.:format) pages/budgets#index
# POST /pages/:page_id/budgets(.:format) pages/budgets#create
# page_budget DELETE /pages/:page_id/budgets/:id(.:format) pages/budgets#destroy
# page_stats GET /pages/:page_id/stats(.:format) pages/stats#index
# page_uptime_index GET /pages/:page_id/uptime(.:format) pages/uptime#index
# page_uptime GET /pages/:page_id/uptime/:id(.:format) pages/uptime#show
# pages GET /pages(.:format) pages#index
# POST /pages(.:format) pages#create
# page GET /pages/:id(.:format) pages#show
# PATCH /pages/:id(.:format) pages#update
# PUT /pages/:id(.:format) pages#update
# DELETE /pages/:id(.:format) pages#destroy
# plans GET /plans(.:format) plans#index
# user_subscription GET /users/:user_id/subscription(.:format) users/subscriptions#show
# user GET /users/:id(.:format) users#show
# PATCH /users/:id(.:format) users#update
# PUT /users/:id(.:format) users#update
# DELETE /users/:id(.:format) users#destroy
# GET /pages/:id/screenshot(.:format) pages#screenshot
# POST /users/:id/save-subscription(.:format) users#save_subscription
# stripe_session POST /stripe/session(.:format) stripe#create_session
# stripe_customer_portal_session POST /stripe/customer_portal_session(.:format) stripe#create_customer_portal_session
# stripe_checkout_completed POST /stripe/checkout_completed(.:format) stripe#hooks

Rails.application.routes.draw do
mount_devise_token_auth_for 'User', at: 'auth', :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
Expand Down
Loading

0 comments on commit 978e46b

Please sign in to comment.