56 files changed, 202 insertions, 212 deletions

@@ -0,0 +1,6 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link_directory ../javascripts .js
+//= link_tree ../../../vendor/javascript .js
+//= link_directory ../audio .aac
+//= link jquery.min.js
@@ -1,4 +0,0 @@
-//= link_directory ../stylesheets/wittle .css
-//= link_directory ../javascripts/wittle .js
-//= link_directory ../audio/wittle .aac
-//= link_directory ../images/wittle .png
@@ -0,0 +1,2 @@
+//= require jquery3
+//= require_tree .
@@ -148,7 +148,7 @@ window.Puzzle = class {
       this.grid[x] = []
       for (var y=0; y<height; y++) {
         if (x%2 === 1 && y%2 === 1) this.grid[x][y] = null
-        else this.grid[x][y] = {'type':'line', 'line':LINE_NONE}
+        else this.grid[x][y] = {'type':'line', 'line':window.LINE_NONE}
       }
     }
     // Performance: A large value which is === 0 to be used for pillar wrapping.
@@ -75,10 +75,10 @@ var proxy = {
 window.settings = new Proxy({}, proxy.init())
 
 var tracks = {
-  'start':   new Audio(src = '<%= asset_url("wittle/panel_start_tracing.aac") %>'),
-  'success': new Audio(src = '<%= asset_url("wittle/panel_success.aac") %>'),
-  'fail':    new Audio(src = '<%= asset_url("wittle/panel_failure.aac") %>'),
-  'abort':   new Audio(src = '<%= asset_url("wittle/panel_abort_tracing.aac") %>'),
+  'start':   new Audio(src = '<%= asset_url("panel_start_tracing.aac") %>'),
+  'success': new Audio(src = '<%= asset_url("panel_success.aac") %>'),
+  'fail':    new Audio(src = '<%= asset_url("panel_failure.aac") %>'),
+  'abort':   new Audio(src = '<%= asset_url("panel_abort_tracing.aac") %>'),
 }
 
 var currentAudio = null
@@ -1,14 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery3
-//= require_tree .
@@ -2,11 +2,11 @@
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
  *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's
+ * vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
@@ -3,7 +3,7 @@
 }
 
 #banner {
-  background-image: image-url("wittle/wittle_header.png");
+  background-image: image-url("wittle_header.png");
   background-size: cover;
   width: 600px;
   height: 245px;
