cafe-grader-web Commit - r769:6eb8c22c844a

cafe-grader-web

Commit `r769:6eb8c22c844a` public

parent | child

Description:

Merge pull request #25 from nattee/master update outdated gem

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r769:6eb8c22c844a - Wed, 26 Jun 2019 04:51:30 - 13 files changed: 186 inserted, 158 deleted

.ruby-gemset created 644 ¶ +1

	@@ -0,0 +1,1
				1	+ grader

.ruby-version created 644 ¶ +1

	@@ -0,0 +1,1
				1	+ ruby-2.6.3

.gitignore ¶ +2 -2

               /.bundle
               # Ignore the default SQLite database.
               /db/*.sqlite3
               # Ignore all logfiles and tempfiles.
               /log/*.log
               /tmp
               *~
               /vendor/plugins/rails_upgrade
               #ignore public assets???
               /public/assets
               /public
               /data
               #ignore .orig and .swp
               *.orig
               *.swp
               #ignore rvm setting file
-            - .ruby-gemset
+            + #.ruby-gemset
-            - .ruby-version
+            + #.ruby-version
               /config/secrets.yml

Gemfile ¶ +2 -1

               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
               #
               #in-place editor
               gem 'best_in_place', '~> 3.0.1'
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               gem 'jquery-countdown-rails'
               #syntax highlighter
               gem 'rouge'
               #bootstrap add-ons
-            - gem 'bootstrap-sass', '~> 3.2.0'
+            + gem 'bootstrap-sass', '~> 3.4.1'
+            + gem 'sassc-rails', '>= 2.1.0'
               gem 'bootstrap-switch-rails'
               gem 'bootstrap-toggle-rails'
               gem 'autoprefixer-rails'
               gem 'momentjs-rails'
               gem 'rails_bootstrap_sortable'
               gem 'bootstrap-datepicker-rails'
               gem 'bootstrap3-datetimepicker-rails'
               gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               #select 2
               gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'
               #paginator
               gem 'will_paginate', '~> 3.0.7'
               gem 'mail'
               gem 'rdiscount'
               gem 'dynamic_form'
               gem 'in_place_editing'
               gem 'verification', :git => 'https://github.com/sikachu/verification.git'

Gemfile.lock ¶ +119 -99

               GIT
                 remote: https://github.com/sikachu/verification.git
                 revision: ff31697b940d7b0e2ec65f08764215c96104e76d
                 specs:
                   verification (1.0.3)
                     actionpack (>= 3.0.0, < 5.1)
                     activesupport (>= 3.0.0, < 5.1)
               GEM
                 remote: https://rubygems.org/
                 specs:
                   RubyInline (3.12.4)
                     ZenTest (~> 4.3)
-            -     ZenTest (4.11.1)
+            +     ZenTest (4.11.2)
-            -     ace-rails-ap (4.1.1)
+            +     ace-rails-ap (4.2)
-            -     actionmailer (4.2.7.1)
+            +     actionmailer (4.2.11.1)
-            -       actionpack (= 4.2.7.1)
+            +       actionpack (= 4.2.11.1)
-            -       actionview (= 4.2.7.1)
+            +       actionview (= 4.2.11.1)
-            -       activejob (= 4.2.7.1)
+            +       activejob (= 4.2.11.1)
                     mail (~> 2.5, >= 2.5.4)
                     rails-dom-testing (~> 1.0, >= 1.0.5)
-            -     actionpack (4.2.7.1)
+            +     actionpack (4.2.11.1)
-            -       actionview (= 4.2.7.1)
+            +       actionview (= 4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     rack (~> 1.6)
                     rack-test (~> 0.6.2)
                     rails-dom-testing (~> 1.0, >= 1.0.5)
                     rails-html-sanitizer (~> 1.0, >= 1.0.2)
-            -     actionview (4.2.7.1)
+            +     actionview (4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     builder (~> 3.1)
                     erubis (~> 2.7.0)
                     rails-dom-testing (~> 1.0, >= 1.0.5)
-            -       rails-html-sanitizer (~> 1.0, >= 1.0.2)
+            +       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-            -     activejob (4.2.7.1)
+            +     activejob (4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     globalid (>= 0.3.0)
-            -     activemodel (4.2.7.1)
+            +     activemodel (4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     builder (~> 3.1)
-            -     activerecord (4.2.7.1)
+            +     activerecord (4.2.11.1)
-            -       activemodel (= 4.2.7.1)
+            +       activemodel (= 4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     arel (~> 6.0)
-            -     activerecord-session_store (1.0.0)
+            +     activerecord-session_store (1.1.3)
-            -       actionpack (>= 4.0, < 5.1)
+            +       actionpack (>= 4.0)
-            -       activerecord (>= 4.0, < 5.1)
+            +       activerecord (>= 4.0)
                     multi_json (~> 1.11, >= 1.11.2)
                     rack (>= 1.5.2, < 3)
-            -       railties (>= 4.0, < 5.1)
+            +       railties (>= 4.0)
-            -     activesupport (4.2.7.1)
+            +     activesupport (4.2.11.1)
                     i18n (~> 0.7)
-            -       json (~> 1.7, >= 1.7.7)
                     minitest (~> 5.1)
                     thread_safe (~> 0.3, >= 0.3.4)
                     tzinfo (~> 1.1)
                   ansi (1.5.0)
                   arel (6.0.4)
-            -     autoprefixer-rails (6.6.0)
+            +     autoprefixer-rails (9.5.1.1)
                     execjs
                   best_in_place (3.0.3)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
-            -     bootstrap-datepicker-rails (1.7.1.1)
+            +     bootstrap-datepicker-rails (1.8.0.1)
                     railties (>= 3.0)
-            -     bootstrap-sass (3.2.0.2)
+            +     bootstrap-sass (3.4.1)
-            -       sass (~> 3.2)
+            +       autoprefixer-rails (>= 5.2.1)
-            -     bootstrap-switch-rails (3.3.3)
+            +       sassc (>= 2.0.0)
+            +     bootstrap-switch-rails (3.3.4)
                   bootstrap-toggle-rails (2.2.1.0)
                   bootstrap3-datetimepicker-rails (4.17.47)
                     momentjs-rails (>= 2.8.1)
-            -     builder (3.2.2)
+            +     builder (3.2.3)
-            -     coffee-rails (4.2.1)
+            +     coffee-rails (4.2.2)
                     coffee-script (>= 2.2.0)
-            -       railties (>= 4.0.0, < 5.2.x)
+            +       railties (>= 4.0.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
-            -     concurrent-ruby (1.0.4)
+            +     concurrent-ruby (1.1.5)
+            +     crass (1.0.4)
                   dynamic_form (1.1.4)
                   erubis (2.7.0)
                   execjs (2.7.0)
-            -     fuzzy-string-match (1.0.0)
+            +     ffi (1.11.1)
+            +     fuzzy-string-match (1.0.1)
                     RubyInline (>= 3.8.6)
-            -     globalid (0.3.7)
+            +     globalid (0.4.2)
-            -       activesupport (>= 4.1.0)
+            +       activesupport (>= 4.2.0)
-            -     haml (4.0.7)
+            +     haml (5.1.0)
+            +       temple (>= 0.8.0)
                     tilt
-            -     haml-rails (0.9.0)
+            +     haml-rails (1.0.0)
                     actionpack (>= 4.0.1)
                     activesupport (>= 4.0.1)
-            -       haml (>= 4.0.6, < 5.0)
+            +       haml (>= 4.0.6, < 6.0)
                     html2haml (>= 1.0.1)
                     railties (>= 4.0.1)
-            -     html2haml (2.0.0)
+            +     html2haml (2.2.0)
                     erubis (~> 2.7.0)
-            -       haml (~> 4.0.0)
+            +       haml (>= 4.0, < 6)
-            -       nokogiri (~> 1.6.0)
+            +       nokogiri (>= 1.6.0)
                     ruby_parser (~> 3.5)
-            -     i18n (0.7.0)
+            +     i18n (0.9.5)
+            +       concurrent-ruby (~> 1.0)
                   in_place_editing (1.2.0)
                   jquery-countdown-rails (2.0.2)
                   jquery-datatables-rails (3.4.0)
                     actionpack (>= 3.1)
                     jquery-rails
                     railties (>= 3.1)
                     sass-rails
-            -     jquery-rails (4.2.1)
+            +     jquery-rails (4.3.3)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
-            -     jquery-tablesorter (1.23.3)
+            +     jquery-tablesorter (1.26.1)
                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (6.0.1)
                     railties (>= 3.2.16)
-            -     json (1.8.3)
+            +     loofah (2.2.3)
-            -     loofah (2.0.3)
+            +       crass (~> 1.0.2)
                     nokogiri (>= 1.5.9)
-            -     mail (2.6.4)
+            +     mail (2.7.1)
-            -       mime-types (>= 1.16, < 4)
+            +       mini_mime (>= 0.1.1)
-            -     mime-types (3.1)
+            +     mini_mime (1.0.1)
-            -       mime-types-data (~> 3.2015)
+            +     mini_portile2 (2.4.0)
-            -     mime-types-data (3.2016.0521)
+            +     minitest (5.11.3)
-            -     mini_portile2 (2.1.0)
+            +     minitest-reporters (1.3.6)
-            -     minitest (5.10.1)
-            -     minitest-reporters (1.1.13)
                     ansi
                     builder
                     minitest (>= 5.0)
                     ruby-progressbar
-            -     momentjs-rails (2.15.1)
+            +     momentjs-rails (2.20.1)
                     railties (>= 3.1)
-            -     multi_json (1.12.1)
+            +     multi_json (1.13.1)
-            -     mysql2 (0.4.5)
+            +     mysql2 (0.5.2)
-            -     nokogiri (1.6.8.1)
+            +     nokogiri (1.10.3)
-            -       mini_portile2 (~> 2.1.0)
+            +       mini_portile2 (~> 2.4.0)
-            -     rack (1.6.5)
+            +     rack (1.6.11)
                   rack-test (0.6.3)
                     rack (>= 1.0)
-            -     rails (4.2.7.1)
+            +     rails (4.2.11.1)
-            -       actionmailer (= 4.2.7.1)
+            +       actionmailer (= 4.2.11.1)
-            -       actionpack (= 4.2.7.1)
+            +       actionpack (= 4.2.11.1)
-            -       actionview (= 4.2.7.1)
+            +       actionview (= 4.2.11.1)
-            -       activejob (= 4.2.7.1)
+            +       activejob (= 4.2.11.1)
-            -       activemodel (= 4.2.7.1)
+            +       activemodel (= 4.2.11.1)
-            -       activerecord (= 4.2.7.1)
+            +       activerecord (= 4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     bundler (>= 1.3.0, < 2.0)
-            -       railties (= 4.2.7.1)
+            +       railties (= 4.2.11.1)
                     sprockets-rails
                   rails-deprecated_sanitizer (1.0.3)
                     activesupport (>= 4.2.0.alpha)
-            -     rails-dom-testing (1.0.8)
+            +     rails-dom-testing (1.0.9)
-            -       activesupport (>= 4.2.0.beta, < 5.0)
+            +       activesupport (>= 4.2.0, < 5.0)
                     nokogiri (~> 1.6)
                     rails-deprecated_sanitizer (>= 1.0.1)
-            -     rails-html-sanitizer (1.0.3)
+            +     rails-html-sanitizer (1.0.4)
-            -       loofah (~> 2.0)
+            +       loofah (~> 2.2, >= 2.2.2)
-            -     rails_bootstrap_sortable (2.0.1)
+            +     rails_bootstrap_sortable (2.0.6)
                     momentjs-rails (>= 2.8.3)
-            -     railties (4.2.7.1)
+            +     railties (4.2.11.1)
-            -       actionpack (= 4.2.7.1)
+            +       actionpack (= 4.2.11.1)
-            -       activesupport (= 4.2.7.1)
+            +       activesupport (= 4.2.11.1)
                     rake (>= 0.8.7)
                     thor (>= 0.18.1, < 2.0)
-            -     rake (12.0.0)
+            +     rake (12.3.2)
+            +     rb-fsevent (0.10.3)
+            +     rb-inotify (0.10.0)
+            +       ffi (~> 1.0)
                   rdiscount (2.2.0.1)
-            -     rouge (2.0.7)
+            +     rouge (3.3.0)
-            -     ruby-progressbar (1.8.1)
+            +     ruby-progressbar (1.10.0)
-            -     ruby_parser (3.8.3)
+            +     ruby_parser (3.13.1)
-            -       sexp_processor (~> 4.1)
+            +       sexp_processor (~> 4.9)
-            -     sass (3.4.23)
+            +     sass (3.7.4)
-            -     sass-rails (5.0.6)
+            +       sass-listen (~> 4.0.0)
+            +     sass-listen (4.0.0)
+            +       rb-fsevent (~> 0.9, >= 0.9.4)
+            +       rb-inotify (~> 0.9, >= 0.9.7)
+            +     sass-rails (5.0.7)
                     railties (>= 4.0.0, < 6)
                     sass (~> 3.1)
                     sprockets (>= 2.8, < 4.0)
                     sprockets-rails (>= 2.0, < 4.0)
                     tilt (>= 1.1, < 3)
+            +     sassc (2.0.1)
+            +       ffi (~> 1.9)
+            +       rake
+            +     sassc-rails (2.1.1)
+            +       railties (>= 4.0.0)
+            +       sassc (>= 2.0)
+            +       sprockets (> 3.0)
+            +       sprockets-rails
+            +       tilt
                   select2-rails (4.0.3)
                     thor (~> 0.14)
-            -     sexp_processor (4.7.0)
+            +     sexp_processor (4.12.0)
-            -     sprockets (3.7.1)
+            +     sprockets (3.7.2)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
-            -     sprockets-rails (3.2.0)
+            +     sprockets-rails (3.2.1)
                     actionpack (>= 4.0)
                     activesupport (>= 4.0)
                     sprockets (>= 3.0.0)
-            -     sqlite3 (1.3.12)
+            +     sqlite3 (1.4.1)
-            -     thor (0.19.4)
+            +     temple (0.8.1)
-            -     thread_safe (0.3.5)
+            +     thor (0.20.3)
-            -     tilt (2.0.5)
+            +     thread_safe (0.3.6)
-            -     tzinfo (1.2.2)
+            +     tilt (2.0.9)
+            +     tzinfo (1.2.5)
                     thread_safe (~> 0.1)
-            -     uglifier (3.0.4)
+            +     uglifier (4.1.20)
                     execjs (>= 0.3.0, < 3)
                   will_paginate (3.0.12)
-            -     yaml_db (0.4.2)
+            +     yaml_db (0.7.0)
-            -       rails (>= 3.0, < 5.1)
+            +       rails (>= 3.0)
                     rake (>= 0.8.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-datepicker-rails
-            -   bootstrap-sass (~> 3.2.0)
+            +   bootstrap-sass (~> 3.4.1)
                 bootstrap-switch-rails
                 bootstrap-toggle-rails
                 bootstrap3-datetimepicker-rails
                 coffee-rails
                 dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
                 jquery-datatables-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-rails
                 mail
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 rails (~> 4.2.0)
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 sass-rails
+            +   sassc-rails (>= 2.1.0)
                 select2-rails
                 sqlite3
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
                 yaml_db
               BUNDLED WITH
-            -    1.15.4
+            +    1.17.2

README.rdoc ¶ +1 -3

                   mysql> flush privileges;
                   Query OK, 0 rows affected (0.00 sec)
               === 2. Install RVM
               Since Ubuntu has dedicated package for RVM we will use that. Just follow instruction given in https://github.com/rvm/ubuntu_rvm. For your convenience, the step are reproduced here.
               First, we install necessary package for installing RVM.
                   cafe@grader:~$ sudo apt install software-properties-common
               Second, we add the custom PPA, update the system and install RVM.
                   cafe@grader:~$ sudo apt-add-repository -y ppa:rael-gc/rvm
                   cafe@grader:~$ sudo apt-get update
                   cafe@grader:~$ sudo apt-get install rvm
               This is very important. You have to logout and login again since RVM change a lots of system.
               If you are using GUI version of Ubuntu, be sure to have Gnome Terminal (or any other terminal you are using) perform login every time. This can be done by mark the check box "Run command as a login shell" in Gnome terminal or by adding --login to bash.
               === 3. Install necessary package
-            -     cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php7.2-cli apache2 dirmngr gnupg apache2-dev
+            +     cafe@grader:~$ sudo apt install libmysqlclient-dev default-jdk unzip nodejs php-cli apache2 dirmngr gnupg apache2-dev
-            - curl build-essential
               === 4. Install cafe-grader
               First, ensure that RVM is installed correctly.
                   cafe@grader:~$ rvm
               If you get a result similar to this.
                   Command 'rvm' not found, but there are 21 similar ones.
               It is very likely that you have not re-login or you are using bash without --login. Please do so and re-read the installation of RVM on Ubuntu https://github.com/rvm/ubuntu_rvm again.
               Next, we will let the install script do the work of installing cafe-grader. Please prepare the DATABASENAME, USERNAME and PASSWORD as the script will ask for that. Make sure that you run the script from the home directory of the user.
                   cafe@grader:~$ wget https://github.com/cafe-grader-team/cafe-grader-judge-scripts/raw/master/installer/install.sh
                   cafe@grader:~$ . ./install.sh
               After installation is finished, grader is ready to run in development mode via WEBrick. We will try that by the following command which will start a grader accessible via http://localhost:3000/. You can try logging in to the system and verify that it is actually work.
               cafe@grader:~/cafe_grader/web$ rails s
               If Everything is OK, stop the WEBrick by Ctrl-C.

app/controllers/problems_controller.rb ¶ +1 -1

                   problems = get_problems_from_params
                   problems.each do |p|
                     p.available = avail
                     p.save
                   end
                 end
                 def get_problems_from_params
                   problems = []
                   params.keys.each do |k|
                     if k.index('prob-')==0
                       name, id, order = k.split('-')
                       problems << Problem.find(id)
                     end
                   end
                   problems
                 end
                 def get_problems_stat
                 end
                 private
                   def problem_params
-            -       params.require(:problem).permit(:name, :full_name, :full_score, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
+            +       params.require(:problem).permit(:name, :full_name, :full_score, :change_date_added, :date_added, :available, :test_allowed,:output_only, :url, :description, tag_ids:[])
                   end
               end

app/models/problem.rb ¶ +2

               class Problem < ActiveRecord::Base
                 belongs_to :description
                 has_and_belongs_to_many :contests, :uniq => true
                 #has_and_belongs_to_many :groups
                 has_many :groups_problems, class_name: GroupProblem
                 has_many :groups, :through => :groups_problems
                 has_many :problems_tags, class_name: ProblemTag
                 has_many :tags, through: :problems_tags
                 has_many :test_pairs, :dependent => :delete_all
                 has_many :testcases, :dependent => :destroy
+            +   has_many :submissions
+            +
                 validates_presence_of :name
                 validates_format_of :name, :with => /\A\w+\z/
                 validates_presence_of :full_name
                 scope :available, -> { where(available: true) }
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.available_problems
                   available.order(date_added: :desc).order(:name)
                   #Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100

app/views/application/_submission_short.html.haml ¶ +3 -1

               - if submission.nil?
                 = "-"
               - else
                 %strong= "Submission ID:"
                 = submission.id
                 %br
                 - unless submission.graded_at
                   %strong= t 'main.submitted_at:'
                   = format_full_time_ago(submission.submitted_at.localtime)
                 - else
                   %strong= t 'main.graded_at:'
                   = format_full_time_ago(submission.graded_at.localtime)
                   %br
                   - if GraderConfiguration['ui.show_score']
                     %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
                 %strong View:
                 - if GraderConfiguration.show_grading_result
                   = link_to '[detailed result]', :action => 'result', :id => submission.id
-            -   = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} if submission.graded_at
+            +   - if submission.graded_at
+            +     %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
+            +       =t 'main.cmp_msg'
                 = link_to "#{t 'main.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'

app/views/submissions/edit.html.haml ¶ +12

                         .input-group
                           %span.input-group-btn
                             %span.btn.btn-default.btn-file
                               Browse
                               = file_field_tag 'load_file'
                           = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     - # latest submission status
                     .panel{class: (@submission && @submission.graded_at) ? "panel-info" : "panel-warning"}
                       .panel-heading
                         Latest Submission Status
                         = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
                         %div#latest_status
                           - if @submission
                             = render :partial => 'submission_short',
                               :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
+            + .modal.fade#compiler{tabindex: -1,role: 'dialog'}
+            +   .modal-dialog.modal-lg{role:'document'}
+            +     .modal-content
+            +       .modal-header
+            +         %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
+            +           %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
+            +         %h4 Compiler message
+            +       .modal-body
+            +         %pre#compiler_msg= @submission.compiler_message
+            +       .modal-footer
+            +         %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
+            +
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")
                   e.setValue($("#text_sourcecode").val());
                   e.gotoLine(1);
                   $("#language_id").trigger('change');
                   $("#load_file").on('change',function(evt) {
                     var file = evt.target.files[0];
                     var reader = new FileReader();
                     reader.onload =  function(theFile) {
                       var e = ace.edit("editor")
                       e.setValue(theFile.target.result);
                       e.gotoLine(1);
                     };
                     reader.readAsText(file)
                   });
                   //brython();
                 });

app/views/users/index.html.haml ¶ +12 -11

               = user_title_bar(@user)
               %h1 Your account settings
               -#%p
                 -#You can edit your alias and e-mails.  Just click on the text and edit it.
-            - %table.uinfo
+            + %table.table.table-bordered{:style => "width:30%"}
                 %tr
-            -     %th.uinfo Login
+            +     %th Login
-            -     %td.uinfo= @user.login
+            +     %td= @user.login
                 %tr
-            -     %th.uinfo Full name
+            +     %th Full name
-            -     %td.uinfo= @user.full_name
+            +     %td= @user.full_name
                 -#%tr
                   -#%th.uinfo Alias
                   -#%td.uinfo= in_place_editor_field :user, 'alias_for_editing', {}, :rows => 1
                 -#%tr
                   -#%th.uinfo E-mail
                   -#%td.uinfo= in_place_editor_field :user, 'email_for_editing', {}, :rows => 1
                 %tr
-            -     %th.uinfo Password
+            +     %th Password
-            -     %td.uinfo
+            +     %td
                     = form_tag :action => 'chg_passwd', :method => 'post' do
                       %table
                         %tr
-            -             %td= password_field_tag 'passwd'
+            +             %td
+            +               %input{:type => "password", :class => "form-control", :name => "passwd", :id => "passwd"}
                           %td (new)
                         %tr
-            -             %td= password_field_tag 'passwd_verify'
+            +             %td
+            +               %input{:type => "password", :class => "form-control", :name => "passwd_verify", :id => "passwd_verify"}
                           %td (verify)
                         %tr
                           %td{:colspan => "2"}
-            -               = submit_tag 'change password'
+            +               %input{:type => "button", :class => "btn btn-default", :name => "commit", :value => "Change Password"}

db/schema.rb ¶ +30 -30

               # encoding: UTF-8
               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
               ActiveRecord::Schema.define(version: 20180612102327) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
                   t.text     "body",         limit: 65535
                   t.boolean  "published"
-            -     t.datetime "created_at",                                 null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",                                 null: false
+            +     t.datetime "updated_at"
                   t.boolean  "frontpage",                  default: false
                   t.boolean  "contest_only",               default: false
                   t.string   "title",        limit: 255
                   t.string   "notes",        limit: 255
                 end
                 create_table "contests", force: :cascade do |t|
                   t.string   "title",      limit: 255
                   t.boolean  "enabled"
-            -     t.datetime "created_at",             null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",             null: false
+            +     t.datetime "updated_at"
                   t.string   "name",       limit: 255
                 end
                 create_table "contests_problems", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "problem_id", limit: 4
                 end
                 create_table "contests_users", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "user_id",    limit: 4
                 end
                 create_table "countries", force: :cascade do |t|
                   t.string   "name",       limit: 255
-            -     t.datetime "created_at",             null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",             null: false
+            +     t.datetime "updated_at"
                 end
                 create_table "descriptions", force: :cascade do |t|
                   t.text     "body",       limit: 65535
                   t.boolean  "markdowned"
-            -     t.datetime "created_at",               null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",               null: false
+            +     t.datetime "updated_at"
                 end
                 create_table "grader_configurations", force: :cascade do |t|
                   t.string   "key",         limit: 255
                   t.string   "value_type",  limit: 255
                   t.string   "value",       limit: 255
-            -     t.datetime "created_at",                null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",                null: false
+            +     t.datetime "updated_at"
                   t.text     "description", limit: 65535
                 end
                 create_table "grader_processes", force: :cascade do |t|
                   t.string   "host",       limit: 255
                   t.integer  "pid",        limit: 4
                   t.string   "mode",       limit: 255
                   t.boolean  "active"
-            -     t.datetime "created_at",             null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",             null: false
+            +     t.datetime "updated_at"
                   t.integer  "task_id",    limit: 4
                   t.string   "task_type",  limit: 255
                   t.boolean  "terminated"
                 end
-            -   add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
+            +   add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_host_and_pid", using: :btree
                 create_table "groups", force: :cascade do |t|
                   t.string "name",        limit: 255
                   t.string "description", limit: 255
                 end
                 create_table "groups_problems", id: false, force: :cascade do |t|
                   t.integer "problem_id", limit: 4, null: false
                   t.integer "group_id",   limit: 4, null: false
                 end
                 add_index "groups_problems", ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id", using: :btree
                 create_table "groups_users", id: false, force: :cascade do |t|
                   t.integer "group_id", limit: 4, null: false
                   t.integer "user_id",  limit: 4, null: false
                 end
                 add_index "groups_users", ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id", using: :btree
                 create_table "heart_beats", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
-            -     t.datetime "created_at",             null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",             null: false
+            +     t.datetime "updated_at"
                   t.string   "status",     limit: 255
                 end
                 add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
                 create_table "languages", force: :cascade do |t|
                   t.string "name",        limit: 10
                   t.string "pretty_name", limit: 255
                   t.string "ext",         limit: 10
                   t.string "common_ext",  limit: 255
                 end
                 create_table "logins", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
-            -     t.datetime "created_at",             null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",             null: false
+            +     t.datetime "updated_at"
                 end
                 create_table "messages", force: :cascade do |t|
                   t.integer  "sender_id",           limit: 4
                   t.integer  "receiver_id",         limit: 4
                   t.integer  "replying_message_id", limit: 4
                   t.text     "body",                limit: 65535
                   t.boolean  "replied"
-            -     t.datetime "created_at",                        null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",                        null: false
+            +     t.datetime "updated_at"
                 end
                 create_table "problems", force: :cascade do |t|
                   t.string  "name",                 limit: 30
                   t.string  "full_name",            limit: 255
                   t.integer "full_score",           limit: 4
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url",                  limit: 255
                   t.integer "description_id",       limit: 4
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string  "description_filename", limit: 255
                   t.boolean "view_testcase"
                 end
                 create_table "problems_tags", force: :cascade do |t|
                   t.integer "problem_id", limit: 4
                   t.integer "tag_id",     limit: 4
                 end
                 add_index "problems_tags", ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true, using: :btree
                 add_index "problems_tags", ["problem_id"], name: "index_problems_tags_on_problem_id", using: :btree
                 add_index "problems_tags", ["tag_id"], name: "index_problems_tags_on_tag_id", using: :btree
                 create_table "roles", force: :cascade do |t|
                   t.string "name", limit: 255
                 end
                 create_table "roles_users", id: false, force: :cascade do |t|
                   t.integer "role_id", limit: 4
                   t.integer "user_id", limit: 4
                 end
                 add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
                 create_table "sessions", force: :cascade do |t|
                   t.string   "session_id", limit: 255
                   t.text     "data",       limit: 65535
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
                 add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
                 create_table "sites", force: :cascade do |t|
                   t.string   "name",       limit: 255
                   t.boolean  "started"
                   t.datetime "start_time"
-            -     t.datetime "created_at",             null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",             null: false
+            +     t.datetime "updated_at"
                   t.integer  "country_id", limit: 4
                   t.string   "password",   limit: 255
                 end
                 create_table "submission_view_logs", force: :cascade do |t|
                   t.integer  "user_id",       limit: 4
                   t.integer  "submission_id", limit: 4
-            -     t.datetime "created_at",              null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",              null: false
+            +     t.datetime "updated_at"
                 end
                 create_table "submissions", force: :cascade do |t|
                   t.integer  "user_id",               limit: 4
                   t.integer  "problem_id",            limit: 4
                   t.integer  "language_id",           limit: 4
                   t.text     "source",                limit: 16777215
                   t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message",      limit: 65535
                   t.datetime "graded_at"
                   t.integer  "points",                limit: 4
                   t.text     "grader_comment",        limit: 65535
                   t.integer  "number",                limit: 4
                   t.string   "source_filename",       limit: 255
                   t.float    "max_runtime",           limit: 24
                   t.integer  "peak_memory",           limit: 4
                   t.integer  "effective_code_length", limit: 4
                   t.string   "ip_address",            limit: 255
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
                 add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
                 create_table "tags", force: :cascade do |t|
                   t.string   "name",        limit: 255,   null: false
                   t.text     "description", limit: 65535
                   t.boolean  "public"
                   t.datetime "created_at",                null: false
                   t.datetime "updated_at",                null: false
                 end
                 create_table "tasks", force: :cascade do |t|
                   t.integer  "submission_id", limit: 4
                   t.datetime "created_at"
                   t.integer  "status",        limit: 4
                   t.datetime "updated_at"
                 end
                 add_index "tasks", ["submission_id"], name: "index_tasks_on_submission_id", using: :btree
                 create_table "test_pairs", force: :cascade do |t|
                   t.integer  "problem_id", limit: 4
                   t.text     "input",      limit: 16777215
                   t.text     "solution",   limit: 16777215
-            -     t.datetime "created_at",                  null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",                  null: false
+            +     t.datetime "updated_at"
                 end
                 create_table "test_requests", force: :cascade do |t|
                   t.integer  "user_id",          limit: 4
                   t.integer  "problem_id",       limit: 4
                   t.integer  "submission_id",    limit: 4
                   t.string   "input_file_name",  limit: 255
                   t.string   "output_file_name", limit: 255
                   t.string   "running_stat",     limit: 255
                   t.integer  "status",           limit: 4
-            -     t.datetime "updated_at",                     null: false
+            +     t.datetime "updated_at"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message", limit: 65535
                   t.datetime "graded_at"
                   t.string   "grader_comment",   limit: 255
-            -     t.datetime "created_at",                     null: false
+            +     t.datetime "created_at"
                   t.float    "running_time",     limit: 24
                   t.string   "exit_status",      limit: 255
                   t.integer  "memory_usage",     limit: 4
                 end
                 add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree
                 create_table "testcases", force: :cascade do |t|
                   t.integer  "problem_id", limit: 4
                   t.integer  "num",        limit: 4
                   t.integer  "group",      limit: 4
                   t.integer  "score",      limit: 4
                   t.text     "input",      limit: 4294967295
                   t.text     "sol",        limit: 4294967295
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
                 create_table "user_contest_stats", force: :cascade do |t|
                   t.integer  "user_id",       limit: 4
                   t.datetime "started_at"
-            -     t.datetime "created_at",              null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",              null: false
+            +     t.datetime "updated_at"
                   t.boolean  "forced_logout"
                 end
                 create_table "users", force: :cascade do |t|
                   t.string   "login",           limit: 50
                   t.string   "full_name",       limit: 255
                   t.string   "hashed_password", limit: 255
                   t.string   "salt",            limit: 5
                   t.string   "alias",           limit: 255
                   t.string   "email",           limit: 255
                   t.integer  "site_id",         limit: 4
                   t.integer  "country_id",      limit: 4
                   t.boolean  "activated",                   default: false
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.string   "section",         limit: 255
                   t.boolean  "enabled",                     default: true
                   t.string   "remark",          limit: 255
                   t.string   "last_ip",         limit: 255
-            -     t.string   "section",         limit: 255
                 end
                 add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
                 add_foreign_key "problems_tags", "problems"
                 add_foreign_key "problems_tags", "tags"
               end

README removed ¶ -10

deleted file

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Author

r769:6eb8c22c844a - Wed, 26 Jun 2019 04:51:30 - 13 files changed: 186 inserted, 158 deleted

Sign in to your account

Commit r769:6eb8c22c844a public

Author

r769:6eb8c22c844a - Wed, 26 Jun 2019 04:51:30 - 13 files changed: 186 inserted, 158 deleted

Commit `r769:6eb8c22c844a` public