cafe-grader-web Commit - r872:17032a7943cf

cafe-grader-web

Commit `r872:17032a7943cf` public

parent | child

Description:

remove unnecessary gems

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r872:17032a7943cf - Tue, 20 Sep 2022 14:56:09 - 13 files changed: 33 inserted, 75 deleted

Gemfile ¶ +1 -4

               #gem 'jquery-datatables-rails'
               #----------- user interface -----------------
               gem 'simple_form'
               #select 2
               #gem 'select2-rails'
               #ace editor
               gem 'ace-rails-ap'
               #paginator
               #gem 'will_paginate', '~> 3.0.7'
               gem 'mail'
-            - gem 'rdiscount'
+            + gem 'rdiscount'  #markdown
-            - gem 'dynamic_form'
-            - gem 'in_place_editing'
-            - #gem 'verification', :git => 'https://github.com/sikachu/verification.git'
               #---------------- testiing -----------------------
               gem 'minitest-reporters'
               #---------------- for console --------------------
               gem 'fuzzy-string-match'
               group :development, :test do
                 # Call 'byebug' anywhere in the code to stop execution and get a debugger console
                 gem 'byebug'

Gemfile.lock ¶ -2

                     xpath (~> 3.2)
                   childprocess (4.1.0)
                   coffee-rails (5.0.0)
                     coffee-script (>= 2.2.0)
                     railties (>= 5.2.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.1.10)
                   crass (1.0.6)
                   digest (3.1.0)
-            -     dynamic_form (1.1.4)
                   erubi (1.11.0)
                   erubis (2.7.0)
                   execjs (2.8.1)
                   ffi (1.15.5)
                   fuzzy-string-match (1.0.1)
                     RubyInline (>= 3.8.6)
                   globalid (1.0.0)
                     activesupport (>= 5.0)
                   haml (5.2.2)
                     temple (>= 0.8.0)
                     tilt
                   haml-rails (2.0.1)
               PLATFORMS
                 x86_64-linux
               DEPENDENCIES
                 ace-rails-ap
                 activerecord-session_store
                 best_in_place!
                 bootsnap
                 bootstrap (~> 5.2)
                 byebug
                 capybara
                 coffee-rails
-            -   dynamic_form
                 fuzzy-string-match
                 haml
                 haml-rails
                 importmap-rails (~> 1.1)
                 in_place_editing
                 jbuilder
                 jquery-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 material_icons
                 minitest-reporters
                 momentjs-rails

app/assets/stylesheets/my_custom.css.scss ¶ +8

               .secondnavbar {
                 top: 50px;
               }
