Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gesseekur/ROR-Project
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tnguye59/Tender
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 4 commits
  • 19 files changed
  • 1 contributor

Commits on Feb 3, 2016

  1. init

    tnguye59 committed Feb 3, 2016
    Copy the full SHA
    5f866ef View commit details
  2. vendor compiled assets

    tnguye59 committed Feb 3, 2016
    Copy the full SHA
    d049b15 View commit details

Commits on Feb 8, 2016

  1. debugg

    tnguye59 committed Feb 8, 2016
    Copy the full SHA
    eb3fb7f View commit details
  2. update titile

    tnguye59 committed Feb 8, 2016
    Copy the full SHA
    87ae833 View commit details
Showing with 12,903 additions and 6 deletions.
  1. +2 −0 Gemfile
  2. +6 −0 Gemfile.lock
  3. +1 −1 app/views/comments/chat.html.erb
  4. +2 −2 app/views/layouts/application.html.erb
  5. +2 −2 config/database.yml
  6. +1 −1 public/assets/.sprockets-manifest-f28450a5252be33f7991a54ebe8de985.json
  7. +27 −0 public/assets/application-2d1758980d60178986709ce5112cd136b0e68692601253485b1cb7c40f28d42d.js
  8. BIN public/assets/application-2d1758980d60178986709ce5112cd136b0e68692601253485b1cb7c40f28d42d.js.gz
  9. +12,415 −0 public/assets/application-45ec1e3c6d3b1564ecd6f40fa1ba86460648c65a18a62037be24b31e066f70f7.js
  10. BIN public/assets/application-45ec1e3c6d3b1564ecd6f40fa1ba86460648c65a18a62037be24b31e066f70f7.js.gz
  11. +447 −0 public/assets/application-a418da353b5c4473aad8c03c0ab2d2d7e6c69232e4cadf016b2dd1ebc5b7c863.css
  12. BIN public/assets/application-a418da353b5c4473aad8c03c0ab2d2d7e6c69232e4cadf016b2dd1ebc5b7c863.css.gz
  13. BIN public/assets/card1-7962e48c8e552aecc62bafa53788af3f0193bd44735c04255b423a6f0402e26e.jpg
  14. BIN public/assets/card5-f3f5bcb08a1e70ae79b2923d62a8fc8fc2681849b01cac7a725f5ff0e6ee054b.jpg
  15. BIN public/assets/home6-69873612e8418bd5d0e8c4517a118811a60d242e8190a9986a674bc97ddb5a10.jpg
  16. BIN public/assets/kobe-3be63a2cdf5ae03e501e5a282fdabf091c624275401f15b23759dd1531f5089f.jpg
  17. BIN public/assets/logo-72bf70b6bd0edf2eac899bdeb70c65a7a73f44ec7abf4ece11583e24ec95a36a.png
  18. BIN public/assets/question-e0b6d13b81b54dd09743780b5d441506ad43adbb4b1f599613361ef821ea576b.jpg
  19. BIN public/assets/question_mark-8539f34a0623d3b4ebbed6c5326e30ad53fc9a2cf3abf0910ccda8c03a81d390.jpg
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -28,6 +28,8 @@ gem 'bcrypt', '~> 3.1.7'
gem "koala", "~> 2.2"
gem 'omniauth-facebook'

gem 'rails_12factor', group: :production

# Use Unicorn as the app server
# gem 'unicorn'

6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -143,6 +143,11 @@ GEM
rails (>= 3.2)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.4)
railties (4.2.4)
actionpack (= 4.2.4)
activesupport (= 4.2.4)
@@ -209,6 +214,7 @@ DEPENDENCIES
pg
rails (= 4.2.4)
rails-footnotes
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
2 changes: 1 addition & 1 deletion app/views/comments/chat.html.erb
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
</div>

<script type="text/javascript">
var socket = io.connect("http://127.0.0.1:8000", {force_connection: true});
var socket = io.connect("http://tenderchat.herokuapp.com", {force_connection: true});

socket.on("welcome", function(response){
$("#chatbox").append("<div class='chatenter'>" + $("#chat-name").val() +" has entered chatroom</div>")
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>RorProject</title>
<title>Tender Loves</title>
<%= stylesheet_link_tag "https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.5/css/materialize.min.css" %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
@@ -10,7 +10,7 @@
<%= csrf_meta_tags %>
<%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Lobster" %>
<%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Nothing+You+Could+Do" %>
<%= javascript_include_tag 'http://127.0.0.1:8000/socket.io/socket.io.js' %>
<%= javascript_include_tag 'https://cdn.socket.io/socket.io-1.4.5.js' %>
<%= stylesheet_link_tag "https://fonts.googleapis.com/css?family=Dancing+Script" %>

<script type="text/javascript">
4 changes: 2 additions & 2 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ default: &default



username: Tomtom
username:
password:

development:
@@ -88,7 +88,7 @@ production:
database: ror_project_production


username: Tomtom
username:
password:


Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.