Skip to content

Smoke Testing 2020-09-24 #4998

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.

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

Merged
merged 20 commits into from
Sep 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ workflows:
filters:
branches:
only:
- community-app-tests-poc
- milestone-20200917
- develop
# This is beta env for production soft releases
- "build-prod-beta":
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev",
"tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.3",
"tc-ui": "^1.0.12",
"topcoder-react-lib": "1.0.5",
"topcoder-react-lib": "1000.22.10",
"topcoder-react-ui-kit": "2.0.1",
"topcoder-react-utils": "0.7.8",
"turndown": "^4.0.2",
Expand Down
332 changes: 223 additions & 109 deletions src/shared/components/challenge-detail/Specification/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,115 +68,6 @@ $tc-link-visited: #0c4e98;
max-width: 10px !important;
}

.challenge-details-view {
white-space: normal;
display: flex;
flex-wrap: wrap;
justify-content: center;
overflow: hidden;
position: relative;
align-items: baseline;
word-break: break-word;

@include linkStyle;

@include xs-to-sm {
flex-direction: column;
}

.challenge-specifications {
@include roboto-regular;

flex: 4;
text-align: left;
display: flex;
flex-direction: column;
margin: 5px 0 50px;

.challenge-specs-develop {
blockquote {
border-left: 3px solid $tc-green;
padding-left: 17px;
}
}

.challenge-specs-datasci {
blockquote {
border-left: 3px solid $tc-orange;
padding-left: 17px;
}
}

.challenge-specs-design {
blockquote {
border-left: 3px solid $tc-light-blue;
padding-left: 17px;
}
}

img {
max-width: 100%;
}
}
}

h2 {
@include roboto-bold;

font-size: 20px;
color: $tc-black;
line-height: 30px;
margin: (6 * $base-unit) 0 (2 * $base-unit);
}

h3 {
@include roboto-bold;

font-size: 15px;
color: $tc-black;
line-height: 25px;
margin: (5 * $base-unit) 0 0;
text-transform: uppercase;
}

p,
em,
strong {
@include roboto-regular;

font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
}

p {
@include roboto-regular;

font-size: 15px;
color: $tc-gray-90;
line-height: 25px;

@include linkStyle;

margin: (2 * $base-unit) 0 (3 * $base-unit);
}

ul {
@include roboto-regular;

margin: 0 0 5px 20px;
font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
list-style: disc outside none;

li {
font-weight: 400;

@include linkStyle;
}
}

.rawHtml {
@include tc-typography;

Expand Down Expand Up @@ -304,6 +195,229 @@ ul {
@include linkStyle;
}

.challenge-details-view {
white-space: normal;
display: flex;
flex-wrap: wrap;
justify-content: center;
overflow: hidden;
position: relative;
align-items: baseline;
word-break: break-word;

@include linkStyle;

@include xs-to-sm {
flex-direction: column;
}

.challenge-specifications {
@include roboto-regular;

flex: 4;
text-align: left;
display: flex;
flex-direction: column;
margin: 5px 0 50px;

.challenge-specs-develop {
blockquote {
border-left: 3px solid $tc-green;
padding-left: 17px;
}
}

.challenge-specs-datasci {
blockquote {
border-left: 3px solid $tc-orange;
padding-left: 17px;
}
}

.challenge-specs-design {
blockquote {
border-left: 3px solid $tc-light-blue;
padding-left: 17px;
}
}

h1 {
@include roboto-bold;

font-size: 28px;
color: #151516;
letter-spacing: -0.78px;
line-height: 40px;
margin: (10 * $base-unit) 0 (2 * $base-unit);
}

h2 {
@include roboto-bold;

font-size: 20px;
color: $tc-black;
line-height: 30px;
margin: (6 * $base-unit) 0 (2 * $base-unit);
}

h3 {
@include roboto-bold;

font-size: 15px;
color: $tc-black;
line-height: 25px;
margin: (5 * $base-unit) 0 0;
text-transform: uppercase;
}

h4 {
@include roboto-bold;

margin: (4 * $base-unit) 0 (2 * $base-unit);
font-size: 15px;
line-height: 25px;
color: $tc-gray-90;
}

h5,
h6 {
margin: (4 * $base-unit) 0 (2 * $base-unit);
}

p,
em,
strong {
@include roboto-regular;

font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
}

p {
@include roboto-regular;

font-size: 15px;
color: $tc-gray-90;
line-height: 25px;

@include linkStyle;

margin: (2 * $base-unit) 0 (3 * $base-unit);
}

ul {
@include roboto-regular;

margin: 0 0 5px 20px;
font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
list-style: disc outside none;

li {
font-weight: 400;

@include linkStyle;
}
}

em {
@include roboto-regular;

font-style: italic;
font-weight: 400;
font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
}

ol {
@include roboto-regular;

color: $tc-gray-80;
font-size: 15px;
line-height: 25px;
list-style-type: decimal;
margin: 0 0 5px;
counter-reset: item;
display: table;

li {
list-style-type: none;
font-weight: 400;
counter-increment: item;
display: table-row;
white-space: normal;

&::before {
display: table-cell;
font-weight: 700;
text-align: right;
content: counter(item) ".";
padding: 0 10px 0 0;
}
}
}

td,
th {
@include roboto-regular;

color: $tc-gray-80;
font-size: 15px;
line-height: 25px;
}

img {
max-width: 100%;
}

code {
white-space: pre;
margin: 10px 0 15px;
background: $tc-gray-neutral-light;
border: 1px solid silver;
border-radius: 6px;
font-family: Roboto Mono, monospace;
font-weight: 400;
font-size: 13px;
color: $tc-black;
line-height: 20px;
padding: 15px;
display: block;
}

sub {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
bottom: -0.25em;
}

sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
top: -0.5em;
}

strong {
@include roboto-bold;

font-size: 15px;
color: $tc-gray-90;
line-height: 25px;
}

pre {
overflow-x: scroll;
}
}
}

.challenge-specs-main {
@include roboto-regular;

Expand Down
7 changes: 7 additions & 0 deletions src/shared/containers/terms-detail/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,15 @@ class TermsDetailPageContainer extends React.Component {
agreeingTerm,
agreeTermFailure,
theme,
history,
} = this.props;
const { termsAccepted, showModal } = this.state;

if (details && details.isLegacyTerm && !history.location.pathname.includes(details.id)) {
const path = `/challenges/terms/detail/${details.id}`;
history.push(path, history.state);
}

return (
<div className={theme['outer-container']}>
{
Expand Down Expand Up @@ -196,6 +202,7 @@ TermsDetailPageContainer.propTypes = {
'terms-title': PT.string.isRequired,
modalMsg: PT.any,
}).isRequired,
history: PT.shape().isRequired,
};

function mapStateToProps(state, props) {
Expand Down