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

Web sockets #29

Merged
merged 11 commits into from
Apr 6, 2023
Merged

Web sockets #29

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8437ab
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
mjhuff Apr 5, 2023
02556ff
Added basic websocket functionality
mjhuff Apr 6, 2023
65183d7
Added relevant client state for sockets
mjhuff Apr 6, 2023
9a4810c
Basic websocket logic finished for progress bar
mjhuff Apr 6, 2023
09bb508
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
mjhuff Apr 6, 2023
29a106d
Solved merge conflicts
mjhuff Apr 6, 2023
dd8522d
Working progress bar
mjhuff Apr 6, 2023
eac2dc0
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
mjhuff Apr 6, 2023
fe16ff9
solved merge conflicts
mjhuff Apr 6, 2023
160e75a
Reverted migrating state back to false
mjhuff Apr 6, 2023
30c4b75
Minor CSS changes
mjhuff Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
  • Loading branch information
@mjhuff
mjhuff committed Apr 5, 2023
commit e8437abe90601b70378dc49e8f2f402911c9123d
6 changes: 1 addition & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@
"description": "A cloud-to-cloud migration tool.",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon server/server.js",
"build": "NODE_ENV=production webpack",
"devWithServer": "NODE_ENV=development nodemon server/server.js & NODE_ENV=development webpack serve",
"dev": " NODE_ENV=development webpack serve"
"start": "NODE_ENV=development nodemon server/server.js & NODE_ENV=development webpack serve"
},
"repository": {
"type": "git",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.