Skip to content
Open
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
6 changes: 6 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@ exclude_patterns:
- "public/js/PLYLoader.js"
- "public/js/STLLoader.js"
- "public/js/three.min.js"
- "public/js/OBJLoader.js"
- "public/js/OBJLoader2.js"
- "public/js/LoaderSupport.js"
- "public/js/OutlinePass.js"
- "public/js/MTLLoader.js"
- "public/js/EffectComposer.js"
- "db"
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,5 @@ before_install:
env:
- DB=postgresql

before_script:
- rails db:create
- rails db:migrate

rvm:
- 2.3.3
- 2.5.0
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/codahale/bcrypt-ruby.git
revision: 011b67ba550457dab5d6084128888f08476f278a
revision: 2875dbf4359ef9ce88775f4aae67aaa011f930fa
specs:
bcrypt (3.1.13)

Expand Down Expand Up @@ -99,13 +99,13 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
crass (1.0.4)
devise (4.6.2)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-i18n (1.8.0)
devise-i18n (1.8.1)
devise (>= 4.6)
erubi (1.8.0)
execjs (2.7.0)
Expand Down Expand Up @@ -154,9 +154,9 @@ GEM
minitest (5.11.3)
multi_json (1.13.1)
nio4r (2.4.0)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.3-x86-mingw32)
nokogiri (1.10.4-x86-mingw32)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (1.1.4)
Expand Down Expand Up @@ -187,7 +187,7 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
railties (5.2.3)
actionpack (= 5.2.3)
Expand Down Expand Up @@ -246,7 +246,7 @@ GEM
thread_safe (~> 0.1)
tzinfo-data (1.2019.2)
tzinfo (>= 1.0.0)
uglifier (4.1.20)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
warden (1.2.8)
rack (>= 2.0.6)
Expand Down
10 changes: 6 additions & 4 deletions app/views/home/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@
</div>
</section>

<% if @featured_museum != nil %>
<%= link_to @featured_museum, class: "no-decoration" do %>
<section id="featured" >
<div class="container">
<h2 class="fancy-title"><%= t('home.featured_museum') %></h2>
<p><%= t('home.featured_museum_info') %></p>
<br/>
<div class="user-header">
<h2 style="display: inline">
<%= image_tag @featured_museum.avatar_image, class: 'avatar' %>
<%= @featured_museum.name %>
<h2 style="display: inline">
<%= image_tag @featured_museum.avatar_image, class: 'avatar' %>
<%= @featured_museum.name %>
</h2>
</div>
<br/>
Expand Down Expand Up @@ -59,6 +60,7 @@
</div>
</div>
</section>
<% end %>

<section id="features">
<div class="container row" style="margin: 0 auto">
Expand Down Expand Up @@ -132,4 +134,4 @@ function render() {
document.addEventListener("turbolinks:load", function() {
render();
});
</script>
</script>
2 changes: 1 addition & 1 deletion app/views/restored_objects/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

<div class="container">
<div class="card-columns">
<% @objects.sort[3..-1].each_with_index do |obj, index| %>
<% @objects.each_with_index do |obj, index| %>
<div class="card">
<%= link_to image_tag(obj.featured_image, class:'card-img-top'), obj %>
<div class="card-body">
Expand Down