Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

187436627 registration only textbox #37

Closed
wants to merge 99 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ab263ca
Automatically use embeddable URL for media items
cycomachead Jul 22, 2023
28e751b
WIP Cleanup registrations datatable to show price+attendance
cycomachead Jul 25, 2023
2d426d1
Fix CoC visibility on reg page
cycomachead Jul 29, 2023
ece1d7d
Registrations table refactoring complete, I think
cycomachead Jul 29, 2023
6a05fd8
I think the reg datatable is good now. :)
cycomachead Jul 29, 2023
32144e4
use CSV to create a commercial/materials
cycomachead Jul 30, 2023
1134f16
Refactor embedding slides, etc
cycomachead Aug 13, 2023
48a6292
Move embeddable_url to services
cycomachead Aug 13, 2023
89c1e1b
Class autoloads as EmbeddableURL now, Dropbox works, but function is …
cycomachead Aug 13, 2023
20cc018
Attempt to fix dropbox URL generation
cycomachead Aug 14, 2023
e82d130
fix messup in spec file
cycomachead Aug 14, 2023
4c83a21
delete spec which leads to warning about being ineffective
cycomachead Aug 14, 2023
01865c5
safer ics categories...
cycomachead Nov 7, 2023
d712445
Bump the bundler group group with 2 updates
dependabot[bot] Feb 29, 2024
51a903f
Bump the bundler group group with 1 update
dependabot[bot] Mar 2, 2024
60395e3
Update nokogiri to version 1.16.2
depfu[bot] Mar 4, 2024
dc04bda
Merge pull request #3266 from openSUSE/depfu/update/nokogiri-1.16.2
hennevogel Mar 4, 2024
4dead61
Update rack to version 2.2.8.1
depfu[bot] Mar 4, 2024
ef4ee83
Update carrierwave to version 2.2.5
depfu[bot] Mar 4, 2024
74c2551
Update rubocop-rspec to version 2.23.0
depfu[bot] Mar 4, 2024
9959011
Merge pull request #3267 from openSUSE/depfu/update/rack-2.2.8.1
hennevogel Mar 4, 2024
b4c5463
Merge pull request #3268 from openSUSE/depfu/update/carrierwave-2.2.5
hennevogel Mar 4, 2024
c63ed43
Merge pull request #3252 from openSUSE/depfu/update/rubocop-rspec-2.23.0
hennevogel Mar 4, 2024
d440b70
Update rails to 7.0.8.1
hennevogel Mar 4, 2024
4ffae65
Merge pull request #3269 from openSUSE/depfu/update/group/rails-7.1.3.2
hennevogel Mar 5, 2024
30bc21c
Move word counting javascript to the page
hennevogel Mar 5, 2024
9fd0807
Merge pull request #3276 from hennevogel/bugfix/word-count-js
hennevogel Mar 5, 2024
b6560db
Get off off rails-assets
hennevogel Mar 5, 2024
4290e9e
Merge pull request #3277 from hennevogel/drop-rails-assets
hennevogel Mar 5, 2024
2f55bc9
Merge pull request #354 from snap-cloud/dependabot/bundler/bundler-se…
cycomachead Mar 8, 2024
8ef80ea
Merge pull request #353 from snap-cloud/dependabot/bundler/bundler-se…
cycomachead Mar 11, 2024
12f95c2
Merge pull request #356 from cs169/main
cycomachead Mar 12, 2024
13584db
Merge upstream, re-run bundle
cycomachead Mar 12, 2024
245e379
Rerun rubocop --auto-gen-config
cycomachead Mar 12, 2024
fd13a1f
Configure some codeclimate exclusions
cycomachead Mar 12, 2024
a7ea6e7
Fix specs for local use, add codeclimate default exclusions
cycomachead Mar 12, 2024
7f33e50
Fixup the AdminUser#index page, some specs
cycomachead Mar 12, 2024
05e877f
Cleanup specs file
cycomachead Mar 12, 2024
49466a8
fix a typo
cycomachead Mar 12, 2024
20fc3ff
More cleanup / fix app :script_head
cycomachead Mar 12, 2024
c13ba7f
resolve bullet message on admin proposals edit
cycomachead Mar 12, 2024
0a6bb4e
Resolve some eager loading / queries
cycomachead Mar 12, 2024
965489d
Delete the YTLF email template no longer needed
cycomachead Mar 12, 2024
3381bed
Refactor the mailbot to make sending more clear
cycomachead Mar 12, 2024
9aa2ff6
Merge pull request #359 from snap-cloud/merge-upstream-assets
cycomachead Mar 12, 2024
d64cd3e
delint
cycomachead Mar 12, 2024
de9e09b
Merge pull request #360 from snap-cloud/ruby-33-email-cleanup
cycomachead Mar 12, 2024
b62b530
Bump the bundler group across 1 directory with 2 updates
dependabot[bot] Mar 25, 2024
100f274
Merge pull request #366 from snap-cloud/dependabot/bundler/bundler-se…
cycomachead Apr 5, 2024
ed2e349
Merge pull request #365 from cs169/187121440_Materials_Bulk_Upload
cycomachead Apr 5, 2024
3ea0338
Merge branch 'main' into 187121501-currency-conv-new-record
cycomachead Apr 15, 2024
0cb9582
Update Gemfile.lock
cycomachead Apr 15, 2024
b02b2f0
Merge pull request #364 from cs169/187121501-currency-conv-new-record
cycomachead Apr 16, 2024
9e8e51e
Merge branch 'snap-cloud:main' into 187348127-add-convert-currency
cycomachead Apr 16, 2024
3a35a36
Merge pull request #367 from cs169/187348127-add-convert-currency
cycomachead Apr 16, 2024
99e5964
Merge branch 'snap-cloud:main' into add-ticket-currency-selector-only
cycomachead Apr 16, 2024
905cc1f
Merge pull request #368 from cs169/add-ticket-currency-selector-only
cycomachead Apr 22, 2024
52d79fb
get rid of environment var in tests
Edge7481 Apr 22, 2024
5122879
Merge branch 'main' into 187153142-impl-currency-for-payments-page
Edge7481 Apr 22, 2024
ae122c2
fix lint
Edge7481 Apr 22, 2024
09bb82f
migrated registered_attendees_message
tiffanylamm Apr 22, 2024
3fd54d3
Fix codacy error
Edge7481 Apr 23, 2024
631f66a
Merge pull request #369 from cs169/187153142-impl-currency-for-paymen…
cycomachead Apr 23, 2024
8459c28
Merge branch 'main' into fixup-ics
cycomachead Apr 26, 2024
eaebb64
Merge pull request #370 from snap-cloud/fixup-ics
cycomachead Apr 26, 2024
90a99b7
registered only textbox implementation and testing done
tiffanylamm Apr 27, 2024
bcff073
lint
tiffanylamm Apr 27, 2024
e59375c
fixed user_params and added visible_event_types to view
tiffanylamm Apr 28, 2024
bfafbd5
Revert "fixed user_params and added visible_event_types to view"
tiffanylamm Apr 28, 2024
0ea87b2
fixed user_params and added visible_event_types to view
tiffanylamm Apr 28, 2024
cd30e51
fixed linting by sepreated form_fields into multiple files
tiffanylamm Apr 28, 2024
cc9e113
Merge branch 'main' into 187436627-registration-only-textbox
cycomachead May 15, 2024
d6a5135
Bump the bundler group across 1 directory with 2 updates
dependabot[bot] May 16, 2024
5a87557
Merge pull request #382 from snap-cloud/dependabot/bundler/bundler-3b…
cycomachead May 23, 2024
e242485
Load superevents on update/create routes when something errors
cycomachead Jun 15, 2024
2c0cf45
minor dependency update
cycomachead Jul 20, 2024
25d6bac
Merge branch 'main' of github.com:snap-cloud/snapcon
cycomachead Jul 20, 2024
4223687
Merge branch 'prod-patch'
cycomachead Jul 20, 2024
02f1675
merge main
cycomachead Jul 20, 2024
518f3fd
delint
cycomachead Jul 20, 2024
815854b
delint - regexp
cycomachead Jul 20, 2024
bb3ba43
Merge pull request #371 from cs169/187217062-enable-public-submission…
cycomachead Jul 20, 2024
be17204
Merge branch 'main' of github.com:snap-cloud/snapcon into import-medi…
cycomachead Jul 20, 2024
f2bead1
Fix dropbox media embed params
cycomachead Jul 20, 2024
1c0877c
address nil URL case for media embeds
cycomachead Jul 20, 2024
fa532b0
exclude haml file
cycomachead Jul 20, 2024
6987122
Merge pull request #339 from snap-cloud/import-media-urls
cycomachead Jul 20, 2024
03a4cc4
Merge pull request #373 from cs169/187391447-schedule-jump-to-time-bu…
cycomachead Jul 20, 2024
78563c1
merge commerical updates
cycomachead Jul 20, 2024
92fa560
fix commericals function call
cycomachead Jul 20, 2024
847e252
Merge branch 'main' into 187436622-commercials-embed-snap
cycomachead Jul 20, 2024
fdab814
Merge pull request #374 from cs169/187436622-commercials-embed-snap
cycomachead Jul 20, 2024
d602335
merge
cycomachead Jul 20, 2024
021a24b
Fixup events admin table
cycomachead Jul 20, 2024
acb36a5
Merge pull request #372 from cs169/187376318-ticket-purchases-curr-co…
cycomachead Jul 20, 2024
3619bfb
Fixup db schema
cycomachead Jul 20, 2024
c9be854
Merge pull request #375 from cs169/187216987_add_event_by_CSV
cycomachead Jul 21, 2024
75ccb35
move migration script to rake task
cycomachead Jul 21, 2024
c8878b3
Merge branch 'main' into 187436627-registration-only-textbox
cycomachead Jul 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 15 additions & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,18 @@ plugins:
rubocop:
enabled: true
channel: rubocop-1-56-3

