Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 20 additions & 3 deletions public/css/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions public/mix-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"/js/app.js.map": "/js/app.js.map?id=271c8f103c569b8f5613b8778d48ee75",
"/js/manifest.js": "/js/manifest.js?id=dc9ead3d7857b522d7de22d75063453c",
"/js/manifest.js.map": "/js/manifest.js.map?id=389e00e7d7680b68d4e1d128ce27ff48",
"/css/app.css": "/css/app.css?id=0fd161f323dd5c77642c3240bbb47d16",
"/css/app.css.map": "/css/app.css.map?id=3ba6add83b449d9a830b1160dc25d43d",
"/css/app.css": "/css/app.css?id=1cd9962328db6b2ee4b66decc951119d",
"/css/app.css.map": "/css/app.css.map?id=f88db670d7cdbf45395e7a22f1f0358e",
"/js/vendor.js": "/js/vendor.js?id=77012e19e850a379f73e3ac0c76bc9b1",
"/js/vendor.js.map": "/js/vendor.js.map?id=f3f5514d1186aa088c887b6ebe999fe0"
}
17 changes: 17 additions & 0 deletions resources/assets/sass/_core.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,23 @@ a {
}
}

.has-external-link-icon {
text-decoration: none;

&:hover {
text-decoration: none;
}

span {
text-decoration: underline;
}
}

ul.list-unstyled {
padding-inline-start: 0;
list-style-type: none;
}

img{
max-width: 100%;
height: auto;
Expand Down
8 changes: 5 additions & 3 deletions resources/assets/sass/_profile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -105,21 +105,23 @@
}
}

