mersge last bit of conflic slove #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Updated files added: - close button for signup and login - button for share - buttons for zoom in and out - some progress on floor menu (w/o toggle) * Updated floor menu UI finished rendering the floor menu UI (just the base version with interactive button to toggle and an image display). * Update .gitignore * fixed some issues and merged branches w/ kim * jest semi working * did the first test for logInModal * temp for honghui * ignore coverage files * remove coverage folder * able to render App * remove unused test * add back RootState Type export, ignored the VS code false error warning, base tester * replaced deprecatedremoveEventListener" deprecated * tester for the "star" node-edge render test * minor update on comments to documentation * update workflow to be tigered on this branch for testing CI/CD * comment out unfinished tests * disable cloud test workflow on this branch * disable debug log, attaching new test funciton to button * optimized the node version constant * making dockerfile for building and serving app * install express.js for hosting server * successfully serving web app * comment update on server.ts * update docker file on docker image run command * switch to build a light weight docker image with only files / node_modules that's production needed * split two dockerfile for building production server * attempts to serve https requests * minor update on comment * added new script, update home page's text * CD workflow, build and upload to Docker Hub * syntax fix * syntax fix 2 * updated unite test base on updates * updated the secrete file storing method * removed un used settings * update CD workflow to use secret env variable * fix version env variable reference * include docker user name for pushing docker image * fix login variable * update deprecated github action * disable previous flow to test the AWS connection * full CICD with AWS EC2 deployment * update on AWS EC2 interaction commands * reference fix * reference fix * workflow syntax fix * checking key pair permission * test only the connection to AWS * change command format pass to EC2 * update key name * format fix * fix attempt * double checked ssh key * pull and run image in EC2 * Full CI-CD workflow finished * remove mock define * checking the variable across jobs * Extract Version in deploy step as well * minor fix * testing deploy workflow with version extraction * Testing full workflow --------- Co-authored-by: poppychan21 <[email protected]> Co-authored-by: paoloyap22 <[email protected]> Co-authored-by: RheuX <[email protected]>
* Updated files added: - close button for signup and login - button for share - buttons for zoom in and out - some progress on floor menu (w/o toggle) * Updated floor menu UI finished rendering the floor menu UI (just the base version with interactive button to toggle and an image display). * Update .gitignore * fixed some issues and merged branches w/ kim * jest semi working * did the first test for logInModal * temp for honghui * ignore coverage files * remove coverage folder * able to render App * remove unused test * add back RootState Type export, ignored the VS code false error warning, base tester * replaced deprecatedremoveEventListener" deprecated * tester for the "star" node-edge render test * minor update on comments to documentation * update workflow to be tigered on this branch for testing CI/CD * comment out unfinished tests * disable cloud test workflow on this branch * disable debug log, attaching new test funciton to button * optimized the node version constant * making dockerfile for building and serving app * install express.js for hosting server * successfully serving web app * comment update on server.ts * update docker file on docker image run command * switch to build a light weight docker image with only files / node_modules that's production needed * split two dockerfile for building production server * attempts to serve https requests * minor update on comment * added new script, update home page's text * CD workflow, build and upload to Docker Hub * syntax fix * syntax fix 2 * updated unite test base on updates * updated the secrete file storing method * removed un used settings * update CD workflow to use secret env variable * fix version env variable reference * include docker user name for pushing docker image * fix login variable * update deprecated github action * disable previous flow to test the AWS connection * full CICD with AWS EC2 deployment * update on AWS EC2 interaction commands * reference fix * reference fix * workflow syntax fix * checking key pair permission * test only the connection to AWS * change command format pass to EC2 * update key name * format fix * fix attempt * double checked ssh key * pull and run image in EC2 * Full CI-CD workflow finished * remove mock define * checking the variable across jobs * Extract Version in deploy step as well * minor fix * testing deploy workflow with version extraction * Testing full workflow --------- Co-authored-by: poppychan21 <[email protected]> Co-authored-by: paoloyap22 <[email protected]> Co-authored-by: RheuX <[email protected]>
paoloyap22
approved these changes
Sep 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.