RouteMeHome/get_my
1
0
Fork 0
mirror of https://gitlab.com/bmcgonag/get_my.git synced 2026-03-27 00:08:49 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

Updating framework to meteor 3 and later

Browse source
This commit is contained in:
Brian McGonagill 2025-06-21 07:28:59 -05:00
parent 717994508a
commit cca29bc591
58 changed files with 2332 additions and 1611 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/Accounts/Login/login.js
View file

@ -1,4 +1,5 @@
import { SysConfig } from '../../../imports/api/systemConfig.js';
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Template.login.onCreated(function() {
this.subscribe("SystemConfig");

24
client/Accounts/Login/reg.js
View file

@ -1,4 +1,5 @@
import { SysConfig } from "../../../imports/api/systemConfig.js";
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Template.reg.onCreated(function() {
this.subscribe("SystemConfig");
@ -29,12 +30,15 @@ Template.reg.helpers({
return Session.get("missingReq");
},
allowReg: function() {
let conf = SysConfig.findOne();
if (typeof conf != 'undefined') {
return conf.allowReg;
} else {
return true
const sysConf = async() => {
let conf = await SysConfig.findOneAsync();
if (!conf) {
return true;
} else {
return conf.allowReg;
}
}
sysConf();
}
});
@ -84,14 +88,16 @@ Template.reg.events({
let userId = Meteor.userId();
console.log("User ID: " + userId);
Meteor.call("addToRole", "user", function(err, result) {
if (err) {
console.log(" ERROR: ROLES - Error adding user to role: " + err);
const addRole = async() => {
let result = await Meteor.callAsync("addToRole", "user");
if (!result) {
console.log(" ERROR: ROLES - Error adding user to role: ");
} else {
// console.log("User should be added to role - teacher.");
FlowRouter.go('/dashboard');
}
});
}
addRole();
}
}
},

2
client/Accounts/UserMgmt/userInfoModal.html
View file

@ -15,7 +15,7 @@
<label for="newPassConf">Enter New Password</label>
{{#if $eq passMatch false}}<p class="red-text">Passwords do not match!</p>{{/if}}
</div>
<div class="col s12 m6 l6 input-field outlined">
<div class="col s12 m6 l6 input-field">
<select name="userRole" id="userRole" class="userRole {{#if $eq roleEmpty true}}red lighten-2 white-text{{/if}}">
<option value="{{userRole}}" selected>{{userRole}}</option>
<option value="admin">Admin</option>

86
client/Accounts/UserMgmt/userInfoModal.js
View file

@ -16,10 +16,10 @@ Template.userInfoModal.onRendered(function() {
var elemse = document.querySelectorAll('select');
var instancese = M.FormSelect.init(elemse, {});
Meteor.setTimeout(() => {
instances = M.Modal.init(elems, {});
instancese = M.FormSelect.init(elemse, {});
}, 500);
// Meteor.setTimeout(() => {
// instances = M.Modal.init(elems, {});
// instancese = M.FormSelect.init(elemse, {});
// }, 500);
});
Template.userInfoModal.helpers({
@ -35,19 +35,34 @@ Template.userInfoModal.helpers({
userInfo: function() {
let usersId = Session.get("usersId");
if (usersId != "" && usersId != null) {
let usersInfo = Meteor.users.findOne({ _id: usersId });
// console.dir(usersInfo);
Session.set("usersInfo", usersInfo);
return usersInfo;
const uIn = async() => {
let usersInfo = await Meteor.users.findOneAsync({ _id: usersId });
if (!usersInfo) {
console.log("No information found for this user.");
return;
} else {
Session.set("usersInfo", usersInfo);
return usersInfo;
}
// console.dir(usersInfo);
}
uIn();
} else {
return;
}
},
userRole: function() {
let userRole = Roles.getRolesForUser( Session.get("usersId"));
Session.set("usersRole", userRole);
console.log(userRole);
return userRole;
const getRole = async() => {
let userRole = Roles.getRolesForUserAsync( Session.get("usersId"));
if (!userRole) {
return;
} else {
Session.set("usersRole", userRole);
console.log(userRole);
return userRole;
}
}
getRole();
},
rolesOptions: function() {
return Roles.find();
@ -121,36 +136,33 @@ Template.userInfoModal.events({
}
});
changePassword = function(userId, passwd) {
changePassword = async function(userId, passwd) {
console.log("would change password.");
Meteor.call('edit.userPass', userId, passwd, function(err, result) {
if (err) {
console.log(" ERROR changing user passwrod:" + err);
} else {
showSnackbar("Successfully Saved Changes!", "green");
console.log(" Password changed successfully!");
}
});
let result = await Meteor.callAsync('edit.userPass', userId, passwd);
if (!result) {
console.log(" ERROR changing user passwrod:");
} else {
showSnackbar("Successfully Saved Changes!", "green");
console.log(" Password changed successfully!");
}
}
changeUserEmail = function(usersId, usersEmail) {
changeUserEmail = async function(usersId, usersEmail) {
console.log("Would change user email");
Meteor.call('update.userEmail', usersId, usersEmail, function(err, result) {
if (err) {
console.log(" ERROR updating user email: " + err);
} else {
showSnackbar("Email updated successfully!", "green");
}
});
let result = await Meteor.callAsync('update.userEmail', usersId, usersEmail);
if (!result) {
console.log(" ERROR updating user email: " + err);
} else {
showSnackbar("Email updated successfully!", "green");
}
}
changeUserRole = function(userId, role) {
changeUserRole = async function(userId, role) {
console.log("Would change user Role.");
Meteor.call('edit.userRole', userId, role, function(err, result) {
if (err) {
console.log(" ERROR updating user role: " + err);
} else {
showSnackbar("Role Successfully Updated!", "green");
}
});
let result = await Meteor.callAsync('edit.userRole', userId, role);
if (!result) {
console.log(" ERROR updating user role: " + err);
} else {
showSnackbar("Role Successfully Updated!", "green");
}
}

2
client/Accounts/UserMgmt/userMgmt.js
View file

@ -23,7 +23,7 @@ Template.userMgmt.helpers({
return this.emails[0].address;
},
userRole: function() {
return Roles.getRolesForUser( this._id );
return Roles.getRolesForUserAsync( this._id );
}
});