-
-
Notifications
You must be signed in to change notification settings - Fork 141
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 v.1.13.0 into Swell's OS Labs Main repo #333
Merged
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
Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]>
Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]>
Co-authored-by: Tanner Malmedal <[email protected]>
…ion-1.12.0 into team/queryeval add splitpanes Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]>
Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]>
Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]>
… resizeable panes (#3) * add TRPC EntryForm and dummy request Co-authored-by: Mihran <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: Jack Sonoda <[email protected]> * read trpc request body * "remove props and methodChange handler" * "add newRequestProtocolSelected" * send tRPC query and mutate Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * add react-split to panes * finalize trpc query functionality Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * add responsive draggable boxes throughout the app Co-authored-by: Tanner Malmedal <[email protected]> * reading url from trpc composer * Create temp display for responses Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> * Create temp display for responses Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> * have trpc data display in response pane Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * add commented string to json parse function Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * send/receive batch tRPC requests --------- Co-authored-by: EnYa <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Mihran Baytaryan <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: KingzandBean <[email protected]>
* add TRPC EntryForm and dummy request * read trpc request body * "remove props and methodChange handler" * "add newRequestProtocolSelected" * add protocol select slices * move protocol select logic to reducers * snapshot before webRTC modifictions * fix webRTC appCrash * Fix webRTC bug --------- Co-authored-by: David Beame <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Mihran Baytaryan <[email protected]>
…nse pane also add uuid to response id Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]>
Co-authored-by: Mihran <[email protected]>
add multiple query functionality within swell app combined with respo…
Co-authored-by: Mihran <[email protected]>
Co-authored-by: Mihran <[email protected]>
* add TRPC EntryForm and dummy request Co-authored-by: Mihran Baytaryan <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: Jack Sonoda <[email protected]> * read trpc request body * "remove props and methodChange handler" * "add newRequestProtocolSelected" * send tRPC query and mutate Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * add react-split to panes * finalize trpc query functionality Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * add responsive draggable boxes throughout the app Co-authored-by: Tanner Malmedal <[email protected]> * reading url from trpc composer * Create temp display for responses Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> * Create temp display for responses Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> * WIP Links * Styling UI of NavBar tabs Co-authored-by: Mihran <[email protected]> * Co-authored-by: Mihran <[email protected]> * Updated Styling to NavBar Components; shows selected composer Co-authored-by: Mihran <[email protected]> * Updated styling to NavBar Components; highlights selected composer Co-authored-by: Mihran <[email protected]> --------- Co-authored-by: EnYa <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Mihran Baytaryan <[email protected]> Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: KingzandBean <[email protected]>
…n tRPC Co-authored-by: Jaden Nguyen <[email protected]>
…ev branch (#9) * get subscriptions working, seperate from rest of app functionality. Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> * add conditional trpc client construction * figure out how to add subscriptions to response pane * add working protocol select file, didn't merge properly previously Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: David Beame <[email protected]> Co-authored-by: Mihran Baytaryan <[email protected]> --------- Co-authored-by: Tanner Malmedal <[email protected]> Co-authored-by: Jack Sonoda <[email protected]> Co-authored-by: Jaden Nguyen <[email protected]> Co-authored-by: Mihran <[email protected]> Co-authored-by: KingzandBean <[email protected]> Co-authored-by: EnYa <[email protected]>
To indicate what the module is for
added new gifs and removed some old ones
Update dev and user-facing readmes
Add incomplete testing coverage to dev `readme`
For some reason, the app's title for production is not capitalized. This enforces the app has a title with first letter capitalized
Update DEV-README.md
Jason/screenshots
Merge dev into master
Travis CI build is broken and future iterations should consider creating CI/CD pipeline with GitHub Action
The current path when the app first started is the HTTP/2 page. The local `state`, however, does not point to the same thing. This commit ensures the initial `curPage` state in `ProtocolSelect.tsx` is consistent with `currPath` and the request fields and contents are updated accordingly. Tests are also updated to handle the disabling feature
jjhuang3
approved these changes
Apr 13, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything looks good since this is essentially our own master in v13.
csuzukida
approved these changes
Apr 13, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Some of the packages in `devdependencies` are required for the app to open in production
Ensure any new files added to `dist`, `main_process` and `src/server` folders are included in the packaged app
It boils down to: 1. We should call `fork` in main process (https://www.matthewslipper.com/2019/09/22/everything-you-wanted-electron-child-process.html) 2. We need to require the mock server when launched in packaged, production mode, similar to how express is required upon app startup. Or else the packaged app will not recognize the mock server at all (https://stackoverflow.com/a/46608130)
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.
Note that this PR contains some of the changes from v.1.12.0 as well. From a quick investigation, 2 things are happening:
dev
branch on Swell's OS Labs Main and then merged from saiddev
intomaster
. The forked branch seems to have contained a few more commits than themaster
branch here.Since we have confirmed that most features work as expected via E2E and manual testing, we should be okay to merge.