22 files changed, 240 insertions, 226 deletions

@@ -4,8 +4,10 @@ PATH
     wittle (0.1.0)
       enumerize
       haml
+      jquery-rails
       rails (>= 7.1.1)
       rice
+      sassc-rails
 
 GEM
   remote: https://rubygems.org/
@@ -95,6 +97,7 @@ GEM
     enumerize (2.7.0)
       activesupport (>= 3.2)
     erubi (1.12.0)
+    ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
     haml (6.2.3)
@@ -107,6 +110,10 @@ GEM
     irb (1.8.3)
       rdoc
       reline (>= 0.3.8)
+    jquery-rails (4.6.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -182,6 +189,14 @@ GEM
       io-console (~> 0.5)
     rice (4.1.0)
     ruby2_keywords (0.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -1,3 +1,4 @@
 //= link_directory ../stylesheets/wittle .css
 //= link_directory ../javascripts/wittle .js
 //= link_directory ../audio/wittle .aac
+//= link_directory ../images/wittle .png
@@ -10,4 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery3
 //= require_tree .
@@ -245,210 +245,6 @@ window.deleteElementsByClassName = function(rootElem, className) {
   }
 }
 
-window.loadHeader = function(titleText) {
-  document.body.style.marginLeft = '0px'
-
-  var navbar = document.createElement('div')
-  document.body.appendChild(navbar)
-  navbar.className = 'navbar'
-  navbar.style = 'min-width: 700px; position: absolute; top: 0; width: 100%; z-index: 1'
-  navbar.style.borderBottom = '2px solid ' + window.BORDER
-  navbar.style.background = window.PAGE_BACKGROUND
-
-  var navbarPadding = document.createElement('div')
-  document.body.appendChild(navbarPadding)
-  navbarPadding.className = 'navbar-padding'
-
-  var titleDiv = document.createElement('div')
-  navbar.appendChild(titleDiv)
-  titleDiv.style = 'position: absolute; width: 100%; pointer-events: none'
-
-  var titleLabel = document.createElement('label')
-  titleDiv.appendChild(titleLabel)
-  titleLabel.style = 'font-size: 48; pointer-events: auto'
-  titleLabel.id = 'title'
-  titleLabel.innerText = titleText
-
-  var link = document.createElement('label')
-  navbar.appendChild(link)
-  link.style = 'float: left; margin-left: 32px; cursor: pointer; line-height: 60px'
-  link.className = 'navbar-content'
-
-  if (window.location.href.endsWith('browse.html')) {
-    navbar.style.position = 'fixed' // When browsing, pin the navbar to the top so that it's visible during infinite scroll.
-
-    link.innerText = 'Create a puzzle'
-    link.onpointerdown = function() {window.location = 'editor.html'}
-
-    var link2 = document.createElement('label')
-    navbar.appendChild(link2)
-    link2.style = 'float: left; margin-left: 20px; cursor: pointer; line-height: 60px; display: none'
-    link2.className = 'navbar-content'
-    link2.innerText = 'Jump to top'
-    link2.id = 'scrollToTop'
-    link2.onpointerdown = function() {window.scrollTo(0, 0)}
-
-  } else if (window.location.href.includes('/play/')) {
-    link.innerText = 'Back to all puzzles'
-    link.onpointerdown = function() {window.location = '../browse.html'}
-  } else /* All other pages */ {
-    link.innerText = 'Browse all puzzles'
-    link.onpointerdown = function() {window.location = 'browse.html'}
-  }
-
-  var feedbackButton = document.createElement('label')
-  navbar.appendChild(feedbackButton)
-  feedbackButton.id = 'feedbackButton'
-  feedbackButton.style = 'float: right; margin-right: 8px; cursor: pointer; line-height: 60px'
-  feedbackButton.innerText = 'Send feedback'
-  feedbackButton.className = 'navbar-content'
-  feedbackButton.onpointerdown = function() {
-    var feedback = prompt('Provide feedback:')
-    if (feedback) {
-      sendFeedback(feedback)
-    }
-  }
-
-  var separator = document.createElement('label')
-  navbar.appendChild(separator)
-  separator.style = 'float: right; line-height: 60px; padding-left: 6px; padding-right: 6px'
-  separator.className = 'navbar-content'
-  separator.innerText = '|'
-
-  var sourceLink = document.createElement('label')
-  navbar.appendChild(sourceLink)
-  sourceLink.style = 'float: right; line-height: 60px; cursor: pointer'
-  sourceLink.innerText = 'Source code'
-  sourceLink.className = 'navbar-content'
-  sourceLink.onpointerdown = function() {window.open('https://github.com/jbzdarkid/jbzdarkid.github.io', '_blank')}
-
-  var collapsedSettings = drawSymbol({'type': 'plus', 'width':20, 'height':20})
-  navbar.appendChild(collapsedSettings)
-  collapsedSettings.style = 'width: 20px; height: 20px; position: absolute; left: 0; cursor: pointer'
-  collapsedSettings.style.border = '2px solid ' + window.BORDER
-  collapsedSettings.id = 'collapsedSettings'
-  collapsedSettings.onpointerdown = function() {
-    this.style.display = 'none'
-    var expandedSettings = document.getElementById('expandedSettings')
-    expandedSettings.style.display = null
-    window.settings.expanded = 'true'
-  }
-
-  var expandedSettings = document.createElement('div')
-  navbar.appendChild(expandedSettings)
-  expandedSettings.style = 'width: 300px; position: absolute; left: 0; display: none; padding: 10px'
-  expandedSettings.style.border = '2px solid ' + window.BORDER
-  expandedSettings.style.background = window.PAGE_BACKGROUND
-  expandedSettings.id = 'expandedSettings'
-
-  var minus = drawSymbol({'type':'minus', 'width':20, 'height':20})
-  minus.style = 'width: 20px; height: 20px; cursor: pointer; position: absolute; top: 0; left: 0'
-  expandedSettings.appendChild(minus)
-  minus.onpointerdown = function() {
-    this.parentElement.style.display = 'none'
-    var collapsedSettings = document.getElementById('collapsedSettings')
-    collapsedSettings.style.display = null
-    window.settings.expanded = 'false'
-  }
-
-  if (window.settings.expanded == 'true') {
-    collapsedSettings.onpointerdown()
-  }
-
-  // Now, for the contents of the settings
-  var settingsLabel = document.createElement('label')
-  expandedSettings.appendChild(settingsLabel)
-  settingsLabel.innerText = 'settings'
-  settingsLabel.style = 'line-height: 0px' // Attach to the top
-
-  expandedSettings.appendChild(document.createElement('br'))
-  expandedSettings.appendChild(document.createElement('br'))
-
-  // Theme
-  document.body.style.color = window.TEXT_COLOR
-  document.body.style.background = window.PAGE_BACKGROUND
-  var themeButton = document.createElement('button')
-  expandedSettings.appendChild(themeButton)
-  if (window.settings.theme == 'night') {
-    themeButton.innerText = 'Night theme'
-    themeButton.onpointerdown = function() {
-      window.settings.theme = 'light'
-      location.reload()
-    }
-  } else if (window.settings.theme == 'light') {
-    themeButton.innerText = 'Light theme'
-    themeButton.onpointerdown = function() {
-      window.settings.theme = 'night'
-      location.reload()
-    }
-  }
-
-  expandedSettings.appendChild(document.createElement('br'))
-
-  // Sensitivity
-  var sensLabel = document.createElement('label')
-  expandedSettings.appendChild(sensLabel)
-  sensLabel.htmlFor = 'sens'
-  sensLabel.innerText = 'Mouse Speed 2D'
-
-  var sens = document.createElement('input')
-  expandedSettings.appendChild(sens)
-  sens.type = 'range'
-  sens.id = 'sens'
-  sens.min = '0.1'
-  sens.max = '1.3'
-  sens.step = '0.1'
-  sens.value = window.settings.sensitivity
-  sens.onchange = function() {
-    window.settings.sensitivity = this.value
-  }
-  sens.style.backgroundImage = 'linear-gradient(to right, ' + window.ALT_BACKGROUND + ', ' + window.ACTIVE_COLOR + ')'
-
-  // Volume
-  var volumeLabel = document.createElement('label')
-  expandedSettings.appendChild(volumeLabel)
-  volumeLabel.htmlFor = 'volume'
-  volumeLabel.innerText = 'Volume'
-
-  var volume = document.createElement('input')
-  expandedSettings.appendChild(volume)
-  volume.type = 'range'
-  volume.id = 'volume'
-  volume.min = '0'
-  volume.max = '0.24'
-  volume.step = '0.02'
-  volume.value = parseFloat(window.settings.volume)
-  volume.onchange = function() {
-    window.settings.volume = this.value
-  }
-  volume.style.backgroundImage = 'linear-gradient(to right, ' + window.ALT_BACKGROUND + ', ' + window.ACTIVE_COLOR + ')'
-
-  // Custom mechanics -- disabled for now
-  window.settings.customMechanics = false
-  /*
-  var customMechanics = createCheckbox()
-  expandedSettings.appendChild(customMechanics)
-  customMechanics.id = 'customMechanics'
-  if (window.settings.customMechanics == 'true') {
-    customMechanics.style.background = window.BORDER
-    customMechanics.checked = true
-  }
-
-  customMechanics.onpointerdown = function() {
-    this.checked = !this.checked
-    this.style.background = (this.checked ? window.BORDER : window.PAGE_BACKGROUND)
-    window.settings.customMechanics = this.checked
-    window.location.reload()
-  }
-
-  var mechLabel = document.createElement('label')
-  expandedSettings.appendChild(mechLabel)
-  mechLabel.style.marginLeft = '6px'
-  mechLabel.htmlFor = 'customMechanics'
-  mechLabel.innerText = 'Custom mechanics'
-  */
-}
-
 // Automatically solve the puzzle
 window.solvePuzzle = function() {
   if (window.setSolveMode) window.setSolveMode(false)
@@ -0,0 +1,5 @@
+$.ajaxSetup({
+  headers: {
+    'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
+  }
+});
@@ -0,0 +1,91 @@
+#wrap {
+
+}
+
+h1 {
+  text-align: center;
+}
+
+#trace-settings {
+  margin: 1em auto;
+  width: 540px;
+
+  summary {
+    text-align: center;
+  }
+}
+
+#sens, #volume {
+  background-image: linear-gradient(to right, #EEE, #555);
+}
+
+/* Slider control main bar */
+input[type="range"] {
+  appearance: none;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  border-radius: 3px;
+  height: 15px;
+  margin-bottom: 5px;
+  margin-top: 5px;
+  outline: none;
+  width: 100%;
+}
+/* Slider control icon */
+input[type="range"]::-webkit-slider-thumb {
+  appearance: none;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  background: image-url('wittle/slider.png');
+  background-size: 17px 33px;
+  height: 33px;
+  width: 17px;
+}
+input[type="range"]::-moz-range-thumb {
+  appearance: none;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  background: image-url('wittle/slider.png');
+  background-size: 17px 33px;
+  height: 33px;
+  width: 17px;
+}
+input[type="range"]::-ms-thumb {
+  appearance: none;
+  -moz-appearance: none;
+  -webkit-appearance: none;
+  background: image-url('wittle/slider.png');
+  background-size: 17px 33px;
+  height: 33px;
+  width: 17px;
+}
+
+#submission-form {
+  margin: 1em auto;
+  width: 540px;
+  text-align: center;
+
+  form {
+    border: 1px solid black;
+    width: max-content;
+    padding: 0 2em;
+    margin: 0 auto;
+  }
+}
+
+#scores {
+  display: flex;
+  
+  div {
+    flex: 0 0 48%;
+
+    h2 {
+      text-align: center;
+    }
+    
+    ol {
+      width: max-content;
+      margin: 0 auto;
+    }
+  }
+}
@@ -1,7 +1,41 @@
 module Wittle
   class PuzzlesController < ApplicationController
