From 1d2a7f1da2c21dae76ae7ea9fccb5d7be735c7b5 Mon Sep 17 00:00:00 2001 From: Dedy Wahyudi Date: Wed, 14 Oct 2020 12:06:27 +0700 Subject: [PATCH 1/5] Fixes for 4029, 4994, 5102 --- .../Specification/SideBar/index.jsx | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx index 42912944d5..281e23b9a9 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx +++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx @@ -197,9 +197,40 @@ export default function SideBar({ ) } + { + !isDesign && ( + + + Usable Code in Dev Challenges + + + ) + } ) } + { isMM && ( +
+

+ CHALLENGE LINKS: +

+

+ + How To Compete in a Marathon Match + +

+
+ )} { isDesign && ( @@ -331,6 +362,23 @@ export default function SideBar({ ) } + { !isDesign && ( +
+

+ TOOLBOX: +

+

+ + Topcoder Extension for VSCode + +

+
+ )} { shareable && (

From 5f31b7891fe2951bb99a89224bfef101666f5150 Mon Sep 17 00:00:00 2001 From: Dedy Wahyudi Date: Wed, 14 Oct 2020 22:56:27 +0700 Subject: [PATCH 2/5] fixes based on feedback --- .../Specification/SideBar/index.jsx | 70 +++++++++++++------ .../Specification/SideBar/styles.scss | 4 ++ 2 files changed, 54 insertions(+), 20 deletions(-) diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx index 281e23b9a9..5a0d32a16f 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx +++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx @@ -88,6 +88,28 @@ export default function SideBar({

); + const usableCodeArticle = ( +
+

+ Useable Code Rules +

+

+ A set of guidelines to help determine if code is acceptable or not. +

+
+ ); + + const vscodeTip = ( +
+

+ Topcoder Extension for VSCode +

+

+ Shortcuts to perform actions related to Topcoder platform without having to open a browser +

+
+ ); + return (
@@ -199,15 +221,20 @@ export default function SideBar({ } { !isDesign && ( - + - Usable Code in Dev Challenges + Useable Code Rules + +
+ ? +
+ ) } @@ -362,23 +389,26 @@ export default function SideBar({
) } - { !isDesign && ( -
-

- TOOLBOX: -

-

- - Topcoder Extension for VSCode - -

-
- )} +
+

+ TOOLBOX: +

+ + + Topcoder Extension
for VSCode + + +
+ ? +
+ + +
{ shareable && (

diff --git a/src/shared/components/challenge-detail/Specification/SideBar/styles.scss b/src/shared/components/challenge-detail/Specification/SideBar/styles.scss index f306f370e9..131f15fb3e 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/styles.scss +++ b/src/shared/components/challenge-detail/Specification/SideBar/styles.scss @@ -1,5 +1,9 @@ @import "mixins"; +.no-margin-top { + margin-top: -10px !important; +} + .challenge-spec-sidebar { background: $tc-dark-blue-10; width: 245px; From d58f28881c1a383001d79d87c13028173bd8b499 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Wed, 14 Oct 2020 23:22:30 -0300 Subject: [PATCH 3/5] ci: deploy dedywahyudi/4029-4994-5102 to Stag env Issues: #4029 #4994 #5102 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e58d6ae06..9bb3b79969 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -260,7 +260,7 @@ workflows: branches: only: - develop - - listing-develop-sync + - dedywahyudi/4029-4994-5102 # Production builds are exectuted # when PR is merged to the master # Don't change anything in this configuration From b13b2de5cc8b731abb316a95eb968d1e31200e0d Mon Sep 17 00:00:00 2001 From: Dedy Wahyudi Date: Thu, 15 Oct 2020 11:25:42 +0700 Subject: [PATCH 4/5] move url to configs --- config/default.js | 3 +++ .../challenge-detail/Specification/SideBar/index.jsx | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/default.js b/config/default.js index ccf981f212..fafbb59363 100644 --- a/config/default.js +++ b/config/default.js @@ -143,6 +143,9 @@ module.exports = { STUDIO_FONTS_POLICY: 'http://help.topcoder.com/hc/en-us/articles/217959447-Font-Policy-for-Design-Challenges', TOPCODER_TERMS: 'https://www.topcoder.com/community/how-it-works/terms/', + HOWTOCOMPETEINMARATHON: 'https://www.topcoder.com/thrive/articles/How%20To%20Compete%20in%20a%20Marathon%20Match', + USABLECODEDEV: 'https://www.topcoder.com/thrive/articles/Usable%20Code%20in%20Dev%20Challenges', + EXTENSIONVSCODE: 'https://marketplace.visualstudio.com/items?itemName=Topcoder.topcoder-workflow&ssr=false#overview', }, IOS: 'https://ios.topcoder-dev.com', diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx index 5a0d32a16f..0822d1cafc 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx +++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx @@ -223,7 +223,7 @@ export default function SideBar({ !isDesign && (

Date: Thu, 15 Oct 2020 13:52:36 +0700 Subject: [PATCH 5/5] fix different spacing --- .../components/challenge-detail/Specification/SideBar/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx index 0822d1cafc..5b4fe7aa2c 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx +++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx @@ -221,7 +221,7 @@ export default function SideBar({ } { !isDesign && ( - +