Fixed #280 Search/Paginate recordings (GRN-12) (#281)

* <Added Pagination>

* <Created search bar in Room>

* <Fixed search bar UI>

* <Fixed searching>

* <Modified search>

* <Fixed code style>

* <fixed changes>

* <Added pagination and search for public recordings>

* <added rspec tests>

* <Added and Updated search.js>

* <Fixed live searching for current user room>

* <Fixed live searching for current user room>

* <Added live search for join>

* <Fixed errors>

* <fixed gemfile>

* <Fix gems>

* <>

* <Fixed rspec tests>

* <Removed commented code>

* Update search.js
This commit is contained in:
John Ma
2018-12-06 10:24:22 -05:00
committed by Jesus Federico
parent 8b41dec8ac
commit 895af7494e
8 changed files with 97 additions and 24 deletions

View File

@ -38,21 +38,26 @@
</tr>
</thead>
<tbody id="recording-table">
<% if recordings.empty? %>
<tr>
<td colspan="7" class="text-center h4 p-6 font-weight-normal">
<%= t("recording.no_recordings", inject: only_public ? t("recording.visibility.public").downcase + " " : "") %>
<tr id="no_recordings_found" style="display: none;">
<td colspan="7" class="text-center h4 p-6 font-weight-normal" >
<%= t("recording.no_matched_recordings", inject: only_public ? t("recording.visibility.public").downcase + " " : "") %>
</td>
</tr>
<% else %>
<% recordings.each do |recording| %>
<% if only_public %>
<%= render "shared/components/public_recording_row", recording: recording %>
<% else %>
<%= render "shared/components/recording_row", recording: recording %>
<% if recordings.empty? %>
<tr>
<td colspan="7" class="text-center h4 p-6 font-weight-normal">
<%= t("recording.no_recordings", inject: only_public ? t("recording.visibility.public").downcase + " " : "") %>
</td>
</tr>
<% else %>
<% recordings.each do |recording| %>
<% if only_public %>
<%= render "shared/components/public_recording_row", recording: recording %>
<% else %>
<%= render "shared/components/recording_row", recording: recording %>
<% end %>
<% end %>
<% end %>
<% end %>
</tbody>
</table>
</div>

View File

@ -16,11 +16,13 @@
<tr>
<td>
<div>
<% if recording[:metadata][:name] %>
<%= recording[:metadata][:name] %>
<% else %>
<%= recording[:name] %>
<% end %>
<text>
<% if recording[:metadata][:name] %>
<%= recording[:metadata][:name] %>
<% else %>
<%= recording[:name] %>
<% end %>
</text>
</div>
<div class="small text-muted">
<%= t("recording.recorded_on", date: recording_date(recording[:startTime])) %>

View File

@ -18,16 +18,14 @@
<p class="subtitle"><%= subtitle %></p>
</div>
<% if search %>
<!--
<div class="col-3">
<div id="search_bar" class="col-3">
<div class="input-icon">
<span class="input-icon-addon">
<i class="fas fa-search"></i>
</span>
<input type="text" class="form-control btn-pill" placeholder="Search...">
<span class="input-icon-addon">
<i class="fas fa-search"></i>
</span>
</div>
</div>
-->
<% end %>
</div>
<hr class="mt-0">