Skip to content

Beta to OSLabs Launch Merge #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 57 commits into from
Nov 24, 2021
Merged

Beta to OSLabs Launch Merge #177

merged 57 commits into from
Nov 24, 2021

Conversation

rfvisuals
Copy link
Contributor

No description provided.

chrisjtang and others added 30 commits November 1, 2021 17:11
ReactRouter components added to DragDrop panel, LinkTo - styles appear in CodePreview
…ances of linkto and switch in draganddrop panel.

Co-authored-by: Crys Lim [email protected]
C2 (Chris and Crys) Branch Merging to Dev-46 Branch
… useStateModal has minimal styling and can display state of parent app component.

Co-authored-by: Crys Lim [email protected]
…to an html element's attribute.

Co-authored-by: Crys Lim [email protected]
Fixed Add and Delete State and Added Context API to code preview
…populates the customization panel's element. useStateModal was also updated to be able to handle state from any components built in reactype, even children components. when a stateful html element is saved, the codepreview generates and imports useContext from the appropriate sources.

co-authored-by: Crys Lim [email protected]
co-authored-by: Crys Lim [email protected]
co-authored-by: William Cheng [email protected]
co-authored-by: Ron Fu [email protected]
Merging RWC2 Branch to Dev-46
crlim and others added 27 commits November 13, 2021 12:32
…w state, adjusted generate code accordingly

Co-authored-by: Chris Tang [email protected]
Fixed Indentaiton in Code Preview

Co-authored: Ron Fu [email protected]
…o drag-and-drop panel as a state tool. button is not functional yet.

co-authored-by: Crys Lim [email protected]
…state. updates were to componentBuilder in DemoRender.tsx.

co-authored-by: Crys Lim [email protected]
Co-authored-by: Ron Fu
and added error handler for invalid input for state
Co-authored-by: Ron Fu
… which state has been used for that particular childelement. added stateusedobj in a react usestate hook to customizationpanel to update when state is used with corresponding comptext or complink values and a string that keeps track of the pathway to the property (can also handle nested objects). from there, we are dispatching the usestateobj to the reducer, which updates the stateusedobj in childelement from interface. the reducer also invokes generatecode to generate the appropriate code. finally, we edited generatecode.ts to have the correct syntax for accessing variables that are provided by state within html elements.

co-authored-by: Crys Lim [email protected]
…and objects, stateKey was also updated to reflect the proper variable string to access state

Co-authored by Chris Tang [email protected]
…topmost component state when clicked. code preview keystring is also refreshed with this click now.

co-authored-by: Crys Lim [email protected]
C2 merge to dev-46 branch
Fixed delete state, indentation problems, context being replaced, link and switch separators in tree
co-authored-by: Crys Lim [email protected]
co-authored-by: William Cheng
Co-authored-by: Crys Lim and Chris Tang
…Value

Co-authored-by: Crys Lim, Ron Fu, Chris Tang
… when component or state is deleted

Co-authored-by: Ron Fu, Chris Tang, and Crys Lim
Final Merge, fixed delete bugs and state being replaced.
@crlim crlim changed the title Beat to OSLabs Launch Merge Beta to OSLabs Launch Merge Nov 24, 2021
@crlim
Copy link
Contributor

crlim commented Nov 24, 2021

Good job team! It was hard work but we did it!

@crlim crlim merged commit 639f1c7 into open-source-labs:master Nov 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants