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

Launch staging to main #88

Merged
merged 261 commits into from
Apr 15, 2023
Merged

Launch staging to main #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
261 commits
Select commit Hold shift + click to select a range
4c78264
working on state
andrewaltman1 Mar 29, 2023
71c6c41
added redux and components
andrewaltman1 Mar 29, 2023
9e152d9
refactored destination render
andrewaltman1 Mar 29, 2023
7702987
remote inputs update state
andrewaltman1 Mar 29, 2023
83ea373
started two component remote approach
andrewaltman1 Mar 30, 2023
e4d13d4
origin and destination are seperated
andrewaltman1 Mar 30, 2023
685bc75
fleshed out api calls
ZGDJ Mar 30, 2023
30493fa
Merge pull request #5 from oslabs-beta/sdk-library
mjhuff Mar 30, 2023
4a82a76
Fixed AWS logic.
mjhuff Mar 30, 2023
06d2425
Merge pull request #6 from oslabs-beta/workingAWSLogic
ZGDJ Mar 30, 2023
10ce5b0
more work on onChange
andrewaltman1 Mar 30, 2023
7940264
fixing difference issues
andrewaltman1 Apr 1, 2023
d30778d
starting work on overlay
andrewaltman1 Apr 1, 2023
8bd3e45
finished remote component logic
andrewaltman1 Apr 1, 2023
ce26a08
Merge branch 'dev' into overlay
Apr 1, 2023
dc0f900
Merge pull request #7 from oslabs-beta/overlay
Apr 1, 2023
d6ba576
finished the overlay functionality
andrewaltman1 Apr 1, 2023
602bdb6
Merge branch 'overlay' of https://github.com/oslabs-beta/CloudShift i…
andrewaltman1 Apr 1, 2023
09b39d5
Added getBuckets rclone logic
mjhuff Apr 3, 2023
2000ddb
Merge pull request #8 from oslabs-beta/getBucketsReduxLogic
andrewaltman1 Apr 3, 2023
604ce03
finished bucket drop down
andrewaltman1 Apr 3, 2023
8245e0e
BucketListing now working with backend
mjhuff Apr 3, 2023
da6f57e
Merge pull request #9 from oslabs-beta/workingListBuckets
mjhuff Apr 3, 2023
5f7644f
pulled down dev changes
andrewaltman1 Apr 3, 2023
2428e86
pulled down dev changes
andrewaltman1 Apr 3, 2023
5038185
Updated listBuckets to support CF
mjhuff Apr 3, 2023
c31835a
Merge pull request #10 from oslabs-beta/cloudflareListBucketsUpdate
mjhuff Apr 3, 2023
a3c113e
Merge branch 'overlay' of https://github.com/oslabs-beta/CloudShift i…
Apr 3, 2023
a23bffb
Merge branch 'dev' into bucket-merge
Apr 3, 2023
4d0bba5
working remote buckets
Apr 3, 2023
43be2b0
Merge pull request #11 from oslabs-beta/bucket-merge
mjhuff Apr 3, 2023
c4ddd38
Rclone copy working
mjhuff Apr 4, 2023
ea7084f
Merge pull request #12 from oslabs-beta/rcloneCopyWorking
Apr 4, 2023
0c6908c
added tailwind css package
Apr 4, 2023
a81dbcd
Merge pull request #13 from oslabs-beta/ansel
mjhuff Apr 4, 2023
605f1f6
Fixed bug concerning AWS config file
mjhuff Apr 4, 2023
8f116e4
Merge pull request #14 from oslabs-beta/rcloneCopyRegionErrorHandling
Apr 4, 2023
5efeed0
fixed Amazon/Cloud and could delete inputs
Apr 4, 2023
9db6f44
Merge pull request #15 from oslabs-beta/amazonCloud
iredonkulousv2 Apr 4, 2023
777ac8b
CSS fixes and solved merge conflicts for Ansel branch
mjhuff Apr 5, 2023
81f6c10
Merge pull request #16 from oslabs-beta/cssFixes
iredonkulousv2 Apr 5, 2023
795978e
Added basic error handling for rcloneListBuckets
mjhuff Apr 5, 2023
8cd23ae
Merge pull request #17 from oslabs-beta/getBucketLocErrorHandling
Apr 5, 2023
9790821
a
Apr 5, 2023
069459f
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
Apr 5, 2023
1dd68cf
added portal
Apr 5, 2023
ffb8918
Merge pull request #18 from oslabs-beta/portal
iredonkulousv2 Apr 5, 2023
d5e6f34
Co-authored-by: iredonkulousv2 <[email protected]>
ZGDJ Apr 5, 2023
4eff34d
commit
ZGDJ Apr 5, 2023
6f5fd9a
Merge branch 'dev'
ZGDJ Apr 5, 2023
fcc6393
Added credential error handling for Cloudflare.
mjhuff Apr 5, 2023
96d847c
Finished basic errorGenerator
mjhuff Apr 5, 2023
522dd4a
Merge pull request #19 from oslabs-beta/helpfulErrorMessages
iredonkulousv2 Apr 5, 2023
e8fcecd
half
ZGDJ Apr 5, 2023
c3bce08
Package.json changes
mjhuff Apr 5, 2023
e8437ab
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
mjhuff Apr 5, 2023
c7ccb47
Merge pull request #20 from oslabs-beta/packagejsonChanges
mjhuff Apr 5, 2023
74e377d
Co-authored-by: iredonkulousv2 <[email protected]>
ZGDJ Apr 5, 2023
8951fa7
added gradient and conditonal rendering of icons
ZGDJ Apr 5, 2023
d50871c
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
ZGDJ Apr 5, 2023
8ddbf4a
Merge branch 'dev' into cssAdditionalChanges
ZGDJ Apr 5, 2023
4c131d3
Merge pull request #24 from oslabs-beta/cssAdditionalChanges
iredonkulousv2 Apr 5, 2023
02556ff
Added basic websocket functionality
mjhuff Apr 6, 2023
65183d7
Added relevant client state for sockets
mjhuff Apr 6, 2023
a8d69b5
nothing
Apr 6, 2023
b9f952a
fixed amazon and can change input
Apr 6, 2023
bde0b09
added a loading button and logic to buckets
Apr 6, 2023
8bd08a6
added loading bucket and moved migration button
Apr 6, 2023
acfbd39
add loading buckets and half of overlay
Apr 6, 2023
cc55b14
Merge pull request #27 from oslabs-beta/tail
ZGDJ 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
780035d
Co-authored-by: iredonkulousv2 <[email protected]>
ZGDJ Apr 6, 2023
0d99d4c
Merge pull request #28 from oslabs-beta/progressOverlay
iredonkulousv2 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
827a8a2
Merge pull request #29 from oslabs-beta/webSockets
mjhuff Apr 6, 2023
54cfea3
commit before pull
andrewaltman1 Apr 6, 2023
e630c00
fixed form reflection bug
mjhuff Apr 6, 2023
7e0daec
Merge pull request #30 from oslabs-beta/formFixes
mjhuff Apr 6, 2023
1ccc729
progress
Apr 6, 2023
4066f13
Merge pull request #31 from oslabs-beta/error
ZGDJ Apr 6, 2023
4e0d7bc
added some front side error handling
Apr 7, 2023
cbc2b49
added front error handling
Apr 7, 2023
00b85b7
added front error trim
Apr 7, 2023
1b272f2
Merge pull request #33 from oslabs-beta/error
ZGDJ Apr 7, 2023
f2809c1
Error handling for in sync buckets
mjhuff Apr 7, 2023
5af8286
Merge branch 'dev' into rcloneCopyErrorHandling
mjhuff Apr 7, 2023
f365066
Merge pull request #34 from oslabs-beta/rcloneCopyErrorHandling
mjhuff Apr 7, 2023
608de4e
Co-authored-by: iredonkulousv2 <[email protected]>
ZGDJ Apr 7, 2023
089c519
add error for destination
Apr 8, 2023
19e2cad
Merge pull request #35 from oslabs-beta/error
ZGDJ Apr 8, 2023
5b7b1ae
added return to server responses
Apr 8, 2023
87ff123
Refactored apis to async thunks
mjhuff Apr 8, 2023
6b12219
Added more error handling
mjhuff Apr 8, 2023
79865ad
Solved merge conflicts.
mjhuff Apr 8, 2023
097a292
Merge pull request #37 from oslabs-beta/rtkQueryRefactoring
mjhuff Apr 8, 2023
2f1f9bc
reset state
Apr 8, 2023
e3df630
solved merge conflicts
Apr 8, 2023
6cdf96a
cleaned up code
Apr 8, 2023
93590f7
Merge pull request #39 from oslabs-beta/reset
mjhuff Apr 8, 2023
c456c0a
solved the problem with autocomplete
Apr 8, 2023
48a8c96
fixed transfer percentage
Apr 8, 2023
75ccd6d
Merge pull request #36 from oslabs-beta/ansel
mjhuff Apr 8, 2023
07ec155
Merge pull request #40 from oslabs-beta/transfer
mjhuff Apr 8, 2023
fe343e1
Fixed a bug with bucketOptions
mjhuff Apr 8, 2023
d125484
Removed console.logs
mjhuff Apr 8, 2023
ed55c50
Merge pull request #41 from oslabs-beta/bugFixBucketOptions
iredonkulousv2 Apr 8, 2023
6827d66
Remove rclone config after transfer
mjhuff Apr 10, 2023
e0f5c18
Merge pull request #42 from oslabs-beta/removeRcloneConfig
mjhuff Apr 10, 2023
6012e45
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into …
andrewaltman1 Apr 10, 2023
3846228
Implemented list bucket functionality for Azure
mjhuff Apr 10, 2023
e72aa04
small icons for cloud images
Apr 10, 2023
ea86b2e
Merge pull request #43 from oslabs-beta/ansel
Apr 10, 2023
2adf0b2
Added azure support to backend
mjhuff Apr 10, 2023
7790f57
Merge branch 'dev' into backendAzureSupport
mjhuff Apr 10, 2023
c886db7
Merge pull request #44 from oslabs-beta/backendAzureSupport
mjhuff Apr 10, 2023
f840883
Fixed access denied due to incorrect permission errors
mjhuff Apr 10, 2023
f64cf1a
fixed progressBar
Apr 10, 2023
423d29e
Merge pull request #46 from oslabs-beta/progressBar
mjhuff Apr 10, 2023
95b1211
Resolved merge conflicts
mjhuff Apr 10, 2023
cfe59ae
Merge pull request #45 from oslabs-beta/errorFixUnauthorized
mjhuff Apr 10, 2023
d4fae81
commit before pull
andrewaltman1 Apr 13, 2023
e0aa8b3
remote
Apr 13, 2023
98d525a
Added CI/CD for formatting & deleting merged branches
mjhuff Apr 13, 2023
d253de6
consolidating remotes into one component
andrewaltman1 Apr 13, 2023
6e23e1c
Updated CI prettier version
mjhuff Apr 13, 2023
b1508c6
Deleted branch delete action
mjhuff Apr 13, 2023
4e282e6
Merge pull request #47 from oslabs-beta/basicCICD
mjhuff Apr 13, 2023
b0584c1
Delete build directory
mjhuff Apr 13, 2023
556ecc4
Merge pull request #48 from oslabs-beta/removeBuildFolder
mjhuff Apr 13, 2023
27c013d
build folder now correctly running
mjhuff Apr 13, 2023
ae12f18
Created semantic names for package.json scripts
mjhuff Apr 13, 2023
f78557b
combined two remote components into one
andrewaltman1 Apr 13, 2023
d0bb9db
half
Apr 13, 2023
85f7efa
ErrorComponent
Apr 13, 2023
dcd743a
Fixed tailwind CSS issues
mjhuff Apr 13, 2023
7f7423e
Prettified Code!
mjhuff Apr 13, 2023
e8eab61
Merge pull request #49 from oslabs-beta/buildTesting
Apr 13, 2023
feef2a4
Cleaned up package.json for staging
mjhuff Apr 13, 2023
f6259fc
Linted and finalized staging
mjhuff Apr 13, 2023
f9886d4
updated github actions
mjhuff Apr 13, 2023
d55e084
combined oirigin/destination components to remote
andrewaltman1 Apr 13, 2023
bfd58a5
a
Apr 13, 2023
2027093
Merge branch 'UI' of https://github.com/oslabs-beta/CloudShift into UI
Apr 13, 2023
43cd27a
added migration button logic
Apr 13, 2023
2ad4a00
Merge pull request #50 from oslabs-beta/UI
mjhuff Apr 13, 2023
fff1ac8
Added whitelisted files CI
mjhuff Apr 14, 2023
5acaba5
Updated prettier CI for bug fixes
mjhuff Apr 14, 2023
9671487
Merge pull request #51 from oslabs-beta/stagingWhitelist
mjhuff Apr 14, 2023
ebcbc2e
test staging
mjhuff Apr 14, 2023
79343a4
test 2
mjhuff Apr 14, 2023
a6fcf7a
test 3
mjhuff Apr 14, 2023
4bec9f8
Fixed prettier CI
mjhuff Apr 14, 2023
275e45c
Prettified Code!
mjhuff Apr 14, 2023
6560f97
Merge pull request #53 from oslabs-beta/CIBugFixes
mjhuff Apr 14, 2023
83c9d61
Fixed typos -- testing CI
mjhuff Apr 14, 2023
88df30e
Prettified Code!
mjhuff Apr 14, 2023
5ba0077
Merge pull request #55 from oslabs-beta/typoFixing
mjhuff Apr 14, 2023
ca517fe
Changed whitelist logic
mjhuff Apr 14, 2023
52d686d
Fixed bug in linux shell command
mjhuff Apr 14, 2023
394faaf
Added required github credentials
mjhuff Apr 14, 2023
4414636
Added paths to ignore
mjhuff Apr 14, 2023
a8a85e8
Merge pull request #58 from oslabs-beta/whitelistChanges
mjhuff Apr 14, 2023
e708c2c
added red error input
Apr 14, 2023
8421c8a
Dockerized app
mjhuff Apr 14, 2023
f4c3ea3
Updated CI for Docker
mjhuff Apr 14, 2023
9cb95a5
Merge pull request #61 from oslabs-beta/CICDUpdates
mjhuff Apr 14, 2023
702469b
Merge pull request #60 from oslabs-beta/UI
mjhuff Apr 14, 2023
0a6c4f3
Merge pull request #62 from oslabs-beta/docker
mjhuff Apr 14, 2023
3897d43
Boilerplate and basic controllers
mjhuff Mar 28, 2023
3a00195
Updated CD for Docker
mjhuff Apr 14, 2023
86e7f39
updated whitelist to include Dockerfile on paths.ignore
mjhuff Apr 14, 2023
a83faed
Merge pull request #63 from oslabs-beta/updateDockerCD
mjhuff Apr 14, 2023
05173c1
fixed CD script error
mjhuff Apr 14, 2023
e0a9d4b
Merge pull request #64 from oslabs-beta/updateDockerCD
mjhuff Apr 14, 2023
bc41ff5
further cd bug fixes for docker
mjhuff Apr 14, 2023
bc187ef
Merge pull request #65 from oslabs-beta/updateDockerCD
mjhuff Apr 14, 2023
7b19600
more CD bugfixes for docker
mjhuff Apr 14, 2023
f84a05c
Merge pull request #66 from oslabs-beta/updateDockerCD
mjhuff Apr 14, 2023
76c9946
Update update-docker.yml
mjhuff Apr 14, 2023
f5c3544
Merge pull request #67 from oslabs-beta/patch-1
mjhuff Apr 14, 2023
8b28122
Update update-docker.yml
mjhuff Apr 14, 2023
f35e5c8
Merge pull request #68 from oslabs-beta/patch-2
mjhuff Apr 14, 2023
1be36ae
Update update-docker.yml
mjhuff Apr 14, 2023
a30b967
Merge pull request #69 from oslabs-beta/patch-3
mjhuff Apr 14, 2023
840da55
Update update-docker.yml
mjhuff Apr 14, 2023
145e357
Merge pull request #70 from oslabs-beta/patch-4
mjhuff Apr 14, 2023
9713575
solved merge conflicts
mjhuff Apr 14, 2023
009b68a
Deleted unnecessary files
mjhuff Apr 14, 2023
253fc53
Prettified Code!
mjhuff Apr 14, 2023
7c13c03
Merge pull request #71 from oslabs-beta/mergeFix
mjhuff Apr 14, 2023
f6fc792
updated styling given azure update
Apr 14, 2023
7eedb7a
Merge pull request #72 from oslabs-beta/ansel
mjhuff Apr 14, 2023
a109dd2
Solved css change merge conflicts
mjhuff Apr 14, 2023
059c346
Delete build directory
mjhuff Apr 14, 2023
00b0f9c
Prettified Code!
mjhuff Apr 14, 2023
d6ab0b4
Merge pull request #74 from oslabs-beta/anselMergeFixes
mjhuff Apr 14, 2023
56db7fa
Merge pull request #73 from oslabs-beta/mjhuff-patch-1
Apr 14, 2023
777a9c9
added new CI for build folder
mjhuff Apr 14, 2023
2ced56a
Merge pull request #75 from oslabs-beta/updateCICD
mjhuff Apr 14, 2023
230d6f8
Fixed CSS & added button hover
mjhuff Apr 14, 2023
021ef54
Prettified Code!
mjhuff Apr 14, 2023
0964da9
Merge pull request #77 from oslabs-beta/cssFixes
mjhuff Apr 14, 2023
c898214
added focus and back button
Apr 15, 2023
368e492
Merge branch 'dev' into focus
Apr 15, 2023
8609752
added focus
Apr 15, 2023
88a1e97
Prettified Code!
iredonkulousv2 Apr 15, 2023
2193cdb
Basic testing boilerplate
mjhuff Apr 15, 2023
9b9a1bf
Fixed spelling
mjhuff Apr 15, 2023
8406e71
Prettified Code!
mjhuff Apr 15, 2023
fac1ce4
Merge pull request #78 from oslabs-beta/focus
mjhuff Apr 15, 2023
8997e09
Merge branch 'dev' of https://github.com/oslabs-beta/CloudShift into dev
Apr 15, 2023
9acf294
Merge pull request #79 from oslabs-beta/jest
iredonkulousv2 Apr 15, 2023
76ff680
merged with jest
Apr 15, 2023
4d0ff82
made vertical and added zoom
Apr 15, 2023
40e1c63
Started readme
mjhuff Apr 15, 2023
90db3f5
added reset icon
Apr 15, 2023
fc0e75f
Finished installation section
mjhuff Apr 15, 2023
803eadc
add cloudshift icon
Apr 15, 2023
577e424
Prettified Code!
iredonkulousv2 Apr 15, 2023
53b1b34
Finished Usage & Credentials section
mjhuff Apr 15, 2023
937fa9e
Finished basic readme
mjhuff Apr 15, 2023
391f05d
Merge pull request #81 from oslabs-beta/readme
Apr 15, 2023
dd513de
Update README.md
mjhuff Apr 15, 2023
1fa1da9
Merge pull request #82 from oslabs-beta/patch-1
mjhuff Apr 15, 2023
ed12f31
Update README.md
mjhuff Apr 15, 2023
d91d34a
Merge pull request #83 from oslabs-beta/patch-2
mjhuff Apr 15, 2023
4033cdb
Update README.md
mjhuff Apr 15, 2023
700f181
Merge pull request #84 from oslabs-beta/patch-3
mjhuff Apr 15, 2023
c51ea0e
New logo & readme fixes
mjhuff Apr 15, 2023
2cccb79
Added banner to imgur
mjhuff Apr 15, 2023
4307495
solved merge conflict with dev
mjhuff Apr 15, 2023
4224c29
Merge pull request #85 from oslabs-beta/readme
mjhuff Apr 15, 2023
149b29d
styling adapts to changing browser size
Apr 15, 2023
8d48bef
Merge branch 'resizing' of https://github.com/oslabs-beta/CloudShift …
mjhuff Apr 15, 2023
82dcae0
Fixed minor CSS bugs
mjhuff Apr 15, 2023
b99b4cb
Prettified Code!
mjhuff Apr 15, 2023
5995bb3
Merge pull request #86 from oslabs-beta/cssUpdates
andrewaltman1 Apr 15, 2023
8012236
updated package*.json
mjhuff Apr 15, 2023
f7541ca
added build
mjhuff Apr 15, 2023
7c15bb4
solved staging merge conflicts
mjhuff Apr 15, 2023
e881d41
Merge pull request #87 from oslabs-beta/softLaunchToStaging
mjhuff Apr 15, 2023
5549177
Delete test directory
mjhuff Apr 15, 2023
4c2ea85
Delete jest.config.js
mjhuff Apr 15, 2023
fd2bc85
Removed CICD for main
mjhuff Apr 15, 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
Prev Previous commit
Next Next commit
Delete test directory
  • Loading branch information
@mjhuff
mjhuff authored Apr 15, 2023
commit 554917761b54ac8af0b5b321c2889af82f84328c
26 changes: 0 additions & 26 deletions test/client.js
View file
Open in desktop

This file was deleted.

Empty file removed test/reduxStore.js
View file
Open in desktop
Empty file.
Empty file removed test/server.js
View file
Open in desktop
Empty file.