Skip to content

[Bug Bash] Challenges bug bash - Round 3 #287

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 108 commits into from
Dec 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
2762c3d
issue #145
nqviet Nov 16, 2021
91b7677
fix: issue #110
yoution Nov 16, 2021
6f1061c
Fixed #96
shivam-51 Nov 16, 2021
2556bd6
Reset Pagination to 1 When Choosing Filter
fikzzzy Nov 16, 2021
ec5f26d
linter
fikzzzy Nov 16, 2021
9762005
fix: issue #126
yoution Nov 16, 2021
72165fe
fix: issue #106
yoution Nov 16, 2021
5cca6d3
issue #143
nqviet Nov 16, 2021
c6593d8
Prevent Trigger Change On Date Picker Input
fikzzzy Nov 16, 2021
eb510ac
fix: issue #85
yoution Nov 16, 2021
a20e2c8
Fixes #95
shivam-51 Nov 16, 2021
915ff0b
fix: issue #76
yoution Nov 16, 2021
ce87a58
issue #97
nqviet Nov 16, 2021
e078aa9
Merge pull request #159 from yoution/issue-76
LieutenantRoger Nov 16, 2021
4936038
Merge pull request #157 from yoution/issue-85
LieutenantRoger Nov 16, 2021
0a80847
ci:deploying
LieutenantRoger Nov 16, 2021
4ebbd62
Merge pull request #158 from shivam-51/issue-95
LieutenantRoger Nov 16, 2021
da3ec44
Add Close Button in Calendar
fikzzzy Nov 16, 2021
36f988d
issue #132
nqviet Nov 16, 2021
314693a
issue 132: focus selection range when having value
nqviet Nov 16, 2021
9a9d966
issue 132: fixed duration of a week having 8 days
nqviet Nov 16, 2021
323c8d4
Clear Challenge Filter On Menu Click
fikzzzy Nov 16, 2021
3f23d6a
Reset Pagination to 1
fikzzzy Nov 16, 2021
6ef504b
linter
fikzzzy Nov 16, 2021
ab62178
Implement Not Found Error
fikzzzy Nov 17, 2021
47d6771
Use debounce function for sort by
fikzzzy Nov 17, 2021
0bb794e
issue #75
nqviet Nov 17, 2021
436648d
Minor update completed
shivam-51 Nov 17, 2021
fc70ecd
Updated totalPrizesTo
shivam-51 Nov 17, 2021
6795ef5
issue 75: refixed
nqviet Nov 17, 2021
c03d249
Merge pull request #167 from nqviet/issue_75
LieutenantRoger Nov 17, 2021
8c01b7b
Merge pull request #166 from fikzzzy/issue_78
LieutenantRoger Nov 17, 2021
33ab549
Merge pull request #160 from nqviet/issue_97
LieutenantRoger Nov 17, 2021
d795d54
Merge pull request #149 from fikzzzy/issue_139
LieutenantRoger Nov 17, 2021
5b50822
Merge pull request #146 from nqviet/issue_145
LieutenantRoger Nov 17, 2021
5470283
Merge pull request #165 from fikzzzy/issue_100
LieutenantRoger Nov 17, 2021
30333de
Merge pull request #154 from fikzzzy/issue_136
LieutenantRoger Nov 17, 2021
e6d4e86
Merge pull request #162 from nqviet/issue_132
LieutenantRoger Nov 17, 2021
e6a38a1
Merge pull request #161 from fikzzzy/issue_128
LieutenantRoger Nov 17, 2021
3027d21
fix: issue #76
yoution Nov 16, 2021
b8e6bba
fix: issue #85
yoution Nov 16, 2021
9d2b365
ci:deploying
LieutenantRoger Nov 16, 2021
119c77e
Fixes #95
shivam-51 Nov 16, 2021
6a34643
issue #75
nqviet Nov 17, 2021
aafee98
issue 75: refixed
nqviet Nov 17, 2021
04f6e2d
Use debounce function for sort by
fikzzzy Nov 17, 2021
9ee11d1
issue #97
nqviet Nov 16, 2021
e43a6cf
Reset Pagination to 1 When Choosing Filter
fikzzzy Nov 16, 2021
c5a1b0c
linter
fikzzzy Nov 16, 2021
8c3f401
issue #145
nqviet Nov 16, 2021
0cc1eaf
Implement Not Found Error
fikzzzy Nov 17, 2021
38c915d
Prevent Trigger Change On Date Picker Input
fikzzzy Nov 16, 2021
0b63036
issue #132
nqviet Nov 16, 2021
6b3fb85
issue 132: focus selection range when having value
nqviet Nov 16, 2021
57e2caf
issue 132: fixed duration of a week having 8 days
nqviet Nov 16, 2021
9517217
=resolve merge conflict
nqviet Nov 17, 2021
96bdb49
Merge pull request #150 from yoution/issue-126
LieutenantRoger Nov 17, 2021
8c04497
Merge branch 'challenges-bug-bash' into issue_143
nqviet Nov 17, 2021
2f26416
Merge pull request #163 from fikzzzy/issue_109
LieutenantRoger Nov 17, 2021
69dd861
Merge pull request #151 from yoution/issue-106
LieutenantRoger Nov 17, 2021
f5bfe7d
Merge branch 'challenges-bug-bash' into issue_143
nqviet Nov 17, 2021
8d03968
Replace Track QA
fikzzzy Nov 18, 2021
0c846fb
Merge branch 'challenges-bug-bash' of github.com:topcoder-platform/mi…
fikzzzy Nov 18, 2021
c317cd2
Reset Pagination
fikzzzy Nov 18, 2021
ecf2b8d
Minor updates done for fixing #96
shivam-51 Nov 18, 2021
cd6c989
Merge pull request #153 from nqviet/issue_143
LieutenantRoger Nov 18, 2021
586bc45
Merge pull request #164 from fikzzzy/issue_124
LieutenantRoger Nov 18, 2021
f6bace0
Merge pull request #171 from fikzzzy/issue_139
LieutenantRoger Nov 18, 2021
bf88ac6
Merge pull request #148 from shivam-51/issue-96
LieutenantRoger Nov 18, 2021
6d2715d
fix: lint
LieutenantRoger Nov 18, 2021
e476c4c
fix: refine
LieutenantRoger Nov 18, 2021
acc82b6
restore ci
LieutenantRoger Nov 19, 2021
c69c1d6
Merge branch 'dev' into challenges-bug-bash
LieutenantRoger Nov 20, 2021
9674b03
deploy bug bash
LieutenantRoger Nov 20, 2021
96f8055
issue 91 fix (#169)
Gauravseta Nov 20, 2021
7c18600
adjustment
LieutenantRoger Nov 20, 2021
7ec9bca
restore ci
LieutenantRoger Nov 20, 2021
c6766c5
issue #115 (#183)
nqviet Nov 21, 2021
eb3484b
ci: deploying
LieutenantRoger Nov 21, 2021
74a668a
fixed some issues (#184)
nqviet Nov 21, 2021
6314460
ci: revert
LieutenantRoger Nov 21, 2021
28968b2
Merge branch 'dev' into challenges-bug-bash
LieutenantRoger Nov 21, 2021
0bd6a58
Merge branch 'dev' into challenges-bug-bash
LieutenantRoger Nov 22, 2021
51c37ce
issue #132: fixed focused date jump (#191)
nqviet Nov 22, 2021
3876ff5
fix lint
LieutenantRoger Nov 23, 2021
a47bf1d
merge master
LieutenantRoger Nov 23, 2021
9b44a0b
ci:deploying
LieutenantRoger Nov 23, 2021
d3e0c86
Fix Issue 182 (#199)
fikzzzy Nov 25, 2021
c5d930a
DO not reset challenges (#200)
fikzzzy Nov 26, 2021
ccc4f13
<fix> issue 102: submit without registration (#197)
flaming-cl Nov 27, 2021
2734650
fix: issue 133 (#203)
flaming-cl Nov 28, 2021
fab2854
revert ci
LieutenantRoger Nov 29, 2021
836e550
fix lint
LieutenantRoger Nov 29, 2021
2848bd4
Merge branch 'dev' into challenges-bug-bash
LieutenantRoger Nov 29, 2021
dcdb2ae
fix:254
LieutenantRoger Dec 1, 2021
31de174
Merge branch 'dev' into challenges-bug-bash
LieutenantRoger Dec 1, 2021
8e534ac
issue #258 (#279)
nqviet Dec 1, 2021
14dfda3
ci: deploying challengeapp
LieutenantRoger Dec 2, 2021
b9f713d
fixed responsive (#280)
nqviet Dec 2, 2021
56de695
wrap code (#286)
fikzzzy Dec 2, 2021
7701f19
Issue#228 (#270)
shivam-51 Dec 2, 2021
e325e1c
fix lint
LieutenantRoger Dec 2, 2021
47dacaa
clear btn
LieutenantRoger Dec 2, 2021
9c9127b
handle
LieutenantRoger Dec 3, 2021
e945636
fixes #226 (#290)
shivam-51 Dec 3, 2021
eb19f5b
fix price
LieutenantRoger Dec 3, 2021
cc55ff8
handle width
LieutenantRoger Dec 3, 2021
1286b1a
reset ci
LieutenantRoger Dec 4, 2021
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
"react-dom": "^16.12.0",
"react-redux": "^7.2.3",
"react-select": "^1.3.0",
"react-responsive": "^9.0.0-beta.5",
"redux": "^4.0.5",
"redux-actions": "^2.6.5",
"redux-logger": "^3.0.6",
Expand Down
12 changes: 12 additions & 0 deletions src/assets/icons/close-gray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/social/icon_email.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/social/icon_facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/social/icon_plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/social/icon_print.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/assets/images/social/icon_twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/components/DateRangePicker/DateInput/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
}

.date-range-input {
width: 230px;
margin-top: -12px;
font-size: $font-size-sm;

Expand Down
14 changes: 5 additions & 9 deletions src/components/DateRangePicker/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -551,15 +551,11 @@ function DateRangePicker(props) {
return isBeforeDay(preview.endDate, range.startDate);
};

const className = `
${focusedRange[1] === 1 && styles.endDate}
${" "}
${range.startDate && range.endDate && styles.isRange}
${" "}
${isInvalidPreview() && styles.isInvalidPreview}
${" "}
${(errors.startDate || errors.endDate) && styles.isErrorInput}
`;
const className = `${(focusedRange[1] === 1 && styles.endDate) || ""} ${
(range.startDate && range.endDate && styles.isRange) || ""
} ${(isInvalidPreview() && styles.isInvalidPreview) || ""} ${
((errors.startDate || errors.endDate) && styles.isErrorInput) || ""
}`;

return (
<div styleName="dateRangePicker" className={className}>
Expand Down
64 changes: 34 additions & 30 deletions src/components/DateRangePicker/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,25 @@ $darkGreen: #0AB88A;;
@include phone {
.rdrDateRangePickerWrapper {
position: relative !important;
width: 100vw !important;
width: 100% !important;
flex-direction: column-reverse;
align-items: center;
justify-content: flex-end;
padding: 0 20px;
border-radius: 0 !important;

.rdrDefinedRangesWrapper {
width: 100vw;
padding-bottom: 10px;

.rdrStaticRanges {
display: inline-flex;
flex-direction: row;
justify-content: space-around;
flex-wrap: wrap;
margin-top: 10px !important;
border-bottom: 1px solid $tc-gray-20;
width: 100vw;
padding-bottom: 10px;
width: calc(100% - 40px);

.rdrStaticRange {
width: 50%;
}

.rdrStaticRangeLabel {
font-size: 14px;
Expand All @@ -83,10 +84,6 @@ $darkGreen: #0AB88A;;
> button:hover .rdrStaticRangeLabel {
background-color: $green;
}

& > *:last-child {
display: none;
}
}
}

Expand Down Expand Up @@ -137,14 +134,14 @@ $darkGreen: #0AB88A;;
.rdrDateRangePickerWrapper {
z-index: 15;
position: relative;
background: $tc-white;
// background: $tc-white;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
overflow: hidden;
width: 455px;

.rdrDefinedRangesWrapper {
width: unset;
width: 100%;
border: none;

.rdrStaticRanges {
Expand All @@ -164,6 +161,10 @@ $darkGreen: #0AB88A;;
background-color: $green;
}
}

.rdrInputRanges {
display: none;
}
}
}

Expand Down Expand Up @@ -373,7 +374,6 @@ $darkGreen: #0AB88A;;
}

.dateInputWrapper {
display: inline-flex;
position: relative;
text-align: left;
}
Expand All @@ -395,26 +395,32 @@ $darkGreen: #0AB88A;;
z-index: 10;

@include phone {
width: 100vw;
width: 100%;
position: fixed;
top: 0;
left: 0;
right: 0;
right: 20px;
bottom: 0;
z-index: 15;
padding: 65px 0 0;
padding: 187px 0 0;
border: 0;
border-radius: 0;
}
background: rgba(#2A2A2A, 0.6);

.calendar-footer {
width: 100%;
@include down(320px) {
padding: 40px 0 0;
}

@include phone {
padding: 0 20px;
.calendar-footer {
margin: 0 20px;
padding: 20px 0;
}
}

.calendar-footer {
background: $tc-white;
}

.calendar-button {
@include roboto-bold;

Expand All @@ -439,20 +445,18 @@ $darkGreen: #0AB88A;;
}
}

.endDate {
@include tablet {
.calendar-container,
.calendar-inner-container {
left: 0;
right: 0;
}

:global {
.rdrDateRangePickerWrapper {
@include tablet {
.calendar-container,
.calendar-inner-container {
right: auto;
left: 62px;
}
.calendar-container,
.calendar-inner-container {
right: 62px;
left: auto;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/DropdownTerms/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React, { useState, useRef, useEffect } from "react";
import PT from "prop-types";
import _ from "lodash";
import { Creatable } from "react-select";
import Select from "react-select";
import iconDown from "assets/icons/dropdown-arrow.png";
import config from "../../../config";
import "./styles.scss";
Expand Down Expand Up @@ -100,7 +100,7 @@ function DropdownTerms({
}`}
>
<div styleName="relative">
<Creatable
<Select
onOpen={() => setFocused(true)}
onClose={() => setFocused(false)}
autosize={false}
Expand Down
1 change: 1 addition & 0 deletions src/components/Editor/MarkdownEditor/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
display: block;
font-family: "Roboto Mono", monospace;
padding: 15px 20px;
white-space: pre-wrap;

&:global.inline {
background: $tc-gray-10;
Expand Down
5 changes: 2 additions & 3 deletions src/components/Pagination/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ const Pagination = ({ length, pageIndex, pageSize, onChange }) => {
onChange={onChangePageSize}
size="xs"
/>
<span styleName="label">per page</span>
</div>
<ul styleName="pages">
<li styleName={`page previous ${pageIndex === 0 ? "hidden" : ""}`}>
<button onClick={previous}>
<span styleName="arrow">
<IconArrow />
</span>{" "}
PREVIOUS
</span>
</button>
</li>
{displayPages.map((p) => (
Expand All @@ -132,7 +132,6 @@ const Pagination = ({ length, pageIndex, pageSize, onChange }) => {
}`}
>
<button onClick={next}>
NEXT{" "}
<span styleName="arrow">
<IconArrow />
</span>
Expand Down
67 changes: 58 additions & 9 deletions src/components/Pagination/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,60 @@
display: flex;
align-items: center;
justify-content: center;

@include down(1024px) {
.per-page {
width: 60px;

:global {
.Select-arrow-zone {
padding: 0 8px !important;
}

.Select ~ img {
right: 8px;
}
}

.label {
display: none;
}
}

.pages {
margin: 0;

.page.previous > button,
.page.next > button {
width: 30px;
padding: 0;

&::before,
&::after {
content: '';
}
}
}
}

@include down($mfe-screen-xs) {
.pages {
flex: auto;
margin: 0;
justify-content: flex-end;
}
}
}

.per-page {
width: 128px;
display: flex;
align-items: center;
width: 144px;

:global {
.Select-value-label::after {
content: ' per page';
}
.label {
white-space: nowrap;
margin-left: 9px;
font-size: $font-size-sm;
}
}

Expand Down Expand Up @@ -65,18 +110,22 @@
}

&.previous {
> button::after {
content: 'PREVIOUS ';
}

.arrow {
transform: rotate(90deg) scale(0.75);
}
}

&.next {
> button::before {
content: ' NEXT';
}

.arrow {
transform: rotate(-90deg) scale(0.75);
}
}
}




Loading