From 871853debfb55083596596e2134aa68894cbdd57 Mon Sep 17 00:00:00 2001 From: AbhishekSharma102 Date: Fri, 10 Mar 2017 02:41:26 +0530 Subject: [PATCH 1/4] Added code to remove "welcome to the Q&A tool" after one question is posted --- server/methods.js | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/server/methods.js b/server/methods.js index 4a526bd3..e7cc3d1d 100644 --- a/server/methods.js +++ b/server/methods.js @@ -142,7 +142,6 @@ Meteor.methods({ stale_length: stale, description: description, moderators: mods, - /*password: passwordConfirm,*/ lasttouch: new Date().getTime() - 1000, admin: admin, max_question: maxQuestion, @@ -418,6 +417,43 @@ Meteor.methods({ // If error, store object in keys variable keys = error.invalidKeys; } else { + var toRemove = Questions.findOne({ + poster: "the system", + instanceid: instanceid + }); + Questions.remove({ + poster: "the system", + instanceid: instanceid + }, function(error) { + if(error) { + keys = error.invalidKeys; + } else { + var ifExists = Answers.findOne({ + qid: toRemove.instanceid + }); + if(ifExists) { + Answers.remove({ + qid: toRemove.instanceid + }, function(error){ + if(error) { + keys = error.invalidKeys; + } + }); + } + var ifVotesExist = Votes.findOne({ + qid: toRemove.instanceid + }); + if(ifVotesExist) { + Votes.remove({ + qid: toRemove.instanceid + }, function(error) { + if(error) { + keys = error.invalidKeys; + } + }); + } + } + }); Instances.update({ _id: table._id }, { From 71c811fce62908acd187e70b3f4b2ffdf1ad6d04 Mon Sep 17 00:00:00 2001 From: AbhishekSharma102 Date: Fri, 10 Mar 2017 03:45:30 +0530 Subject: [PATCH 2/4] Added help button --- client/views/helpers/nav/nav.html | 1 + client/views/helpers/nav/nav.js | 4 ++++ client/views/helpers/nav/nav.scss | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/client/views/helpers/nav/nav.html b/client/views/helpers/nav/nav.html index 19173698..1354ce3a 100644 --- a/client/views/helpers/nav/nav.html +++ b/client/views/helpers/nav/nav.html @@ -28,6 +28,7 @@

  • Admin
    • {{/if}}
  • +
    • +
    • {{else}}
  • + Create
    • diff --git a/client/views/helpers/nav/nav.js b/client/views/helpers/nav/nav.js index ba025c88..8b410e90 100644 --- a/client/views/helpers/nav/nav.js +++ b/client/views/helpers/nav/nav.js @@ -29,6 +29,10 @@ Template.nav.events({ Session.set("search", ""); Router.go("/"); }, + "click #navHelp": function(event, template) { + var parentNode = document.getElementById("nav"); + popoverTemplate = Blaze.render(Template.helpButton, parentNode); + }, "click #darker": function(event, template) { $(".formcontainer").fadeOut(400); $("#darker").fadeOut(400, function() { diff --git a/client/views/helpers/nav/nav.scss b/client/views/helpers/nav/nav.scss index 6cd3f446..6f845d6d 100644 --- a/client/views/helpers/nav/nav.scss +++ b/client/views/helpers/nav/nav.scss @@ -167,6 +167,16 @@ $screen-sm-max: ($screen-md - 1); } } +#navHelp { + width: 18px; + height: 20px; + padding: 3px 15px 5px 15px; + background-image: url('/help.png'); + background-repeat: no-repeat; + background-size: 1.2em 1.2em; + background-position: 0.5em 0.4em; +} + #navLogout { background-color: #5d6a7b; From 82a972cb541c6bfc7e33f760fbe47b3f4ee603e7 Mon Sep 17 00:00:00 2001 From: AbhishekSharma102 Date: Fri, 10 Mar 2017 03:46:21 +0530 Subject: [PATCH 3/4] Added templates and corresponding files for help button --- client/views/helpButton/help.html | 12 ++++++++++++ client/views/helpButton/help.js | 13 +++++++++++++ client/views/helpButton/help.scss | 0 3 files changed, 25 insertions(+) create mode 100644 client/views/helpButton/help.html create mode 100644 client/views/helpButton/help.js create mode 100644 client/views/helpButton/help.scss diff --git a/client/views/helpButton/help.html b/client/views/helpButton/help.html new file mode 100644 index 00000000..a0e2552b --- /dev/null +++ b/client/views/helpButton/help.html @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/client/views/helpButton/help.js b/client/views/helpButton/help.js new file mode 100644 index 00000000..04adc253 --- /dev/null +++ b/client/views/helpButton/help.js @@ -0,0 +1,13 @@ +Template.helpButton.onRendered(function() { + $(".formcontainer").hide().fadeIn(400); + $("#darker").hide().fadeIn(400); +}); + +Template.helpButton.events({ + "click #shareclosebutton": function(event, template) { + $(".formcontainer").fadeOut(400); + $("#darker").fadeOut(400, function() { + Blaze.remove(popoverTemplate); + }); + } +}); \ No newline at end of file diff --git a/client/views/helpButton/help.scss b/client/views/helpButton/help.scss new file mode 100644 index 00000000..e69de29b From 7a9c011082a85a3a4aacb24321cfa6751c24382d Mon Sep 17 00:00:00 2001 From: AbhishekSharma102 Date: Fri, 10 Mar 2017 03:47:00 +0530 Subject: [PATCH 4/4] added image for help button --- public/help.png | Bin 0 -> 6746 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/help.png diff --git a/public/help.png b/public/help.png new file mode 100644 index 0000000000000000000000000000000000000000..6b5ba1ae0f3f4571b6fdc058e80aeaafedf2d1ce GIT binary patch literal 6746 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 E0DV!U^8f$< literal 0 HcmV?d00001