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

Get rid of the old way of handling Regional Organizations. #4180

Merged
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -35,7 +35,6 @@
@import "links";
@import "posts";
@import "delegates";
@import "organizations";
@import "regional_organizations";
@import "users";
@import "competitions";

This file was deleted.

@@ -11,150 +11,6 @@ def delegates
@delegates_without_senior_delegates = User.where(delegate_status: ["candidate_delegate", "delegate"], senior_delegate: nil)
end

ORGANIZATIONS_INFO = [
{
country: "Australia",
name: "Speedcubing Australia",
url: "https://speedcubing.org.au",
logo: "Cube_FA_RGB_pos.png",
},
{
country: "Belarus",
name: "Speedcubing Federation",
url: "http://www.scfed.by",
logo: "sfb.png",
},
{
country: "Canada",
name: "Canadian Cubing",
url: "http://www.canadiancubing.com",
logo: "canada_cubing.jpg",
},
{
country: "Croatia",
name: "Speedcubing Hrvatska",
url: "https://speedcubinghrvatska.hr",
logo: "speedcubing-hrvatska.png",
},
{
country: "Denmark",
name: "Dansk Speedcubing Forening",
url: "http://danishcubing.dk/",
logo: "denmark.png",
},
{
country: "Estonia",
name: "Eesti Kuubik",
url: "http://www.estonianopen.eu",
logo: "estonian_open.png",
},
{
country: "France",
name: "Association Française de Speedcubing",
url: "http://www.speedcubingfrance.org",
logo: "afs.png",
},
{
country: "Japan",
name: "Japan Rubik's Cube Association",
url: "http://jrca.cc",
logo: "jrca.jpg",
},
{
country: "Kazakhstan",
name: "Kazakhstan Speedcubing Federation",
url: "http://cubing.kz/",
logo: "kazakhstan.png",
},
{
country: "Korea",
name: "Korea Cube Culture United",
url: "https://www.kccu.kr/",
logo: "korea.png",
},
{
country: "Macedonia",
name: "Macedonian Cubing Association",
url: "https://speedcubing.mk/",
logo: "mca.png",
},
{
country: "Malaysia",
name: "Malaysia Cube Association",
url: "https://www.mycubeassociation.com",
logo: "myca.svg",
},
{
country: "Netherlands",
name: "Speedcubing Nederland",
url: "http://www.kubuswedstrijden.nl",
logo: "nederland.png",
},
{
country: "New Zealand",
name: "Speedcubing New Zealand",
url: "http://www.speedcubing.nz",
},
{
country: "Norway",
name: "Norges kubeforbund",
url: "http://www.kubing.no",
logo: "nkf.png",
},
{
country: "Paraguay",
name: "Club de SpeedCubing Paraguay",
url: "http://www.pol.una.py/csc/",
logo: "paraguay.png",
},
{
country: "Poland",
name: "Polskie Stowarzyszenie Speedcubingu",
url: "http://www.speedcubing.pl",
logo: "pss.jpg",
},
{
country: "Russia",
name: "Speedcubing Federation",
url: "https://cubingrf.org",
logo: "sfr.png",
},
{
country: "Spain",
name: "Asociación Española del cubo de Rubik",
url: "http://www.asociacionrubik.es",
logo: "spain.png",
},
{
country: "Slovenia",
name: "Rubik klub Slovenija",
url: "https://www.rubiks.si/",
logo: "slovenia.png",
},
{
country: "Switzerland",
name: "Swisscubing",
url: "https://swisscubing.ch",
logo: "swisscubing.png",
},
{
country: "United Kingdom",
name: "UK Cube Association",
url: "http://ukca.org",
logo: "ukcalogo.png",
},
{
country: "United States",
name: "Cubing USA",
url: "http://www.cubingusa.org",
logo: "cubing_usa.svg",
},
].freeze

def organizations
@organizations_info = ORGANIZATIONS_INFO
end

def score_tools
end

This file was deleted.

@@ -124,7 +124,6 @@
get 'documents' => 'static_pages#documents'
get 'delegates' => 'static_pages#delegates'
get 'disclaimer' => 'static_pages#disclaimer'
get 'organizations' => 'static_pages#organizations'
get 'contact' => 'static_pages#contact'
get 'privacy' => 'static_pages#privacy'
get 'faq' => 'static_pages#faq'
@@ -135,7 +134,8 @@
get 'organizer-guidelines' => 'static_pages#organizer_guidelines'
get 'tutorial' => redirect('/files/WCA_Competition_Tutorial.pdf', status: 302)

resources :regional_organizations, only: [:index, :new, :update, :edit], path: '/regional-organizations'
resources :regional_organizations, only: [:new, :update, :edit], path: '/regional-organizations'
get 'organizations' => 'regional_organizations#index'
get 'admin/regional-organizations' => 'regional_organizations#admin'
patch 'regional-organizations/:id/edit' => 'regional_organizations#update'
post 'regional-organizations/new' => 'regional_organizations#create'
Binary file not shown.
Binary file not shown.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.