h3 {
h2 {
font-weight: lighter;
font-size: 1.8rem;
margin-bottom: 1.4rem;
z-index: 0;
position: relative;
margin-top: 1rem;
}

h5 {
h3 {
clear: both;
margin-bottom: 15px;
}

h6 {
h4 {
color: $utd-web-orange;
font-size: 1rem;
}

.links {
Expand Down
24 changes: 15 additions & 9 deletions resources/views/livewire/profile-data-cards/activities.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
<section id="activities" class="card">
<h3><i class="fas fa-chart-line" aria-hidden="true"></i> Activities @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'activities']) }}" aria-label="Edit Publications"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $activity)
<div class="entry">
<h5>{{$activity->title}}</h5>
{!! Purify::clean($activity->description) !!}
@if($activity->start_date)[{{$activity->start_date}}&ndash;{{$activity->end_date}}] @endif
</div>
@endforeach
<section id="activities" role="region" class="card" aria-labelledby="activities-heading">
<h2 id="activities-heading"><i class="fas fa-chart-line" aria-hidden="true"></i> Activities @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'activities']) }}" aria-label="Edit Publications"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $activity)
<li aria-label="{{$activity->title}}">
<article>
@if($activity->title)
<h3>{{$activity->title}}</h3>
@endif
<p>{!! Purify::clean($activity->description) !!}</p>
@if($activity->start_date)[{{$activity->start_date}}&ndash;{{$activity->end_date}}] @endif
</article>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
29 changes: 21 additions & 8 deletions resources/views/livewire/profile-data-cards/additionals.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
<section id="additionals" class="card">
<h3><i class="fas fa-sticky-note" aria-hidden="true"></i> Additional Information @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'additionals']) }}" aria-label="Edit Additional Information"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $additional)
<div class="entry">
<h5><i class="far fa-sticky-note" aria-hidden="true"></i> {{$additional->title}}</h5>
{!! Purify::clean($additional->description) !!}
</div>
@endforeach
<section id="additionals" role="region" class="card" aria-labelledby="additionals-heading">
<h2 id="additionals-heading"><i class="fas fa-sticky-note" aria-hidden="true"></i> Additional Information @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'additionals']) }}" aria-label="Edit Additional Information"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $additional)
<li class="entry" aria-label="{{$additional->title}}">
@if($additional->url)
<h3>
<a target="_blank" href="{{$additional->url}}" class="has-external-link-icon">
<i class="far fa-sticky-note" aria-hidden="true"></i>
<span class="has-external-link-icon">{!! Purify::clean($additional->title) !!}</span>
<i class="fas fa-external-link-alt"></i>
<span class="sr-only"> (opens in a new tab)</span>
</a>
</h3>
@else
<h3><i class="far fa-sticky-note" aria-hidden="true"></i> {{$additional->title}}</h3>
@endif
<p>{!! Purify::clean($additional->description) !!}</p>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
20 changes: 11 additions & 9 deletions resources/views/livewire/profile-data-cards/affiliations.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<section id="affiliations" class="card">
<h3><i class="fas fa-users" aria-hidden="true"></i> Affiliations @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'affiliations']) }}" aria-label="Edit Affiliations"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $affiliation)
<div class="entry">
<h5>{{$affiliation->title}}</h5>
@if($affiliation->start_date)<strong>{{$affiliation->start_date}}@if($affiliation->end_date)&ndash;{{$affiliation->end_date}}@endif</strong><br>@endif
{!! Purify::clean($affiliation->description) !!}
</div>
@endforeach
<section id="affiliations" role="region" class="card" aria-labelledby="affiliations-heading">
<h2 id="affiliations-heading"><i class="fas fa-users" aria-hidden="true"></i> Affiliations @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'affiliations']) }}" aria-label="Edit Affiliations"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $affiliation)
<li class="entry" aria-label="{{$affiliation->title}}">
<h3>{{$affiliation->title}}</h3>
@if($affiliation->start_date)<strong>{{$affiliation->start_date}}@if($affiliation->end_date)&ndash;{{$affiliation->end_date}}@endif</strong><br>@endif
<p>{!! Purify::clean($affiliation->description) !!}</p>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
28 changes: 16 additions & 12 deletions resources/views/livewire/profile-data-cards/appointments.blade.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<section id="appointments" class="card">
<h3><i class="fa fa-calendar" aria-hidden="true"></i> Appointments @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'appointments']) }}" aria-label="Edit Appointments"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $appt)
<div class="entry">
<strong>{{$appt->appointment}}</strong>
<br>
<em>{{$appt->organization}}</em> [{{$appt->start_date}}@if($appt->end_date)&ndash;{{$appt->end_date}}@else<span>&ndash;Present</span>@endif]<br />
@if($appt->description)
{!! Purify::clean($appt->description) !!}
@endif
</div>
@endforeach
<section id="appointments" role="region" class="card" aria-labelledby="appointments-heading">
<h2 id="appointments-heading"><i class="fa fa-calendar" aria-hidden="true"></i> Appointments @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'appointments']) }}" aria-label="Edit Appointments"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $appt)
<li class="entry" aria-label="{{$appt->appointment}}">
<p>
<strong>{{$appt->appointment}}</strong>
<br>
<em>{{$appt->organization}}</em> [{{$appt->start_date}}@if($appt->end_date)&ndash;{{$appt->end_date}}@else<span>&ndash;Present</span>@endif]<br />
@if($appt->description)
{!! Purify::clean($appt->description) !!}
@endif
</p>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
30 changes: 20 additions & 10 deletions resources/views/livewire/profile-data-cards/areas.blade.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
<section id="areas" class="card">
<h3><i class="fas fa-flask" aria-hidden="true"></i> Research Areas @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'areas']) }}" aria-label="Edit Research Areas"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $area)
@if($area->url)
<h5><a href="{{$area->url}}">{{$area->title}} <i class="fas fa-link" aria-hidden="true"></i></a></h5>
@else
<h5>{{$area->title}}</h5>
@endif
{!! Purify::clean($area->description) !!}
@endforeach
<section id="areas" role="region" class="card" aria-labelledby="areas-heading">
<h2 id="areas-heading"><i class="fas fa-flask" aria-hidden="true"></i> Research Areas @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'areas']) }}" aria-label="Edit Research Areas"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $area)
<li aria-label="{{$area->title}}">
@if($area->url)
<h3>
<a href="{{$area->url}}" target="_blank" class="has-external-link-icon">
<span class="has-external-link-icon">{{$area->title}}</span>
<i class="fas fa-external-link-alt" aria-hidden="true"></i>
<span class="sr-only"> (opens in a new tab)</span>
</a>
</h3>
@else
<h3>{{$area->title}}</h3>
@endif
<p>{!! Purify::clean($area->description) !!}</p>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
18 changes: 11 additions & 7 deletions resources/views/livewire/profile-data-cards/awards.blade.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<section id="awards" class="card">
<h3><i class="fa fa-trophy" aria-hidden="true"></i> Awards @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'awards']) }}" aria-label="Edit Awards"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $award)
<div class="entry">
<strong>{{$award->name}}</strong> - <em>{{$award->organization}}</em> @if($award->year)[{{$award->year}}]@endif<br />
</div>
@endforeach
<section id="awards" role="region" class="card" aria-labelledby="awards-heading">
<h2 id="awards-heading"><i class="fa fa-trophy" aria-hidden="true"></i> Awards @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'awards']) }}" aria-label="Edit Awards"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $award)
<li class="entry" aria-label="{{$award->name}}">
<p>
<strong>{{$award->name}}</strong> - <em>{{$award->organization}}</em> @if($award->year)[{{$award->year}}]@endif<br />
</p>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
42 changes: 25 additions & 17 deletions resources/views/livewire/profile-data-cards/news.blade.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
<section id="news" class="card">
<h3><i class="fas fa-newspaper" aria-hidden="true"></i> News Articles @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'news']) }}" aria-label="Edit News Articles"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $article)
<div class="entry">
@if($article->url)
<h5>
<a href="{{$article->url}}" target="_blank" title="link to article">
{{$article->title}} <i class="fas fa-external-link-alt" aria-hidden="true"></i>
</a>
</h5>
@else
<h5>{{$article->title}}</h5>
@endif
@if($article->image)<img src="{{ $article->imageUrl }}" class="news_image" alt="{{ $article->image_alt ?? $article->title }}"/>@endif
{!! Purify::clean($article->description) !!}
</div>
@endforeach
<section id="news" role="region" class="card" aria-labelledby="news-heading">
<h2 id="news-heading"><i class="fas fa-newspaper" aria-hidden="true"></i> News Articles @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'news']) }}" aria-label="Edit News Articles"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $article)
<li class="entry" aria-label="{{$article->title}}">
<article>
@if($article->url)
<h3>
<a href="{{$article->url}}" target="_blank" class="has-external-link-icon">
<span class="has-external-link-icon">{{$article->title}}</span>
<i class="fas fa-external-link-alt" aria-hidden="true"></i>
<span class="sr-only"> (opens in a new tab)</span>
</a>
</h3>
@else
<h3>{{$article->title}}</h3>
@endif
@if($article->image)
<img src="{{ $article->imageUrl }}" class="news_image" alt="{{ $article->image_alt ?? $article->title }}"/>
@endif
<p>{!! Purify::clean($article->description) !!}</p>
</article>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
22 changes: 13 additions & 9 deletions resources/views/livewire/profile-data-cards/preparation.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
<section id="preparation" class="card">
<h3><i class="fas fa-graduation-cap" aria-hidden="true"></i> Professional Preparation @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'preparation']) }}" aria-label="Edit Professional Preparation"><i class="fas fa-edit"></i> Edit</a>@endif</h3>
@foreach($data as $prep)
<div class="entry">
{{$prep->degree}} @if($prep->major)- {{$prep->major}}@endif
<br>
<strong>{{$prep->institution}}</strong>@if($prep->year) - {{$prep->year}}@endif
</div>
@endforeach
<section id="preparation" role="region" class="card" aria-labelledby="preparation-heading">
<h2 id="preparation-heading"><i class="fas fa-graduation-cap" aria-hidden="true"></i> Professional Preparation @if($editable)<a class="btn btn-primary btn-sm" href="{{ route('profiles.edit', [$profile->slug, 'preparation']) }}" aria-label="Edit Professional Preparation"><i class="fas fa-edit"></i> Edit</a>@endif</h2>
<ul class="list-unstyled">
@foreach($data as $prep)
<li class="entry" aria-label="{{$prep->degree}}">
<p>
{{$prep->degree}} @if($prep->major)- {{$prep->major}}@endif
<br>
<strong>{{$prep->institution}}</strong>@if($prep->year) - {{$prep->year}}@endif
</p>
</li>
@endforeach
</ul>
@if($paginated)
{{ $data->links() }}
@endif
Expand Down
Loading
Loading