diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 3c91bddc..25665067 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -124,7 +124,9 @@ def update_restaurant
@group = current_user.groups.find(1)
@group_users = @group.users.all
# render json: params
+
# puts params
+
@resto = params[:resto_name]
# puts @resto
@group_users.each do |user|
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 85cd039a..9d117816 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -4,11 +4,11 @@
<%= devise_error_messages! %>
<%= f.label :name %>
- <%= f.text_field :name %>
+ <%= f.text_field :name, :required => true %>
<%= f.label :email %>
- <%= f.email_field :email %>
+ <%= f.email_field :email , :required => true%>
@@ -17,12 +17,12 @@
(<%= @minimum_password_length %>
characters minimum)
<% end %>
- <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.password_field :password, autocomplete: "off", :required => true %>
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off", :required => true %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 3d42fe19..4fbd1918 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -2,14 +2,15 @@
Log in
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+<%= devise_error_messages! %>
<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true , :required => true%>
<%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.password_field :password, autocomplete: "off" , :required => true%>
<% if devise_mapping.rememberable? -%>
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index 56d3bfa9..04b670b9 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -3,9 +3,9 @@
<%#= link_to "New", new_group_path %>
Hi <%= current_user.name %>
-<%= form_for @group do |f| %>
+<%= form_for @group, {:class => "form-group"} do |f| %>
<%= f.text_field :name%>
-<%= f.submit("create group") %>
+<%= f.submit class:"btn btn-primary" %>
<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 8bb225f0..abb4dc87 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -69,6 +69,9 @@
<% end %>
+ <%- flash.each do |name, msg| -%>
+ <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
+ <%- end -%>
<%= yield %>
diff --git a/db/schema.rb b/db/schema.rb
index dfbecabf..3947357b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -46,7 +46,7 @@
end
create_table "users", force: :cascade do |t|
- t.string "name"
+ t.string "name", default: "", null: false
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"