From 82265ad1ac077162565d7a690465c14e382025cb Mon Sep 17 00:00:00 2001 From: Carson Wright Date: Fri, 27 Mar 2015 23:26:29 -0400 Subject: [PATCH] fixed famous people bug --- Gulpfile.coffee | 7 ++ bundles.yml | 4 - package.json | 3 +- public/careers-bundle-stag.html | 70 ++++++++++-------- public/famous-people-bundle.html | 51 +++++++++---- public/famous-people-source.html | 74 ++++++++++++------- .../results/famous-people/master.coffee | 33 ++++++++- src/widgets/slide-deck/master.coffee | 4 + 8 files changed, 165 insertions(+), 81 deletions(-) diff --git a/Gulpfile.coffee b/Gulpfile.coffee index bae3b7a..0c9b1dc 100644 --- a/Gulpfile.coffee +++ b/Gulpfile.coffee @@ -34,6 +34,13 @@ gulp.task("server", -> res.send(fileContents) ) + app.get("/assets/*", (req, res)-> + res.setHeader('Content-Type', "text/css" ) + a = req.originalUrl + fileContents = fs.readFileSync(req.originalUrl.slice(1, req.originalUrl.length), "utf8") + res.send(fileContents) + ) + app.get("/public/*", (req, res)-> a = req.originalUrl fileContents = fs.readFileSync(req.originalUrl.slice(1, req.originalUrl.length), "utf8") diff --git a/bundles.yml b/bundles.yml index 1e8b738..fb8eb75 100644 --- a/bundles.yml +++ b/bundles.yml @@ -58,10 +58,6 @@ famous-people: - "compiled/widgets/results/career-details/master.js" - "compiled/widgets/results/personality-types/master.js" - "compiled/widgets/results/personality-traits/master.js" - - "support/riot.js" - - "support/html5shiv-printshiv.js" - - "support/html5shiv.js" - - "compiled/widgets/results/famous-people/main.js" - "compiled/widgets/results/famous-people/master.js" css: - "widgets/all/master.css" diff --git a/package.json b/package.json index 872900e..a4daa8f 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "cors": "latest", "gulp-webserver": ">= 0.9.0", "traitify": "latest", - "express":"latest" + "express":"latest", + "gulp":"latest" } } diff --git a/public/careers-bundle-stag.html b/public/careers-bundle-stag.html index 8bfaf0d..8d492b6 100644 --- a/public/careers-bundle-stag.html +++ b/public/careers-bundle-stag.html @@ -1,32 +1,44 @@ - - - - - - - -
-
-
-
- - + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ + + diff --git a/public/famous-people-bundle.html b/public/famous-people-bundle.html index 3798e7a..2c913a6 100644 --- a/public/famous-people-bundle.html +++ b/public/famous-people-bundle.html @@ -10,23 +10,44 @@ } - + + + -
-
-
-
- + if($.cookie("assessmentId")){ + processAssessment() + }else{ + $.post("/public_key").then(function(publicKey){ + $.cookie("publicKey", publicKey) + $.post("/assessments/?deck=livingsocial").then(function(assessment){ + $.cookie("assessmentId", assessment.id) + processAssessment() + }) + }) + } + + diff --git a/public/famous-people-source.html b/public/famous-people-source.html index d7470e1..9f419aa 100644 --- a/public/famous-people-source.html +++ b/public/famous-people-source.html @@ -9,38 +9,56 @@ width:100%; } - - - - - - - - + + - - - - - - + + + + + + + + + + + + + -
-
-
-
- diff --git a/src/widgets/results/famous-people/master.coffee b/src/widgets/results/famous-people/master.coffee index 28c1047..b5a3c22 100644 --- a/src/widgets/results/famous-people/master.coffee +++ b/src/widgets/results/famous-people/master.coffee @@ -4,13 +4,38 @@ Traitify.ui.widget("famousPeople", (widget, options)-> widget.styleDependency("all") widget.styleDependency("results/famous-people") + + ######################## + # INITIALIZE + ######################## widget.initialization.events.add("Setup Data", -> + widget.views.render("Famous People").appendTo("main") + + widget.callbacks.trigger("Initialize") + ) + + ######################### + # PARTIALS + ######################### + widget.views.add("Famous People", -> personality_blend = widget.data.get("PersonalityTypes").personality_blend - peopleTag = riot.mountTo(widget.views.tags.get("main"), 'famouspeople') people = personality_blend.famous_people.sort(-> 0.5 - Math.random())[0..4] - peopleTag.famousPeople = people - peopleTag.update() - widget.callbacks.trigger("Initialize") + @tags.div("tfFamousPeopleContainerScroller") + + @tags.div("personalityTypesContainer").appendTo("tfFamousPeopleContainerScroller") + @tags.div("tfFamousPeople").appendTo("personalityTypesContainer") + index = 0 + for person in people + @tags.div(["tfFamousPerson"]).appendTo("tfFamousPeople") + @tags.img(["tfImage"], person.picture).appendTo(["tfFamousPerson", index]) + @tags.div(["tfName"], Object(), person.name).appendTo(["tfFamousPerson", index]) + + index++ + + @tags.get("tfFamousPeopleContainerScroller") + + ) + ) diff --git a/src/widgets/slide-deck/master.coffee b/src/widgets/slide-deck/master.coffee index de093a6..efbf5cf 100644 --- a/src/widgets/slide-deck/master.coffee +++ b/src/widgets/slide-deck/master.coffee @@ -70,6 +70,10 @@ Traitify.ui.widget("slideDeck", (widget, options = Object())-> callbacks = widgets.results.callbacks widgets.results = Traitify.ui.load("results", widget.assessmentId, widgets.results.target || widget.target, widgets.results.options) widgets.results.callbacks = callbacks + if widgets.famousPeople + callbacks = widgets.famousPeople.callbacks + widgets.famousPeople = Traitify.ui.load("famousPeople", widget.assessmentId, widgets.results.target || widget.target, widgets.results.options) + widgets.famousPeople.callbacks = callbacks widget.callbacks.trigger("Finished") ).catch(->