Skip to content

working on group members partial #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yisusans wants to merge 1 commit into
base: master
Choose a base branch
from
Open

working on group members partial #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/assets/javascripts/models/group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
});
17 changes: 17 additions & 0 deletions app/assets/stylesheets/groups.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions app/controllers/groups_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -58,3 +65,4 @@ def group_params
params.require(:group).permit(:name)
end
end

12 changes: 12 additions & 0 deletions app/views/groups/_group_members.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div class="row" id="group-members">
<h6 id="members"><%=@group.name%>'s members<h6>
<ul class="collection" id="group-membership">
<%@group.users.each do |user|%>
<li class="collection-item avatar">
<img src="<%=user.image%>" class="circle" style="height:3.5em;width:3.5em;"/>
<%=user.name%>
</li>
<%end%>
</ul>
</div>

5 changes: 5 additions & 0 deletions app/views/groups/group_members.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<h1>Group memberships</h1>

<% @groups.each do |group|%>
<%= group.name%>
<%end%>
5 changes: 4 additions & 1 deletion app/views/groups/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
<% if @group.tasks.length > 1 %>
<div id="container" style="width:100%; height:350px;" data-chart-info="<%= @data_for_chart.to_json %>"></div>
<%end%>

<div>
<%= link_to "See all members", group_members_path(@group), class: "foo" %>
<!-- <a href="/groups/group_members" class="group-members"> Click here to see all members </a> -->
<div>
<div class="row">
<ul class="collection">
<% @group.activity.each do |event| %>
Expand Down
1 change: 1 addition & 0 deletions config/routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

post 'accept' => 'invites#accept'
get 'user_groups' => 'groups#user_groups'
get 'group_members' => 'groups#group_members'


# Example of regular route:
Expand Down