exclude_patterns:
- "bin/"
- "config/"
- "db/"
- "dist/"
- "features/"
- "**/node_modules/"
- "script/"
- "**/spec/"
- "**/test/"
- "**/tests/"
- "Tests/"
- "**/vendor/"
- "**/*_test.go"
- "**/*.d.ts"
2 changes: 2 additions & 0 deletions .haml-lint_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,13 @@ linters:
- "app/views/admin/events/index.html.haml"
- "app/views/admin/tracks/index.html.haml"
- "app/views/admin/tracks/show.html.haml"
- "app/views/admin/registrations/index.html.haml"
- "app/views/admin/versions/_object_desc_and_link.html.haml"
- "app/views/conference_registrations/show.html.haml"
- "app/views/layouts/_admin_sidebar.html.haml"
- "app/views/proposals/index.html.haml"
- "app/views/proposals/show.html.haml"
- "app/views/proposals/_form.html.haml"

# Offense count: 28
IdNames:
Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ require:
- rubocop-rails
- rubocop-capybara
- rubocop-performance
- rubocop-factory_bot

inherit_from: .rubocop_todo.yml

Expand Down
97 changes: 75 additions & 22 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2024-02-13 04:01:02 UTC using RuboCop version 1.60.2.
# on 2024-03-12 05:45:42 UTC using RuboCop version 1.61.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand All @@ -14,19 +14,66 @@ Bundler/OrderedGems:
Exclude:
- 'Gemfile'

