# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2019-07-03 11:23:09
# Node ID c37b8f654c0b177878f631c8c3e981090d658873
# Parent  1323b43e275a29060f6ebf6b0397669615f44df5

front page OK

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -7,7 +7,7 @@
           %span.icon-bar
           %span.icon-bar
           %span.icon-bar
-        %a.navbar-brand{href: main_list_path} 
+        %a.navbar-brand{href: list_main_path} 
           %span.glyphicon.glyphicon-home
           MAIN
       .collapse.navbar-collapse#navbar-collapse
@@ -72,7 +72,7 @@
 
         %ul.nav.navbar-nav.navbar-right
           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
-          = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
+          = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
           - if GraderConfiguration['system.user_setting_enabled']
             = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
diff --git a/config/routes.rb b/config/routes.rb
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,6 +12,14 @@
 
   resources :sites
 
+  resources :test
+
+  resources :messages do
+    collection do
+      get 'console'
+    end
+  end
+
   resources :announcements do
     member do
       get 'toggle','toggle_front'
@@ -80,22 +88,57 @@
   end
 
 
+  #user admin
+  resources :user_admin do
+    collection do
+      get 'bulk_manage', as: 'bulk_manage_user_admin'
+      delete ':id', to: 'user_admin#destroy', as: 'user_admin_destroy'
+      get 'user_stat'
+    end
+  end
 
-  #main
-  get "main/list"
-  get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
+  resources :contest_management, only: [:index] do
+    collection do
+      get 'user_stat'
+      get 'clear_stat'
+      get 'clear_all_stat'
+    end
+  end
+
+  #get 'user_admin', to: 'user_admin#index'
+  #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+  #post 'user_admin', to: 'user_admin#create'
+  #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
 
-  #user admin
-  get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
-  post 'user_admin', to: 'user_admin#create'
-  delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
-
+  #singular resource
+  #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
   #report
-  get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
-  get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
-  get "report/login"
-  get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
-  post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
+  resource :report, only: [], controller: 'report' do
+    get 'login'
+    get 'multiple_login'
+    get 'problem_hof/:id', action: 'problem_hof'
+    get 'current_score'
+    get 'max_score'
+    post 'show_max_score'
+  end
+  #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
+  #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
+  #get "report/login"
+  #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
+  #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
+
+  resource :main, only: [], controller: 'main' do
+    get 'list'
+    get 'submission(/:id)', action: 'submission', as: 'main_submission'
+    post 'submit'
+    get 'announcements'
+    get 'help'
+  end
+  #main
+  #get "main/list"
+  #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
+  #post 'main/submit', to: 'main#submit'
+  #get 'main/announcements', to: 'main#announcements'
 
 
   #