Move Rails folders to project root (#8945)

* Move individual files and merge where necessary

* Move Rails folders to top level

* Remove WcaOnRails mentions where appropriate

.github/dependabot.yml

@@ -1,12 +1,12 @@
 version: 2
 updates:
 - package-ecosystem: bundler
-  directory: "/WcaOnRails"
+  directory: "/"
   schedule:
     interval: monthly
   open-pull-requests-limit: 10
 - package-ecosystem: npm
-  directory: "/WcaOnRails"
+  directory: "/"
   schedule:
     interval: monthly
   open-pull-requests-limit: 10

.github/workflows/deploy-on-release.yml

@@ -22,9 +22,8 @@ jobs:
       - name: Build and Push Sidekiq image
         uses: docker/build-push-action@v5
         with:
-          context: ./WcaOnRails
           push: true
-          file: ./WcaOnRails/Dockerfile.sidekiq
+          file: ./Dockerfile.sidekiq
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/wca-on-rails:sidekiq-production
             ${{ steps.login-ecr.outputs.registry }}/wca-on-rails:sidekiq-staging
@@ -34,9 +33,7 @@ jobs:
       - name: Build and push Prod Image
         uses: docker/build-push-action@v5
         with:
-          context: ./WcaOnRails
           push: true
-          file: ./WcaOnRails/Dockerfile
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/wca-on-rails:latest
             ${{ steps.login-ecr.outputs.registry }}/wca-on-rails:staging

.github/workflows/ruby.yml

@@ -12,16 +12,12 @@ jobs:
     env:
       RACK_ENV: test
       RAILS_ENV: test
-    defaults:
-      run:
-        working-directory: WcaOnRails
     steps:
       - uses: actions/checkout@v4
       - uses: fregante/setup-git-user@v2 # set up dummy user.name and user.email in git so that Overcommit doesn't explode
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          working-directory: WcaOnRails
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Set up Corepack/Yarn
         run: corepack enable # this allows NPM to use its own Yarn. It is crucial that this is run BEFORE the Node setup!
@@ -42,8 +38,6 @@ jobs:
         run: bundle exec rake yarn:install
       - name: Run Overcommit commit hooks
         working-directory: ${{ env.GITHUB_WORKSPACE }}
-        env:
-          BUNDLE_GEMFILE: WcaOnRails/Gemfile
         run: bundle exec overcommit --sign && bundle exec overcommit --sign pre-commit && bundle exec overcommit --run
       - name: Activate MySQL # as per https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md#mysql
         run: |
@@ -61,10 +55,9 @@ jobs:
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: 'WcaOnRails/coverage/lcov/WcaOnRails.lcov'
-          base-path: 'WcaOnRails'
+          path-to-lcov: 'coverage/lcov/worldcubeassociation.org.lcov'
       - uses: actions/upload-artifact@v4
         if: always() && steps.rspec.outcome == 'failure'
         with:
           name: capybara-screenshots
-          path: WcaOnRails/tmp/capybara
+          path: tmp/capybara

.github/workflows/staging-deployment-from-prs.yml

@@ -44,9 +44,8 @@ jobs:
         if: steps.trigger-deployment.outputs.triggered == 'true'
         uses: docker/build-push-action@v5
         with:
-          context: ./WcaOnRails
           push: true
-          file: ./WcaOnRails/Dockerfile.sidekiq
+          file: ./Dockerfile.sidekiq
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/wca-on-rails:sidekiq-staging
           cache-from: type=gha
@@ -55,9 +54,7 @@ jobs:
         if: steps.trigger-deployment.outputs.triggered == 'true'
         uses: docker/build-push-action@v5
         with:
-          context: ./WcaOnRails
           push: true
-          file: ./WcaOnRails/Dockerfile
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/wca-on-rails:staging
           cache-from: type=gha

.gitignore

@@ -1,2 +1,62 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
 # byebug stuff
 .byebug_history
+
+# Ignore bundler config.
+/.bundle
+/vendor/bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp/*
+!/tmp/.keep
+
+# More rails stuff
+public/assets/**
+
+# Ignore js-specific generated locales (they are rebuilt whenever we compile assets)
+app/webpacker/rails_translations/*.json
+
+# Environment configuration
+.env*
+!.env.development
+!.env.test
+
+# Unicorn pid
+pids/*.pid
+
+/public/packs
+/public/packs-test
+/node_modules
+
+# Coveralls stuff
+/coverage/
+
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
+
+# Healthcheck flag for our Rails docker container
+.db-inited
+
+# GCE secrets file
+**/application_default_credentials.json
+
+# Per https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.overcommit.yml

@@ -15,20 +15,16 @@
 #
 # Uncomment the following lines to make the configuration take effect.
 
-gemfile: 'WcaOnRails/Gemfile'
+gemfile: 'Gemfile'
 
 PreCommit:
   ALL:
     exclude:
-      - 'regulations/**/*'
-      - 'webroot/**/*'
-      - 'WcaOnRails/vendor/**/*'
-      - 'WcaOnRails/tmp/**/*'
-      - 'WcaOnRails/db/structure.sql'
-      - 'WcaOnRails/node_modules/**/*'
-      - 'WcaOnRails/app/webpacker/stylesheets/semantic/**/*'
-      - 'WcaOnRails/config/locales/*.yml'
-      - 'chef/**/*'
+      - 'vendor/**/*'
+      - 'tmp/**/*'
+      - 'node_modules/**/*'
+      - 'app/webpacker/stylesheets/semantic/**/*'
+      - 'config/locales/*.yml'
       - '.gitmodules'
       - '**/*.pdf'
       - '**/*.jpg'
@@ -40,18 +36,18 @@ PreCommit:
       - '**/*.svg'
 
   EsLint:
-    required_executable: 'WcaOnRails/bin/yarn'
+    required_executable: 'bin/yarn'
     enabled: true
     include:
-      - 'WcaOnRails/app/webpacker/**/*.js'
+      - 'app/webpacker/**/*.js'
     exclude:
       # Semantic UI stuff, we need to re-exclude that here.
-      - 'WcaOnRails/app/webpacker/stylesheets/semantic/**/*'
-    command: ['WcaOnRails/bin/yarn', '--silent', 'run', 'eslint', '-c', '.eslintrc.json', '-f', 'compact']
+      - 'app/webpacker/stylesheets/semantic/**/*'
+    command: ['bin/yarn', '--silent', 'run', 'eslint', '-c', '.eslintrc.json', '-f', 'compact']
 
   RuboCop:
     enabled: true
-    command: ['bundle', 'exec', 'rubocop', '--config', './WcaOnRails/.rubocop.yml']
+    command: ['bundle', 'exec', 'rubocop', '--config', './.rubocop.yml']
     on_warn: fail # Treat all warnings as failures
 
   IllegalStrings:
@@ -61,14 +57,14 @@ PreCommit:
     enabled: true
     include:
       # Others are handled by EsLint
-      'WcaOnRails/app/assets'
-    required_executable: 'WcaOnRails/bin/yarn'
-    command: ['WcaOnRails/bin/yarn', '--silent', 'run', 'jshint', '--verbose']
+      'app/assets'
+    required_executable: 'bin/yarn'
+    command: ['bin/yarn', '--silent', 'run', 'jshint', '--verbose']
 
   Stylelint:
     enabled: true
-    required_executable: 'WcaOnRails/bin/yarn'
-    command: ['WcaOnRails/bin/yarn', '--silent', 'run', 'stylelint', '-f', 'compact']
+    required_executable: 'bin/yarn'
+    command: ['bin/yarn', '--silent', 'run', 'stylelint', '-f', 'compact']
 
   TrailingWhitespace:
     enabled: true

.ruby-version

@@ -0,0 +1 @@
+3.3.0

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">WorldCubeAssociation Website</h1>
 <div align="center">
-  <img height="120" src="WcaOnRails/public/files/wca_icon_only.png" />
+  <img height="120" src="public/files/wca_icon_only.png" />
 </div>
 <br />
 <div align="center">

WcaOnRails/app/controllers/translations_controller.rb → app/controllers/translations_controller.rb

@@ -38,7 +38,7 @@ def update
     user_login = Octokit.user.login
     origin_repo = "#{user_login}/worldcubeassociation.org"
     upstream_repo = "thewca/worldcubeassociation.org"
-    file_path = "WcaOnRails/config/locales/#{locale}.yml"
+    file_path = "config/locales/#{locale}.yml"
     message = "Update #{locale} translation."
     content_digest = Digest::SHA1.hexdigest(content)
     branch_name = "translation-#{locale}-#{content_digest}"