Explorar el Código

Added 404 page.

KrisVos130 hace 9 años
padre
commit
ed561f3a9b
Se han modificado 3 ficheros con 22 adiciones y 8 borrados
  1. 11 6
      app/client/scripts/routes.js
  2. 11 0
      app/client/templates/404.html
  3. 0 2
      app/server/server.js

+ 11 - 6
app/client/scripts/routes.js

@@ -1,5 +1,6 @@
 Router.configure({
-   loadingTemplate: 'loading'
+    loadingTemplate: 'loading',
+    notFoundTemplate: '404'
 });
 
 Router.onBeforeAction(function() {
@@ -102,9 +103,9 @@ Router.route("/project", {
     template: "project"
 })
 
-Router.route("/donate", {
+/*Router.route("/donate", {
     template: "donate"
-})
+})*/
 
 Router.route("/admin", {
     waitOn: function() {
@@ -173,10 +174,14 @@ Router.route("/:type", {
     action: function() {
         var user = Meteor.users.findOne({});
         var room = Rooms.findOne({type: this.params.type});
-        if ((room.private === true && user !== undefined && user.profile !== undefined && (user.profile.rank === "admin" || user.profile.rank === "moderator")) || room.private === false) {
-            this.render("room");
+        if (room !== undefined) {
+            if ((room.private === true && user !== undefined && user.profile !== undefined && (user.profile.rank === "admin" || user.profile.rank === "moderator")) || room.private === false) {
+                this.render("room");
+            } else {
+                this.redirect("/");
+            }
         } else {
-            this.redirect("/");
+            this.render("404");
         }
     }
 });

+ 11 - 0
app/client/templates/404.html

@@ -0,0 +1,11 @@
+<template name="404">
+    <div class="row">
+        <div class="col l8 s8 m8 offset-l2 offset-m2 offset-s2 teal-text">
+            <i class="material-icons center red-text" style="font-size: 20em; width: 100%;">remove_circle</i>
+            <div class="divider"></div>
+            <h1 class="center-align">404</h1>
+            <h3 class="center-align">It seems like you ended up in the wrong place.</h3>
+            <a class="btn btn-block" href="/">Take me back!</a>
+        </div>
+    </div>
+</template>

+ 0 - 2
app/server/server.js

@@ -29,8 +29,6 @@ Meteor.startup(function () {
     }
 
     Rooms.update({}, {$set: {userList: []}});
-
-    console.log(Meteor.settings);
 });
 
 var default_song = {