# Offense count: 1
# Offense count: 180
# Configuration parameters: EnforcedStyle.
# SupportedStyles: link_or_button, strict
Capybara/ClickLinkOrButtonStyle:
Enabled: false

# Offense count: 77
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: have_no, not_to
Capybara/NegationMatcher:
Exclude:
- 'spec/features/versions_spec.rb'
- 'spec/features/cfp_ability_spec.rb'
- 'spec/features/code_of_conduct_spec.rb'
- 'spec/features/info_desk_ability_spec.rb'
- 'spec/features/organizer_ability_spec.rb'
- 'spec/features/proposals_spec.rb'
- 'spec/features/splashpage_spec.rb'
- 'spec/features/sponsor_spec.rb'
- 'spec/features/track_organizer_ability_spec.rb'

# Offense count: 10
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: DefaultSelector.
Capybara/RSpec/HaveSelector:
Exclude:
- 'spec/features/cfp_ability_spec.rb'
- 'spec/features/info_desk_ability_spec.rb'
- 'spec/features/organization_admin_ability_spec.rb'
- 'spec/features/organizer_ability_spec.rb'
- 'spec/features/proposals_spec.rb'
- 'spec/features/sponsor_spec.rb'
- 'spec/features/track_organizer_ability_spec.rb'
- 'spec/features/voting_spec.rb'

