diff --git a/portfolio_backend/Cargo.lock b/portfolio_backend/Cargo.lock index 76a8ede..a28c66a 100644 --- a/portfolio_backend/Cargo.lock +++ b/portfolio_backend/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aho-corasick" version = "0.7.15" @@ -50,9 +52,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bcrypt" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d0faafe9e089674fc3efdb311ff5253d445c79d85d1d28bd3ace76d45e7164" +checksum = "f691e63585950d8c1c43644d11bab9073e40f5060dd2822734ae7c3dc69a3a80" dependencies = [ "base64 0.13.0", "blowfish", @@ -67,9 +69,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blowfish" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fa6a061124e37baba002e496d203e23ba3d7b73750be82dbfbc92913048a5b" +checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab" dependencies = [ "byteorder", "cipher", @@ -134,9 +136,9 @@ dependencies = [ [[package]] name = "cipher" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ "generic-array", ] @@ -207,9 +209,9 @@ dependencies = [ [[package]] name = "diesel" -version = "1.4.6" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "047bfc4d5c3bd2ef6ca6f981941046113524b9a9f9a7cbdfdd7ff40f58e6f542" +checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" dependencies = [ "bitflags", "byteorder", @@ -466,7 +468,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio", + "tokio 0.2.25", "tokio-util", "tracing", "tracing-futures", @@ -579,7 +581,7 @@ dependencies = [ "itoa", "pin-project", "socket2", - "tokio", + "tokio 0.2.25", "tower-service", "tracing", "want", @@ -594,7 +596,7 @@ dependencies = [ "bytes 0.5.6", "hyper 0.13.10", "native-tls", - "tokio", + "tokio 0.2.25", "tokio-tls", ] @@ -1146,7 +1148,7 @@ dependencies = [ "rocket_cors", "serde", "serde_json", - "tokio", + "tokio 0.3.7", "uuid", ] @@ -1326,7 +1328,7 @@ dependencies = [ "pin-project-lite 0.2.6", "serde", "serde_urlencoded", - "tokio", + "tokio 0.2.25", "tokio-tls", "url 2.2.1", "wasm-bindgen", @@ -1352,12 +1354,12 @@ dependencies = [ [[package]] name = "rocket" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7febfdfd4d43facfc7daba20349ebe2c310c6735bd6a2a9255ea8bc425b4cb13" +checksum = "4a7ab1dfdc75bb8bd2be381f37796b1b300c45a3c9145b34d86715e8dd90bf28" dependencies = [ "atty", - "base64 0.12.3", + "base64 0.13.0", "log 0.4.14", "memchr", "num_cpus", @@ -1373,9 +1375,9 @@ dependencies = [ [[package]] name = "rocket_codegen" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceac2c55b2c8b1cdc53add64332defa5fc227f64263b86b4114d1386286d42a3" +checksum = "1729e687d6d2cf434d174da84fb948f7fef4fac22d20ce94ca61c28b72dbcf9f" dependencies = [ "devise", "glob", @@ -1388,9 +1390,9 @@ dependencies = [ [[package]] name = "rocket_contrib" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7954a707f9ca18aa74ca8c1f5d1f900f52a4dceb68e96e3112143f759cfd20e" +checksum = "6b6303dccab46dce6c7ac26c9b9d8d8cde1b19614b027c3f913be6611bff6d9b" dependencies = [ "diesel", "log 0.4.14", @@ -1404,9 +1406,9 @@ dependencies = [ [[package]] name = "rocket_contrib_codegen" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30deb6dec53b91fac3538a2a3935cf13e0f462745f9f33bf27bedffbe7265b5d" +checksum = "a0f2cbcb6c09b3ac0acdf77682ff8c9d1f317361498a773ee50b32be7fddfe2b" dependencies = [ "devise", "quote 0.6.13", @@ -1429,9 +1431,9 @@ dependencies = [ [[package]] name = "rocket_http" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce364100ed7a1bf39257b69ebd014c1d5b4979b0d365d8c9ab0aa9c79645493d" +checksum = "6131e6e6d38a9817f4a494ff5da95971451c2eb56a53915579fc9c80f6ef0117" dependencies = [ "cookie", "hyper 0.10.16", @@ -1689,6 +1691,16 @@ dependencies = [ "slab", ] +[[package]] +name = "tokio" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46409491c9375a693ce7032101970a54f8a2010efb77e13f70788f0d84489e39" +dependencies = [ + "autocfg", + "pin-project-lite 0.2.6", +] + [[package]] name = "tokio-tls" version = "0.3.1" @@ -1696,7 +1708,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.25", ] [[package]] @@ -1710,7 +1722,7 @@ dependencies = [ "futures-sink", "log 0.4.14", "pin-project-lite 0.1.12", - "tokio", + "tokio 0.2.25", ] [[package]] diff --git a/portfolio_backend/Cargo.toml b/portfolio_backend/Cargo.toml index ca900d3..da30122 100644 --- a/portfolio_backend/Cargo.toml +++ b/portfolio_backend/Cargo.toml @@ -7,23 +7,23 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bcrypt = "0.9.0" +bcrypt = "0.10.1" chrono = { version = "0.4", features = ["serde"] } -diesel = { version = "1.4.6", features = ["chrono", "postgres"] } +diesel = { version = "1.4.8", features = ["chrono", "postgres"] } diesel_migrations = { version = "1.4.0", features = ["postgres"] } dotenv = "0.15" futures = "0.3" hubcaps = "0.6" jsonwebtoken = "7.2.0" lazy_static = "1.4.0" -rocket = { version = "0.4.7", default-features = false } +rocket = { version = "0.4.10", default-features = false } rocket_cors = { version = "0.5.2", default-features = false } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -tokio = "0.2.25" +tokio = "0.3.7" uuid = { version = "0.8", features = ["v4"] } [dependencies.rocket_contrib] -version = "0.4.7" +version = "0.4.10" default-features = false features = ["json", "diesel_postgres_pool"] diff --git a/portfolio_frontend/package.json b/portfolio_frontend/package.json index 8571137..eaf96e2 100644 --- a/portfolio_frontend/package.json +++ b/portfolio_frontend/package.json @@ -18,14 +18,14 @@ "@types/react-router-bootstrap": "^0.24.5", "@types/react-router-dom": "^5.1.7", "@types/react-scroll": "^1.8.2", - "axios": "^0.21.2", + "axios": "^0.24.0", "bootstrap": "^4.5.3", "github-contributions-canvas": "^0.6.0", "immutable": "^4.0.0-rc.12", "react": "^17.0.1", "react-bootstrap": "^1.4.0", "react-dom": "^17.0.1", - "react-router-bootstrap": "^0.25.0", + "react-router-bootstrap": "^0.26.0", "react-router-dom": "^5.2.0", "react-scripts": "4.0.3", "react-scroll": "^1.8.1", diff --git a/portfolio_frontend/yarn.lock b/portfolio_frontend/yarn.lock index 55d8bc2..c6ce039 100644 --- a/portfolio_frontend/yarn.lock +++ b/portfolio_frontend/yarn.lock @@ -2733,12 +2733,12 @@ axe-core@^4.0.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.3.tgz#b55cd8e8ddf659fe89b064680e1c6a4dceab0325" integrity sha512-/lqqLAmuIPi79WYfRpy2i8z+x+vxU3zX2uAm0gs1q52qTuKwolOj1P8XbufpXcsydrpKx2yGn2wzAnxCMV86QA== -axios@^0.21.2: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== +axios@^0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" + integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== dependencies: - follow-redirects "^1.14.0" + follow-redirects "^1.14.4" axobject-query@^2.2.0: version "2.2.0" @@ -5278,11 +5278,16 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.0.0, follow-redirects@^1.14.0: +follow-redirects@^1.0.0: version "1.14.4" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379" integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g== +follow-redirects@^1.14.4: + version "1.14.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" + integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -9153,7 +9158,7 @@ prop-types-extra@^1.1.0: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.5.10, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -9425,12 +9430,12 @@ react-refresh@^0.8.3: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f" integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg== -react-router-bootstrap@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/react-router-bootstrap/-/react-router-bootstrap-0.25.0.tgz#5d1a99b5b8a2016c011fc46019d2397e563ce0df" - integrity sha512-/22eqxjn6Zv5fvY2rZHn57SKmjmJfK7xzJ6/G1OgxAjLtKVfWgV5sn41W2yiqzbtV5eE4/i4LeDLBGYTqx7jbA== +react-router-bootstrap@^0.26.0: + version "0.26.0" + resolved "https://registry.yarnpkg.com/react-router-bootstrap/-/react-router-bootstrap-0.26.0.tgz#822e2659d221e4feed700ad959aee2cc809b338a" + integrity sha512-auVpsCOYgI+3CrmtpVjme8ucz76iiMvJhv2BrnWof2HtimrF9NtAHtFzdZrsku5hwp166EPbz7IuSyHJA8kkdA== dependencies: - prop-types "^15.5.10" + prop-types "^15.7.2" react-router-dom@^5.2.0: version "5.3.0"