progress

s0 · s0 · commit 07495565dd72 · 2015-01-16T00:25:59.000Z
diff --git a/java-admin-web/.project b/java-admin-web/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -17,7 +22,9 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>net.vtst.ow.eclipse.less.nature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/java-admin-web/resources/static/css/main.css b/java-admin-web/resources/static/css/main.css
@@ -0,0 +1,13 @@
+body {
+	background-color: #fff;
+}
+
+#header {
+  	background-color: #eee;
+  	border-bottom: 1px solid #ddd;
+  	margin: 0 0 20px;
+}
+
+#header h1 {
+	margin: 15px 0;
+}
diff --git a/java-admin-web/resources/static/test.txt b/java-admin-web/resources/static/test.txt
diff --git a/java-admin-web/resources/templates/page.peb b/java-admin-web/resources/templates/page.peb
@@ -15,9 +15,21 @@
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
+    
+    <link href="{{ static_href }}/css/main.css" rel="stylesheet">
   </head>
   <body>
+    <div id="header">
+      <div class="container">
+        <h1>{{ site_title }}</h1>
+      </div>
+    </div> 
     <div class="container">
+      <ul class="nav nav-tabs">
+        {% for item in main_menu_items %}
+          <li role="presentation"{% if item == active_page %} class="active"{% endif %}><a href="{{ admin_root }}{{ item.path }}">{{ item.label }}</a></li>
+        {% endfor %}
+      </ul>
       {% block content %}{% endblock %}
     </div>
 
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/AdminServlet.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/AdminServlet.java
@@ -14,14 +14,15 @@
 import net.compsoc.ox.web.admin.util.PageBuilder;
 import net.compsoc.ox.web.admin.util.PageRenderer;
 import net.compsoc.ox.web.admin.util.PathInfo;
