Fixed coffee script

RailsFails · Feb 14, 2016 · 8a80c27 · 8a80c27
1 parent 1f85032
commit 8a80c27
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 89 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'coffee-script-source', '1.8.0'
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
+# gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
@@ -29,14 +29,15 @@ gem 'faker'
 gem 'tinymce-rails'
 gem 'paperclip', '~> 4.3'
 gem 'kaminari'
+gem 'coffee-rails'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
-platforms :ruby do
+group :production do
   gem 'unicorn'
   gem 'pg'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -103,6 +103,7 @@ GEM
       mime-types
       mimemagic (= 0.3.0)
     pg (0.18.4)
+    pg (0.18.4-x86-mingw32)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -160,8 +161,6 @@ GEM
     tilt (2.0.2)
     tinymce-rails (4.3.3)
       railties (>= 3.1.1)
-    turbolinks (2.5.3)
-      coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.1)
@@ -187,6 +186,7 @@ PLATFORMS
 
 DEPENDENCIES
   byebug
+  coffee-rails
   coffee-script-source (= 1.8.0)
   devise
   faker
@@ -200,8 +200,10 @@ DEPENDENCIES
   sdoc (~> 0.4.0)
   sqlite3
   tinymce-rails
-  turbolinks
   tzinfo-data
   uglifier (>= 1.3.0)
   unicorn
   web-console (~> 2.0)
+
+BUNDLED WITH
+   1.11.2
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -16,7 +16,6 @@
 //= require select2.min
 
 
-///= require turbolinks
 //= require_tree .
 
 //$(function(){ $(document).foundation(); });
diff --git a/app/assets/javascripts/friendships.coffee b/app/assets/javascripts/friendships.coffee
diff --git a/app/assets/javascripts/home.coffee b/app/assets/javascripts/home.coffee
diff --git a/app/assets/javascripts/landing_page.coffee b/app/assets/javascripts/landing_page.coffee
diff --git a/app/assets/javascripts/user.coffee b/app/assets/javascripts/user.coffee
diff --git a/app/views/albums/index.html.erb b/app/views/albums/index.html.erb
@@ -1,70 +1,28 @@
 <div class="row">
 
   <div class="col-lg-12">
-    <h1 class="page-header">ALBUMS</h1>
+    <h1 class="page-header"> <%= current_user.username %>'s Albums</h1>
   </div>
 
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
-  <div class="col-lg-3 col-md-4 col-xs-6 thumb">
-    <a class="thumbnail" href="#">
-      <img class="img-responsive" src="http://placehold.it/400x300" alt="">
-    </a>
-  </div>
+  <!--<div class="col-lg-3 col-md-4 col-xs-6 thumb">-->
+    <!--<a class="thumbnail" href="#">-->
+      <!--<img class="img-responsive" src="http://placehold.it/400x300" alt="">-->
+    <!--</a>-->
+  <!--</div>-->
+
+  <% @albums.each do |album| %>
+      <div class="col-lg-3 col-md-4 col-xs-6 thumb">
+        <h3><%= album.title %></h3>
+        <%= link_to image_tag('http://placehold.it/400x300', class: "img-responsive"), album_show_page_path(username: current_user.username, title: album.title), class: "thumbnail" %>
+       <%= link_to 'Edit', edit_album_path(album) %>|<%= link_to 'Destroy', album, method: :delete, data: { confirm: 'Are you sure?' } %>
+
+      </div>
+  <% end %>
+
 </div>
+<p class="btn btn-default" type="submit">
+  <%= link_to 'Create New Album', album_new_page_path(@album, username: current_user.username) %>
+</p>
 
 <h1>Listing Albums</h1>
 
@@ -84,16 +42,14 @@
         <td><%= album.user.username %> &nbsp;</td>
         <td><%= album.title %></td>
         <td><%= album.access %></td>
-        <td><%= link_to 'Show', album_show_page_path(username: current_user.username, title: album.title) %></td>
-        <td><%= link_to 'Edit', edit_album_path(album) %></td>
-        <td><%= link_to 'Destroy', album, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td class="btn btn-default" type="submit"><%= link_to 'Show', album_show_page_path(username: current_user.username, title: album.title) %></td>
+        <td class="btn btn-default" type="submit"><%= link_to 'Edit', edit_album_path(album) %></td>
+        <td class="btn btn-default" type="submit"><%= link_to 'Destroy', album, method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>
 </table>
 
 <br>
 
-<br/>
 
-<%= link_to 'New Album', album_new_page_path(@album, username: current_user.username) %>
diff --git a/app/views/albums/show.html.erb b/app/views/albums/show.html.erb
@@ -180,5 +180,12 @@
     $('.pager').bootstrapPaginator(options);
 </script>
 
+<p class="btn btn-default" type="submit">
+  <%= link_to 'Edit Album', edit_album_path(@album) %>
+</p>
+<p class="btn btn-default" type="submit">
+  <%= link_to 'Back', album_index_page_path(username: current_user.username) %>
+</p>
+
 <%= link_to 'Edit', edit_album_path(@album) %> |
 <%= link_to 'Back', album_index_page_path(@album) %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -11,13 +11,12 @@
   <%= stylesheet_link_tag 'application', media: 'all', '../javascripts/jquery-ui-1.11.4.custom/jquery-ui.min.css' => true %><!--New ADDED LINK FOR TABS ON MAIN PAGE----!>
   <%= stylesheet_link_tag 'application', 'http://www.shieldui.com/shared/components/latest/css/light-bootstrap/all.min.css' => true %><!--New ADDED FOR FOOTER REGISTER PAGE----!>
   <link href='https://fonts.googleapis.com/css?family=Quicksand:400,300' rel='stylesheet' type='text/css'>
-  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
   <%= javascript_include_tag 'javascripts/jquery-ui1.11.4.custom/jquery/jquery.js' => true %> <!--New ADDED LINK FOR TABS ON MAIN PAGE----!>
   <%= javascript_include_tag '../javascripts/jquery-ui-1.11.4.custom/jquery-ui.min.js' => true %> <!--New ADDED LINK FOR TABS ON MAIN PAGE----!>
   <%#= javascript_include_tag 'http://www.shieldui.com/shared/components/latest/js/shieldui-all.min.js' => true %> <!--New ADDED FOR FOOTER REGISTER PAGE----!>
   <script src="http://www.shieldui.com/shared/components/latest/js/shieldui-all.min.js"></script>  <!--New ADDED FOR FOOTER REGISTER PAGE----!>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
 
 
   <%= csrf_meta_tags %>

diff --git a/db/schema.rb b/db/schema.rb
@@ -74,8 +74,6 @@
     t.string   "phone_number"
     t.string   "location"
     t.text     "about_me"
-    t.text     "provile_avatar"
-    t.text     "profile_avatar"
     t.string   "avatar_file_name"
     t.string   "avatar_content_type"
     t.integer  "avatar_file_size"