浏览代码

Merge remote-tracking branch 'origin/staging' into staging

Owen Diffey 2 年之前
父节点
当前提交
57ca112643
共有 2 个文件被更改,包括 11 次插入9 次删除
  1. 2 7
      backend/logic/actions/users.js
  2. 9 2
      frontend/src/pages/Team.vue

+ 2 - 7
backend/logic/actions/users.js

@@ -775,13 +775,8 @@ export default {
 				next => {
 					const query = {};
 					if (identifier.indexOf("@") !== -1) query["email.address"] = identifier;
-					else query.username = identifier;
-					userModel.findOne(
-						{
-							$or: [query]
-						},
-						next
-					);
+					else query.username = { $regex: `^${identifier}$`, $options: "i" };
+					userModel.findOne(query, next);
 				},
 
 				// if the user doesn't exist, respond with a failure

+ 9 - 2
frontend/src/pages/Team.vue

@@ -20,9 +20,10 @@ const currentTeam = ref([
 			"MusareReact",
 			"MusareNode",
 			"MusareStatus",
+			"lofig",
 			"MusareTranslation",
 			"aw-watcher-musare",
-			"lofig"
+			"vue-draggable-list"
 		],
 		active: "Sept 2015 - present",
 		github: "KrisVos130",
@@ -35,7 +36,13 @@ const currentTeam = ref([
 	{
 		name: "Owen Diffey",
 		bio: "Developer, Designer, System Admin and QA Tester. Previously Owner and Project Manager.",
-		projects: ["MusareMeteor", "MusareReact", "MusareNode", "vue-roaster"],
+		projects: [
+			"MusareMeteor",
+			"MusareReact",
+			"MusareNode",
+			"vue-roaster",
+			"vue-draggable-list"
+		],
 		active: "Feb 2016 - present",
 		github: "odiffey",
 		link: "https://diffey.dev",