+    def about
+      @normal_puzzle = Puzzle.normal.order(created_at: :desc).first
+      @hard_puzzle = Puzzle.hard.order(created_at: :desc).first
+    end
+
     def index
-      @puzzle = WittleGenerator.new.generate_medium
+      #@puzzle = WittleGenerator.new.generate_medium
+    end
+
+    def show
+      @puzzle = Puzzle.find(params[:id])
+      @playable = @puzzle.latest? && !((session[:played_puzzles] || []).include? @puzzle.id)
+    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
+
+      session[:played_puzzles] ||= []
+      session[:played_puzzles] << @puzzle.id
+    end
+
+    def submit
+      @puzzle = Puzzle.find(params[:id])
+
+      raise ActiveRecord::RecordNotFound unless @puzzle.latest?
+
+      @puzzle.scores.create!(name: params[:name], ip: request.ip)
+
+      redirect_to @puzzle
     end
   end
 end
@@ -8,5 +8,9 @@ module Wittle
 
     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
@@ -6,4 +6,5 @@
     = csp_meta_tag
     = stylesheet_link_tag    "wittle/application", media: "all"
     = javascript_include_tag "wittle/application"
-  %body= yield
+  %body
+    #wrap= yield
@@ -0,0 +1,33 @@
+<script type="text/javascript">
+window.onload = function() {
+  <% if @playable %>
+  $("#sens").val(window.settings.sensitivity)
+  $("#sens").on("change", function() {
+    window.settings.sensitivity = this.value
+  })
+  $("#volume").val(parseFloat(window.settings.volume))
+  $("#volume").on("change", function() {
+    window.settings.volume = this.value
+  })
+  <% end %>
+
+  var puzzle = window.deserializePuzzle("<%= @puzzle.data %>")
+  draw(puzzle)
+
+  <% unless @playable %>
+  drawPath(puzzle, JSON.parse("<%= escape_javascript(sanitize @puzzle.solved_data) %>"))
+  window.trace = function() {}
+  <% end %>
+}
+
+<% if @playable %>
+window.TRACE_COMPLETION_FUNC = function(puzzle, rawPath) {
+  $.ajax({
+    type: "POST",
+    url: "<%= solve_puzzle_path(@puzzle, format: :js) %>",
+    data: { solved: JSON.stringify(rawPath) }
+  })
+}
+
+<% end %>
+</script>
@@ -0,0 +1,7 @@
+%h3 Congrats!
+%p Would you like to submit your time?
+= form_with url: submit_puzzle_path(@puzzle) do |form|
+  %p
+    = form.label :name, "Name:"
+    = form.text_field :name
+  %p= form.submit "Submit"
@@ -0,0 +1,3 @@
+%p by Hatkirby, with help from Sigma144 and jbzdarkid
+%p= link_to "Normal", @normal_puzzle
+%p= link_to "Hard", @hard_puzzle
@@ -1,13 +0,0 @@
-%h1 Puzzles#index
-%p Find me in app/views/wittle/puzzles/index.html.haml
-:javascript
-  loadHeader("Unnamed Puzzle")
-%div{ style: "display: flex; justify-content: center; align-items: center"}
-  %svg#puzzle{ style: "pointer-events: auto"}
-:javascript
-  window.onload = function() {
-    //var puzzle = window.deserializePuzzle("_AAAAAA8PCQAAAEdlbmVyYXRlZAABAAAACAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAgAAQAAAAACAAAA/wABAAAAAAgAAQAAAAAIAAEAAAAACAABAAAAAAgAAQAAAAAIAAEAAQAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQABAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAAIAAEAAAAACAABAAAAAAgAAQAAAAAIAAEAAAAAAv////8AAQAAAAAIAAEAAAAAAv////8AAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAQEAAAAAAQAAAAABAAAAAAEAAQAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAIAAAD/AAEAAAAACAABAAAAAAgAAQAAAAAIAAEAAAAACAABAAAAAAgAAQAAAAAIAAEAAAAAAQAAAAEBAAAAAAEAAAAAAQAAAAABAAAAAQEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAAIAAEAAQAAAv////8AAQAAAAAIAAEAAAAAAv////8AAQAAAAACAAAA/wABAAAAAAIAAAD/AAEAAAAAAgAAAP8AAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAL/////AAEAAAAAAv////8AAQAAAAAIAAEAAAAACAABAAAAAAgAAQAAAAACAAAA/wABAAAAAAgAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAQAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAABAQAAAAABAAEAAAEAAAAAAQAAAAABAAAAAAL/////AAEAAAAAAgAAAP8AAQAAAAAIAAEAAAAAAv////8AAQAAAAACAAAA/wABAAAAAAIAAAD/AAEAAAAACAABAAEAAAEAAAAAAQABAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAgAAAP8AAQAAAAAIAAEAAAAAAv////8AAQAAAAAIAAEAAAAAAv////8AAQAAAAAIAAEAAAAACAABAAAAAAEAAAAIAQAAAAABAAAAAAEAAAAAAQABAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAAAAAQAAAAABAAAAAAEAAQAAAQAAAAABAAAAEAAAAAAN")
-    var puzzle = window.deserializePuzzle("#{@puzzle}")
-    draw(puzzle)
-  }
-
@@ -0,0 +1,25 @@
+%h1 Wittle ##{@puzzle.id}
+#puzzle-container{ style: "display: flex; justify-content: center; align-items: center" }
+  %svg#puzzle{ style: "pointer-events: auto"}
+#submission-form
+- if @playable
+  %details#trace-settings
+    %summary Settings
+    .things
+      %label{ for: "sens" } Mouse Speed 2D
+      %input#sens{ type: "range", min: "0.1", max: "1.3", step: "0.1" }
+      %label{ for: "volume" } Volume
+      %input#volume{ type: "range", min: "0", max: "0.24", step: "0.02" }
+- else
+  #scores
+    #by-time
+      %h2 Fastest Solves
+      %ol
+        - @puzzle.scores.where("seconds_taken IS NOT NULL").order(seconds_taken: :asc).each do |score|
+          %li= score.name
+    #by-when
+      %h2 Completion Order
+      %ol
+        - @puzzle.scores.order(created_at: :desc).each do |score|
+          %li= score.name
+= render partial: "handle_puzzle"
@@ -0,0 +1 @@
+$("#submission-form").html('<%= escape_javascript(render partial: "submission") %>');
@@ -1,3 +1,7 @@
 Wittle::Engine.routes.draw do