@@ -65,7 +65,7 @@ input[type="range"]::-webkit-slider-thumb {
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
-  background: image-url('wittle/slider.png');
+  background: image-url('slider.png');
   background-size: 17px 33px;
   height: 33px;
   width: 17px;
@@ -74,7 +74,7 @@ input[type="range"]::-moz-range-thumb {
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
-  background: image-url('wittle/slider.png');
+  background: image-url('slider.png');
   background-size: 17px 33px;
   height: 33px;
   width: 17px;
@@ -83,7 +83,7 @@ input[type="range"]::-ms-thumb {
   appearance: none;
   -moz-appearance: none;
   -webkit-appearance: none;
-  background: image-url('wittle/slider.png');
+  background: image-url('slider.png');
   background-size: 17px 33px;
   height: 33px;
   width: 17px;
@@ -190,7 +190,7 @@ input[type="range"]::-ms-thumb {
   margin-right: 1em;
 
   a {
-    background-image: image-url("wittle/wittle_normal.png");
+    background-image: image-url("wittle_normal.png");
     background-size: cover;
     display: block;
     width: 215px;
@@ -206,7 +206,7 @@ input[type="range"]::-ms-thumb {
   margin-right: 1em;
 
   a {
-    background-image: image-url("wittle/wittle_hard.png");
+    background-image: image-url("wittle_hard.png");
     background-size: cover;
     display: block;
     width: 215px;
@@ -221,7 +221,7 @@ input[type="range"]::-ms-thumb {
   width: 215px;
 
   a {
-    background-image: image-url("wittle/wittle_expert.png");
+    background-image: image-url("wittle_expert.png");
     background-size: cover;
     display: block;
     width: 215px;
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end
@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end
@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end
@@ -0,0 +1,109 @@
+class PuzzlesController < ApplicationController
+  before_action :prepare_session
+
+  def about
+    @normal_puzzle = Puzzle.normal.order(created_at: :desc).first
+    if session[:puzzles]["normal"]["id"] == @normal_puzzle.id
+      @normal_started = session[:puzzles]["normal"]["started"]
+      @normal_solved = session[:puzzles]["normal"]["solved"]
+    else
+      @normal_started = false
+      @normal_solved = false
+    end
+
+    @hard_puzzle = Puzzle.hard.order(created_at: :desc).first
+    if session[:puzzles]["hard"]["id"] == @hard_puzzle.id
+      @hard_started = session[:puzzles]["hard"]["started"]
+      @hard_solved = session[:puzzles]["hard"]["solved"]
+    else
+      @hard_started = false
+      @hard_solved = false
+    end
+
+    @expert_puzzle = Puzzle.expert.order(created_at: :desc).first
+    if session[:puzzles]["expert"]["id"] == @expert_puzzle.id
+      @expert_started = session[:puzzles]["expert"]["started"]
+      @expert_solved = session[:puzzles]["expert"]["solved"]
+    else
+      @expert_started = false
+      @expert_solved = false
+    end
+  end
+
+  def index
+    @puzzles = Puzzle.select(:id, :created_at, :category).order(created_at: :asc).all.chunk { |puzzle| puzzle.created_at.localtime.to_date }.to_h.transform_values { |by_date| by_date.sort_by(&:category).chunk { |puzzle| puzzle.category }.to_h }
+  end
+
+  def show
+    @puzzle = Puzzle.find(params["id"])
+
+    if @puzzle.latest?
+      if session[:puzzles][@puzzle.category]["id"] == @puzzle.id
+        @playable = !(session[:puzzles][@puzzle.category]["solved"])
+        @already_started = session[:puzzles][@puzzle.category]["started"]
+
+        unless @playable
+          @solution = session[:puzzles][@puzzle.category]["path"]
+        end
+      else
+        @playable = true
+        @already_started = false
+      end
+    else
+      @playable = false
+      @already_started = false
+      @solution = @puzzle.solved_data
+    end
+  end
+
+  def start
+    @puzzle = Puzzle.find(params["id"])
+
+    if session[:puzzles][@puzzle.category]["id"] != @puzzle.id
+      session[:puzzles][@puzzle.category] = { "id" => @puzzle.id }
+    end
+
+    session[:puzzles][@puzzle.category]["started"] = true
+  end
+
+  def solve
+    @puzzle = Puzzle.find(params["id"])
+
+    raise ActiveRecord::RecordNotFound unless @puzzle.latest?
+
+    if @puzzle.solved_data.nil?
+      @puzzle.solved_data = params["solved"]
+      @puzzle.save!
+    end
+
+    @time = (params.include? :time) ? params[:time] : nil
+
+    if session[:puzzles][@puzzle.category]["id"] != @puzzle.id
+      session[:puzzles][@puzzle.category] = { "id" => @puzzle.id }
+    end
+
+    session[:puzzles][@puzzle.category]["solved"] = true
+    session[:puzzles][@puzzle.category]["path"] = params["solved"]
+  end
+
+  def submit
+    @puzzle = Puzzle.find(params["id"])
+
+    raise ActiveRecord::RecordNotFound unless @puzzle.latest?
+
+    @puzzle.scores.create(name: params[:name], ip: request.ip, seconds_taken: (params.include? :time) ? params[:time] : nil)
+
+    redirect_to @puzzle
+  end
+
+  private
+
+    def prepare_session
+      session[:puzzles] ||= {
+        normal: { "id" => 0 },
+        hard: { "id" => 0 },
+        expert: { "id" => 0 },
+      }
+    end
+
+end
@@ -1,4 +0,0 @@
-module Wittle
-  class ApplicationController < ActionController::Base
-  end
-end
@@ -1,120 +0,0 @@
-module Wittle
-  class PuzzlesController < ApplicationController
-    before_action :prepare_session
-    after_action :commit_session
-
-    def about
-      @normal_puzzle = Puzzle.normal.order(created_at: :desc).first
-      if @session_puzzles["normal"]["id"] == @normal_puzzle.id
-        @normal_started = @session_puzzles["normal"]["started"]
-        @normal_solved = @session_puzzles["normal"]["solved"]
-      else
-        @normal_started = false
-        @normal_solved = false
-      end
-
-      @hard_puzzle = Puzzle.hard.order(created_at: :desc).first
-      if @session_puzzles["hard"]["id"] == @hard_puzzle.id
-        @hard_started = @session_puzzles["hard"]["started"]
-        @hard_solved = @session_puzzles["hard"]["solved"]
-      else
-        @hard_started = false
-        @hard_solved = false
-      end
-
-      @expert_puzzle = Puzzle.expert.order(created_at: :desc).first
-      if @session_puzzles["expert"]["id"] == @expert_puzzle.id
-        @expert_started = @session_puzzles["expert"]["started"]
-        @expert_solved = @session_puzzles["expert"]["solved"]
-      else
-        @expert_started = false
-        @expert_solved = false
-      end
-    end
-
-    def index
-      @puzzles = Puzzle.select(:id, :created_at, :category).order(created_at: :asc).all.chunk { |puzzle| puzzle.created_at.localtime.to_date }.to_h.transform_values { |by_date| by_date.sort_by(&:category).chunk { |puzzle| puzzle.category }.to_h }
-    end
-
-    def show
-      @puzzle = Puzzle.find(params[:id])
-
-      if @puzzle.latest?
-        if @session_puzzles[@puzzle.category]["id"] == @puzzle.id
-          @playable = !(@session_puzzles[@puzzle.category]["solved"])
-          @already_started = @session_puzzles[@puzzle.category]["started"]
-
-          unless @playable
-            @solution = @session_puzzles[@puzzle.category]["path"]
-          end
-        else
-          @playable = true
-          @already_started = false
-        end
-      else
-        @playable = false
-        @already_started = false
-        @solution = @puzzle.solved_data
-      end
-    end
-
-    def start
-      @puzzle = Puzzle.find(params[:id])
-
-      if @session_puzzles[@puzzle.category]["id"] != @puzzle.id
-        @session_puzzles[@puzzle.category] = { "id" => @puzzle.id }
-      end
-
-      @session_puzzles[@puzzle.category]["started"] = true
-    end
-
-    def solve
-      @puzzle = Puzzle.find(params[:id])
-
-      raise ActiveRecord::RecordNotFound unless @puzzle.latest?
-
-      if @puzzle.solved_data.nil?
-        @puzzle.solved_data = params[:solved]
-        @puzzle.save!
-      end
-
-      @time = (params.include? :time) ? params[:time] : nil
-
-      if @session_puzzles[@puzzle.category]["id"] != @puzzle.id
-        @session_puzzles[@puzzle.category] = { "id" => @puzzle.id }
-      end
-
-      @session_puzzles[@puzzle.category]["solved"] = true
-      @session_puzzles[@puzzle.category]["path"] = params[:solved]
-    end
-
-    def submit
-      @puzzle = Puzzle.find(params[:id])
-
-      raise ActiveRecord::RecordNotFound unless @puzzle.latest?
-
-      @puzzle.scores.create(name: params[:name], ip: request.ip, seconds_taken: (params.include? :time) ? params[:time] : nil)
-
-      redirect_to @puzzle
-    end
-
-    private
-
-      def prepare_session
-        if cookies.encrypted[:puzzles].nil?
-          @session_puzzles = { "normal" => { id: nil }, "hard" => { id: nil }, "expert" => { id: nil } }
-        else
-          @session_puzzles = JSON.parse(cookies.encrypted[:puzzles])
-        end
-
-        # Temporary hack
-        if session.has_key? :puzzle_solutions
-          session[:puzzle_solutions].clear()
-        end
-      end
-
-      def commit_session
-        cookies.encrypted[:puzzles] = JSON.generate(@session_puzzles)
-      end
-  end
-end
@@ -0,0 +1,2 @@
+module ApplicationHelper
+end
@@ -0,0 +1,7 @@
+module PuzzlesHelper
+
+  def humanize_interval(seconds)
+    "#{(seconds / 60).to_s.rjust(2, '0')}:#{(seconds % 60).to_s.rjust(2, '0')}"
+  end
+
+end
@@ -1,4 +0,0 @@
-module Wittle
-  module ApplicationHelper
-  end
-end
@@ -1,9 +0,0 @@
-module Wittle
-  module PuzzlesHelper
-
-    def humanize_interval(seconds)
-      "#{(seconds / 60).to_s.rjust(2, '0')}:#{(seconds % 60).to_s.rjust(2, '0')}"
-    end
-
-  end
-end
@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end
@@ -1,4 +0,0 @@
-module Wittle
-  class ApplicationJob < ActiveJob::Base
-  end
-end
@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: "from@example.com"
+  layout "mailer"
+end
@@ -1,6 +0,0 @@
-module Wittle
-  class ApplicationMailer < ActionMailer::Base
-    default from: "from@example.com"
-    layout "mailer"
-  end
-end
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  primary_abstract_class
+end
@@ -0,0 +1,14 @@
+class Puzzle < ApplicationRecord
+  extend Enumerize
+
+  has_many :scores
+
+  validates :data, presence: true
+
+  validates :category, presence: true
+  enumerize :category, in: [:normal, :hard, :expert], scope: :shallow
+
+  def latest?
+    Puzzle.where(category: category).order(created_at: :desc).first.id == id
+  end
+end
@@ -0,0 +1,7 @@
+class Score < ApplicationRecord
+  belongs_to :puzzle
+
+  validates :name, presence: true
+  validates :ip, presence: true
+  validates_uniqueness_of :name, scope: :puzzle_id
+end
@@ -1,5 +0,0 @@
-module Wittle
-  class ApplicationRecord < ActiveRecord::Base
-    self.abstract_class = true
-  end
-end
@@ -1,16 +0,0 @@
-module Wittle
-  class Puzzle < ApplicationRecord
-    extend Enumerize
-
-    has_many :scores
-
-    validates :data, presence: true
-
-    validates :category, presence: true
-    enumerize :category, in: [:normal, :hard, :expert], scope: :shallow
-
-    def latest?
-      Puzzle.where(category: category).order(created_at: :desc).first.id == id
-    end
-  end
-end
@@ -1,9 +0,0 @@
-module Wittle
-  class Score < ApplicationRecord
-    belongs_to :puzzle
-
-    validates :name, presence: true
-    validates :ip, presence: true
-    validates_uniqueness_of :name, scope: :puzzle_id
-  end
-end
@@ -4,8 +4,8 @@
     %title Wittle
     = csrf_meta_tags
     = csp_meta_tag
-    = stylesheet_link_tag    "wittle/application", media: "all"
-    = javascript_include_tag "wittle/application"
+    = stylesheet_link_tag    "application", "data-turbo-track": "reload"
+    = javascript_include_tag "application"
   %body
     #wrap
       %header#banner
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>
@@ -0,0 +1 @@
+<%= yield %>