# Offense count: 98
# Offense count: 101
# This cop supports safe autocorrection (--autocorrect).
Capybara/SpecificFinders:
Enabled: false

# Offense count: 8
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
# SupportedStyles: explicit, implicit
FactoryBot/AssociationStyle:
Exclude:
- 'spec/factories/comments.rb'
- 'spec/factories/commercials.rb'
- 'spec/factories/conferences.rb'
- 'spec/factories/surveys.rb'
- 'spec/factories/tracks.rb'

# Offense count: 4
# Configuration parameters: Include.
# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
FactoryBot/FactoryAssociationWithStrategy:
Exclude:
- 'spec/factories/booths.rb'
- 'spec/factories/users.rb'

# Offense count: 13
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowedMethods, AllowedPatterns.
Expand All @@ -40,7 +87,7 @@ Lint/AmbiguousBlockAssociation:
- 'spec/controllers/schedules_controller_spec.rb'
- 'spec/models/user_spec.rb'

# Offense count: 5
# Offense count: 3
# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
Lint/DuplicateBranch:
Exclude:
Expand All @@ -53,38 +100,38 @@ Lint/IneffectiveAccessModifier:
- 'app/models/commercial.rb'
- 'app/models/conference.rb'

# Offense count: 111
# Offense count: 110
# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
Metrics/AbcSize:
Max: 72

# Offense count: 19
# Offense count: 14
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
# AllowedMethods: refine
Metrics/BlockLength:
Max: 227
Max: 99

# Offense count: 13
# Configuration parameters: CountComments, CountAsOne.
Metrics/ClassLength:
Max: 270

# Offense count: 26
# Offense count: 28
# Configuration parameters: AllowedMethods, AllowedPatterns.
Metrics/CyclomaticComplexity:
Max: 15

# Offense count: 127
# Offense count: 126
# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
Metrics/MethodLength:
Max: 55

# Offense count: 4
# Configuration parameters: CountComments, CountAsOne.
Metrics/ModuleLength:
Max: 168
Max: 158

# Offense count: 25
# Offense count: 27
# Configuration parameters: AllowedMethods, AllowedPatterns.
Metrics/PerceivedComplexity:
Max: 17
Expand Down Expand Up @@ -191,7 +238,7 @@ RSpec/Capybara/FeatureMethods:
- 'spec/features/user_spec.rb'
- 'spec/features/voting_spec.rb'

# Offense count: 338
# Offense count: 339
# Configuration parameters: Prefixes, AllowedPatterns.
# Prefixes: when, with, without
RSpec/ContextWording:
Expand All @@ -204,7 +251,7 @@ RSpec/ContextWording:
RSpec/DescribedClass:
Enabled: false

# Offense count: 248
# Offense count: 251
# Configuration parameters: CountAsOne.
RSpec/ExampleLength:
Max: 222
Expand Down Expand Up @@ -259,7 +306,7 @@ RSpec/IdenticalEqualityAssertion:
- 'spec/controllers/admin/conferences_controller_spec.rb'

