Skip to content

fix: add group about #7535

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

Merged
merged 7 commits into from
Jul 14, 2021
Merged

fix: add group about #7535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06cff1f
f
maze-runnar Jul 8, 2021
daab5bb
fix: adding about
maze-runnar Jul 8, 2021
e00c25e
merge conflict
maze-runnar Jul 14, 2021
5b927a7
cb
maze-runnar Jul 14, 2021
d55b94e
Merge branch 'development' into group-about
MeghalBisht Jul 14, 2021
e3a5315
f
MeghalBisht Jul 14, 2021
183e71c
pos
MeghalBisht Jul 14, 2021
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
6 changes: 6 additions & 0 deletions app/templates/components/forms/group/group-settings-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
</div>

<form class="ui form {{if this.isLoading 'loading'}}" >
<div class="field mt-4">
<label>{{t 'About'}}</label>
<Widgets::Forms::RichTextEditor
@value={{@group.about}}
@name="description" />
</div>
<div class="fields">
<div class="fifteen wide field">
<Widgets::Forms::ImageUpload
Expand Down
23 changes: 23 additions & 0 deletions app/templates/components/forms/group/group-view.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,36 @@
{{/if}}
{{/each}}
</div>
{{#if @group.about}}
<br>
<div class="description">
{{sanitize @group.about}}
</div>
<br>
{{/if}}
{{#if this.upcomingEvents}}
<h2 class="main-heading mb-4">{{t 'Upcoming Events'}}</h2>
<div class="ui stackable three column grid">
{{#each this.upcomingEvents as |event|}}
<EventCard @event={{event}} @shareEvent={{action "shareEvent"}} />
{{/each}}
</div>
{{#if this.upcomingEvents}}
<h2 class="main-heading mb-4">{{t 'Upcoming Events'}}</h2>
<div class="ui stackable three column grid">
{{#each this.upcomingEvents as |event|}}
<EventCard @event={{event}} @shareEvent={{action "shareEvent"}} />
{{/each}}
</div>
{{/if}}
{{#if this.pastEvents}}
<h2 class="main-heading mb-4">{{t 'Past Events'}}</h2>
<div class="ui stackable three column grid">
{{#each this.pastEvents as |event|}}
<EventCard @event={{event}} @shareEvent={{action "shareEvent"}} />
{{/each}}
</div>
{{/if}}
{{/if}}
{{#if this.pastEvents}}
<h2 class="main-heading mb-4">{{t 'Past Events'}}</h2>
Expand Down
12 changes: 3 additions & 9 deletions app/templates/components/group-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<div class="header mb-1">
<a href={{href-to 'groups.view' @group.id}} class="black-text">{{@group.name}}</a>
</div>
<div class="meta mb-2">
{{@group.about}}
</div>
{{#if (not @followedGroups)}}
<LinkTo @route="groups.team" @model={{@group.id}}>
<UiPopup @content={{t "Manage"}} @class="ml-2 ui circular icon button compact blue" @position="left center">
Expand All @@ -26,15 +29,6 @@
<button class="ml-2 ui circular icon button compact red" {{action (confirm (t "Are you sure you would like to delete this group?") (action @deleteGroup @group.id))}}><i class="trash icon"></i></button>
{{/if}}
</div>
<div class="meta">
<span class="time">
{{general-date @group.modifieddAt 'date-time-short'}}
</span>
<br>
{{#each @group.events as |event|}}
<a href="{{event.url}}" target="_blank" rel="noopener" class="ui blue basic compact button">{{event.name}} </a>
{{/each}}
</div>
</div>
</div>
</div>