Layout refactor

src/app.rb

@@ -238,6 +238,7 @@ end
 
 # ADMIN USER MANAGEMENT
 get "/admin/users/:id/ban" do
+	auth_denied unless get_current_user.admin?
 end
 
 # ADMIN ROLE MANAGEMENT
@@ -302,6 +303,9 @@ post "/admin/roles/give" do
 	user_id = params[:user_id].to_i
 	role_id = params[:role_id].to_i
 
+	# Deny giving the "banned role"
+	auth_denied "You are not permitted to give that role!", 403, "/admin" if role_id == ROLES[:banned][:id]
+	
 	if user.role_ids.include?(role_id) or user.admin? then
 		resp = User_Role_relation.give_role(user_id, role_id)
 

src/views/admin/index.slim

@@ -1,5 +1,5 @@
 div
-  h1 Admin Panel
+  h1.tcenter Admin Panel
   nav
     ul.button-container
       li
@@ -23,6 +23,7 @@ div
               | #{user.name}
               a.inlbutton href="/admin/users/#{user.id}/edit"
                 | [EDIT]
+              - if session_user.admin?
                 - if user.banned?
                   a.green.inlbutton href="/admin/users/#{user.id}/unban"
                     | [UNBAN USER]
@@ -45,10 +46,12 @@ div
           select name="role_id"
             - if session_user.admin?
               - Role.get_all.each do |selrole|
+                - if selrole.id != ROLES[:banned][:id]
                   option value="#{selrole.id}"
                     | #{selrole.name} (id=#{selrole.id})
             - else
               - session_user.roles.each do |selrole|
+                - if selrole.id != ROLES[:banned][:id]
                   option value="#{selrole.id}"
                     | #{selrole.name} (id=#{selrole.id})
 
@@ -77,6 +80,7 @@ div
       h2 Manage Roles 
       ul.list-container
         - data[:roles].each do |role|
+            - if not ROLE_IDS.include? role.id
               li
                 | #{role.name}
                 a.inlbutton href="/admin/roles/#{role.id}/edit"

src/views/auction/index.slim

@@ -1,4 +1,5 @@
-#auctions
+.content-container
+  #auctions
     aside
       h2 Search Filters
       .form-container

src/views/auction/new.slim

@@ -1,5 +1,6 @@
-h1 Post Auction
-.form-container#auction_new
+.content-container
+  h1 Post Auction
+  .form-container#auction_new
     form action="/auctions" method="post" enctype="multipart/form-data"
       input type="file" name="image" accept="image"
 

src/views/auction/view.slim

@@ -1,2 +1,3 @@
-h1 = auction.title
-h2 = auction.description
+.content-container
+  h1 = auction.title
+  h2 = auction.description

src/views/index.slim

@@ -1,4 +1,5 @@
-article.index
+.content-container
+  article.index
     h1.tcenter The Auction House
     p.tcenter
       | Welcome to the Auction House! With our convenient online auction platform, you can easily browse through listings and find great deals on everything from clothes to electronics.
@@ -8,6 +9,6 @@ article.index
       li
         a.button href="/auctions/new" = "Post Auction"
 
-article.index
+  article.index
     h1.tcenter.title
       | Recent posts

src/views/layout.slim

@@ -44,6 +44,6 @@ html lang="en"
       - flash.each do |k, v|
           div class="flash-#{k}"
             | #{v}
-    .content-container.fade-in
+    .fade-in
       ==yield
 

src/views/user/profile.slim

@@ -1,4 +1,5 @@
-#profile-container
+.content-container
+  #profile-container
     aside
       #userinfo.card.card-container
         h2 = user.name

src/views/user/settings.slim

@@ -1,4 +1,5 @@
-#settings
+.content-container
+  #settings
     h1.tcenter = "#{session_user.name}'s Settings"
     .form-container
       form action="/user/update" method="post" enctype="multipart/form-data"