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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ group :development, :test do
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring', '1.3.5'
end

# deploying to Heroku
group :production do
gem 'thin'
gem 'rails_12factor'
end
end
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ GEM
rdoc (~> 4.0)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
spring (1.3.4)
spring (1.3.5)
sprockets (3.0.1)
rack (~> 1.0)
sprockets-rails (2.2.4)
Expand Down Expand Up @@ -194,7 +194,7 @@ DEPENDENCIES
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
shoulda-matchers
spring
spring (= 1.3.5)
thin
uglifier (>= 1.3.0)
web-console (~> 2.0)
109 changes: 56 additions & 53 deletions app/assets/javascripts/refactor.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
$(document).ready(function() {
// debugger;
console.log("in document.ready anonymous function");
$(document).ready( function() {
//console.log("in document.ready anonymous function");
bindEvents();

$(function() {
var unorderedLists = $('.connectedSortable');
// grabs the card container from each list
// debugger;
//All of the lists
var $unorderedLists = $('.connectedSortable');
var sortableOptions = {
connectWith: ".connectedSortable",
placeholder: "ui-state-highlight"
}
// http://api.jquery.com/jQuery/#jQuery-elementArray
$(unorderedLists)
.sortable(sortableOptions)
.disableSelection();
console.log("in anonymous function that activates connectedSortable")
// http://api.jquery.com/jQuery/#jQuery-elementArray
$unorderedLists
.sortable(sortableOptions)
.disableSelection();
//console.log("in anonymous function that activates connectedSortable")
});
});

});

function bindEvents() {
console.log("in bindEvents function");
$(".add-card").on("submit", "form", createCard);
// console.log("in bindEvents function");
$(".add-card").on("submit", "form", createCard); //WORKS, had to update the HTML
$('.list').droppable( {drop: createMovement} ); //Works, had to fix the controller

$('.card-container').on("dblclick", '.card', handleDoubleclick);
// $('.card-container').mouseup(".card", handleDoubleclick);
$('.list').droppable( {drop: createMovement} );
$('.card-modal').on('submit', updateCard);
// DON'T USE THIS: // $('.card-container').mouseup(".card", handleDoubleclick);
// $('.card-modal').on('submit', updateCard);
}

function createCard() {
Expand All @@ -36,7 +35,7 @@ function createCard() {
var that = this;
var url = that.action;
var data = {organization_name: $(that).children()[0].value}

debugger;
$.ajax({
url: url,
type: "POST",
Expand All @@ -52,33 +51,58 @@ function createCard() {
}

function addCardToDOM(data) {
console.log("in addCardToDOM function")
// debugger;
var newCard = "<li class='ui-state-default' ui-sortable-handle id='card" + data.id + "'>"
// console.log("in addCardToDOM function")
var newCard = "<li class='ui-state-default card ui-sortable-handle' id='card" + data.id + "'>"
+ "<div class='organization-name'>" + data.organization_name + "</div>"
+ "<div class='star-bar'>"
+ "<span class='fa fa-star'></span>"
+ "<span class='fa fa-star'></span>"
+ "<span class='fa fa-star'></span>"
+ "<span class='fa fa-star'></span>"
+ "<span class='fa fa-star'></span>"
+ "<span class='fa fa-star'></span>"
+ "<span class='fa fa-star-half-o'></span>"
+ "<span class='fa fa-star-o'></span>"
+ "<span class='fa fa-star'></span> "
+ "<span class='fa fa-star'></span> "
+ "<span class='fa fa-star'></span> "
+ "<span class='fa fa-star'></span> "
+ "<span class='fa fa-star'></span> "
+ "<span class='fa fa-star'></span> "
+ "<span class='fa fa-star-half-o'></span> "
+ "<span class='fa fa-star-o'></span> "
+ "</div>"
+ "</li>"
// need to revise this HTML
$('#sortable1').append(newCard);
console.log("card appended");
// console.log("card appended");
// Don't really like this selector but it works so we can keep it for now
};


function findClickedCardId() {
console.log("in findClickedCardId function")
var clickedCardId = event.target.closest('.card').id.slice(4);
// debugger;
return clickedCardId
};

function createMovement() {
event.preventDefault();
console.log("in createMovement function")
// var that = this;
var cardId = findClickedCardId();
var listId = this.id;
var boardId = $('.board').attr('id');
console.log("cardId : ", cardId);
console.log("listId : ", listId);
console.log("boardId : ", boardId);
debugger;
var clickedCardId = event.target.id.slice(4);
return clickedCardId // or cardId?

var url = "/users/1/boards/" + boardId + "/lists/" + listId + "/cards/" + cardId + '/movements';
// var data = {list_id: listId, card_id: cardId, board_id: boardId} ;

$.ajax({
url: url,
type: "POST",
// data: data //This is not doing anything....
}).done(function(response) {
console.log("success: ", response);
}).fail(function(response) {
console.log("fail: ", response);
});
};

function getCardFromServer(cardId) {
Expand Down Expand Up @@ -118,25 +142,4 @@ function addCardToDOM(data) {
getCardFromServer(id);
};

function createMovement() {
event.preventDefault();
console.log("in createMovement function")
debugger;
var that = this;
var cardId = findClickedCardId();
var listId = that.id;
var boardId = $('.board').attr('id');

var url = "/users/1/boards/" + boardId + "/lists/" + listId + "/cards/" + cardId + '/movements'
var data = {list_id: listId, card_id: cardId, board_id: boardId}

$.ajax({
url: url,
type: "POST",
data: data
}).done(function(response) {
console.log("success: ", response);
}).fail(function(response) {
console.log("fail: ", response);
});
};
9 changes: 8 additions & 1 deletion app/controllers/movements_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
class MovementsController < ApplicationController

def create
card = Card.find_by(params[:id])
# p "*="*50
# p params
# p data
card = Card.find(params[:card_id]) #we have to access the card_id, also this was an incorrect usage of find_by!
# p "We are looking at"
# p card.organization_name
card.update_attributes(list_id: params[:list_id])
if card.save
movement = card.movements.new(current_list: params[:list_id],
Expand All @@ -14,4 +20,5 @@ def create
render json: { error: "card failed to save"}
end
end

end
Loading