diff --git a/imports/startup/client/routes.js b/imports/startup/client/routes.js index 7494091..7248f0c 100644 --- a/imports/startup/client/routes.js +++ b/imports/startup/client/routes.js @@ -9,12 +9,14 @@ let pri = FlowRouter.group({ }); //**** ADMIN +//** These first two routes are the defaults that are used after logging in, or if the user types /admin or /Admin without a specific page. pri.route("/admin", { - triggersEnter: [function(context, redirect) {redirect("/Admin/InternshipJobs");}] + triggersEnter: [function(context, redirect) {redirect("/Admin/Internships");}] }); pri.route("/Admin", { - triggersEnter: [function(context, redirect) {redirect("/Admin/InternshipJobs");}] + triggersEnter: [function(context, redirect) {redirect("/Admin/Internships");}] }); +//** The login pages... AccountsTemplates.configureRoute('signIn', { name: 'SignIn', path: '/Login' @@ -74,6 +76,13 @@ pri.route("/Admin/NewsEditor", { BlazeLayout.render("Admin", {content: "PageEditor"}); } }); +pri.route("/Admin/SecondChanceEditor", { + name: "SecondChanceEditor", + action: function(params, queryParams) { + require("/imports/ui/Admin/PageEditor.js"); + BlazeLayout.render("Admin", {content: "PageEditor"}); + } +}); pri.route("/Admin/SlideshowEditor", { name: "SlideshowEditor", action: function(params, queryParams) { @@ -191,6 +200,13 @@ pub.route("/News", { BlazeLayout.render("Public", {content: "EditablePage"}); } }); +pub.route("/SecondChance", { + name: 'SecondChance', + action: function(params, queryParams) { + require("/imports/ui/EditablePage.js"); + BlazeLayout.render("Public", {content: "EditablePage"}); + } +}); pub.route("/PhotoGallery", { name: 'PhotoGallery', action: function(params, queryParams) { @@ -230,4 +246,4 @@ pub.route('/!', { action: function(params, queryParams) { FlowRouter.go("/"); } -}); \ No newline at end of file +}); diff --git a/imports/ui/Admin/PageEditor.js b/imports/ui/Admin/PageEditor.js index 3b81808..da52a48 100644 --- a/imports/ui/Admin/PageEditor.js +++ b/imports/ui/Admin/PageEditor.js @@ -8,6 +8,7 @@ let currentPath = ""; let routeData = { JrHighSummerEditor: {title: "Jr High Summer", name: "JrHighSummer"}, NewsEditor: {title: "News", name: "News"}, + SecondChanceEditor: {title: "Second Chance", name: "SecondChance"}, DatesEditor: {title: "Dates", name: "Dates"}, BoardEditor: {title: "Current Board", name: "Board"}, SlideshowPageEditor: {title: "Slideshow Page", name: "Slideshow"} @@ -224,4 +225,4 @@ Template.PageEditor.helpers({ } }; } -}); \ No newline at end of file +}); diff --git a/imports/ui/EditablePage.js b/imports/ui/EditablePage.js index c30e5e5..bb7e3b2 100644 --- a/imports/ui/EditablePage.js +++ b/imports/ui/EditablePage.js @@ -3,6 +3,7 @@ import './EditablePage.html'; let routeData = { JrHighSummer: {name: "JrHighSummer"}, News: {name: "News"}, + SecondChance: {name: "SecondChance"}, ImportantDates: {name: "Dates"}, CurrentBoard: {name: "Board"} }; @@ -30,4 +31,4 @@ Template.EditablePage.helpers({ return doc === undefined ? "" : doc.html; } -}); \ No newline at end of file +}); diff --git a/imports/ui/Home.html b/imports/ui/Home.html index 8622b08..20a9d3d 100644 --- a/imports/ui/Home.html +++ b/imports/ui/Home.html @@ -11,11 +11,18 @@
+