cafe-grader-web Commit - r564:484b31caab29

app/assets/javascripts/sources.js.coffee created 644 ¶ +10

			@@ -0,0 +1,10
		1	+ # Place all the behaviors and hooks related to the matching controller here.
		2	+ # All this logic will automatically be available in application.js.
		3	+ # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
		4	+
		5	+
		6	+ $ ->
		7	+ $("#live_submit").on "click", (event) ->
		8	+ h = $("#editor_text")
		9	+ e = ace.edit("editor")
		10	+ h.val(e.getValue())

app/assets/stylesheets/sources.css.scss created 644 ¶ +12

			@@ -0,0 +1,12
		1	+ // Place all the styles related to the sources controller here.
		2	+ // They will automatically be included in application.css.
		3	+ // You can use Sass (SCSS) here: http://sass-lang.com/
		4	+
		5	+ #editor {
		6	+ position: absolute;
		7	+ top: 0;
		8	+ right: 0;
		9	+ bottom: 0;
		10	+ left: 0;
		11	+ }
		12	+

app/controllers/sources_controller.rb created 644 ¶ +7

			@@ -0,0 +1,7
		1	+ class SourcesController < ApplicationController
		2	+ before_filter :authenticate, :except => [:index, :login]
		3	+
		4	+ def direct_edit
		5	+ @problem = Problem.find_by_id(params[:pid])
		6	+ end
		7	+ end

app/helpers/sources_helper.rb created 644 ¶ +2

app/views/sources/direct_edit.html.haml created 644 ¶ +21

			@@ -0,0 +1,21
		1	+ %h1 Live submit
		2	+ = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form-inline') do
		3	+ = hidden_field_tag 'editor_text'
		4	+ = hidden_field_tag 'submission[problem_id]', @problem.id
		5	+ .form-group
		6	+ = label_tag "Task:"
		7	+ = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
		8	+
		9	+ .form-group
		10	+ = label_tag 'Language'
		11	+ = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name',"C++"), class: 'form-control', style: "width: 100px"
		12	+ .form-group
		13	+ = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit'
		14	+
		15	+ %br
		16	+
		17	+ .container
		18	+ .row
		19	+ .col-md-12
		20	+ %div#editor{style: 'height: 400px'}
		21	+ Hahaha

spec/controllers/sources_controller_spec.rb created 644 ¶ +12

			@@ -0,0 +1,12
		1	+ require 'spec_helper'
		2	+
		3	+ describe SourcesController do
		4	+
		5	+ describe "GET 'direct_edit'" do
		6	+ it "returns http success" do
		7	+ get 'direct_edit'
		8	+ response.should be_success
		9	+ end
		10	+ end
		11	+
		12	+ end

spec/helpers/sources_helper_spec.rb created 644 ¶ +15

			@@ -0,0 +1,15
		1	+ require 'spec_helper'
		2	+
		3	+ # Specs in this file have access to a helper object that includes
		4	+ # the SourcesHelper. For example:
		5	+ #
		6	+ # describe SourcesHelper do
		7	+ # describe "string concat" do
		8	+ # it "concats two strings with spaces" do
		9	+ # expect(helper.concat_strings("this","that")).to eq("this that")
		10	+ # end
		11	+ # end
		12	+ # end
		13	+ describe SourcesHelper do
		14	+ pending "add some examples to (or delete) #{__FILE__}"
		15	+ end

spec/views/sources/direct_edit.html.haml_spec.rb created 644 ¶ +5

			@@ -0,0 +1,5
		1	+ require 'spec_helper'
		2	+
		3	+ describe "sources/direct_edit.html.haml" do
		4	+ pending "add some examples to (or delete) #{__FILE__}"
		5	+ end

Gemfile ¶ +3

               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
+            + gem 'ace-rails-ap'
+            +
               gem 'haml'
+            + gem 'haml-rails'
               gem 'mail'
               gem 'rdiscount'
               gem 'test-unit'

Gemfile.lock ¶ +8

               GEM
                 remote: https://rubygems.org/
                 specs:
+            +     ace-rails-ap (4.0.2)
                   actionmailer (3.2.21)
                     actionpack (= 3.2.21)
                     mail (~> 2.5.4)
                   execjs (2.3.0)
                   haml (4.0.6)
                     tilt
+            +     haml-rails (0.4)
+            +       actionpack (>= 3.1, < 4.1)
+            +       activesupport (>= 3.1, < 4.1)
+            +       haml (>= 3.1, < 4.1)
+            +       railties (>= 3.1, < 4.1)
                   hike (1.2.3)
                   i18n (0.7.0)
                   in_place_editing (1.2.0)
                 ruby
               DEPENDENCIES
+            +   ace-rails-ap
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
+            +   haml-rails
                 in_place_editing
                 jquery-rails
                 jquery-tablesorter

app/assets/javascripts/application.js ¶ +1

               //= require bootstrap-toggle
               //= require select2
               //= require custom
+            + //= require ace-rails-ap
               // since this is after blank line, it is not downloaded

app/assets/javascripts/custom.js.coffee ¶ +4

                   target.text '...'
                   return
+            +   editor = ace.edit("editor")
+            +   editor.setTheme("ace/theme/monokai")
+            +   editor.getSession().setMode("ace/mode/javascript")
+            +
                 return

app/controllers/main_controller.rb ¶ +8

                     @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
+            +
+            +     if (params[:editor_text])
+            +       language = Language.find_by_id(params[:language_id])
+            +       @submission.source = params[:editor_text]
+            +       @submission.source_filename = "live_edit.#{language.ext}"
+            +       @submission.language = language
+            +     end
+            +
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip

app/models/problem.rb ¶ +4

                   result[:total_sub] = Submission.where(problem_id: self.id).count
                   result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id)
                 end
+            +
+            +   def long_name
+            +     "[#{name}] #{full_name}"
+            +   end
                 protected

app/views/main/_submission_short.html.haml ¶ +1 -1

                 = " | "
                 = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
                 = " | "
-            -   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => problem_name
+            +   = link_to "[#{t 'main.submissions_link'}]", :action => 'submission', :id => submission.problem.id

config/routes.rb ¶ +8

               CafeGrader::Application.routes.draw do
+            +   get "sources/direct_edit"
+            +
                 root :to => 'main#login'
                   end
                 end
+            +   #resources :sources do
+            +   #  collection do
+            +   #  end
+            +   #end
+            +   get 'sources/direct_edit/:pid', to: 'sources#direct_edit', as: 'direct_edit'
+            +
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

r564:484b31caab29 - Sat, 02 Jul 2016 06:11:19 - 16 files changed: 121 inserted, 1 deleted