+import net.compsoc.ox.web.admin.util.StatusException;
 
 public class AdminServlet extends HttpServlet {
     
     private final Database database;
     private final PageRenderer pageRenderer = new PageRenderer();
     private final Section rootSection = new RootSection();
     
-    public AdminServlet(){
+    public AdminServlet() {
         // Create Database
         database = new DummyDatabase();
     }
@@ -30,7 +31,12 @@ public AdminServlet(){
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException {
         
-        rootSection.handlePage(new PathInfo(), new PageBuilder(pageRenderer, request, response));
+        try {
+            rootSection.handle(new PathInfo(request), new PageBuilder(pageRenderer, database,
+                request, response));
+        } catch (StatusException e) {
+            response.sendError(e.code);
+        }
         
     }
 }
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/Constants.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/Constants.java
@@ -0,0 +1,7 @@
+package net.compsoc.ox.web.admin;
+
+public class Constants {
+    
+    public static final String SITE_TITLE = "Compsoc Admin Panel";
+    
+}
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/MainSectionsEnum.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/MainSectionsEnum.java
@@ -0,0 +1,15 @@
+package net.compsoc.ox.web.admin.sections;
+
+public enum MainSectionsEnum {
+    HOME("Home", "/"),
+    EVENTS("Events", "/events/"),
+    MEMBERS("Members", "/members/");
+    
+    public final String label;
+    public final String path;
+    
+    private MainSectionsEnum(String label, String path){
+        this.label = label;
+        this.path = path;
+    }
+}
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/RootSection.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/RootSection.java
@@ -3,11 +3,16 @@
 
 import java.io.IOException;
 
+import net.compsoc.ox.web.admin.sections.events.EventsSection;
+import net.compsoc.ox.web.admin.sections.members.MembersSection;
 import net.compsoc.ox.web.admin.templating.Template;
 import net.compsoc.ox.web.admin.util.PageBuilder;
 import net.compsoc.ox.web.admin.util.PathInfo;
 
-public class RootSection implements Section {
+public class RootSection extends Section {
+    
+    private final Section eventsSection = new EventsSection();
+    private final Section membersSection = new MembersSection();
 
     @Override
     public void visitSection(PathInfo info, PageBuilder builder) {
@@ -16,8 +21,23 @@ public void visitSection(PathInfo info, PageBuilder builder) {
     }
 
     @Override
-    public void handlePage(PathInfo info, PageBuilder builder) throws IOException {
+    public void renderPage(PathInfo info, PageBuilder builder) throws IOException {
+        builder.setActivePage(MainSectionsEnum.HOME);
+        
+        builder.put("title", "home");
+        
         builder.render(Template.HOME);
     }
+
+    @Override
+    public Section getSubsection(String slug) {
+        switch(slug){
+            case "events":
+                return eventsSection;
+            case "members":
+                return membersSection;
+        }
+        return null;
+    }
     
 }
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/Section.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/Section.java
@@ -4,11 +4,30 @@
 
 import net.compsoc.ox.web.admin.util.PageBuilder;
 import net.compsoc.ox.web.admin.util.PathInfo;
+import net.compsoc.ox.web.admin.util.StatusException;
 
-public interface Section {
+public abstract class Section {
     
-    public void visitSection(PathInfo info, PageBuilder builder);
+    public abstract void visitSection(PathInfo info, PageBuilder builder) throws StatusException;
     
-    public void handlePage(PathInfo info, PageBuilder builder) throws IOException;
+    public abstract void renderPage(PathInfo info, PageBuilder builder) throws IOException,
+        StatusException;
+    
+    public abstract Section getSubsection(String slug);
+    
+    public void handle(PathInfo info, PageBuilder builder) throws IOException, StatusException {
+        visitSection(info, builder);
+        
+        PathInfo next = info.next();
+        if (next != null) {
+            Section subSection = getSubsection(next.slug());
+            if (subSection != null)
+                subSection.handle(next, builder);
+            else
+                throw StatusException.do404();
+        } else {
+            renderPage(info, builder);
+        }
+    }
     
 }
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/events/EventsSection.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/events/EventsSection.java
@@ -0,0 +1,30 @@
+package net.compsoc.ox.web.admin.sections.events;
+
+import java.io.IOException;
+
+import net.compsoc.ox.web.admin.sections.MainSectionsEnum;
+import net.compsoc.ox.web.admin.sections.Section;
+import net.compsoc.ox.web.admin.templating.Template;
+import net.compsoc.ox.web.admin.util.PageBuilder;
+import net.compsoc.ox.web.admin.util.PathInfo;
+import net.compsoc.ox.web.admin.util.StatusException;
+
+public class EventsSection extends Section {
+
+    @Override
+    public void visitSection(PathInfo info, PageBuilder builder) throws StatusException {
+        builder.setActivePage(MainSectionsEnum.EVENTS);
+    }
+
+    @Override
+    public void renderPage(PathInfo info, PageBuilder builder) throws IOException, StatusException {
+        builder.put("title", "events");
+        builder.render(Template.HOME);
+    }
+
+    @Override
+    public Section getSubsection(String slug) {
+        return null;
+    }
+    
+}
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/members/MembersSection.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/sections/members/MembersSection.java
@@ -0,0 +1,30 @@
+package net.compsoc.ox.web.admin.sections.members;
+
+import java.io.IOException;
+
+import net.compsoc.ox.web.admin.sections.MainSectionsEnum;
+import net.compsoc.ox.web.admin.sections.Section;
+import net.compsoc.ox.web.admin.templating.Template;
+import net.compsoc.ox.web.admin.util.PageBuilder;
+import net.compsoc.ox.web.admin.util.PathInfo;
+import net.compsoc.ox.web.admin.util.StatusException;
+
+public class MembersSection extends Section {
+
+    @Override
+    public void visitSection(PathInfo info, PageBuilder builder) throws StatusException {
+        builder.setActivePage(MainSectionsEnum.MEMBERS);
+    }
+
+    @Override
+    public void renderPage(PathInfo info, PageBuilder builder) throws IOException, StatusException {
+        builder.put("title", "members");
+        builder.render(Template.HOME);
+    }
+
+    @Override
+    public Section getSubsection(String slug) {
+        return null;
+    }
+    
+}
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/util/PageBuilder.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/util/PageBuilder.java
@@ -9,26 +9,45 @@
 
 import com.mitchellbosecke.pebble.error.PebbleException;
 
+import net.compsoc.ox.database.Database;
+import net.compsoc.ox.web.admin.Constants;
+import net.compsoc.ox.web.admin.sections.MainSectionsEnum;
 import net.compsoc.ox.web.admin.templating.Template;
 
 public class PageBuilder {
     
-    public final HttpServletRequest request;
-    public final HttpServletResponse response;
     private final PageRenderer renderer;
     private final Map<String, Object> context = new HashMap<>();
     
-    public PageBuilder(PageRenderer renderer, HttpServletRequest request,
+    public final Database database;
+    public final HttpServletRequest request;
+    public final HttpServletResponse response;
+    
+    public PageBuilder(PageRenderer renderer, Database database, HttpServletRequest request,
         HttpServletResponse response) {
         this.renderer = renderer;
+        this.database = database;
         this.request = request;
         this.response = response;
     }
     
+    public void put(String key, Object value) {
+        context.put(key, value);
+    }
+    
+    public void setActivePage(MainSectionsEnum section) {
+        put("active_page", section);
+    }
+    
     public void render(Template template) throws IOException {
         try {
             response.setContentType("text/html");
-            context.put("static_href", request.getContextPath() + "/static");
+            
+            put("site_title", Constants.SITE_TITLE);
+            put("static_href", request.getContextPath() + "/static");
+            put("admin_root", request.getContextPath());
+            put("main_menu_items", MainSectionsEnum.values());
+            
             renderer.render(template, context, response.getWriter());
         } catch (PebbleException e) {
             throw new IOException(e);
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/util/PathInfo.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/util/PathInfo.java
@@ -1,5 +1,37 @@
 package net.compsoc.ox.web.admin.util;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class PathInfo {
     
+    private final String[] slugs;
+    private final int index;
+    
+    public PathInfo(HttpServletRequest request) {
+        String path = request.getPathInfo();
+        
+        if (path.equals("/")) {
+            slugs = new String[] { "" };
+        } else {
+            slugs = (path.endsWith("/") ? path.substring(0, path.length() - 1) : path).split("/");
+        }
+        
+        index = 0;
+    }
+    
+    private PathInfo(String[] slugs, int index){
+        this.slugs = slugs;
+        this.index = index;
+    }
+    
+    public String slug(){
+        return slugs[index];
+    }
+    
+    public PathInfo next() {
+        if(index + 1 < slugs.length)
+            return new PathInfo(slugs, index + 1);
+        return null;
+    }
+    
 }
diff --git a/java-admin-web/src/java/net/compsoc/ox/web/admin/util/StatusException.java b/java-admin-web/src/java/net/compsoc/ox/web/admin/util/StatusException.java
@@ -0,0 +1,15 @@
+package net.compsoc.ox.web.admin.util;
+
+public class StatusException extends Exception {
+    
+    public final int code;
+    
+    public StatusException(int code){
+        this.code = code;
+    }
+    
+    public static StatusException do404(){
+        return new StatusException(404);
+    }
+    
+}
