Reorganized the group, users and games indexes

Author: Matt Karl

app/helpers/pagination.js

@@ -5,12 +5,12 @@
  * @param {string} base The base url
  * @param {int} numItems Number of items
  * @param {int} currentPage The page currently being shown
+ * @param {int} [itemsPerPage=30] Number of items per page
  * @param {int} [buttonCount=7]
  *   How many page button to display from left-to-right.
  *   Odd numbers wil produce nicer looking, even sided, UI.
- * @param {int} [itemsPerPage=20] Number of items per page
  */
-module.exports = function(base, numItems, currentPage, buttonCount, itemsPerPage)
+module.exports = function(base, numItems, currentPage, itemsPerPage, buttonCount)
 {
     itemsPerPage = itemsPerPage || 30;
 

app/public/css/main.css

@@ -6,8 +6,8 @@ router.get('/:local(page)?/:number([0-9]+)?', function(req, res)
 {
 	Game.getAll().count(function(err, count)
 	{
-		var nav = new Pagination('/games', count, req.params.number, 7, 2);
-		res.render('games/edit',
+		var nav = new Pagination('/games', count, req.params.number);
+		res.render('games/index',
 		{
 			pagination: nav.result,
 			games: Game.getAll()

app/routes/games/index.js

@@ -1,25 +1,26 @@
 var router = require('express').Router(),
 	async = require('async'),
     log = require('../../helpers/logger'),
-	User = require('../../models/user'),
+	Pagination = require('../../helpers/pagination'),
 	Group = require('../../models/group');
 
-router.post('/', function(req, res)
+router.get('/:local(page)?/:number([0-9]+)?', function(req, res)
 {
-	res.redirect('/groups/group/'+req.body.slug);
-});
-
-router.get('/', function(req, res)
-{
-	res.render('select',
+	Group.getTeams().count(function(err, count)
 	{
-		itemName: 'Group',
-		itemProperty: 'slug',
-		itemKey: 'slug',
-		items: Group.getTeams().select('name slug'),
-		error: req.flash('error'),
-		errors: req.flash('errors'),
-		success: req.flash('success')
+		var nav = new Pagination('/groups', count, req.params.number);
+		res.render('groups/index',
+		{
+			pagination: nav.result,
+			groups: Group.getTeams()
+				.select('name slug logo')
+				.sort('name')
+				.skip(nav.start || 0)
+				.limit(nav.itemsPerPage),
+			error: req.flash('error'),
+			errors: req.flash('errors'),
+			success: req.flash('success')
+		});
 	});
 });
 

app/routes/groups/index.js

@@ -113,11 +113,9 @@ function render(user, req, res)
 
 router.get('/', function(req, res)
 {
-	res.render('select',
+	res.render('users/index',
 	{
-		itemName: 'User',
-		itemProperty: 'userId',
-		items: User.getAll(req.user._id).select('name'),
+		users: User.getAll(req.user._id).select('name'),
 		error: req.flash('error'),
 		errors: req.flash('errors'),
 		success: req.flash('success')

app/routes/users/index.js

@@ -0,0 +1,24 @@
+extend ../templates/normal
+
+append title
+	| Edit Group - 
+
+append content
+	.col-sm-12
+		a.btn.btn-sm.btn-default.pull-right(href="/groups/add")
+			span.glyphicon.glyphicon-pencil
+			|  Add
+		h3 Groups
+		if !groups.length
+			.alert.alert-warning.text-center No groups have been added.
+				|    
+				a.btn.btn-warning.btn-sm(href="/groups/add") Add Group
+		else
+			.row
+				for group in groups
+					.col-md-3.col-sm-4.col-xs-6
+						a.group(href="/groups/group/#{group.slug}")
+							if group.logo && group.logo.length
+								img.logo.logo-lg(src="data:image/png;base64,#{group.logo}")
+							| #{group.name}
+			.row: include ../partials/pagination

app/views/games/edit.jade app/views/games/index.jadeapp/views/games/edit.jade renamed to app/views/games/index.jade

@@ -0,0 +1,24 @@
+extend ../templates/normal
+
+append title
+	| Edit #{itemName} -
+
+append content
+	.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
+		.panel.panel-default
+			.panel-heading
+				a.pull-right.btn.btn-sm.btn-default(href="/users/add") 
+					span.glyphicon.glyphicon-plus 
+					|  Add
+				h2.panel-title Users
+			form.panel-body.form-horizontal(action=url, method='post')
+				if !users.length
+					.alert.alert-warning No users to edit.
+				else
+					include ../partials/feedback
+					.form-group
+						.col-sm-12
+							select.content-select.form-control(name="userId", required, autofocus)
+								option Edit User...
+								for user in users
+									option(value=user._id)=user.name

app/views/groups/index.jade

@@ -1,6 +1,6 @@
 {
 	"name": "SpringRollConnect",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"dependencies": {
 		"jquery": "*",
 		"bootstrap": "*",