Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Main merge #6

Merged
merged 28 commits into from Mar 5, 2022
Merged

Main merge #6

merged 28 commits into from Mar 5, 2022

Conversation

dplee123
Copy link
Contributor

@dplee123 dplee123 commented Mar 5, 2022

  • Used Acorn to parse AST
  • Developed component tree structure using React
  • Successfully merged parser and component tree, creating data-flow pipeline between frontend and backend in WebviewView
  • Able to pass in external files into extension and create component tree
  • Created unit & integration tests for parser

hersler and others added 28 commits February 22, 2022 17:14
@hersler
set up webpack. set up basic files/components to render react app to …
73fe7a1 
…webviewview dom
@hersler
added a few things in MainSideBarTest
c66a4e2
@nicoflrs
webpack progression
6ea945d
@nicoflrs
webpack progression
c192762
@nicoflrs
mvp feature
95f8b74
@hersler
deleted chungus svg
3c39e8d
@hersler
added styling to component tree. cleaned up extension.ts. removed chu…
2c3216c 
… references.
trying to render React components, running into issues
ad904cd
@hersler
updated tsconfig
f2b88ca
@hersler
got basic react component rendering again
4d525c5
@hersler
a few tweaks to renderToDom and webpackconfig
65ea93d
dynamically rendering react components onto webviewView
295a238
Separated components to be more modular
729fbc5
rendering child components as well
a5ce37e
some other changes
b48554e
@hersler
add more details to logs in mainsidebartest
25dad03
@nicoflrs
some AST progress
272c40c
@mykongee
Merged App branch and Parser branch; parser functional within new rea…
47c2c80 
…ct app
@mykongee
Moved webview components out of media folder into src/webview
1c0300b
@mykongee
Updated out folder
50d69e4
generated file input button, work needed on passing to parser
9442e54
dynamically rendering components with absolute file paths
d34cd0f
@mykongee
merged with updated AST parser and tests
4691963
dynamically rendering components with absolute file paths
15a19aa
@nicoflrs @mykongee
merged with updated AST parser and tests
1889b90
@mykongee
Merge branch 'main-merge' of https://github.com/oslabs-beta/Nexus int…
18ad5db 
…o main-merge
merging to local machine
e71dcbd
@BChiang4 @FoxEight
@nicoflrs @mykongee
Rendered component tree using external files
baa96e8 
Co-authored-by: Brian Chiang <chiangbrian4@gmail.com>
Co-authored-by: Alex Hersler <alex@alexhersler.com>
Co-authored-by: Nico Flores <floresni1996@gmail.com>
Co-authored-by: Mike Hong <mikehongde@gmail.com>
FoxEight
FoxEight approved these changes Mar 5, 2022
View reviewed changes
Copy link
Contributor

@FoxEight FoxEight left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work troubleshooting the extension and front end data flow

mykongee
mykongee approved these changes Mar 5, 2022
View reviewed changes
Copy link
Collaborator

@mykongee mykongee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job everyone! 🎉

BChiang4
BChiang4 approved these changes Mar 5, 2022
View reviewed changes
Copy link
Contributor

@BChiang4 BChiang4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great Job, approved.

@mykongee mykongee merged commit f29746d into dev Mar 5, 2022
@mykongee mykongee mentioned this pull request Mar 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mykongee mykongee mykongee approved these changes

@FoxEight FoxEight FoxEight approved these changes

@BChiang4 BChiang4 BChiang4 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dplee123 @mykongee @FoxEight @BChiang4 @hersler @nicoflrs