Skip to content

fix: add url box and width distribution #6334

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
Jan 12, 2021
Merged

fix: add url box and width distribution #6334

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd6d79f
fix
maze-runnar Jan 12, 2021
c4a41ec
alpha
maze-runnar Jan 12, 2021
a095adc
-
maze-runnar Jan 12, 2021
6e948af
new component
maze-runnar Jan 12, 2021
68e783b
js file not needed
maze-runnar Jan 12, 2021
9b4998a
@url
maze-runnar Jan 12, 2021
e516787
Update app/templates/components/ui-table/cell/cell-link.hbs
iamareebjamal Jan 12, 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
3 changes: 3 additions & 0 deletions app/components/url-box.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Component from '@glimmer/component';

export default class UrlBox extends Component {}
Copy link
Member

@iamareebjamal iamareebjamal Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need of empty component, as discussed previously

6 changes: 3 additions & 3 deletions app/controllers/events/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
valuePath : 'startsAt',
extraValuePaths : ['endsAt', 'timezone'],
isSortable : true,
width : 200,
width : 220,
headerComponent : 'tables/headers/sort',
cellComponent : 'ui-table/cell/cell-event-date'

Expand All @@ -40,7 +40,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
},
{
name : this.l10n.t('Tickets'),
width : 150,
width : 180,
valuePath : 'tickets',
extraValuePaths : ['totalSales'],
cellComponent : 'ui-table/cell/cell-tickets'
Expand All @@ -58,7 +58,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
{
name : this.l10n.t('Public URL'),
valuePath : 'url',
width : 250,
width : 220,
cellComponent : 'ui-table/cell/cell-link'
}
];
Expand Down
17 changes: 1 addition & 16 deletions app/templates/components/ui-table/cell/cell-link.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1 @@
<div class="ui action input" style="width: 100%; height: 36px">
<input class="truncate" style="flex: 1 0 !important" type="text" value={{this.record}} placeholder={{this.record}} readonly>
<UiPopup @on="click" @content={{t "Link copied to clipboard"}} @position="bottom right">
<CopyButton @clipboardText={{this.record}} @class="ui grey icon button rounded-none m-0">
<i class="copy icon"></i>
</CopyButton>
</UiPopup>
<a
id="public_url"
href="{{this.record}}"
target="_blank" rel="noopener">
<div class="ui blue icon button ml-auto rounded-l-none m-0">
<i class="share icon" ></i>
</div>
</a>
</div>
<UrlBox @sourceUrl={{this.record}}/>
Copy link
Member

@iamareebjamal iamareebjamal Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<UrlBox @sourceUrl={{this.record}}/>
<UrlBox @url={{this.record}} />

16 changes: 16 additions & 0 deletions app/templates/components/url-box.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<div class="ui action input" style="width: 100%; height: 36px">
<input class="truncate" style="flex: 1 0 !important" type="text" value={{@sourceUrl}} placeholder={{@sourceUrl}} readonly>
Copy link
Member

@iamareebjamal iamareebjamal Jan 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to url from sourceUrl

<UiPopup @on="click" @content={{t "Link copied to clipboard"}} @position="bottom right">
<CopyButton @clipboardText={{@sourceUrl}} @class="ui grey icon button rounded-none m-0">
<i class="copy icon"></i>
</CopyButton>
</UiPopup>
<a
id="public_url"
href="{{@sourceUrl}}"
target="_blank" rel="noopener">
<div class="ui blue icon button ml-auto rounded-l-none m-0">
<i class="share icon" ></i>
</div>
</a>
</div>