From 5a992c3c1fa03085e26e5f7deb6cee6269dde88b Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Wed, 24 Apr 2013 18:09:43 -0400 Subject: [PATCH] made some changes to the application controller, added a user controller, and am now about to start working on the login piece --- .DS_Store | Bin .gitignore | 0 .rvmrc | 0 Gemfile | 0 Gemfile.lock | 0 Guardfile | 0 Procfile | 0 README.md | 0 README.rdoc | 0 Rakefile | 0 app/.DS_Store | Bin app/assets/.DS_Store | Bin app/assets/images/.DS_Store | Bin app/assets/images/1.jpg | Bin app/assets/images/2.jpg | Bin app/assets/images/3.jpg | Bin app/assets/images/4.jpg | Bin app/assets/images/alpha.png | Bin app/assets/images/blackforest.png | Bin app/assets/images/clear.png | Bin app/assets/images/company.png | Bin app/assets/images/email.png | Bin app/assets/images/fonts/.DS_Store | Bin app/assets/images/fonts/icomoon.dev.svg | 0 app/assets/images/fonts/icomoon.eot | Bin app/assets/images/fonts/icomoon.svg | 0 app/assets/images/fonts/icomoon.ttf | Bin app/assets/images/fonts/icomoon.woff | Bin app/assets/images/fonts/lte-ie7.js | 0 .../images/glyphicons-halflings-white.png | Bin app/assets/images/glyphicons-halflings.png | Bin app/assets/images/html-screen.jpg | Bin app/assets/images/hue.png | Bin app/assets/images/key.png | Bin app/assets/images/loading-black.gif | Bin app/assets/images/loading-blue.gif | Bin app/assets/images/loading-green.gif | Bin app/assets/images/loading-orange.gif | Bin app/assets/images/loading-red.gif | Bin app/assets/images/loading.gif | Bin app/assets/images/logo-blue.png | Bin app/assets/images/logo.png | Bin app/assets/images/logo.psd | Bin app/assets/images/logo1.png | Bin app/assets/images/logo2.png | Bin app/assets/images/logo3.png | Bin app/assets/images/profile.jpg | Bin app/assets/images/profile.png | Bin app/assets/images/profile1.png | Bin app/assets/images/profile_color.jpg | Bin app/assets/images/saturation.png | Bin app/assets/images/select2.png | Bin app/assets/images/social_icons.png | Bin app/assets/images/sorting.png | Bin app/assets/images/sorting_asc.png | Bin app/assets/images/sorting_desc.png | Bin app/assets/images/ui-icons_3d80b3_256x240.png | Bin app/assets/javascripts/.DS_Store | Bin app/assets/javascripts/alertify.min.js | 0 app/assets/javascripts/application.js | 0 .../javascripts/bootstrap-colorpicker.js | 0 .../javascripts/bootstrap-editable.min.js | 0 .../bootstrap-image-gallery-main.js | 0 .../javascripts/bootstrap-image-gallery.js | 0 .../javascripts/bootstrap-timepicker.js | 0 app/assets/javascripts/bootstrap.js | 0 app/assets/javascripts/date-picker/date.js | 0 .../date-picker/daterangepicker.js | 0 app/assets/javascripts/fullcalendar.js | 0 .../jquery-ui-1.8.23.custom.min.js | 0 .../javascripts/jquery.bootstrap.wizard.js | 0 app/assets/javascripts/jquery.dataTables.js | 0 .../javascripts/jquery.easy-pie-chart.js | 0 app/assets/javascripts/jquery.min.js | 0 app/assets/javascripts/jquery.scrollUp.js | 0 app/assets/javascripts/jquery.sparkline.js | 0 app/assets/javascripts/load-image.min.js | 0 app/assets/javascripts/moment.js | 0 app/assets/javascripts/select2.js | 0 app/assets/javascripts/tiny-scrollbar.js | 0 .../wysiwyg/bootstrap-wysihtml5.js | 0 .../locales/bootstrap-wysihtml5.ar-AR.js | 0 .../locales/bootstrap-wysihtml5.bg-BG.js | 0 .../locales/bootstrap-wysihtml5.ca-CT.js | 0 .../locales/bootstrap-wysihtml5.cs-CZ.js | 0 .../locales/bootstrap-wysihtml5.de-DE.js | 0 .../locales/bootstrap-wysihtml5.el-GR.js | 0 .../locales/bootstrap-wysihtml5.es-AR.js | 0 .../locales/bootstrap-wysihtml5.es-ES.js | 0 .../locales/bootstrap-wysihtml5.fr-FR.js | 0 .../locales/bootstrap-wysihtml5.hr-HR.js | 0 .../locales/bootstrap-wysihtml5.it-IT.js | 0 .../locales/bootstrap-wysihtml5.ja-JP.js | 0 .../locales/bootstrap-wysihtml5.ko-KR.js | 0 .../locales/bootstrap-wysihtml5.lt-LT.js | 0 .../locales/bootstrap-wysihtml5.mo-MD.js | 0 .../locales/bootstrap-wysihtml5.nb-NB.js | 0 .../locales/bootstrap-wysihtml5.nl-NL.js | 0 .../locales/bootstrap-wysihtml5.pl-PL.js | 0 .../locales/bootstrap-wysihtml5.pt-BR.js | 0 .../locales/bootstrap-wysihtml5.ru-RU.js | 0 .../locales/bootstrap-wysihtml5.sk-SK.js | 0 .../locales/bootstrap-wysihtml5.sv-SE.js | 0 .../locales/bootstrap-wysihtml5.tr-TR.js | 0 .../locales/bootstrap-wysihtml5.ua-UA.js | 0 .../locales/bootstrap-wysihtml5.zh-CN.js | 0 .../locales/bootstrap-wysihtml5.zh-TW.js | 0 .../javascripts/wysiwyg/wysihtml5-0.3.0.js | 0 app/assets/stylesheets/.DS_Store | Bin app/assets/stylesheets/alertify.core.scss | 0 app/assets/stylesheets/application.scss | 0 app/assets/stylesheets/bootstrap-editable.css | 0 app/assets/stylesheets/calendar-theme.css | 0 app/assets/stylesheets/charts-graphs.css | 0 app/assets/stylesheets/fullcalendar.css | 0 app/assets/stylesheets/main.css | 0 app/assets/stylesheets/select2.css | 0 app/assets/stylesheets/style.scss | 0 app/assets/stylesheets/timepicker.css | 0 .../wysiwyg/bootstrap-wysihtml5.css | 0 .../stylesheets/wysiwyg/wysiwyg-color.css | 0 app/controllers/application_controller.rb | 18 ++++++++++++- app/controllers/sessions_controller.rb | 4 ++- app/controllers/users_controller.rb | 4 +++ app/helpers/application_helper.rb | 0 app/helpers/sessions_helper.rb | 0 app/helpers/users_helper.rb | 2 ++ app/mailers/.gitkeep | 0 app/models/.gitkeep | 0 app/models/user.rb | 3 +++ app/views/layouts/application.html.erb | 2 +- app/views/layouts/shared/_footer.html.erb | 19 ++++++++++++- app/views/layouts/shared/_header.html.erb | 0 app/views/layouts/shared/_sidebar.html.erb | 20 ++------------ app/views/sessions/new.html.erb | 0 app/views/users/new.html.erb | 2 ++ config.ru | 0 config/application.rb | 0 config/boot.rb | 0 config/database.yml | 0 config/environment.rb | 0 config/environments/development.rb | 0 config/environments/production.rb | 0 config/environments/test.rb | 0 config/initializers/backtrace_silencers.rb | 0 config/initializers/inflections.rb | 0 config/initializers/mime_types.rb | 0 config/initializers/secret_token.rb | 0 config/initializers/session_store.rb | 0 config/initializers/wrap_parameters.rb | 0 config/locales/en.yml | 0 config/routes.rb | 2 ++ db/migrate/20130424220355_create_users.rb | 12 +++++++++ db/schema.rb | 25 ++++++++++++++++++ db/seeds.rb | 0 doc/README_FOR_APP | 0 lib/assets/.gitkeep | 0 lib/tasks/.gitkeep | 0 log/.gitkeep | 0 public/404.html | 0 public/422.html | 0 public/500.html | 0 public/favicon.ico | 0 public/robots.txt | 0 test/fixtures/.gitkeep | 0 test/fixtures/users.yml | 9 +++++++ test/functional/.gitkeep | 0 test/functional/sessions_controller_test.rb | 0 test/functional/users_controller_test.rb | 9 +++++++ test/integration/.gitkeep | 0 test/performance/browsing_test.rb | 0 test/test_helper.rb | 0 test/unit/.gitkeep | 0 test/unit/helpers/sessions_helper_test.rb | 0 test/unit/helpers/users_helper_test.rb | 4 +++ test/unit/user_test.rb | 7 +++++ vendor/assets/javascripts/.gitkeep | 0 vendor/assets/stylesheets/.gitkeep | 0 vendor/plugins/.gitkeep | 0 179 files changed, 120 insertions(+), 22 deletions(-) mode change 100644 => 100755 .DS_Store mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .rvmrc mode change 100644 => 100755 Gemfile mode change 100644 => 100755 Gemfile.lock mode change 100644 => 100755 Guardfile mode change 100644 => 100755 Procfile mode change 100644 => 100755 README.md mode change 100644 => 100755 README.rdoc mode change 100644 => 100755 Rakefile mode change 100644 => 100755 app/.DS_Store mode change 100644 => 100755 app/assets/.DS_Store mode change 100644 => 100755 app/assets/images/.DS_Store mode change 100644 => 100755 app/assets/images/1.jpg mode change 100644 => 100755 app/assets/images/2.jpg mode change 100644 => 100755 app/assets/images/3.jpg mode change 100644 => 100755 app/assets/images/4.jpg mode change 100644 => 100755 app/assets/images/alpha.png mode change 100644 => 100755 app/assets/images/blackforest.png mode change 100644 => 100755 app/assets/images/clear.png mode change 100644 => 100755 app/assets/images/company.png mode change 100644 => 100755 app/assets/images/email.png mode change 100644 => 100755 app/assets/images/fonts/.DS_Store mode change 100644 => 100755 app/assets/images/fonts/icomoon.dev.svg mode change 100644 => 100755 app/assets/images/fonts/icomoon.eot mode change 100644 => 100755 app/assets/images/fonts/icomoon.svg mode change 100644 => 100755 app/assets/images/fonts/icomoon.ttf mode change 100644 => 100755 app/assets/images/fonts/icomoon.woff mode change 100644 => 100755 app/assets/images/fonts/lte-ie7.js mode change 100644 => 100755 app/assets/images/glyphicons-halflings-white.png mode change 100644 => 100755 app/assets/images/glyphicons-halflings.png mode change 100644 => 100755 app/assets/images/html-screen.jpg mode change 100644 => 100755 app/assets/images/hue.png mode change 100644 => 100755 app/assets/images/key.png mode change 100644 => 100755 app/assets/images/loading-black.gif mode change 100644 => 100755 app/assets/images/loading-blue.gif mode change 100644 => 100755 app/assets/images/loading-green.gif mode change 100644 => 100755 app/assets/images/loading-orange.gif mode change 100644 => 100755 app/assets/images/loading-red.gif mode change 100644 => 100755 app/assets/images/loading.gif mode change 100644 => 100755 app/assets/images/logo-blue.png mode change 100644 => 100755 app/assets/images/logo.png mode change 100644 => 100755 app/assets/images/logo.psd mode change 100644 => 100755 app/assets/images/logo1.png mode change 100644 => 100755 app/assets/images/logo2.png mode change 100644 => 100755 app/assets/images/logo3.png mode change 100644 => 100755 app/assets/images/profile.jpg mode change 100644 => 100755 app/assets/images/profile.png mode change 100644 => 100755 app/assets/images/profile1.png mode change 100644 => 100755 app/assets/images/profile_color.jpg mode change 100644 => 100755 app/assets/images/saturation.png mode change 100644 => 100755 app/assets/images/select2.png mode change 100644 => 100755 app/assets/images/social_icons.png mode change 100644 => 100755 app/assets/images/sorting.png mode change 100644 => 100755 app/assets/images/sorting_asc.png mode change 100644 => 100755 app/assets/images/sorting_desc.png mode change 100644 => 100755 app/assets/images/ui-icons_3d80b3_256x240.png mode change 100644 => 100755 app/assets/javascripts/.DS_Store mode change 100644 => 100755 app/assets/javascripts/alertify.min.js mode change 100644 => 100755 app/assets/javascripts/application.js mode change 100644 => 100755 app/assets/javascripts/bootstrap-colorpicker.js mode change 100644 => 100755 app/assets/javascripts/bootstrap-editable.min.js mode change 100644 => 100755 app/assets/javascripts/bootstrap-image-gallery-main.js mode change 100644 => 100755 app/assets/javascripts/bootstrap-image-gallery.js mode change 100644 => 100755 app/assets/javascripts/bootstrap-timepicker.js mode change 100644 => 100755 app/assets/javascripts/bootstrap.js mode change 100644 => 100755 app/assets/javascripts/date-picker/date.js mode change 100644 => 100755 app/assets/javascripts/date-picker/daterangepicker.js mode change 100644 => 100755 app/assets/javascripts/fullcalendar.js mode change 100644 => 100755 app/assets/javascripts/jquery-ui-1.8.23.custom.min.js mode change 100644 => 100755 app/assets/javascripts/jquery.bootstrap.wizard.js mode change 100644 => 100755 app/assets/javascripts/jquery.dataTables.js mode change 100644 => 100755 app/assets/javascripts/jquery.easy-pie-chart.js mode change 100644 => 100755 app/assets/javascripts/jquery.min.js mode change 100644 => 100755 app/assets/javascripts/jquery.scrollUp.js mode change 100644 => 100755 app/assets/javascripts/jquery.sparkline.js mode change 100644 => 100755 app/assets/javascripts/load-image.min.js mode change 100644 => 100755 app/assets/javascripts/moment.js mode change 100644 => 100755 app/assets/javascripts/select2.js mode change 100644 => 100755 app/assets/javascripts/tiny-scrollbar.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/bootstrap-wysihtml5.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ar-AR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.bg-BG.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ca-CT.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.cs-CZ.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.de-DE.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.el-GR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.es-AR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.es-ES.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.fr-FR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.hr-HR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.it-IT.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ja-JP.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ko-KR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.lt-LT.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.mo-MD.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.nb-NB.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.nl-NL.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.pl-PL.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.pt-BR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ru-RU.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.sk-SK.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.sv-SE.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.tr-TR.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ua-UA.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.zh-CN.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.zh-TW.js mode change 100644 => 100755 app/assets/javascripts/wysiwyg/wysihtml5-0.3.0.js mode change 100644 => 100755 app/assets/stylesheets/.DS_Store mode change 100644 => 100755 app/assets/stylesheets/alertify.core.scss mode change 100644 => 100755 app/assets/stylesheets/application.scss mode change 100644 => 100755 app/assets/stylesheets/bootstrap-editable.css mode change 100644 => 100755 app/assets/stylesheets/calendar-theme.css mode change 100644 => 100755 app/assets/stylesheets/charts-graphs.css mode change 100644 => 100755 app/assets/stylesheets/fullcalendar.css mode change 100644 => 100755 app/assets/stylesheets/main.css mode change 100644 => 100755 app/assets/stylesheets/select2.css mode change 100644 => 100755 app/assets/stylesheets/style.scss mode change 100644 => 100755 app/assets/stylesheets/timepicker.css mode change 100644 => 100755 app/assets/stylesheets/wysiwyg/bootstrap-wysihtml5.css mode change 100644 => 100755 app/assets/stylesheets/wysiwyg/wysiwyg-color.css mode change 100644 => 100755 app/controllers/application_controller.rb mode change 100644 => 100755 app/controllers/sessions_controller.rb create mode 100755 app/controllers/users_controller.rb mode change 100644 => 100755 app/helpers/application_helper.rb mode change 100644 => 100755 app/helpers/sessions_helper.rb create mode 100755 app/helpers/users_helper.rb mode change 100644 => 100755 app/mailers/.gitkeep mode change 100644 => 100755 app/models/.gitkeep create mode 100755 app/models/user.rb mode change 100644 => 100755 app/views/layouts/application.html.erb mode change 100644 => 100755 app/views/layouts/shared/_footer.html.erb mode change 100644 => 100755 app/views/layouts/shared/_header.html.erb mode change 100644 => 100755 app/views/layouts/shared/_sidebar.html.erb mode change 100644 => 100755 app/views/sessions/new.html.erb create mode 100755 app/views/users/new.html.erb mode change 100644 => 100755 config.ru mode change 100644 => 100755 config/application.rb mode change 100644 => 100755 config/boot.rb mode change 100644 => 100755 config/database.yml mode change 100644 => 100755 config/environment.rb mode change 100644 => 100755 config/environments/development.rb mode change 100644 => 100755 config/environments/production.rb mode change 100644 => 100755 config/environments/test.rb mode change 100644 => 100755 config/initializers/backtrace_silencers.rb mode change 100644 => 100755 config/initializers/inflections.rb mode change 100644 => 100755 config/initializers/mime_types.rb mode change 100644 => 100755 config/initializers/secret_token.rb mode change 100644 => 100755 config/initializers/session_store.rb mode change 100644 => 100755 config/initializers/wrap_parameters.rb mode change 100644 => 100755 config/locales/en.yml mode change 100644 => 100755 config/routes.rb create mode 100755 db/migrate/20130424220355_create_users.rb create mode 100644 db/schema.rb mode change 100644 => 100755 db/seeds.rb mode change 100644 => 100755 doc/README_FOR_APP mode change 100644 => 100755 lib/assets/.gitkeep mode change 100644 => 100755 lib/tasks/.gitkeep mode change 100644 => 100755 log/.gitkeep mode change 100644 => 100755 public/404.html mode change 100644 => 100755 public/422.html mode change 100644 => 100755 public/500.html mode change 100644 => 100755 public/favicon.ico mode change 100644 => 100755 public/robots.txt mode change 100644 => 100755 test/fixtures/.gitkeep create mode 100755 test/fixtures/users.yml mode change 100644 => 100755 test/functional/.gitkeep mode change 100644 => 100755 test/functional/sessions_controller_test.rb create mode 100755 test/functional/users_controller_test.rb mode change 100644 => 100755 test/integration/.gitkeep mode change 100644 => 100755 test/performance/browsing_test.rb mode change 100644 => 100755 test/test_helper.rb mode change 100644 => 100755 test/unit/.gitkeep mode change 100644 => 100755 test/unit/helpers/sessions_helper_test.rb create mode 100755 test/unit/helpers/users_helper_test.rb create mode 100755 test/unit/user_test.rb mode change 100644 => 100755 vendor/assets/javascripts/.gitkeep mode change 100644 => 100755 vendor/assets/stylesheets/.gitkeep mode change 100644 => 100755 vendor/plugins/.gitkeep diff --git a/.DS_Store b/.DS_Store old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.rvmrc b/.rvmrc old mode 100644 new mode 100755 diff --git a/Gemfile b/Gemfile old mode 100644 new mode 100755 diff --git a/Gemfile.lock b/Gemfile.lock old mode 100644 new mode 100755 diff --git a/Guardfile b/Guardfile old mode 100644 new mode 100755 diff --git a/Procfile b/Procfile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/README.rdoc b/README.rdoc old mode 100644 new mode 100755 diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 diff --git a/app/.DS_Store b/app/.DS_Store old mode 100644 new mode 100755 diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store old mode 100644 new mode 100755 diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store old mode 100644 new mode 100755 diff --git a/app/assets/images/1.jpg b/app/assets/images/1.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/2.jpg b/app/assets/images/2.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/3.jpg b/app/assets/images/3.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/4.jpg b/app/assets/images/4.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/alpha.png b/app/assets/images/alpha.png old mode 100644 new mode 100755 diff --git a/app/assets/images/blackforest.png b/app/assets/images/blackforest.png old mode 100644 new mode 100755 diff --git a/app/assets/images/clear.png b/app/assets/images/clear.png old mode 100644 new mode 100755 diff --git a/app/assets/images/company.png b/app/assets/images/company.png old mode 100644 new mode 100755 diff --git a/app/assets/images/email.png b/app/assets/images/email.png old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/.DS_Store b/app/assets/images/fonts/.DS_Store old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/icomoon.dev.svg b/app/assets/images/fonts/icomoon.dev.svg old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/icomoon.eot b/app/assets/images/fonts/icomoon.eot old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/icomoon.svg b/app/assets/images/fonts/icomoon.svg old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/icomoon.ttf b/app/assets/images/fonts/icomoon.ttf old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/icomoon.woff b/app/assets/images/fonts/icomoon.woff old mode 100644 new mode 100755 diff --git a/app/assets/images/fonts/lte-ie7.js b/app/assets/images/fonts/lte-ie7.js old mode 100644 new mode 100755 diff --git a/app/assets/images/glyphicons-halflings-white.png b/app/assets/images/glyphicons-halflings-white.png old mode 100644 new mode 100755 diff --git a/app/assets/images/glyphicons-halflings.png b/app/assets/images/glyphicons-halflings.png old mode 100644 new mode 100755 diff --git a/app/assets/images/html-screen.jpg b/app/assets/images/html-screen.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/hue.png b/app/assets/images/hue.png old mode 100644 new mode 100755 diff --git a/app/assets/images/key.png b/app/assets/images/key.png old mode 100644 new mode 100755 diff --git a/app/assets/images/loading-black.gif b/app/assets/images/loading-black.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/loading-blue.gif b/app/assets/images/loading-blue.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/loading-green.gif b/app/assets/images/loading-green.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/loading-orange.gif b/app/assets/images/loading-orange.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/loading-red.gif b/app/assets/images/loading-red.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/loading.gif b/app/assets/images/loading.gif old mode 100644 new mode 100755 diff --git a/app/assets/images/logo-blue.png b/app/assets/images/logo-blue.png old mode 100644 new mode 100755 diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png old mode 100644 new mode 100755 diff --git a/app/assets/images/logo.psd b/app/assets/images/logo.psd old mode 100644 new mode 100755 diff --git a/app/assets/images/logo1.png b/app/assets/images/logo1.png old mode 100644 new mode 100755 diff --git a/app/assets/images/logo2.png b/app/assets/images/logo2.png old mode 100644 new mode 100755 diff --git a/app/assets/images/logo3.png b/app/assets/images/logo3.png old mode 100644 new mode 100755 diff --git a/app/assets/images/profile.jpg b/app/assets/images/profile.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/profile.png b/app/assets/images/profile.png old mode 100644 new mode 100755 diff --git a/app/assets/images/profile1.png b/app/assets/images/profile1.png old mode 100644 new mode 100755 diff --git a/app/assets/images/profile_color.jpg b/app/assets/images/profile_color.jpg old mode 100644 new mode 100755 diff --git a/app/assets/images/saturation.png b/app/assets/images/saturation.png old mode 100644 new mode 100755 diff --git a/app/assets/images/select2.png b/app/assets/images/select2.png old mode 100644 new mode 100755 diff --git a/app/assets/images/social_icons.png b/app/assets/images/social_icons.png old mode 100644 new mode 100755 diff --git a/app/assets/images/sorting.png b/app/assets/images/sorting.png old mode 100644 new mode 100755 diff --git a/app/assets/images/sorting_asc.png b/app/assets/images/sorting_asc.png old mode 100644 new mode 100755 diff --git a/app/assets/images/sorting_desc.png b/app/assets/images/sorting_desc.png old mode 100644 new mode 100755 diff --git a/app/assets/images/ui-icons_3d80b3_256x240.png b/app/assets/images/ui-icons_3d80b3_256x240.png old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/.DS_Store b/app/assets/javascripts/.DS_Store old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/alertify.min.js b/app/assets/javascripts/alertify.min.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap-colorpicker.js b/app/assets/javascripts/bootstrap-colorpicker.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap-editable.min.js b/app/assets/javascripts/bootstrap-editable.min.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap-image-gallery-main.js b/app/assets/javascripts/bootstrap-image-gallery-main.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap-image-gallery.js b/app/assets/javascripts/bootstrap-image-gallery.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap-timepicker.js b/app/assets/javascripts/bootstrap-timepicker.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/date-picker/date.js b/app/assets/javascripts/date-picker/date.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/date-picker/daterangepicker.js b/app/assets/javascripts/date-picker/daterangepicker.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/fullcalendar.js b/app/assets/javascripts/fullcalendar.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery-ui-1.8.23.custom.min.js b/app/assets/javascripts/jquery-ui-1.8.23.custom.min.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.bootstrap.wizard.js b/app/assets/javascripts/jquery.bootstrap.wizard.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.dataTables.js b/app/assets/javascripts/jquery.dataTables.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.easy-pie-chart.js b/app/assets/javascripts/jquery.easy-pie-chart.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.min.js b/app/assets/javascripts/jquery.min.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.scrollUp.js b/app/assets/javascripts/jquery.scrollUp.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/jquery.sparkline.js b/app/assets/javascripts/jquery.sparkline.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/load-image.min.js b/app/assets/javascripts/load-image.min.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/moment.js b/app/assets/javascripts/moment.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/select2.js b/app/assets/javascripts/select2.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/tiny-scrollbar.js b/app/assets/javascripts/tiny-scrollbar.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/bootstrap-wysihtml5.js b/app/assets/javascripts/wysiwyg/bootstrap-wysihtml5.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ar-AR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ar-AR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.bg-BG.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.bg-BG.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ca-CT.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ca-CT.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.cs-CZ.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.cs-CZ.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.de-DE.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.de-DE.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.el-GR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.el-GR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.es-AR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.es-AR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.es-ES.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.es-ES.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.fr-FR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.fr-FR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.hr-HR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.hr-HR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.it-IT.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.it-IT.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ja-JP.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ja-JP.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ko-KR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ko-KR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.lt-LT.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.lt-LT.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.mo-MD.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.mo-MD.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.nb-NB.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.nb-NB.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.nl-NL.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.nl-NL.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.pl-PL.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.pl-PL.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.pt-BR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.pt-BR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ru-RU.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ru-RU.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.sk-SK.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.sk-SK.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.sv-SE.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.sv-SE.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.tr-TR.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.tr-TR.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ua-UA.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.ua-UA.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.zh-CN.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.zh-CN.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.zh-TW.js b/app/assets/javascripts/wysiwyg/locales/bootstrap-wysihtml5.zh-TW.js old mode 100644 new mode 100755 diff --git a/app/assets/javascripts/wysiwyg/wysihtml5-0.3.0.js b/app/assets/javascripts/wysiwyg/wysihtml5-0.3.0.js old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/.DS_Store b/app/assets/stylesheets/.DS_Store old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/alertify.core.scss b/app/assets/stylesheets/alertify.core.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/bootstrap-editable.css b/app/assets/stylesheets/bootstrap-editable.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/calendar-theme.css b/app/assets/stylesheets/calendar-theme.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/charts-graphs.css b/app/assets/stylesheets/charts-graphs.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/fullcalendar.css b/app/assets/stylesheets/fullcalendar.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/main.css b/app/assets/stylesheets/main.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/select2.css b/app/assets/stylesheets/select2.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/timepicker.css b/app/assets/stylesheets/timepicker.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/wysiwyg/bootstrap-wysihtml5.css b/app/assets/stylesheets/wysiwyg/bootstrap-wysihtml5.css old mode 100644 new mode 100755 diff --git a/app/assets/stylesheets/wysiwyg/wysiwyg-color.css b/app/assets/stylesheets/wysiwyg/wysiwyg-color.css old mode 100644 new mode 100755 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb old mode 100644 new mode 100755 index e8065d9..0730591 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,19 @@ class ApplicationController < ActionController::Base - protect_from_forgery + + before_filter :authenticated + helper_method :current_user + + # Our security guy keep talking about sea-surfing, cool story bro. + #protect_from_forgery + + private + + def current_user + @current_user ||= User.find_by_user_id(session[:user_id].to_s) + end + + def authenticated + redirect_to root_url and reset_session if not current_user + end + end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb old mode 100644 new mode 100755 index 8b04482..d7c9a87 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,5 +1,7 @@ class SessionsController < ApplicationController - + + skip_before_filter :authenticated, :only => [:new] + def new end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100755 index 0000000..2ec9ecc --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,4 @@ +class UsersController < ApplicationController + def new + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb old mode 100644 new mode 100755 diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100755 index 0000000..2310a24 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/mailers/.gitkeep b/app/mailers/.gitkeep old mode 100644 new mode 100755 diff --git a/app/models/.gitkeep b/app/models/.gitkeep old mode 100644 new mode 100755 diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100755 index 0000000..3778979 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,3 @@ +class User < ActiveRecord::Base + attr_accessible :email, :password, :user_id, :admin +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb old mode 100644 new mode 100755 index d473fa4..b5ecd7a --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,7 +4,7 @@ RailsGoat <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> + <%#= csrf_meta_tags %>