cafe-grader-web Commit - r875:567f1ebe063b

cafe-grader-web

Commit `r875:567f1ebe063b` public

parent | child

Description:

user admin

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

r875:567f1ebe063b - Mon, 26 Sep 2022 21:05:12 - 8 files changed: 80 inserted, 78 deleted

app/controllers/user_admin_controller.rb ¶ +1

               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_action :admin_authorization
                 def index
                   @user_count = User.count
                   @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
+            +     @user = User.new
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago)
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end

app/helpers/application_helper.rb ¶ -10

                 BOOTSTRAP_FLASH_MSG = {
                   success: 'alert-success',
                   error: 'alert-danger',
                   alert: 'alert-danger',
                   notice: 'alert-info'
                 }
                 def bootstrap_class_for(flash_type)
                   BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
                 end
-            -   def flash_messages
-            -     flash.each do |msg_type, message|
-            -       concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
-            -               concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
-            -               concat message
-            -             end)
-            -     end
-            -     nil
-            -   end
               end

app/javascript/application.js ¶ +4 -1

               import "datatables-searchpanes-bs5"
               import "datatables-select"
               import "datatables-staterestore"
               import "datatables-staterestore-bs5"
               /* */
               import "select2"
               //my own customization
               import 'custom'
+            + //trigger import map ready
               console.log('application.js ready')
+            + window.importmapScriptsLoaded = true
+            + const import_map_loaded = new CustomEvent('import-map-loaded', { });
+            + document.dispatchEvent(import_map_loaded);

app/views/layouts/application.html.haml ¶ +4 -1

                   <link href="https://fonts.googleapis.com/css2?family=Mitr:ital,wght@0,300;1,300&family=Kodchasan:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                   <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
                 <link href="https://fonts.googleapis.com/css2?family=Sarabun:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
               %body
                 - unless local_assigns[:skip_header]
                   = render 'layouts/header'
                 /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
                 .container-fluid
-            -     = flash_messages
+            +     - flash.each do |msg_type, message|
+            +       .alert.alert-dismissible.fade.show{class: bootstrap_class_for(msg_type)}
+            +         = message
+            +         %button.btn-close{type: 'button', 'data-bs-dismiss': :alert}
                   = yield

app/views/user_admin/_form.html.haml ¶ +17 -9

@@ -1,12 +1,20
1	= simple_form_for(@user) do \|f\|	1	= simple_form_for(@user) do \|f\|
2	= f.error_notification	2	= f.error_notification
3	- = f.input :login, label: 'Login'	3	+ .mb-2
4	- = f.input :~~full_name~~, label: '~~Full name~~'	4	+ = f.input :login, label: 'Login'
5	- = f.input :password	5	+ .mb-2
6	- = f.input :password_confirmation	6	+ = f.input :full_name, label: 'Full name'
7	- = f.input :email	7	+ .mb-2
8	- = f.input :~~alias~~	8	+ = f.input :password
9	- = f.input :remark	9	+ .mb-2
10	- = f.button :submit, class: 'btn btn-primary'	10	+ = f.input :password_confirmation
11	- = link_to 'Cancel', :back, class: 'btn btn-default'	11	+ .mb-2
		12	+ = f.input :email
		13	+ .mb-2
		14	+ = f.input :alias
		15	+ .mb-2
		16	+ = f.input :remark
		17	+ .mb-2
		18	+ = f.button :submit, class: 'btn btn-primary'
		19	+ = link_to 'Cancel', :back, class: 'btn btn-secondary'
12		20

app/views/user_admin/index.html.haml ¶ +30 -35

               %h1 Users
-            - .card.border-primary
+            + .card.border-success.mb-3
-            -   .card-header.text-bg-primary.border-primary
+            +   .card-header.text-bg-success.border-success
                   Quick Add
                 .card-body
-            -     = form_with url: 'asd', class: 'row row-cols-lg-auto g-3 align-items-center'  do |f|
+            +     = form_with url: user_admin_index_path, scope: :user,  class: 'row row-cols-lg-auto g-3 align-items-center'  do |f|
                     .col-12
-            -         = f.label 'user_login', 'Login'
+            +         = f.text_field 'login', :size => 10,class: 'form-control', placeholder: 'login'
-            -         = f.text_field 'login', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_full_name', 'Full Name'
+            +         = f.text_field 'full_name', :size => 10,class: 'form-control', placeholder: 'full name'
-            -         = f.text_field 'full_name', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_password', 'Password'
+            +         = f.password_field 'password', :size => 10,class: 'form-control', placeholder: 'password'
-            -         = f.text_field 'password', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_password_confirmation', 'Confirm'
+            +         = f.password_field 'password_confirmation', :size => 10,class: 'form-control', placeholder: 'password confirmation'
-            -         = f.text_field 'password_confirmation', :size => 10,class: 'form-control'
                     .form-group
-            -         = f.label 'user_email', 'email'
+            +         = f.text_field 'email', :size => 10,class: 'form-control', placeholder: 'email'
-            -         = f.text_field 'email', :size => 10,class: 'form-control'
+            +       =submit_tag "Create", class: 'btn btn-success align-items-bottom'
-            -       =submit_tag "Create", class: 'btn btn-primary align-items-bottom'
-            - .panel.panel-primary
+            + .card.border-success.mb-3
-            -   .panel-title.panel-heading
+            +   .card-header.text-bg-success.border-success
                   Import from site management
