Closed Cthomp7 closed 1 year ago
@Cthomp7 so excited to see this come through! we (have almost) refactored the entire code base recently (nearly there) so this might need some addressing in order to merge properly. i'm thinking the easiest thing would be to add my fork as a new remote:
git remote add nick https://github.com/nbriz/netnet.studio.git
&& then pull from the refactored branch @sarahrooney && i have been working on
git pull nick refactor-v3
u'll likely have some conflicts u'll need to resolve, but if that gets too messy send me an email && we can schedule a time to zoom && resolve it together :)
Sounds good, I will definitely do that! I will let you know if there are any issues with the refactor branch or if I have any questions :)
Hey @nbriz
Sorry for the delayed response. Did this end up working? I am not sure what changes I should be seeing. I see the aborted portion at the end, so I wasn't sure if it was successful.
Thanks! :)
@Cthomp7 seems like it couldn't merge b/c of conflicts. this might be a trickier/messier merge than usual, might be easiest to do this together over zoom maybe? would u be up for that? there are faculty-folks that could really benefit from these updates this semester so would be great to get this into the next update! send me an email to schedule a call when u've got time :)
i'm gonna close this PR seeing as how we worked this into the refactor :)
I have the functionality of the Demo/Example Maker widget loading! Let me know if there are any issues. I haven't looked at this in a hot minute, so there might be something buggy I am missing.
How do I close the welcome layouts convo? I tried
window.convo.hide()
on line 210 in www/widgets/DemoExampleMaker.jsFor myself:
calledBy
variable in_uploadJSON()