diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb new file mode 100644 index 00000000..47207459 --- /dev/null +++ b/app/controllers/static_controller.rb @@ -0,0 +1,7 @@ +class StaticController < ApplicationController + def index + end + + def about + end +end diff --git a/app/helpers/static_helper.rb b/app/helpers/static_helper.rb new file mode 100644 index 00000000..8cfc9af4 --- /dev/null +++ b/app/helpers/static_helper.rb @@ -0,0 +1,2 @@ +module StaticHelper +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 22638ad8..00000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Justask2 - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml new file mode 100644 index 00000000..11444f6f --- /dev/null +++ b/app/views/layouts/application.html.haml @@ -0,0 +1,9 @@ +!!! 5 +%html + %head + %title justask2 + = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true + = javascript_include_tag 'application', 'data-turbolinks-track' => true + = csrf_meta_tags + %body + = yield \ No newline at end of file diff --git a/app/views/static/about.html.haml b/app/views/static/about.html.haml new file mode 100644 index 00000000..0a964f00 --- /dev/null +++ b/app/views/static/about.html.haml @@ -0,0 +1,2 @@ +%h1 Static#about +%p Find me in app/views/static/about.html.haml diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml new file mode 100644 index 00000000..e5cd5a12 --- /dev/null +++ b/app/views/static/index.html.haml @@ -0,0 +1,2 @@ +%h1 Static#index +%p Find me in app/views/static/index.html.haml \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 3f66539d..9c2f2591 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,56 +1,6 @@ Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - # You can have the root of your site routed with "root" - # root 'welcome#index' + root 'static#index' - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end + match '/about', to: 'static#about', via: 'get' end