From cf267657dd06582b8b4fd67633d0376f6f3078be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 07:05:22 +0000 Subject: [PATCH 01/19] Bump decode-uri-component from 0.2.0 to 0.2.2 Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 10ba128..696e9d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3570,9 +3570,9 @@ decimal.js@^10.2.1: integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== dedent@^0.7.0: version "0.7.0" From 470ddb0598344625e06389bef7826fae04a37083 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 8 Jan 2023 23:21:55 +0000 Subject: [PATCH 02/19] Bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 10ba128..ebbc011 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5867,9 +5867,9 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== dependencies: minimist "^1.2.0" @@ -6248,9 +6248,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== mkdirp@~0.5.1: version "0.5.6" From f3f5dc95ae1a0b95bdc6360de7f2490e1b6d0bbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jan 2023 22:30:14 +0000 Subject: [PATCH 03/19] Bump bzip2 from 0.4.3 to 0.4.4 in /src-tauri Bumps [bzip2](https://github.com/alexcrichton/bzip2-rs) from 0.4.3 to 0.4.4. - [Release notes](https://github.com/alexcrichton/bzip2-rs/releases) - [Commits](https://github.com/alexcrichton/bzip2-rs/commits/0.4.4) --- updated-dependencies: - dependency-name: bzip2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src-tauri/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1dc7e64..9612a22 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -313,9 +313,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "bzip2" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ "bzip2-sys", "libc", From 6f1f55663ba65157734ec45c1a2aa3379ebd68a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 22:13:35 +0000 Subject: [PATCH 04/19] Bump bumpalo from 3.10.0 to 3.12.0 in /src-tauri Bumps [bumpalo](https://github.com/fitzgen/bumpalo) from 3.10.0 to 3.12.0. - [Release notes](https://github.com/fitzgen/bumpalo/releases) - [Changelog](https://github.com/fitzgen/bumpalo/blob/main/CHANGELOG.md) - [Commits](https://github.com/fitzgen/bumpalo/compare/3.10.0...3.12.0) --- updated-dependencies: - dependency-name: bumpalo dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src-tauri/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 1dc7e64..ccf8568 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -283,9 +283,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.10.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytecount" From 420e4377883ccb588d6a38d3653a7ff6ffada663 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 03:14:14 +0000 Subject: [PATCH 05/19] Bump webpack from 5.73.0 to 5.76.1 Bumps [webpack](https://github.com/webpack/webpack) from 5.73.0 to 5.76.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.73.0...v5.76.1) --- updated-dependencies: - dependency-name: webpack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 10ba128..8ecf491 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2385,7 +2385,7 @@ acorn@^7.0.0, acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1: +acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1: version "8.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== @@ -3859,10 +3859,10 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -enhanced-resolve@^5.9.3: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== +enhanced-resolve@^5.10.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" + integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -8826,7 +8826,7 @@ walker@^1.0.7: dependencies: makeerror "1.0.12" -watchpack@^2.3.1: +watchpack@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== @@ -8937,20 +8937,20 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.64.4: - version "5.73.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.73.0.tgz#bbd17738f8a53ee5760ea2f59dce7f3431d35d38" - integrity sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA== + version "5.76.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c" + integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^0.0.51" "@webassemblyjs/ast" "1.11.1" "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" + acorn "^8.7.1" acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.3" + enhanced-resolve "^5.10.0" es-module-lexer "^0.9.0" eslint-scope "5.1.1" events "^3.2.0" @@ -8963,7 +8963,7 @@ webpack@^5.64.4: schema-utils "^3.1.0" tapable "^2.1.1" terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" + watchpack "^2.4.0" webpack-sources "^3.2.3" websocket-driver@>=0.5.1, websocket-driver@^0.7.4: From f508b3f0cf9738d4dc201c5cec9d59ad4703aaeb Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 01:45:31 +0200 Subject: [PATCH 06/19] RightBar resembles the official release --- src/ui/components/RightBar.css | 37 ++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css index 608064f..cba34db 100644 --- a/src/ui/components/RightBar.css +++ b/src/ui/components/RightBar.css @@ -8,34 +8,26 @@ justify-content: flex-start; height: 100vh; - width: 80px; + width: 70px; right: 0%; z-index: 99; - background-color: rgba(77, 77, 77, 0.6); + background-color: rgba(0, 0, 0, 0.250); z-index: 999; } -.BarImg:hover { - cursor: pointer; -} .RightBarInner > div { margin: 30px 0; } .RightBar img { - height: 40px; + height: 35px; filter: invert(100%) sepia(0%) saturate(11%) hue-rotate(227deg) brightness(103%) contrast(105%); - transition: filter 0.2s ease-in-out; } -.RightBar img:hover { - filter: invert(75%) sepia(0%) saturate(100%) hue-rotate(0deg) brightness(100%) contrast(100%); -} - @media (max-height: 580px) { .RightBar { height: calc(100vh - 180px); @@ -47,3 +39,26 @@ height: calc(100vh - 170px); } } + +.BarImg { + transition: 0.2s; + border-radius: 50%; + width: 50px; + height: 50px; + background-color: rgba(0, 0, 0, 0.685); + display: flex; + justify-content: center; + align-items: center; + border: 2px solid transparent; +} + + +.BarImg:hover { + cursor: pointer; + border: 2px solid #ffc920; + +} + +.BarImg:hover img { + filter: invert(72%) sepia(68%) saturate(777%) hue-rotate(341deg) brightness(113%) contrast(101%); +} \ No newline at end of file From 776aee026523301637be763ba9980444c3371389 Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 01:57:36 +0200 Subject: [PATCH 07/19] Added a welcome message to the rightbar in order to make it look more comfy --- src/ui/components/RightBar.css | 66 ++++++++++++++++++++++++++++++---- src/ui/components/RightBar.tsx | 4 +++ 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css index cba34db..64609ed 100644 --- a/src/ui/components/RightBar.css +++ b/src/ui/components/RightBar.css @@ -13,17 +13,16 @@ z-index: 99; - background-color: rgba(0, 0, 0, 0.250); + background-color: rgba(0, 0, 0, 0.25); z-index: 999; } - .RightBarInner > div { margin: 30px 0; } .RightBar img { - height: 35px; + height: 30px; filter: invert(100%) sepia(0%) saturate(11%) hue-rotate(227deg) brightness(103%) contrast(105%); transition: filter 0.2s ease-in-out; } @@ -43,8 +42,8 @@ .BarImg { transition: 0.2s; border-radius: 50%; - width: 50px; - height: 50px; + width: 40px; + height: 40px; background-color: rgba(0, 0, 0, 0.685); display: flex; justify-content: center; @@ -52,13 +51,66 @@ border: 2px solid transparent; } - .BarImg:hover { cursor: pointer; border: 2px solid #ffc920; - } .BarImg:hover img { filter: invert(72%) sepia(68%) saturate(777%) hue-rotate(341deg) brightness(113%) contrast(101%); +} + +.WelcomeMessage { + margin-left: 10px; + color: white; + writing-mode: vertical-rl; + text-orientation: upright; + text-transform: uppercase; + font-weight: 600; +} + +@keyframes background-pan { + from { + background-position: 0% center; + } + + to { + background-position: -200% center; + } +} + +@keyframes scale { + from, + to { + transform: scale(0); + } + + 50% { + transform: scale(1); + } +} + +@keyframes rotate { + from { + transform: rotate(0deg); + } + + to { + transform: rotate(180deg); + } +} + +.magic-text { + animation: background-pan 3s linear infinite; + background: linear-gradient( + to right, + #fff, + #ffc920, + #fff, + #fff + ); + background-size: 200%; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + white-space: nowrap; } \ No newline at end of file diff --git a/src/ui/components/RightBar.tsx b/src/ui/components/RightBar.tsx index 456fde4..dd415f1 100644 --- a/src/ui/components/RightBar.tsx +++ b/src/ui/components/RightBar.tsx @@ -24,6 +24,10 @@ export default class RightBar extends React.Component {
this.openInBrowser(GITHUB)}>
+
+ Welcome to Cultivation! + +
) From ed743b2ff9ad11f12bcd64cd94c22068995724ba Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 02:02:44 +0200 Subject: [PATCH 08/19] added background to make the welcome text more visible --- src/ui/components/RightBar.css | 89 +++++++++++++++++----------------- src/ui/components/RightBar.tsx | 5 +- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css index 64609ed..e9c8e0a 100644 --- a/src/ui/components/RightBar.css +++ b/src/ui/components/RightBar.css @@ -1,3 +1,43 @@ +@keyframes background-pan { + from { + background-position: 0% center; + } + + to { + background-position: -200% center; + } +} + +@keyframes scale { + from, + to { + transform: scale(0); + } + + 50% { + transform: scale(1); + } +} + +@keyframes rotate { + from { + transform: rotate(0deg); + } + + to { + transform: rotate(180deg); + } +} + +.magic-text { + animation: background-pan 3s linear infinite; + background: linear-gradient(to right, #fff, #ffc920, #fff, #fff); + background-size: 200%; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + white-space: nowrap; +} + .RightBar { position: absolute; transform: translate(0%, 0%); @@ -61,56 +101,15 @@ } .WelcomeMessage { - margin-left: 10px; color: white; writing-mode: vertical-rl; text-orientation: upright; text-transform: uppercase; font-weight: 600; + padding: 10px 0 10px 0; } -@keyframes background-pan { - from { - background-position: 0% center; - } - - to { - background-position: -200% center; - } +.WelcomeDiv { + background-color: rgba(0, 0, 0, 0.585); + text-align: center; } - -@keyframes scale { - from, - to { - transform: scale(0); - } - - 50% { - transform: scale(1); - } -} - -@keyframes rotate { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(180deg); - } -} - -.magic-text { - animation: background-pan 3s linear infinite; - background: linear-gradient( - to right, - #fff, - #ffc920, - #fff, - #fff - ); - background-size: 200%; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - white-space: nowrap; -} \ No newline at end of file diff --git a/src/ui/components/RightBar.tsx b/src/ui/components/RightBar.tsx index dd415f1..810f04e 100644 --- a/src/ui/components/RightBar.tsx +++ b/src/ui/components/RightBar.tsx @@ -25,7 +25,10 @@ export default class RightBar extends React.Component {
- Welcome to Cultivation! +
+ Welcome to Cultivation! + +
From f4b8cdf732049b33d06e3c316208959a4fd0b996 Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 02:19:44 +0200 Subject: [PATCH 09/19] Launch button stylized to look clearer. WIP on moving all the launch elements to the right for better readability. --- src/ui/App.css | 7 ++----- src/ui/components/ServerLaunchSection.css | 9 ++++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ui/App.css b/src/ui/App.css index 89f71a9..5d16289 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -29,7 +29,7 @@ select:focus { .App { background-size: cover !important; - background-position: center !important; + background-position: bottom !important; } .TopButton { @@ -107,11 +107,8 @@ select:focus { width: 100%; height: 160px; - backdrop-filter: blur(10px); - box-shadow: inset 0px 5px 12px -3px rgb(50 50 50 / 75%); - margin: 0; - padding: 0; + text-align: right; } @media (max-height: 580px) { diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index 7b54b91..ebc1712 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -8,9 +8,10 @@ right: 10%; top: 50%; - width: 32%; - height: 80%; + width: 20%; + height: 120%; min-width: 357px; + padding: 0 0 140px 0; } #playButton > div { @@ -20,13 +21,15 @@ #playButton .BigButton { height: 100%; box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.2); + font-size: 24px; + font-weight: 400; } #serverControls { color: white; text-shadow: 1px 1px 8px black; -} +} .BottomSection .CheckboxDisplay { border-color: #c5c5c5; From 9dcaea7e5b4d3573bd81a89e8059b98dbc0391fe Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 02:31:42 +0200 Subject: [PATCH 10/19] Deleted the welcome message cause my friends said it sucks --- src/ui/App.css | 2 +- src/ui/components/RightBar.css | 14 -------------- src/ui/components/RightBar.tsx | 6 ------ src/ui/components/ServerLaunchSection.css | 6 ++---- 4 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/ui/App.css b/src/ui/App.css index 5d16289..7e50998 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -29,7 +29,7 @@ select:focus { .App { background-size: cover !important; - background-position: bottom !important; + background-position: center !important; } .TopButton { diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css index e9c8e0a..b78756e 100644 --- a/src/ui/components/RightBar.css +++ b/src/ui/components/RightBar.css @@ -99,17 +99,3 @@ .BarImg:hover img { filter: invert(72%) sepia(68%) saturate(777%) hue-rotate(341deg) brightness(113%) contrast(101%); } - -.WelcomeMessage { - color: white; - writing-mode: vertical-rl; - text-orientation: upright; - text-transform: uppercase; - font-weight: 600; - padding: 10px 0 10px 0; -} - -.WelcomeDiv { - background-color: rgba(0, 0, 0, 0.585); - text-align: center; -} diff --git a/src/ui/components/RightBar.tsx b/src/ui/components/RightBar.tsx index 810f04e..a136039 100644 --- a/src/ui/components/RightBar.tsx +++ b/src/ui/components/RightBar.tsx @@ -24,13 +24,7 @@ export default class RightBar extends React.Component {
this.openInBrowser(GITHUB)}>
-
-
- Welcome to Cultivation! -
- -
) diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index ebc1712..97354c9 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -11,12 +11,10 @@ width: 20%; height: 120%; min-width: 357px; - padding: 0 0 140px 0; + padding: 0 0 100px 0; } -#playButton > div { - margin-bottom: 6px; -} + #playButton .BigButton { height: 100%; From c6abf53880594b4058215e5d4578d1fcaf93982c Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 03:15:48 +0200 Subject: [PATCH 11/19] BottomBar elements now align to right --- src/ui/App.css | 5 +++ src/ui/components/ServerLaunchSection.css | 28 +++++++++--- src/ui/components/ServerLaunchSection.tsx | 53 +++++++++++++---------- 3 files changed, 57 insertions(+), 29 deletions(-) diff --git a/src/ui/App.css b/src/ui/App.css index 7e50998..56da799 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -109,6 +109,11 @@ select:focus { margin: 0; text-align: right; + + /* Gradient shadow */ + -webkit-box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); + -moz-box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); + box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); } @media (max-height: 580px) { diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index 97354c9..5be0824 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -25,8 +25,10 @@ #serverControls { color: white; - text-shadow: 1px 1px 8px black; + align-self: flex-end; + margin-top: 10px; + margin-bottom: -10px; } .BottomSection .CheckboxDisplay { @@ -55,8 +57,8 @@ .ServerConfig .Checkbox { display: inline-grid; - vertical-align: middle; - margin-left: 8px; + margin-top: 10px; + } .ServerLaunchButtons { @@ -102,8 +104,24 @@ box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.2); } -.ServerConfig .TextInputWrapper { - display: inline-block; +.ServerConfig { + display: grid; + height: 100px; + grid-template-columns: 1; + grid-template-rows: repeat(2, 1fr); + justify-content: flex-end; +} + +.ServerConfigGrid { + display: flex; + justify-content: flex-end; + align-items: center; +} + +#ServerConfigCheckbox { + margin-bottom: -10px; + margin-top: 10px; + } #ip { diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx index c8ef226..0c25523 100644 --- a/src/ui/components/ServerLaunchSection.tsx +++ b/src/ui/components/ServerLaunchSection.tsx @@ -277,30 +277,34 @@ export default class ServerLaunchSection extends React.Component {this.state.grasscutterEnabled && (
- - - - +
+ +
+
+ + + +
)} @@ -314,6 +318,7 @@ export default class ServerLaunchSection extends React.Component )} + From 36b3c2f84103790ec2331b2436c2af0011db36af Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 15:03:29 +0200 Subject: [PATCH 12/19] Taken spikes feedback into account. Removed backdrop blur anyway due to my friends feedback, added shadow gradient for better button visibility. Lmk whether or not to still keep the backdrop blur. --- src/ui/App.css | 7 +-- src/ui/App.tsx | 2 +- src/ui/components/RightBar.css | 40 ----------------- src/ui/components/ServerLaunchSection.css | 42 ++++++----------- src/ui/components/ServerLaunchSection.tsx | 55 +++++++++++------------ 5 files changed, 41 insertions(+), 105 deletions(-) diff --git a/src/ui/App.css b/src/ui/App.css index 56da799..207faf2 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -108,11 +108,8 @@ select:focus { height: 160px; margin: 0; - text-align: right; + padding: 0; - /* Gradient shadow */ - -webkit-box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); - -moz-box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); } @@ -126,4 +123,4 @@ select:focus { .BottomSection { height: 140px; } -} +} \ No newline at end of file diff --git a/src/ui/App.tsx b/src/ui/App.tsx index 3c46541..5d4f349 100644 --- a/src/ui/App.tsx +++ b/src/ui/App.tsx @@ -114,4 +114,4 @@ class App extends React.Component, IState> { } } -export default App +export default App \ No newline at end of file diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css index b78756e..47a42f0 100644 --- a/src/ui/components/RightBar.css +++ b/src/ui/components/RightBar.css @@ -1,43 +1,3 @@ -@keyframes background-pan { - from { - background-position: 0% center; - } - - to { - background-position: -200% center; - } -} - -@keyframes scale { - from, - to { - transform: scale(0); - } - - 50% { - transform: scale(1); - } -} - -@keyframes rotate { - from { - transform: rotate(0deg); - } - - to { - transform: rotate(180deg); - } -} - -.magic-text { - animation: background-pan 3s linear infinite; - background: linear-gradient(to right, #fff, #ffc920, #fff, #fff); - background-size: 200%; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - white-space: nowrap; -} - .RightBar { position: absolute; transform: translate(0%, 0%); diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index 5be0824..1799025 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -8,28 +8,28 @@ right: 10%; top: 50%; - width: 20%; - height: 120%; + width: 32%; + height: 80%; min-width: 357px; - padding: 0 0 100px 0; } - +#playButton > div { + margin-bottom: 6px; +} #playButton .BigButton { height: 100%; box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.2); font-size: 24px; font-weight: 400; + width: 20%; } #serverControls { color: white; + text-shadow: 1px 1px 8px black; - align-self: flex-end; - margin-top: 10px; - margin-bottom: -10px; -} +} .BottomSection .CheckboxDisplay { border-color: #c5c5c5; @@ -57,8 +57,8 @@ .ServerConfig .Checkbox { display: inline-grid; - margin-top: 10px; - + vertical-align: middle; + margin-left: 8px; } .ServerLaunchButtons { @@ -104,24 +104,8 @@ box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.2); } -.ServerConfig { - display: grid; - height: 100px; - grid-template-columns: 1; - grid-template-rows: repeat(2, 1fr); - justify-content: flex-end; -} - -.ServerConfigGrid { - display: flex; - justify-content: flex-end; - align-items: center; -} - -#ServerConfigCheckbox { - margin-bottom: -10px; - margin-top: 10px; - +.ServerConfig .TextInputWrapper { + display: inline-block; } #ip { @@ -146,4 +130,4 @@ #officialPlay { width: 40%; } -} +} \ No newline at end of file diff --git a/src/ui/components/ServerLaunchSection.tsx b/src/ui/components/ServerLaunchSection.tsx index 0c25523..a3de46a 100644 --- a/src/ui/components/ServerLaunchSection.tsx +++ b/src/ui/components/ServerLaunchSection.tsx @@ -277,34 +277,30 @@ export default class ServerLaunchSection extends React.Component {this.state.grasscutterEnabled && (
-
- -
-
- - - -
+ + + +
)} @@ -318,7 +314,6 @@ export default class ServerLaunchSection extends React.Component )} - @@ -326,4 +321,4 @@ export default class ServerLaunchSection extends React.Component ) } -} +} \ No newline at end of file From 15e6958527b91e502212841799f370e8709938d9 Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 15:06:04 +0200 Subject: [PATCH 13/19] Added transition to socials images --- src/ui/components/RightBar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ui/components/RightBar.css b/src/ui/components/RightBar.css index 47a42f0..cdae2fa 100644 --- a/src/ui/components/RightBar.css +++ b/src/ui/components/RightBar.css @@ -57,5 +57,6 @@ } .BarImg:hover img { + transition: 0.2s; filter: invert(72%) sepia(68%) saturate(777%) hue-rotate(341deg) brightness(113%) contrast(101%); } From 878dfed932fd3d25a395c84ff820c7f589b0c81a Mon Sep 17 00:00:00 2001 From: Wehi Date: Wed, 10 May 2023 16:13:55 +0200 Subject: [PATCH 14/19] slight changes to Big Button css and Launch button font-weight --- src/ui/components/ServerLaunchSection.css | 2 +- src/ui/components/common/BigButton.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index 1799025..f0e392e 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -21,7 +21,7 @@ height: 100%; box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.2); font-size: 24px; - font-weight: 400; + font-weight: 500; width: 20%; } diff --git a/src/ui/components/common/BigButton.css b/src/ui/components/common/BigButton.css index 045008d..067884d 100644 --- a/src/ui/components/common/BigButton.css +++ b/src/ui/components/common/BigButton.css @@ -7,7 +7,7 @@ padding: 0 30px; border-radius: 5px; border: none; - background: linear-gradient(#ffd326, #ffc61e); + background: linear-gradient(#ffcf0d, #fec004); color: #704a1d; font-weight: bold; @@ -16,7 +16,7 @@ .BigButton:hover { cursor: pointer; - background: linear-gradient(#ffc61e, #ffd326); + background: linear-gradient(#fdd841, #ffc517); } .BigButton.disabled { From ce78bf69aabf7f1526016f55207acb9c1dd9a4d4 Mon Sep 17 00:00:00 2001 From: Wehi Date: Thu, 11 May 2023 02:46:30 +0200 Subject: [PATCH 15/19] added back backdrop blur, fixed button size issue --- src/ui/App.css | 3 ++- src/ui/components/ServerLaunchSection.css | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/App.css b/src/ui/App.css index 207faf2..2aee07a 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -109,7 +109,8 @@ select:focus { margin: 0; padding: 0; - + + backdrop-filter: blur(10px); box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); } diff --git a/src/ui/components/ServerLaunchSection.css b/src/ui/components/ServerLaunchSection.css index f0e392e..b414c93 100644 --- a/src/ui/components/ServerLaunchSection.css +++ b/src/ui/components/ServerLaunchSection.css @@ -22,7 +22,6 @@ box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.2); font-size: 24px; font-weight: 500; - width: 20%; } #serverControls { From 00929a3efe01f57b84ea083121aec8006f524405 Mon Sep 17 00:00:00 2001 From: Wehi Date: Thu, 11 May 2023 02:56:20 +0200 Subject: [PATCH 16/19] backdrop blur full functioning --- src/ui/App.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/App.css b/src/ui/App.css index 2aee07a..b389969 100644 --- a/src/ui/App.css +++ b/src/ui/App.css @@ -109,9 +109,9 @@ select:focus { margin: 0; padding: 0; - + backdrop-filter: blur(10px); - box-shadow: inset 0px -150px 96px -85px rgba(0,0,0,0.43); + box-shadow: inset 0px 5px 12px -3px rgb(0,0,0,0.43); } @media (max-height: 580px) { From 0df78f35bdc5eb4ad099865a289fd41e40ed6c6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 01:19:36 +0000 Subject: [PATCH 17/19] Bump tauri from 1.0.8 to 1.0.9 in /src-tauri Bumps [tauri](https://github.com/tauri-apps/tauri) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/tauri-apps/tauri/releases) - [Commits](https://github.com/tauri-apps/tauri/compare/tauri-v1.0.8...tauri-v1.0.9) --- updated-dependencies: - dependency-name: tauri dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- src-tauri/Cargo.lock | 14 ++++++++------ src-tauri/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e61d25c..f1b53c6 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4099,9 +4099,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63a5d3a76d114e252eeebda97e2affba0943b6e1fa7e49a88ebb520aefcb21b" +checksum = "0d935ccc2848c5dc05ba698a994fe97aa17821ab290cb496aa9936d894e01504" dependencies = [ "anyhow", "attohttpc", @@ -4208,9 +4208,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4cff3b4d9469727fa2107c4b3d2eda110df1ba45103fb420178e536362fae4" +checksum = "59edc884920cd3541620ec52d7e6e97e5b45e52d0610b6c71a1c4054729286c3" dependencies = [ "gtk", "http", @@ -4221,6 +4221,7 @@ dependencies = [ "serde_json", "tauri-utils", "thiserror", + "url", "uuid 1.1.2", "webview2-com", "windows 0.37.0", @@ -4228,9 +4229,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa8c4edaf01d8b556e7172c844b1b4dd3399adcd1a606bd520fc3e65f698546" +checksum = "7fcc220eab1e5709486273617901dc99f35bdb4fe25da4163aee6923375d1a99" dependencies = [ "cocoa", "gtk", @@ -4239,6 +4240,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", + "url", "uuid 1.1.2", "webkit2gtk", "webview2-com", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 543fab4..ec132a5 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -24,7 +24,7 @@ sudo = "0.6.0" [dependencies] serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.0.8", features = ["api-all"] } +tauri = { version = "1.0.9", features = ["api-all"] } # Arg parsing args = "2.0" From 554bda4643fc27768f7f4a325cda7012ef5c6923 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 01:19:17 +0000 Subject: [PATCH 18/19] Bump openssl from 0.10.41 to 0.10.52 in /src-tauri Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.41 to 0.10.52. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.41...openssl-v0.10.52) --- updated-dependencies: - dependency-name: openssl dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src-tauri/Cargo.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index af88ed1..2656f00 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2561,9 +2561,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.41" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if", @@ -2593,11 +2593,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.75" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", From c2cbf4049e6a0331b316af0bff1be8bd79bf6025 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 May 2023 01:18:55 +0000 Subject: [PATCH 19/19] Bump h2 from 0.3.13 to 0.3.18 in /src-tauri Bumps [h2](https://github.com/hyperium/h2) from 0.3.13 to 0.3.18. - [Release notes](https://github.com/hyperium/h2/releases) - [Changelog](https://github.com/hyperium/h2/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/h2/compare/v0.3.13...v0.3.18) --- updated-dependencies: - dependency-name: h2 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- src-tauri/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 2656f00..0cde6b4 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -1592,9 +1592,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.13" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv",