diff --git a/app/assets/javascripts/models/group.js b/app/assets/javascripts/models/group.js index f181e80..3406627 100644 --- a/app/assets/javascripts/models/group.js +++ b/app/assets/javascripts/models/group.js @@ -6,3 +6,12 @@ var Group = function(params) { this.invites = params.invites || []; this.conversation = params.conversation || null; }; + +$(document).ready(function(){ + $(".foo").on("click", function(e){ + debugger; + e.preventDefault(); + var $target = $(event.target) + $target.append(data) + }); +}); diff --git a/app/assets/stylesheets/groups.scss b/app/assets/stylesheets/groups.scss index 451675d..8d565ff 100644 --- a/app/assets/stylesheets/groups.scss +++ b/app/assets/stylesheets/groups.scss @@ -48,6 +48,23 @@ color: #039be5; } +#group-members +{ + border:3px solid #ef9a9a; + margin-top:10px; + +} + +#group-membership +{ + border:1px solid #80cbc4; + margin-top:10px; + +} + +#group-members{ + text-align: center; +} .group-join { color: black; font-weight: 900; diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 1d6b5d4..b05b570 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -49,6 +49,13 @@ def destroy @group.destroy end + def group_members + @group = Group.find_by(params[:group_id]) + if request.xhr? + return render partial: '/groups/group_members', layout: false + end + end + private def set_group @group = Group.find(params[:id]) @@ -58,3 +65,4 @@ def group_params params.require(:group).permit(:name) end end + diff --git a/app/views/groups/_group_members.html.erb b/app/views/groups/_group_members.html.erb new file mode 100644 index 0000000..27bf29a --- /dev/null +++ b/app/views/groups/_group_members.html.erb @@ -0,0 +1,12 @@ +
+
<%=@group.name%>'s members
+ +
+ diff --git a/app/views/groups/group_members.html.erb b/app/views/groups/group_members.html.erb new file mode 100644 index 0000000..1fe084d --- /dev/null +++ b/app/views/groups/group_members.html.erb @@ -0,0 +1,5 @@ +

Group memberships

+ +<% @groups.each do |group|%> +<%= group.name%> +<%end%> \ No newline at end of file diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb index b011196..6f5c15c 100644 --- a/app/views/groups/show.html.erb +++ b/app/views/groups/show.html.erb @@ -6,7 +6,10 @@ <% if @group.tasks.length > 1 %>
<%end%> - +
+ <%= link_to "See all members", group_members_path(@group), class: "foo" %> + +
    <% @group.activity.each do |event| %> diff --git a/config/routes.rb b/config/routes.rb index c8949d9..4d1b57d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -29,6 +29,7 @@ post 'accept' => 'invites#accept' get 'user_groups' => 'groups#user_groups' + get 'group_members' => 'groups#group_members' # Example of regular route: