diff --git a/package-lock.json b/package-lock.json index c8d8ab23c..a6d00c438 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20399,7 +20399,6 @@ "version": "2.3.2", "resolved": "https://registry.nlark.com/braces/download/braces-2.3.2.tgz", "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=", - "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -20417,7 +20416,6 @@ "version": "2.0.1", "resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -20448,7 +20446,6 @@ "version": "4.0.0", "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -20460,7 +20457,6 @@ "version": "2.0.1", "resolved": "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -20511,7 +20507,6 @@ "version": "3.0.0", "resolved": "https://registry.nlark.com/is-number/download/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -20520,7 +20515,6 @@ "version": "3.2.2", "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -20536,14 +20530,12 @@ "kind-of": { "version": "6.0.3", "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz", - "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=", - "optional": true + "integrity": "sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0=" }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.nlark.com/micromatch/download/micromatch-3.1.10.tgz", "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=", - "optional": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -20599,7 +20591,6 @@ "version": "2.1.1", "resolved": "https://registry.nlark.com/to-regex-range/download/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "optional": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" diff --git a/src/assets/images/educoder.png b/src/assets/images/educoder.png index ee7b29f6d..19da86157 100644 Binary files a/src/assets/images/educoder.png and b/src/assets/images/educoder.png differ diff --git a/src/assets/images/educoder_old.png b/src/assets/images/educoder_old.png new file mode 100644 index 000000000..ee7b29f6d Binary files /dev/null and b/src/assets/images/educoder_old.png differ diff --git a/src/components/User/PopLoginRegister/components/LoginPanel/index.less b/src/components/User/PopLoginRegister/components/LoginPanel/index.less index a4a5f5cae..a47a9311b 100644 --- a/src/components/User/PopLoginRegister/components/LoginPanel/index.less +++ b/src/components/User/PopLoginRegister/components/LoginPanel/index.less @@ -75,8 +75,8 @@ display: flex; align-items: center; justify-content: center; - margin-top: 35px; - margin-bottom: 10px; + margin-top: 30px; + margin-bottom: 16px; } .tabs { &[class~='ant-tabs'] { diff --git a/src/pages/Competitions/Detail/components/InitGitLink/index.tsx b/src/pages/Competitions/Detail/components/InitGitLink/index.tsx index d14e7074e..f603274db 100644 --- a/src/pages/Competitions/Detail/components/InitGitLink/index.tsx +++ b/src/pages/Competitions/Detail/components/InitGitLink/index.tsx @@ -60,7 +60,8 @@ const InitGitlink:FC=({ type:"user/ForgeSaveUserInfo", payload:{ ...values, - email:values?.email || user?.userInfo?.email + email:values?.email || user?.userInfo?.email, + platform:"educoder" } }) if(res){