-            -   .panel-body
+            +   .card-body
-            -     = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do
+            +     = form_with url: import_user_admin_index_path, :multipart => true do |f|
-            -       .form-group
+            +       .row
-            -         = label_tag :file, 'File:'
+            +         .col-auto
-            -         .input-group
+            +           = f.label :file, 'File:', class: 'col-form-label'
-            -           %span.input-group-btn
+            +         .col-auto
-            -             %span.btn.btn-default.btn-file
+            +           = f.file_field :file, class: 'form-control'
-            -               Browse
+            +         .col-auto
-            -               = file_field_tag 'file'
+            +           = f.submit 'Submit', class: 'btn btn-secondary'
-            -           = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
-            -       = submit_tag 'Submit', class: 'btn btn-default'
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
-            -   = link_to 'Bulk Manage', { action: :bulk_manage} , { class: 'btn btn-default btn-info'}
+            +   = link_to 'Bulk Manage', { action: :bulk_manage} , { class: 'btn btn-secondary btn-info'}
-            -   = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
+            +   = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-secondary '}
-            -   = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
+            +   = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-secondary '}
-            -   = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
+            +   = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-secondary '}
-            -   = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
+            +   = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-secondary '}
               - if GraderConfiguration.multicontests?
                 %br/
                 %b Multi-contest:
                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
               -# Total #{@user_count} users |
               -# - if !@paginated
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
                     %td= user.last_ip
                     %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-default btn-xs btn-block'
                     %td= link_to 'Destroy', {action: :destroy, id: user}, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-xs btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
               :javascript
-            -   $('.datatable').DataTable({
+            +   $(document).on('import-map-loaded',(e) => {
-            -     'pageLength': 50
+            +     $('.datatable').DataTable({
-            -   });
+            +       'pageLength': 50
+            +     });
+            +   })

app/views/user_admin/new_list.html.haml ¶ +23 -21

               .container-fluid
                 .row
                   .col-md-6
                     %h1 Adding list of users
-            -   .row
+            +   .row.my-3
                   .col-md-6
-            -       .panel.panel-default
+            +       = form_with url: create_from_list_user_admin_index_path do |f|
-            -         .panel-heading
+            +         .row.align-items-center.mb-3
-            -           .panel-title Info
+            +           .col-auto
-            -         .panel-body
+            +             = f.submit 'Create following users',class: 'btn btn-success'
+            +           .col-auto
+            +             .form-check
+            +               = f.check_box :add_to_group, class: 'form-check-input'
+            +               = f.label :add_to_group, 'Also add these users to the following group', class: 'form-check-label'
+            +           .col-4
+            +             = f.select "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), {}, class: 'select2 form-control'
+            +         .row.mb-3
+            +           .col-12
+            +             = f.text_area :user_list, value: nil, class: 'form-control', style: 'height: 30rem'
+            +     .col-md-6
+            +       .card.card-default
+            +         .card-header
+            +           .card-title Info
+            +         .card-body
                         %ul
                           %li
                             List of user information in this format:
                             %tt user_id,name(,passwd(,alias(,remark)))
                           %li
                             Note that
                             %tt passwd, alias
                             and
                             %tt remark
                             is optional.
                           %li
                             When
                             is empty, the original value will be used instead.
                           %li
                             If the users with the same user_id already exists, existing information will be overwritten.
                         Example:
                         %ol
                           %li
                             %pre user1,Somchai Jaidee
                             will create (or update) a user with login "user1" and setting the fullname to "Somchai Jaidee", also setting a random password.
                           %li
                             %pre user1,Somchai Jaidee,
                             will create (or update) a user with login "user1" and and setting the fullname "Somchai Jaidee". No change is made to the password unless this is a new user. If this is a new user, a random password will be generated.
+            + :javascript
+            +   $(document).on('import-map-loaded',(e) => {
+            +     $('.select2').select2()
+            +   });
-            -   .row
-            -     .col-md-6
-            -       = form_tag :action => 'create_from_list' do
-            -         .form-group
-            -           = submit_tag 'Create following users',class: 'btn btn-success'
-            -         .form-group
-            -           .div.checkbox
-            -             %label
-            -               = check_box_tag :add_to_group
-            -               Also add these users to the following group
-            -             = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
-            -         .form-group
-            -           = text_area_tag 'user_list', nil, :rows => 50, :cols => 80
-            -     .col-md-6

config/initializers/new_framework_defaults_5_2.rb ¶ +1 -1

               # Add default protection from forgery to ActionController::Base instead of in
               # ApplicationController.
               # Rails.application.config.action_controller.default_protect_from_forgery = true
               # Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
               # 'f' after migrating old data.
               # Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
               # Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
               # Rails.application.config.active_support.use_sha1_digests = true
               # Make `form_with` generate id attributes for any generated HTML tags.
-            - # Rails.application.config.action_view.form_with_generates_ids = true
+            + Rails.application.config.action_view.form_with_generates_ids = true

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

r875:567f1ebe063b - Mon, 26 Sep 2022 21:05:12 - 8 files changed: 80 inserted, 78 deleted

Sign in to your account

Commit r875:567f1ebe063b public

Author

r875:567f1ebe063b - Mon, 26 Sep 2022 21:05:12 - 8 files changed: 80 inserted, 78 deleted

Commit `r875:567f1ebe063b` public