Skip to content
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

feat: Made contact list support right clicks #1947

Merged
merged 5 commits into from
Oct 26, 2018
Merged

feat: Made contact list support right clicks #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0131dae
made it able to right click on contact list
bdowson Oct 24, 2018
0481c15
running commands for circleci
bdowson Oct 24, 2018
2d75c07
merge
bdowson Oct 26, 2018
2b4bbff
Merge branch 'master' into 1939-contacts-new-tab
djaiss Oct 26, 2018
25bfb23
add changelog entry
djaiss Oct 26, 2018
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
1 change: 1 addition & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
UNRELEASED CHANGES:

* Add right-click support on contact list
* Set currency and timezone for new users
* Fix settings' sidebar links and change security icon
* Fix CSV import
Expand Down
2 changes: 1 addition & 1 deletion public/css/app-ltr.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/app-rtl.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"/js/app.js": "/js/app.js?id=68874c7541cfb8852584",
"/css/app-ltr.css": "/css/app-ltr.css?id=aeed1bc1277811d4283c",
"/css/app-rtl.css": "/css/app-rtl.css?id=ebbe907f4e5cf0c8bd1a",
"/css/app-ltr.css": "/css/app-ltr.css?id=a5c361327371d1806c30",
"/css/app-rtl.css": "/css/app-rtl.css?id=14cb056bfe9cdfb2fc94",
"/css/stripe.css": "/css/stripe.css?id=64c68c04c4e475fcc7c6",
"/js/vendor.js": "/js/vendor.js?id=490bf428af4c7224b600",
"/js/stripe.js": "/js/stripe.js?id=e2284957ba723a52a4b7",
Expand Down
1 change: 1 addition & 0 deletions resources/assets/sass/people.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
a {
color: #333;
text-decoration: none;
display: block;

&:hover {
background-color: transparent;
Expand Down
81 changes: 43 additions & 38 deletions resources/views/people/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,66 +124,71 @@
</div>
</li>

@foreach($starredContacts as $contact)

<li class="people-list-item bg-white pointer" @click="window.location.href='{{ route('people.show', $contact) }}'">
@foreach($starredContacts as $contact)
<li class="people-list-item bg-white pointer"
@click="window.location.href='{{ route('people.show', $contact) }}'">
<a href="{{ route('people.show', $contact) }}">
@if ($contact->has_avatar)
<img src="{{ $contact->getAvatarURL(110) }}" width="43">
<img src="{{ $contact->getAvatarURL(110) }}" width="43">
@else
@if (! is_null($contact->gravatar_url))
<img src="{{ $contact->gravatar_url }}" width="43">
@if (! is_null($contact->gravatar_url))
<img src="{{ $contact->gravatar_url }}" width="43">
@else
@if (strlen($contact->getInitials()) == 1)
<div class="avatar one-letter" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@else
@if (strlen($contact->getInitials()) == 1)
<div class="avatar one-letter" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@else
<div class="avatar" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@endif
<div class="avatar" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@endif
@endif
@endif
<span>
<span class="{{ htmldir() == 'ltr' ? 'mr1' : 'ml1' }}">{{ $contact->name }}</span>
<svg class="relative" style="top: 5px" width="23" height="22" viewBox="0 0 23 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.6053 7.404L14.7224 7.68675L15.0275 7.7111C16.7206 7.84628 18.1486 7.92359 19.2895 7.98536C19.9026 8.01855 20.4327 8.04725 20.8765 8.07803C21.5288 8.12327 21.9886 8.17235 22.2913 8.24003C22.3371 8.25027 22.3765 8.26035 22.4102 8.27001C22.3896 8.29619 22.3651 8.32572 22.336 8.35877C22.1328 8.58945 21.7914 8.89714 21.2913 9.31475C20.9474 9.60184 20.5299 9.93955 20.0459 10.331C19.1625 11.0455 18.0577 11.9391 16.7762 13.0302L16.543 13.2288L16.614 13.5267C17.0045 15.1663 17.3689 16.5406 17.6601 17.6391C17.819 18.2381 17.956 18.7552 18.0638 19.1886C18.2209 19.8206 18.3149 20.2704 18.3428 20.5768C18.347 20.6222 18.3493 20.6616 18.3505 20.6957C18.3176 20.6838 18.2798 20.6688 18.2367 20.6502C17.9532 20.5277 17.5539 20.2981 17.0014 19.9522C16.6264 19.7175 16.1833 19.4306 15.671 19.099C14.7143 18.4797 13.5162 17.7042 12.0695 16.8199L11.8087 16.6604L11.5478 16.82C10.0753 17.7209 8.86032 18.5085 7.89223 19.136C7.3851 19.4648 6.94572 19.7496 6.57253 19.9838C6.01576 20.3332 5.61353 20.5656 5.32808 20.6899C5.28721 20.7077 5.25111 20.7222 5.21941 20.7339C5.22088 20.7009 5.22355 20.663 5.22783 20.6197C5.25839 20.3111 5.35605 19.8582 5.51781 19.2225C5.62627 18.7962 5.76269 18.2914 5.92018 17.7087C6.22053 16.5972 6.59748 15.2024 7.00309 13.5286L7.07553 13.2297L6.84141 13.0303C5.52399 11.9079 4.39683 10.9982 3.50024 10.2747C3.03915 9.90254 2.63904 9.57963 2.30539 9.30232C1.80195 8.88388 1.45729 8.57562 1.25116 8.34437C1.22315 8.31293 1.19929 8.28466 1.17903 8.25939C1.20999 8.25084 1.24557 8.24198 1.28628 8.233C1.58841 8.1663 2.048 8.11835 2.701 8.07418C3.1353 8.0448 3.65101 8.01744 4.24568 7.98589C5.39523 7.9249 6.83989 7.84824 8.56208 7.71111L8.86638 7.68688L8.98388 7.40514C9.61646 5.88824 10.1238 4.58366 10.5314 3.53571C10.7656 2.93365 10.9668 2.4163 11.1399 1.99205C11.3854 1.39027 11.5751 0.972355 11.7339 0.708729C11.7601 0.66516 11.7838 0.628777 11.8048 0.598565C11.8256 0.628571 11.849 0.664658 11.8748 0.707817C12.0327 0.971308 12.2212 1.38911 12.465 1.99089C12.6368 2.41509 12.8365 2.93242 13.0689 3.53445C13.4735 4.58244 13.9771 5.88709 14.6053 7.404Z" fill="#F2C94C" stroke="#DCBB58"/>
</svg>
</span>

<span class="{{ htmldir() == 'ltr' ? 'mr1' : 'ml1' }}">{{ $contact->name }}</span>
<svg class="relative" style="top: 5px" width="23" height="22" viewBox="0 0 23 22" fill="none"
xmlns="http://www.w3.org/2000/svg">
<path d="M14.6053 7.404L14.7224 7.68675L15.0275 7.7111C16.7206 7.84628 18.1486 7.92359 19.2895 7.98536C19.9026 8.01855 20.4327 8.04725 20.8765 8.07803C21.5288 8.12327 21.9886 8.17235 22.2913 8.24003C22.3371 8.25027 22.3765 8.26035 22.4102 8.27001C22.3896 8.29619 22.3651 8.32572 22.336 8.35877C22.1328 8.58945 21.7914 8.89714 21.2913 9.31475C20.9474 9.60184 20.5299 9.93955 20.0459 10.331C19.1625 11.0455 18.0577 11.9391 16.7762 13.0302L16.543 13.2288L16.614 13.5267C17.0045 15.1663 17.3689 16.5406 17.6601 17.6391C17.819 18.2381 17.956 18.7552 18.0638 19.1886C18.2209 19.8206 18.3149 20.2704 18.3428 20.5768C18.347 20.6222 18.3493 20.6616 18.3505 20.6957C18.3176 20.6838 18.2798 20.6688 18.2367 20.6502C17.9532 20.5277 17.5539 20.2981 17.0014 19.9522C16.6264 19.7175 16.1833 19.4306 15.671 19.099C14.7143 18.4797 13.5162 17.7042 12.0695 16.8199L11.8087 16.6604L11.5478 16.82C10.0753 17.7209 8.86032 18.5085 7.89223 19.136C7.3851 19.4648 6.94572 19.7496 6.57253 19.9838C6.01576 20.3332 5.61353 20.5656 5.32808 20.6899C5.28721 20.7077 5.25111 20.7222 5.21941 20.7339C5.22088 20.7009 5.22355 20.663 5.22783 20.6197C5.25839 20.3111 5.35605 19.8582 5.51781 19.2225C5.62627 18.7962 5.76269 18.2914 5.92018 17.7087C6.22053 16.5972 6.59748 15.2024 7.00309 13.5286L7.07553 13.2297L6.84141 13.0303C5.52399 11.9079 4.39683 10.9982 3.50024 10.2747C3.03915 9.90254 2.63904 9.57963 2.30539 9.30232C1.80195 8.88388 1.45729 8.57562 1.25116 8.34437C1.22315 8.31293 1.19929 8.28466 1.17903 8.25939C1.20999 8.25084 1.24557 8.24198 1.28628 8.233C1.58841 8.1663 2.048 8.11835 2.701 8.07418C3.1353 8.0448 3.65101 8.01744 4.24568 7.98589C5.39523 7.9249 6.83989 7.84824 8.56208 7.71111L8.86638 7.68688L8.98388 7.40514C9.61646 5.88824 10.1238 4.58366 10.5314 3.53571C10.7656 2.93365 10.9668 2.4163 11.1399 1.99205C11.3854 1.39027 11.5751 0.972355 11.7339 0.708729C11.7601 0.66516 11.7838 0.628777 11.8048 0.598565C11.8256 0.628571 11.849 0.664658 11.8748 0.707817C12.0327 0.971308 12.2212 1.38911 12.465 1.99089C12.6368 2.41509 12.8365 2.93242 13.0689 3.53445C13.4735 4.58244 13.9771 5.88709 14.6053 7.404Z"
fill="#F2C94C" stroke="#DCBB58"/>
</svg>
</span>
<span class="i {{ htmldir() == 'ltr' ? 'ml3' : 'mr3' }}">{{ $contact->description }}</span>
</a>
</li>
@endforeach

@endforeach

@foreach($unstarredContacts as $contact)
@foreach($unstarredContacts as $contact)

<li class="people-list-item bg-white pointer" @click="window.location.href='{{ route('people.show', $contact) }}'">
<li class="people-list-item bg-white pointer"
@click="window.location.href='{{ route('people.show', $contact) }}'">
<a href="{{ route('people.show', $contact) }}">
@if ($contact->has_avatar)
<img src="{{ $contact->getAvatarURL(110) }}" width="43">
<img src="{{ $contact->getAvatarURL(110) }}" width="43">
@else
@if (! is_null($contact->gravatar_url))
<img src="{{ $contact->gravatar_url }}" width="43">
@if (! is_null($contact->gravatar_url))
<img src="{{ $contact->gravatar_url }}" width="43">
@else
@if (strlen($contact->getInitials()) == 1)
<div class="avatar one-letter" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@else
@if (strlen($contact->getInitials()) == 1)
<div class="avatar one-letter" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@else
<div class="avatar" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@endif
<div class="avatar" style="background-color: {{ $contact->getAvatarColor() }};">
{{ $contact->getInitials() }}
</div>
@endif
@endif
@endif
<span>
{{ $contact->name }}
</span>

<span class="i {{ htmldir() == 'ltr' ? 'ml3' : 'mr3' }}">{{ $contact->description }}</span>
</a>
</li>

@endforeach
@endforeach
</ul>
</div>

Expand Down