Initial cut - untested.
This commit is contained in:
@@ -42,7 +42,7 @@ export const StudentPage = (props) => {
|
||||
<div style={{width: '100%', height: '100%', background: 'url(/images/student.svg)', backgroundSize: 'cover', backgroundPosition: 'center bottom', position: 'fixed', right: 0, bottom: 0, top: 0, left: 0}}> </div>
|
||||
|
||||
<div style={{display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', height: '100%', width: '100%'}}>
|
||||
<Button css={{height: "100%", width: '100px', margin: 'auto'}} variant="contained" className="button" onClick={performLogin}>Login</Button>*/}
|
||||
<Button css={{height: "100%", width: '100px', margin: 'auto'}} variant="contained" className="button" onClick={performLogin}>Login</Button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -50,15 +50,15 @@ export const WorkshopList = () => {
|
||||
const isAdmin = user && Roles.userIsInRole(user._id, 'admin', 'global');
|
||||
const [selectedWorkshop, setSelectedWorkshop] = useState("")
|
||||
|
||||
const {workshops} = useTracker(() => {
|
||||
const {workshops} = useTracker(async () => {
|
||||
let workshops = [];
|
||||
|
||||
workshops = Workshops.find({isComplete: false}).fetch();
|
||||
workshops = await Workshops.find({isComplete: false}).fetchAsync();
|
||||
|
||||
for(let workshop of workshops) {
|
||||
for(let user of workshop.signupSheet) {
|
||||
user.data = Students.findOne({_id: user._id})
|
||||
if(!user.data) user.data = Staff.findOne({_id: user._id})
|
||||
user.data = await Students.findOneAsync({_id: user._id})
|
||||
if(!user.data) user.data = await Staff.findOneAsync({_id: user._id})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ export const WorkshopList = () => {
|
||||
setOpenWorkshopEditor(true)
|
||||
}
|
||||
}
|
||||
const workshopEditorClosed = (save) => {
|
||||
const workshopEditorClosed = async (save) => {
|
||||
const completeHandler = (err, result) => {
|
||||
if(err) console.error(err)
|
||||
else {
|
||||
@@ -105,8 +105,8 @@ export const WorkshopList = () => {
|
||||
}
|
||||
|
||||
if(save) {
|
||||
if(editedWorkshop._id) Meteor.call('workshops.update', editedWorkshop._id, editedName, editedDescription, editedSignupLimit, completeHandler)
|
||||
else Meteor.call('workshops.add', editedName, editedDescription, editedSignupLimit, completeHandler)
|
||||
if(editedWorkshop._id) await Meteor.callAsync('workshops.update', editedWorkshop._id, editedName, editedDescription, editedSignupLimit, completeHandler)
|
||||
else await Meteor.callAsync('workshops.add', editedName, editedDescription, editedSignupLimit, completeHandler)
|
||||
}
|
||||
else completeHandler()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user