+            +
+            + //for google material design
+            + .mi-bs {
+            +   vertical-align: middle;
+            +   position: relative;
+            +   top: -3px;
+            + }
+            +
               // --------------- bootstrap file upload ----------------------
               .btn-file {
                 position: relative;
                 overflow: hidden;
               }
               .btn-file input[type=file] {
                 position: absolute;
                 top: 0;
                 right: 0;
                 min-width: 100%;
                 min-height: 100%;

app/controllers/announcements_controller.rb ¶ +1 -3

               class AnnouncementsController < ApplicationController
                 before_action :admin_authorization
-            -   in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
                   @announcements = Announcement.order(created_at: :desc)
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 def toggle
                   @announcement = Announcement.find(params[:id])
                   @announcement.update( published:  !@announcement.published? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_#{@announcement.id}",button_on: @announcement.published? } }
                   end
                 end
                 def toggle_front
                   @announcement = Announcement.find(params[:id])
-            -     @announcement.update_attributes( frontpage:  !@announcement.frontpage? )
+            +     @announcement.update( frontpage:  !@announcement.frontpage? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#announcement_toggle_front_#{@announcement.id}",button_on: @announcement.frontpage? } }
                   end
                 end
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy

app/controllers/problems_controller.rb ¶ -4

               class ProblemsController < ApplicationController
                 before_action :admin_authorization, except: [:stat]
                 before_action only: [:stat] do
                   authorization_by_roles(['admin','ta'])
                 end
-            -   in_place_edit_for :problem, :name
-            -   in_place_edit_for :problem, :full_name
-            -   in_place_edit_for :problem, :full_score
                 def index
                   @problems = Problem.order(date_added: :desc)
                 end
                 def show
                   @problem = Problem.find(params[:id])
                 end
                 def new
                   @problem = Problem.new
                   @description = nil

app/helpers/application_helper.rb ¶ +2 -2

                   st = time_ago_in_words(time) + ' ago (' + format_short_time(time) + ')'
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
-            -     btn_size = option[:size] || 'btn-xs'
+            +     btn_size = option[:size] || 'btn-sm'
                   btn_block = option[:block] || 'btn-block'
                   link_to (on ? "Yes" : "No"), toggle_url,
-            -       {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
+            +       {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'outline-secondary'} ajax-toggle",
                       id: id,
                       data: {remote: true, method: 'get'}}
                 end
                 def get_ace_mode(language)
                   # return ace mode string from Language
                   case language.pretty_name
                     when 'Pascal'
                       'ace/mode/pascal'
                     when 'C++','C'
                       'ace/mode/c_cpp'

app/views/announcements/edit.html.haml ¶ -39

@@ -1,45 +1,6
1	%h1 Edit Announcement	1	%h1 Edit Announcement
2		2
3	-content_for(:form_buttons) do	3	-content_for(:form_buttons) do
4	= link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'	4	= link_to t(:back), announcements_path, class: 'card-link btn btn-secondary'
5		5
6	= render 'form'	6	= render 'form'
7	- -# old style
8	- .container-fluid
9	- %h1 Editing announcement
10	- = error_messages_for :announcement
11	- .row
12	- .col-md-6
13	- = form_for(@announcement) do \|f\|
14	- .form-group
15	- %label Title
16	- = f.text_field :title, class: 'form-control'
17	- .form-group
18	- %label Notes
19	- (shown internally, used to organize announcements)
20	- = f.text_field :notes, class: 'form-control'
21	- .form-group
22	- %label Body
23	- = f.text_area :body, class: 'form-control', style: 'height: 200px;'
24	- .form-group
25	- %label Author
26	- = f.text_field :author, class: 'form-control'
27	- .checkbox
28	- %label
29	- = f.check_box :published
30	- Published
31	- .checkbox
32	- %label
33	- = f.check_box :frontpage
34	- Show on front page?
35	- .checkbox
36	- %label
37	- = f.check_box :on_nav_bar
38	- Show on top menu bar?
39	- .checkbox
40	- %label
41	- = f.check_box :contest_only
42	- Show only in contest?
43	- = f.submit "Update", class: 'btn btn-primary'
44	- = link_to 'Show', @announcement, class: 'btn btn-default'
45	- = link_to 'Back', announcements_path, class: 'btn btn-default'

app/views/application/_toggle_button.js.haml ¶ +2 -2

               :plain
                 var t = $("#{button_id}");
-            -   t.removeClass('btn-default');
+            +   t.removeClass('btn-outline-secondary');
                 t.removeClass('btn-success');
                 t.removeClass('btn-warning');
-            -   t.addClass("btn-#{button_on ? 'success' : 'default'}");
+            +   t.addClass("btn-#{button_on ? 'success' : 'outline-secondary'}");
                 t.text("#{button_on ? 'Yes' : 'No'}");

app/views/layouts/_header.html.haml ¶ +5 -5

               %header
                 %nav.navbar.fixed-top.navbar-dark.bg-primary.navbar-expand-lg
                   .container-fluid
                     %a.navbar-brand{href: list_main_path}
-            -         %span.glyphicon.glyphicon-home
+            +         %span.mi.mi-bs home
                       MAIN
                     %button.navbar-toggler.collapsed{ type: :button, 'data-bs': {toggle: 'collapse', target: '#navbar-collapse'} }
                       %span.navbar-toggler-icon
                     .collapse.navbar-collapse#navbar-collapse
                       %ul.navbar-nav.me-auto.mb-2.mb-lg-0
                         / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                             %ul.dropdown-menu
                               %li= link_to 'View', submissions_path, class:'dropdown-item'
                               %li= link_to 'Login Report', login_report_path, class: 'dropdown-item'
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               graders_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                         / announcement
                         - @nav_announcement.each do |ann|
                           %p.navbar-text
                             = ann.body.html_safe
                     %ul.navbar-nav
                       %li.nav-item
                         %a.nav-link{href: help_main_path}
-            -             %span.mi.md-18 help
+            +             %span.mi.mi-bs.md-18 help
                       %li.nav-item
                         %a.nav-link{href: messages_path}
-            -             %span.mi.md-18 chat
+            +             %span.mi.mi-bs.md-18 chat
                       - if GraderConfiguration['system.user_setting_enabled']
                         %li.nav-item
                           %a.nav-link{href: profile_users_path}
-            -               %span.mi.md-18 settings
+            +               %span.mi.mi-bs.md-18 settings
                       %li.nav-item
                         %a.nav-link{href: login_main_path}
-            -             %span.mi.md-18 exit_to_app
+            +             %span.mi.mi-bs.md-18 exit_to_app
                           = @current_user.full_name

app/views/main/_submission_box.html.haml ¶ +2 -2

               = form_with url: submit_main_path, multipart: true, class: 'form' do |form|
                 - if @submission and @submission.errors.any?
                   #error_explanation
                     .alert.alert-danger
                       %h3= "#{pluralize(@submission.errors.count, "error")} prohibited this user from being saved:"
                       %ul
                         - @submission.errors.full_messages.each do |msg|
                           %li= msg
                 .row.mb-2
                   .col-sm-2
-            -       = form.label :submission, 'Problem:', class: 'form-label'
+            +       = form.label :submission, 'Problem:', class: 'col-form-label'
                   .col-sm-10
                     = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {|p| ["[#{p.name}] #{p.full_name}", p.id]}, {:selected => '-1'}, { class: 'select2 form-control', style: "width: 100%" }
                 .row.mb-2
                   .col-sm-2
-            -       = form.label :file, 'File:', class: 'form-label'
+            +       = form.label :file, 'File:', class: 'col-form-label'
                   .col-sm-10
                     = form.file_field :file, class: 'form-control'
                 = form.submit 'Submit', class: 'btn btn-primary'

app/views/problems/index.html.haml ¶ +7 -7

                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
                     View Data?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
                   %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
-            -     %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
+            +     %tr{:class => "#{(problem.available) ? "bg-success bg-opacity-25" : "bg-opacity-25"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
                     %td
                       = problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
                       = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td
                       - problem.tags.each do |t|
-            -           - #%button.btn.btn-default.btn-xs= t.name
+            +           - #%button.btn.btn-default.btn-sm= t.name
                         %span.label.label-default= t.name
-            -       %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-xs btn-primary'
+            +       %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-sm btn-primary'
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
                     %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
-            -       %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
+            +       %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
+            +       %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block'
+            +       %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block'
+            +       %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-sm btn-block'
               %br/
               = link_to '[New problem]', :action => 'new'

app/views/problems/toggle.js.haml ¶ +3 -3

               = render partial: 'toggle_button',
                                 locals: {button_id: "#problem-avail-#{@problem.id}",button_on: @problem.available }
               :plain
                 r = $("#prob-#{@problem.id}");
-            -   r.removeClass('success');
+            +   r.removeClass('bg-success');
-            -   r.removeClass('danger');
+            +   r.removeClass('bg-danger');
-            -   r.addClass("#{@problem.available? ? 'success' : 'danger'}");
+            +   r.addClass("#{@problem.available? ? 'bg-success' : 'bg-danger-'}");

app/views/testcases/show_problem.html.haml ¶ +2 -2

               %h1 Test cases
               %h2= @problem.long_name
               /navbar
               %ul.nav.nav-pills{role: :tablist}
                 - @problem.testcases.each.with_index do |tc,id|
-            -     %li{role: :presentation, class: ('active' if id == 0)}
+            +     %li.nav-item{role: :presentation, class: ('active' if id == 0)}
-            -       %a{href:"#tc#{tc.id}", role: 'tab', data: {toggle: 'tab'}}= tc.num
+            +       %a.nav-link{href:"#tc#{tc.id}", role: 'tab', 'data-bs': {toggle: 'tab', target: "#tc#{tc.id}"}}= tc.num
               /actual data
               .tab-content
                 - @problem.testcases.each.with_index do |tc,id|
                   .tab-pane{id: "tc#{tc.id}",class: ('active' if id == 0)}
                     .row
                       .col-md-6
                         %h3 Input
                         = link_to "Download",download_input_testcase_path(tc),class: 'btn btn-info btn-sm'
                       .col-md-6
                         %h3 Output
                         = link_to "Download",download_sol_testcase_path(tc),class: 'btn btn-info btn-sm'

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

Commit r872:17032a7943cf public

Author

r872:17032a7943cf - Tue, 20 Sep 2022 14:56:09 - 13 files changed: 33 inserted, 75 deleted

Commit `r872:17032a7943cf` public