# Offense count: 53
# Configuration parameters: Max.
# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
RSpec/IndexedLet:
Exclude:
- 'spec/controllers/admin/reports_controller_spec.rb'
Expand Down Expand Up @@ -319,11 +366,11 @@ RSpec/MultipleDescribes:
Exclude:
- 'spec/models/conference_spec.rb'

# Offense count: 298
# Offense count: 300
RSpec/MultipleExpectations:
Max: 97

# Offense count: 272
# Offense count: 274
# Configuration parameters: AllowSubject.
RSpec/MultipleMemoizedHelpers:
Max: 32
Expand Down Expand Up @@ -396,6 +443,12 @@ RSpec/Rails/InferredSpecType:
- 'spec/helpers/users_helper_spec.rb'
- 'spec/routing/routing_spec.rb'

# Offense count: 12
# This cop supports safe autocorrection (--autocorrect).
RSpec/ReceiveMessages:
Exclude:
- 'spec/models/track_spec.rb'

# Offense count: 4
RSpec/RepeatedDescription:
Exclude:
Expand Down Expand Up @@ -466,12 +519,12 @@ Style/CaseLikeIf:
Exclude:
- 'app/views/admin/events/events.xlsx.axlsx'

# Offense count: 103
# Offense count: 107
# Configuration parameters: AllowedConstants.
Style/Documentation:
Enabled: false

# Offense count: 40
# Offense count: 43
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: always, always_true, never
Expand Down Expand Up @@ -510,7 +563,7 @@ Style/IdenticalConditionalBranches:
- 'app/controllers/admin/booths_controller.rb'
- 'app/controllers/admin/events_controller.rb'

# Offense count: 32
# Offense count: 34
# This cop supports safe autocorrection (--autocorrect).
Style/IfUnlessModifier:
Enabled: false
Expand Down Expand Up @@ -587,7 +640,7 @@ Style/OptionalBooleanParameter:
- 'app/models/event.rb'

# Offense count: 2
# This cop supports safe autocorrection (--autocorrect).
# This cop supports unsafe autocorrection (--autocorrect-all).
# Configuration parameters: AllowedCompactTypes.
# SupportedStyles: compact, exploded
Style/RaiseArgs:
Expand Down Expand Up @@ -640,7 +693,7 @@ Style/WordArray:
EnforcedStyle: percent
MinSize: 5

# Offense count: 260
# Offense count: 269
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
# URISchemes: http, https
Expand Down
34 changes: 1 addition & 33 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ source 'https://rubygems.org'

ruby ENV.fetch('OSEM_RUBY_VERSION', '3.2.2')

# rails-assets requires >= 1.8.4
abort 'Bundler version >= 1.8.4 is required' if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')

# as web framework
if next?
gem 'rails', '~> 7'
Expand Down Expand Up @@ -89,40 +86,11 @@ gem 'cocoon'
# as the JavaScript library
# TODO: Consolidate with the rails-assets below or move to webpack...
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 6.0.1'
gem 'jquery-ui-rails', '~> 7.0.0'

# for languages validation
gem 'iso-639'

# frontend javascripts
source 'https://rails-assets.org' do
# transient dependencies, included here to reduce warnings.
gem 'rails-assets-bootstrap'
gem 'rails-assets-jquery'
# for placeholder images
gem 'rails-assets-holderjs'
# for formating dates
gem 'rails-assets-date.format'
# for or parsing, validating, manipulating, and formatting dates
gem 'rails-assets-momentjs'
# for smooth scrolling
gem 'rails-assets-jquery-smooth-scroll'
# as color picker
gem 'rails-assets-spectrum'
# for color manipulation
gem 'rails-assets-tinycolor'
# for drawing triangle backgrounds
gem 'rails-assets-trianglify'
# for scroll way points
gem 'rails-assets-waypoints'
# for markdown editors
gem 'rails-assets-bootstrap-markdown'
# for select with icon
gem 'rails-assets-bootstrap-select'
gem 'rails-assets-markdown'
gem 'rails-assets-to-markdown', '~> 3'
end

# as date picker
gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47'

Expand Down
Loading
Loading