Merge branch 'main' into refactor

Author: rugulous

WPOrderProcessor.js

@@ -2,7 +2,7 @@
 
 const {
 	helpers: {
-		SlugHelper
+		StringHelper
 	},
 	constants
 } = require(global.__lib);
@@ -21,8 +21,8 @@ class WPOrderProcessor {
 	async getContact(order) {
 		const contact = {
 			Email: order.billing.email,
-			FirstName: order.billing.first_name,
-			Surname: order.billing.last_name,
+			FirstName: StringHelper.toTitleCase(order.billing.first_name),
+			Surname: StringHelper.toTitleCase(order.billing.last_name),
 			IsActive: true,
 			IsAdmin: false,
 			Password: `BYBA@${this.#season.Identifier}`
@@ -47,9 +47,9 @@ class WPOrderProcessor {
 	}
 
 	async getOrganisation(orgName) {
-		const slug = SlugHelper.formatSlug(orgName);
+		const slug = StringHelper.formatSlug(orgName);
 		const org = {
-			Name: orgName,
+			Name: StringHelper.toTitleCase(orgName),
 			Slug: slug,
 			Description: '',
 			OrganisationTypeId: constants.ORGANISATION_TYPE.BAND

config/db.sample.json

@@ -1,27 +1,9 @@
 {
-	"development": {
 		"username": "root",
 		"password": null,
 		"database": "database_development",
 		"host": "127.0.0.1",
 		"dialect": "mariadb",
-		"sync": true
-	},
-	"test": {
-		"username": "root",
-		"password": null,
-		"database": "database_test",
-		"host": "127.0.0.1",
-		"dialect": "mariadb",
-		"sync": true
-	},
-	"production": {
-		"username": "root",
-		"password": null,
-		"database": "database_production",
-		"host": "127.0.0.1",
-		"dialect": "mariadb",
-		"logging": false,
-		"sync": true
-	}
-}
+		"sync": false,
+		"logging": true
+}

config/server.sample.json

@@ -1,9 +1,6 @@
 {
 	"port": 5000,
-	"noAuthRequired": [],
-	"uploadPath":"/web/uploads/-org-",
-	"uploadURL": "",
-	"serveUploads": true,
+	"noAuthRequired": ["/"],
 	"logging": true,
 	"uploadServer": "",
 	"uploadSecret": ""

config/site.sample.json

@@ -1,7 +1,6 @@
 {
 	"title": "Website Name",
-	"frameworkURL": null,
 	"adminName": "Admin Team",
 	"adminEmail": "[email protected]",
-	"version": "1.0.0"
+	"version": "1.0.1b"
 }

package.json

@@ -19,7 +19,7 @@
 	"homepage": "https://github.com/BritishYouthBandAssociation/OrgAdmin#readme",
 	"devDependencies": {
 		"@byba/eslint-config": "^1.4.0",
-		"eslint": "^8.26.0",
+		"eslint": "^8.32.0",
 		"husky": "^8.0.1",
 		"lint-staged": "^13.0.3"
 	},
@@ -29,17 +29,17 @@
 		"chalk": "4",
 		"connect-session-sequelize": "^7.1.4",
 		"del": "6",
-		"express": "^4.18.1",
-		"express-form-data": "^2.0.18",
+		"express": "^4.18.2",
+		"express-form-data": "^2.0.19",
 		"express-handlebars": "^6.0.6",
 		"express-session": "^1.17.3",
 		"gulp": "^4.0.2",
 		"gulp-rename": "^2.0.0",
 		"jimp": "^0.16.2",
-		"joi": "^17.6.2",
+		"joi": "^17.7.0",
 		"morgan": "^1.10.0",
 		"prompt-sync": "^4.2.0",
-		"sequelize": "^6.25.3",
+		"sequelize": "^6.28.0",
 		"serve-favicon": "^2.5.0"
 	},
 	"lint-staged": {

routes/config.js

@@ -181,7 +181,7 @@ router.post('/event-type', checkAdmin,
 	})),
 	async (req, res, next) => {
 		await Promise.all(req.body.type.map((_, i) => {
-			return (async function(){
+			return (async function() {
 				const details = {
 					Name: req.body.type[i],
 					EntryCost: req.body.cost[i],
@@ -207,27 +207,29 @@ router.post('/event-type', checkAdmin,
 					}
 				});
 
-				await Promise.all(req.body.discountAfter[i].map((_, d) => {
-					return (async function() {
-						const allPos = (req.body.membershipType[i][d] ?? []).indexOf(-1);
-						if (allPos > -1) {
-							req.body.membershipType[i][d].splice(allPos, 1);
-						}
+				if (req.body.discountAfter && req.body.discountAfter.length > i) {
+					await Promise.all(req.body.discountAfter[i].map((_, d) => {
+						return (async function() {
+							const allPos = (req.body.membershipType[i][d] ?? []).indexOf(-1);
+							if (allPos > -1) {
+								req.body.membershipType[i][d].splice(allPos, 1);
+							}
 
-						const discountDetails = {
-							DiscountAfter: req.body.discountAfter[i][d],
-							DiscountMultiplier: req.body.multiplier[i][d],
-							MembersOnly: req.body.membersOnly[i][d],
-							AllMembers: allPos > -1
-						};
+							const discountDetails = {
+								DiscountAfter: req.body.discountAfter[i][d],
+								DiscountMultiplier: req.body.multiplier[i][d],
+								MembersOnly: req.body.membersOnly[i][d],
+								AllMembers: allPos > -1
+							};
 
-						const discount = await type.createEventTypeDiscount(discountDetails);
+							const discount = await type.createEventTypeDiscount(discountDetails);
 
-						if (discount.MembersOnly) {
-							await discount.addMembershipTypes(req.body.membershipType[i][d]);
-						}
-					})();
-				}));
+							if (discount.MembersOnly) {
+								await discount.addMembershipTypes(req.body.membershipType[i][d]);
+							}
+						})();
+					}));
+				}
 			})();
 		}));
 
@@ -429,7 +431,10 @@ router.get('/season', checkAdmin, validator.query(Joi.object({
 			id: {
 				[Op.not]: season?.id ?? 0
 			}
-		}
+		},
+		order: [
+			['Start', 'DESC']
+		]
 	});
 
 	return res.render('config/season.hbs', {

routes/event.js

@@ -7,7 +7,7 @@ const Joi = require('joi');
 
 const validator = require('@byba/express-validator');
 
-const { helpers: { SlugHelper: { formatSlug } } } = require(__lib);
+const { helpers: { StringHelper: { formatSlug } , SortHelper }} = require(__lib);
 
 const router = express.Router();
 
@@ -84,43 +84,6 @@ async function recalculateEntryFees(db, season, typeID, org) {
 	}
 }
 
-function shuffleArray(array) {
-	for (let i = array.length - 1; i > 0; i--) {
-		const j = Math.floor(Math.random() * (i + 1));
-		[array[i], array[j]] = [array[j], array[i]];
-	}
-
-	return array;
-}
-
-function leagueSort(entries) {
-	entries.sort((a, b) => {
-		const aMember = a.Organisation.OrganisationMemberships;
-		const aScore = aMember.length == 0 ? 0 : aMember[0].LeagueScore;
-
-		const bMember = b.Organisation.OrganisationMemberships;
-		const bScore = bMember.length == 0 ? 0 : bMember[0].LeagueScore;
-
-		return aScore - bScore;
-	});
-
-	return entries;
-}
-
-function entrySort(array, direction) {
-	array.sort((a, b) => {
-		const d1 = new Date(a.EntryDate), d2 = new Date(b.EntryDate);
-
-		if (direction === 'asc') {
-			return d1 - d2;
-		}
-
-		return d2 - d1;
-	});
-
-	return array;
-}
-
 function splitEntries(entries, cutoff) {
 	const late = [], regular = [];
 
@@ -211,15 +174,15 @@ async function generateSchedule(req, next, eventID, config, divisionOrder) {
 		let late = [], regular = div;
 		if (config.LateOnFirst) {
 			[late, regular] = splitEntries(div, cutoff);
-			entrySort(late, 'desc');
+			late = late.sort((a, b) => SortHelper.dateProp('EntryDate', a, b, false));
 		}
 
 		if (config.Type.indexOf('entry') > -1) {
-			entrySort(regular, config.Type.split('-')[1]);
+			regular = regular.sort((a, b) => SortHelper.dateProp('EntryDate', a, b, config.Type.split('-')[1] == 'asc'));
 		} else if (config.Type == 'league') {
-			leagueSort(regular);
+			regular = regular.sort((a, b) => SortHelper.compare(a.Organisation.OrganisationMemberships[0]?.LeagueScore, b.Organisation.OrganisationMemberships[0]?.LeagueScore));
 		} else {
-			shuffleArray(regular);
+			regular = SortHelper.shuffleArray(regular);
 		}
 
 		div = late.concat(regular);
@@ -272,7 +235,10 @@ router.get('/', async (req, res, next) => {
 			],
 			where: {
 				SeasonId: season.id
-			}
+			},
+			order: [
+				['Start']
+			]
 		}),
 		req.db.EventType.getActive()
 	]);

routes/membership.js

@@ -10,6 +10,12 @@ const validator = require('@byba/express-validator');
 const WPOrderProcessor = require('../WPOrderProcessor');
 const { checkAdmin } = require('../middleware');
 
+const {
+	helpers: {
+		SortHelper
+	}
+} = require(global.__lib);
+
 const router = express.Router();
 
 router.get('/', checkAdmin, async (req, res, next) => {
@@ -19,7 +25,7 @@ router.get('/', checkAdmin, async (req, res, next) => {
 		return res.redirect(`/config/season?needsSeason=true&next=${req.originalUrl}`);
 	}
 
-	const memberships = await req.db.Membership.getAll({ SeasonId: season.id });
+	const memberships = (await req.db.Membership.getAll({ SeasonId: season.id })).sort((a, b) => SortHelper.stringProp('Name', a, b));
 
 	const labels = await req.db.Label.findAll({
 		where: { '$Memberships.SeasonId$': season.id },

routes/organisation.js

@@ -74,7 +74,10 @@ async function removeImage(config, id, origin, token = null) {
 
 router.get('/', checkAdmin, async (req, res, next) => {
 	const orgs = await req.db.Organisation.findAll({
-		include: [req.db.OrganisationType]
+		include: [req.db.OrganisationType],
+		order: [
+			['Name']
+		]
 	});
 
 	return res.render('organisation/index.hbs', {

routes/user.js

@@ -19,7 +19,12 @@ const idParamSchema = Joi.object({
 const {checkAdmin, matchingID} = require('../middleware');
 
 router.get('/', checkAdmin, async (req, res, next) => {
-	const users = await req.db.User.findAll();
+	const users = await req.db.User.findAll({
+		order: [
+			['FirstName'],
+			['Surname']
+		]
+	});
 	const active = [];
 	const inactive = [];
 

views/config/season.hbs

@@ -56,7 +56,7 @@
 						<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" :data-bs-target="'#collapse-' + season.id" aria-expanded="false" :aria-controls="'collapse-' + season.id">
 							<span class="accordion-header header">${getTitle(season)} <span v-if="season.touched"> - edited</span></span>
 						</button>
-						<div :id="'collapse-' + season.id" class="accordion-collapse" :class="{'collapse': index < seasons.length, 'show': index == seasons.length - 1}" data-bs-parent="#seasons">
+						<div :id="'collapse-' + season.id" class="accordion-collapse" :class="{'collapse': index < seasons.length, 'show': index == seasons.length - 1 && season.touched}" data-bs-parent="#seasons">
 							<div class="accordion-body">
 								<div class="form-group mb-3">
 									<label :for="'name-' + season.id">Identifier</label>
@@ -85,7 +85,7 @@
 				{{/if}}
 
 				<div class="text-center">
-					<button class="btn btn-lg btn-success" @click="addSeason">+ Add</button>
+					<button type="button" class="btn btn-lg btn-success" @click="addSeason">+ Add</button>
 					<button type="submit" class="btn btn-default btn-lg" v-if="seasons.length > 0">Save Changes</button>
 				</div>
 			</form>
@@ -112,7 +112,7 @@
 				Start: '',
 				End: '',
 				Identifier: '',
-				touched: false
+				touched: true
 			});
 
 			Vue.nextTick(() => {

views/event/index.hbs

@@ -44,7 +44,7 @@
 
 <div class='row text-center'>
 	{{#each events}}
-	<div class='col-12 col-md-6 col-lg-4'>
+	<div class='col-12 col-md-6 col-lg-4 mb-3'>
 		<div class='card card-action' data-type='{{EventType.id}}'>
 			<div class='card-body'>
 				<p class='h4'><a href='{{id}}/' class='stretched-link text-reset text-decoration-none'>{{Name}}</a></p>