From 4d057c4329d2250c5d5915b57d12e7f3fe96a367 Mon Sep 17 00:00:00 2001 From: Brennan Novak Date: Fri, 28 Jun 2019 10:11:19 -0400 Subject: [PATCH] moved Catalyst builder to Advanced, added nav links, routes, and such #78 --- app/controllers/catalyst_controller.rb | 8 ++++++-- app/views/catalyst/_tabs.html.erb | 12 +++++++++--- .../catalyst/{builder.html.erb => advanced.html.erb} | 11 ++++------- config/routes.rb | 4 +++- 4 files changed, 22 insertions(+), 13 deletions(-) rename app/views/catalyst/{builder.html.erb => advanced.html.erb} (96%) diff --git a/app/controllers/catalyst_controller.rb b/app/controllers/catalyst_controller.rb index d1493ae..2ea9b09 100644 --- a/app/controllers/catalyst_controller.rb +++ b/app/controllers/catalyst_controller.rb @@ -1,8 +1,12 @@ class CatalystController < ApplicationController include CatalystApi - def builder - render 'catalyst/builder' + def basic + render 'catalyst/basic' + end + + def advanced + render 'catalyst/advanced' end def index diff --git a/app/views/catalyst/_tabs.html.erb b/app/views/catalyst/_tabs.html.erb index 8e85b64..69340e4 100644 --- a/app/views/catalyst/_tabs.html.erb +++ b/app/views/catalyst/_tabs.html.erb @@ -5,10 +5,16 @@ Mining Jobs -
  • class="active"<% end %>> - +
  • class="active"<% end %>> + - Create New Job + New Basic Job + +
  • +
  • class="active"<% end %>> + + + New Avanced Job
  • diff --git a/app/views/catalyst/builder.html.erb b/app/views/catalyst/advanced.html.erb similarity index 96% rename from app/views/catalyst/builder.html.erb rename to app/views/catalyst/advanced.html.erb index f88d104..1930c20 100644 --- a/app/views/catalyst/builder.html.erb +++ b/app/views/catalyst/advanced.html.erb @@ -6,23 +6,20 @@
    -

    1. Narrow Your Search

    +

    Narrow Your Job

    You can run Catalyst text miners on all your documents or only a specific subset of narrowed down documents.

    - +
    diff --git a/config/routes.rb b/config/routes.rb index 6943faa..d0ba3a8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,8 @@ delete 'delete_documents', to: 'docs#delete_documents' get 'catalyst', to: 'catalyst#index' - get 'catalyst/builder', to: 'catalyst#builder' + get 'catalyst/basic', to: 'catalyst#basic' + get 'catalyst/advanced', to: 'catalyst#advanced' get 'entities', to: 'entities#index' get 'entities_create/*entity', to: 'entities#create' post 'entities/save', to: 'entities#save' @@ -23,6 +24,7 @@ post 'api/recipe_search', to: 'api#recipe_search' post 'api/create_job', to: 'api#create_job' get 'api/facets', to: 'api#facets' + get 'api/delete_recipe', to: 'api#delete_recipe' root to: 'docs#index' resources :docs