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.

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

Merge Dev into master #173

Merged
merged 45 commits into from
Sep 12, 2024
Merged

Merge Dev into master #173

merged 45 commits into from
Sep 12, 2024

Conversation

aymanhab
Copy link
Member

Development branch has many changes on it, this merges these changes to master

AlbertoCasasOrtiz and others added 30 commits February 29, 2024 11:58
Create css file that removes top bar and drawer in modelviewpage.
… output file to download. This change should go along with accompanying update to backend done manually on aws
Modify front end to maintain user id and pass it to backend lambda
CSS defining gui mode loaded dinamically through url param.
Removed important, loading only needed css.
Using typescript instead of css file to switch between app and gui mode.
Getting gui param and storing as viewer state
Copy link

netlify bot commented Sep 11, 2024

Deploy Preview for grand-clafoutis-85edb2 failed.

Name Link
🔨 Latest commit 80821dd
🔍 Latest deploy log https://app.netlify.com/sites/grand-clafoutis-85edb2/deploys/66e3378f4d43f50007535d42

Copy link

netlify bot commented Sep 11, 2024

Deploy Preview for comforting-speculoos-d9e100 failed.

Name Link
🔨 Latest commit 80821dd
🔍 Latest deploy log https://app.netlify.com/sites/comforting-speculoos-d9e100/deploys/66e3378fe653c80008f24dfe

@aymanhab
Copy link
Member Author

Per our discussion yesterday, this brings master in sync. with Dev so that new changes can be isolated/tested with better granularity.

Copy link
Collaborator

@AlbertoCasasOrtiz AlbertoCasasOrtiz left a comment

Choose a reason for hiding this comment

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

Everything looks good to me. Just a few comments on the code.

I have tested dev with a few files and everything seems to work fine.

src/backend/readme.md Outdated Show resolved Hide resolved
src/components/Components/DropFile.tsx Outdated Show resolved Hide resolved
src/state/ViewerState.tsx Show resolved Hide resolved
@aymanhab
Copy link
Member Author

I believe I responded to your feedback @AlbertoCasasOrtiz please let me know if we should merge. Thank you

Copy link
Collaborator

@AlbertoCasasOrtiz AlbertoCasasOrtiz left a comment

Choose a reason for hiding this comment

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

Everything Looks good, I just changed the name of the README_1.md file to README.md.

@aymanhab
Copy link
Member Author

Thanks much @AlbertoCasasOrtiz 👍 Merging

@aymanhab aymanhab merged commit 6411bf4 into master Sep 12, 2024
1 of 9 checks passed
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.

2 participants