From ae59b0f0657ed2510d36cc8d0dff7c5936c15f7b Mon Sep 17 00:00:00 2001 From: isabelle Date: Sat, 21 Apr 2018 11:35:24 +0000 Subject: [PATCH 1/2] isabelle implemented admin user --- app/controllers/orders_controller.rb | 15 +++++++++-- app/controllers/user_controller.rb | 2 ++ app/views/layouts/_footer.html.erb | 25 ++++++++++++++---- app/views/layouts/_header.html.erb | 20 ++++++++++---- db/development.sqlite3 | Bin 109568 -> 111616 bytes .../20180421092309_add_admin_to_users.rb | 5 ++++ db/schema.rb | 3 ++- db/seeds.rb | 6 +++++ 8 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 db/migrate/20180421092309_add_admin_to_users.rb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 6a21f46..de792e9 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -5,8 +5,19 @@ class OrdersController < ApplicationController # GET /orders.json def index # filtering information according to current user - @user = User.find(current_user.id) - @orders = @user.orders.all + + @user = User.find(current_user.id) + + if @user.admin? + + @orders = Order.all + + else + + @orders = @user.orders.all + + end + #@orders = Order.all end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 54d2f90..dd81954 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -5,6 +5,8 @@ def login flash[:notice] = "you are logged in" redirect_to :controller => :items #session[:cart] = nil + + current_user.update_attribute :admin, true end def logout #in case things go crazy and impossible to understand uncomment the line below and logout /login diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 8fe3764..e306ca0 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,12 +1,27 @@ \ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 66955bc..e0b20c7 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -12,16 +12,26 @@ <% if user_signed_in? %>
  • <%= link_to 'Edit Profile', edit_user_registration_path %>
  • <%= link_to 'Sign Out', destroy_user_session_path, :method =>:delete %>
    • + + <% if current_user.admin? %> +
  • Admin
    • + <% else %> +
  • User
    • + <% end %> <% else %>
  • <%= link_to 'Register', new_user_registration_path %>
  • <%= link_to 'Sign In', new_user_session_path %>
    • - <% end %> - <% if session[:login] == 1 %> -
  • <%= link_to "Admin Logout", logout_path %>
    • - <% else %> -
  • <%= link_to "Admin Login", login_path %>
    • + + + <% end %> + + + + + + diff --git a/db/development.sqlite3 b/db/development.sqlite3 index 97109f1eb63591a5926f2775081330b2a958a395..d55d7311230b5cca04c78f698caa2433393f75dd 100644 GIT binary patch delta 1271 zcmZ`&U1%It6u$SK*`I8;c9T@I*-+Vpg_zpT-aE6iGk2)CgGMkkbPHX(1_Zb6Y+RF> zO?Q*j+NIlsK3G9ircm35qJ6OXRCFlqV<{9Rz6ibuDt%G#!6+?)6e@TpZE1Gf4$OHt z-}%1topbL!@l*K3AK{Nj`mZB|9PvN+5})i+@%69YJO|JAiQJCxRuQAHfZ#9q1=ipy zd;zCn6&CzasSE>&D49?wGiXj>lq)Lb-fCoZdlc#c;b-^`F2e=*2-;8=g#F;Px5WA$ zlt%sbmTcm=)Kd`{#f@gwZq^rVr)9-LFpOtyw`sSeJ_18{sbx1?lKA_>hP z7(_F8l4QM6X=-rgZIVDQtb~MBY+2*umbJ~>;~vnGfwkQw9GuTbgC^c%{r1N`6bO@o9ij+Xvu6A{|)+o$Y9DBavR^_)EPDZI@ z7|Xm=q*}E&HLbt9m+dPpmvv)$zPMDMquGOUSvx#auD!EdnR1*8=hKSfEWLKLR&@Hh z&8e!HV{$(5Hlp`H)YPb~>nc+M-(wqtiX1bUCL6-Gp6emp(^4qs`9*)QaZ8E;T1RLd zB$yMsycs*WJrWrj8p7{Kd~NY>ykl2-tWtIA?pXRzqcLw+-1N(nuUMtM2h!uUaWAv{ zUm_-!BEeY%m*6)z3*Y+v@l){3(~!lFY(?@e9V^8pSVwRd{)OAH?)SHUg^&aYOaAT7 zKr}8Pju6L5e2c6JLlfTUk(++<)Sod(f$c?3XTxw9=D-%$X#xg9fU%ScA{pL@N$<#+ z52FQgO_)NC7yq;^ksIWisMbkjz95owFZyfe%n(@QxEJ}XBaxHjxPbq`@jxJD1u~vv6lI6+sq$)v~&G%c#jzS=TgO)un|>y_!CBG#y;s z^dozCJW*HkJ;xPD=4DFr1~=Xq4!Vw5R%a8Na?vw5Y$eB4u9BkdR_pHUV=FYyRpZIX zv1Fisuxl!6h<9NsRL)bL(>U3f>dX)4@x=2i{SZ_XO`)5W@6p6Ea*T29%Ej~e^{wB0 s*~GYTrS%mqldhNfP$#FV`OP=H2iZ`t?kl7=^%HOV{_=G(Ab&FQKky?iL;wH) delta 454 zcmY+A%}X0m6vf|rXOht|enrYeV!?n#F@7XYm}I0?W)XKn7k1&!MMn`61BnvQfEpK8 zX=&vNtyxIx!YqS4r2Yp=z?GYVf}0k)D2iDqf(2g$7hbq`@jI7$ICuH4d-<39i@&)* z2$_-nRE?WG1}*GQ6wszg_R?K1r;0qmCC*XCA@;C^ylD0$!1HR}t0Gs`&Txza?BX+W zQk#Ux)%7=Z=?y9ZG?jkuq^IYcWM)`%p_NWKvuP)z)H3LFKI5b_5U2jWw^b+5I6({R zrg0HaqLjyzf4nP`tdYD~aY>olc4wz;^JHSo&jv!_SZ^rO8@AfR#$d!844HjK%(S8g zZ%V#!S!Tqr_)X%q_xVE1jK)Mu>RRzABuGe*y<#5`*tGrHYF1TsU8ifK;&$$ea%BH= z>%&Du^$|dcpoHHzlJRx`iFj%8od#40?s1FCBj+JyL{yf%H5#aoP#?W!Wtl{y!ngiU zgN`g$xB4Zq!LwgK)eNz+yhLWW=UYzFI1?v@s0+hvgR9?{BvF{y*j>2Oz={Mv(7}ol MZnK}o9XekB0F_5}egFUf diff --git a/db/migrate/20180421092309_add_admin_to_users.rb b/db/migrate/20180421092309_add_admin_to_users.rb new file mode 100644 index 0000000..79116a7 --- /dev/null +++ b/db/migrate/20180421092309_add_admin_to_users.rb @@ -0,0 +1,5 @@ +class AddAdminToUsers < ActiveRecord::Migration[5.1] + def change + add_column :users, :admin, :boolean, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 3208439..36b5a92 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180418113405) do +ActiveRecord::Schema.define(version: 20180421092309) do create_table "brands", force: :cascade do |t| t.string "title" @@ -82,6 +82,7 @@ t.string "last_sign_in_ip" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "admin", default: false t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2a..a2cc9c4 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,9 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) + + + + +User.create(email: "info@gameland.com", admin:"true", password: "1234567", password_confirmation: "1234567") + From b61da7379bfe7cc3a0fc0d3144f3ce54ac01cc26 Mon Sep 17 00:00:00 2001 From: Galiant Date: Sat, 21 Apr 2018 12:26:37 +0000 Subject: [PATCH 2/2] Commiting changes before switching to admin2 branch --- app/views/static_pages/about.html.erb | 2 +- app/views/static_pages/help.html.erb | 2 +- db/development.sqlite3 | Bin 113664 -> 113664 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/static_pages/about.html.erb b/app/views/static_pages/about.html.erb index 8575d57..d2f698b 100644 --- a/app/views/static_pages/about.html.erb +++ b/app/views/static_pages/about.html.erb @@ -1,7 +1,7 @@ - Bootstrap Example + GameLand | About diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb index 808d529..9a3c2d2 100644 --- a/app/views/static_pages/help.html.erb +++ b/app/views/static_pages/help.html.erb @@ -1,7 +1,7 @@ - Bootstrap Example + GameLand | Help diff --git a/db/development.sqlite3 b/db/development.sqlite3 index fba0ddd8034114ea75eca9873791277a1a487e33..69a73b0c016737cea21a17494dec0607407fa579 100644 GIT binary patch delta 84 zcmZqp!PfADZGtr8s);hrjH@;#xaLZ87#SE^=o*;l8W}1W8d(_`TNxVb85vp_7@JKN g$P;5RF*h}xd@I+9401C?&ZU6uP delta 74 zcmZqp!PfADZGtr8%84@0j4L-LxaKmlPd<<