-  get 'puzzles/index'
+  root to: 'puzzles#about'
+  get 'archive' => 'puzzles#index'
+  get ':id' => 'puzzles#show', as: 'puzzle'
+  post ':id/solve' => 'puzzles#solve', as: 'solve_puzzle'
+  post ':id/submit' => 'puzzles#submit', as: 'submit_puzzle'
 end
@@ -1,7 +1,7 @@
 class CreateWittleScores < ActiveRecord::Migration[7.1]
   def change
     create_table :wittle_scores do |t|
-      t.references :puzzle, null: false, foreign_key: true
+      t.references :puzzle, null: false
       t.string :name
       t.string :ip
       t.integer :seconds_taken
@@ -1,4 +1,7 @@
-# desc "Explaining what the task does"
-# task :wittle do
-#   # Task goes here
-# end
+namespace :wittle do
+  desc "Generate new puzzles for the day"
+  task :generate_puzzles => :environment do
+    Wittle::Puzzle.create(data: WittleGenerator.new.generate_easy, category: :normal)
+    Wittle::Puzzle.create(data: WittleGenerator.new.generate_medium, category: :hard)
+  end
+end
@@ -1,5 +1,7 @@
 require "enumerize"
 require "haml"
+require "jquery-rails"
+require "sassc-rails"
 require "wittle_generator/wittle_generator"
 
 module Wittle
@@ -29,5 +29,4 @@ ActiveRecord::Schema[7.1].define(version: 2023_10_28_210722) do
     t.index ["puzzle_id"], name: "index_wittle_scores_on_puzzle_id"
   end
 
-  add_foreign_key "wittle_scores", "puzzles"
 end
@@ -19,4 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rice"
   s.add_dependency "haml"
   s.add_dependency "enumerize"
+  s.add_dependency 'sassc-rails'
+  s.add_dependency 'jquery-rails'
 end