Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ Rails/HelperInstanceVariable:
- 'app/helpers/invoices_helper.rb'
- 'app/helpers/sessions_helper.rb'
- 'app/helpers/stripe_cards_helper.rb'
- 'app/helpers/tours_helper.rb'

# Offense count: 17
# Configuration parameters: IgnoreScopes, Include.
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ summary {
@import 'components/welcome';
@import 'components/tabs';
@import 'components/team';
@import 'components/tour';
@import 'components/receipts';
@import 'components/shimmer';
@import 'components/carousel';
Expand Down
25 changes: 0 additions & 25 deletions app/assets/stylesheets/components/_tour.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,6 @@
}
}

.back-to-tour {
animation: fadeUp 0.25s 0.5s ease-out both;

position: fixed;
bottom: 3rem;
left: 3rem;

z-index: 5;

background-color: map-get($palette, 'primary') !important;
color: $white;

&__arrow {
transition: transform 0.125s ease-out;
}

&:hover &__arrow {
transform: translateX(0.4rem);
}

&:hover {
color: $white;
}
}

@keyframes fadeUp {
from {
transform: translateY(10px) scale(0.9);
Expand Down
1 change: 0 additions & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
class ApplicationController < ActionController::Base
include Pundit::Authorization
include SessionsHelper
include ToursHelper
include PublicActivity::StoreController
include SetGovernanceRequestContext

Expand Down
21 changes: 16 additions & 5 deletions app/controllers/events_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,29 @@ class EventsController < ApplicationController
include Rails::Pagination
before_action :set_event, except: [:index]
before_action :set_transaction_filters, only: [:transactions, :ledger]
before_action except: [:show, :index] do
render_back_to_tour @organizer_position, :welcome, event_path(@event)
end
# before_action except: [:show, :index] do
# render_back_to_tour @organizer_position, :welcome, event_path(@event)
# end
skip_before_action :signed_in_user
before_action :set_mock_data
before_action :set_event_follow, only: [:show, :transactions, :announcement_overview]

before_action :redirect_to_onboarding, unless: -> { @event&.is_public? }
before_action :set_timeframe, only: [:merchants_chart, :categories_chart, :tags_chart, :users_chart]

def walkthrough_steps
[
{
key: "ledger",
page: event_transactions_path(event_id: @event.slug),
steps: [
{ attachTo: "balance", intro: "This is your organization's current balance." },
{ attachTo: "filter-bar", intro: "Search transactions and narrow results down with filters." },
]
}
]
end

# GET /events
def index
authorize Event
Expand Down Expand Up @@ -149,8 +162,6 @@ def users_chart
end

def transactions
render_tour @organizer_position, :welcome

maybe_pending_invite = OrganizerPositionInvite.pending.find_by(user: current_user, event: @event)

if maybe_pending_invite.present?
Expand Down
17 changes: 0 additions & 17 deletions app/controllers/organizer_positions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,4 @@ def set_index
render json: organizer_positions.pluck(:id)
end

def mark_visited
organizer_position = OrganizerPosition.find(params[:id])
authorize organizer_position

organizer_position.update!(first_time: false)

if params[:start_tour] == true
start_tour organizer_position, :welcome

ahoy.track "Tour started", organizer_position_id: organizer_position.id
else
ahoy.track "Tour skipped", organizer_position_id: organizer_position.id
end

redirect_to organizer_position.event
end

end
37 changes: 0 additions & 37 deletions app/controllers/tours_controller.rb

This file was deleted.

24 changes: 0 additions & 24 deletions app/helpers/tours_helper.rb

This file was deleted.

138 changes: 0 additions & 138 deletions app/javascript/components/tour/TourOverlay.js

This file was deleted.

Loading