Skip to content

Commit d6198aa

Browse files
LieutenantRogernqvietyoutionshivam-51fikzzzy
authored
[Release Ready] Bug Bash - Release 3 (#291)
* [Bug Bash] Fix 1 (#173) * issue #145 * fix: issue #110 * Fixed #96 * Reset Pagination to 1 When Choosing Filter * linter * fix: issue #126 * fix: issue #106 * issue #143 * Prevent Trigger Change On Date Picker Input * fix: issue #85 * Fixes #95 * fix: issue #76 * issue #97 * ci:deploying * Add Close Button in Calendar * issue #132 * issue 132: focus selection range when having value * issue 132: fixed duration of a week having 8 days * Clear Challenge Filter On Menu Click * Reset Pagination to 1 * linter * Implement Not Found Error * Use debounce function for sort by * issue #75 * Minor update completed * Updated totalPrizesTo * issue 75: refixed * fix: issue #76 * fix: issue #85 * ci:deploying * Fixes #95 * issue #75 * issue 75: refixed * Use debounce function for sort by * issue #97 * Reset Pagination to 1 When Choosing Filter * linter * issue #145 * Implement Not Found Error * Prevent Trigger Change On Date Picker Input * issue #132 * issue 132: focus selection range when having value * issue 132: fixed duration of a week having 8 days * =resolve merge conflict * Replace Track QA * Reset Pagination * Minor updates done for fixing #96 * fix: lint * fix: refine * restore ci Co-authored-by: Nguyen Viet <[email protected]> Co-authored-by: yoution <[email protected]> Co-authored-by: Shivam Kumar Singh <[email protected]> Co-authored-by: M Fikri A <[email protected]> Co-authored-by: Nguyen Viet <[email protected]> * Challenges bug bash - three addition tickets (#178) Three addition bug tickets * [Bug Bash] Challenges bug bash - One more ticket (#185) * [Additional Fix] Challenges bug bash (#192) Additional fix for issue_132 * Commented out Grid View Button (#195) Co-authored-by: Pauline <[email protected]> * Revert "Commented out Grid View Button (#195)" (#196) This reverts commit c0efb7e. * [Bug Bash] Challenges bug bash - 2 (#267) * [Bug Bash] Fixign lint * fixes #254 (#275) * Revert "fixes #254 (#275)" (#282) This reverts commit 76bb2f4. * [Bug Bash] Challenges bug bash - Round 3 (#287) * issue #145 * fix: issue #110 * Fixed #96 * Reset Pagination to 1 When Choosing Filter * linter * fix: issue #126 * fix: issue #106 * issue #143 * Prevent Trigger Change On Date Picker Input * fix: issue #85 * Fixes #95 * fix: issue #76 * issue #97 * ci:deploying * Add Close Button in Calendar * issue #132 * issue 132: focus selection range when having value * issue 132: fixed duration of a week having 8 days * Clear Challenge Filter On Menu Click * Reset Pagination to 1 * linter * Implement Not Found Error * Use debounce function for sort by * issue #75 * Minor update completed * Updated totalPrizesTo * issue 75: refixed * fix: issue #76 * fix: issue #85 * ci:deploying * Fixes #95 * issue #75 * issue 75: refixed * Use debounce function for sort by * issue #97 * Reset Pagination to 1 When Choosing Filter * linter * issue #145 * Implement Not Found Error * Prevent Trigger Change On Date Picker Input * issue #132 * issue 132: focus selection range when having value * issue 132: fixed duration of a week having 8 days * =resolve merge conflict * Replace Track QA * Reset Pagination * Minor updates done for fixing #96 * fix: lint * fix: refine * restore ci * deploy bug bash * issue 91 fix (#169) * issue 91 fix * feedback fix * adjustment * restore ci * issue #115 (#183) * ci: deploying * fixed some issues (#184) * fixed issues: - detailed page navigation should not refresh the page - Joi validation of url query should return default values if not matched - missing QA track icon * fixed track -> [track] * ci: revert * issue #132: fixed focused date jump (#191) * fix lint * ci:deploying * Fix Issue 182 (#199) * Add loading indicator * update margin Co-authored-by: mfikria <[email protected]> * DO not reset challenges (#200) * <fix> issue 102: submit without registration (#197) * fix: issue 133 (#203) * <fix> issue_133 * <fix> issue_133 - code updated * revert ci * fix lint * fix:254 * issue #258 (#279) * ci: deploying challengeapp * fixed responsive (#280) * fixed responsive * fixed responsive for ipad (768px) * fixed title font size * fixed clicking mobile menu * wrap code (#286) * Issue#228 (#270) * fixes #228 * Update index.jsx for #228 * Update index.js for #228 * fix lint * clear btn * handle * fixes #226 (#290) * fix price * handle width * reset ci Co-authored-by: Nguyen Viet <[email protected]> Co-authored-by: yoution <[email protected]> Co-authored-by: Shivam Kumar Singh <[email protected]> Co-authored-by: M Fikri A <[email protected]> Co-authored-by: Nguyen Viet <[email protected]> Co-authored-by: Gaurav Seta <[email protected]> Co-authored-by: M Fikri A <[email protected]> Co-authored-by: mfikria <[email protected]> Co-authored-by: linmiao <[email protected]> * fix merge issue * [Bug Bash] Challenges bug bash - Additional Two tickets (#318) Co-authored-by: Nguyen Viet <[email protected]> Co-authored-by: yoution <[email protected]> Co-authored-by: Shivam Kumar Singh <[email protected]> Co-authored-by: M Fikri A <[email protected]> Co-authored-by: Nguyen Viet <[email protected]> Co-authored-by: pauline <[email protected]> Co-authored-by: Pauline <[email protected]> Co-authored-by: Gaurav Seta <[email protected]> Co-authored-by: M Fikri A <[email protected]> Co-authored-by: mfikria <[email protected]> Co-authored-by: linmiao <[email protected]>
1 parent 3a5d6b2 commit d6198aa

File tree

44 files changed

+820
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+820
-215
lines changed

‎package-lock.json

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"react-dom": "^16.12.0",
8787
"react-redux": "^7.2.3",
8888
"react-select": "^1.3.0",
89+
"react-responsive": "^9.0.0-beta.5",
8990
"redux": "^4.0.5",
9091
"redux-actions": "^2.6.5",
9192
"redux-logger": "^3.0.6",

‎src/App.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ const App = () => {
1717
varsRef.current = { previousLocation };
1818

1919
useEffect(() => {
20-
if (location.pathname !== varsRef.current.previousLocation.pathname) {
20+
if (
21+
location.pathname !== varsRef.current.previousLocation.pathname ||
22+
location.search !== varsRef.current.previousLocation.search
23+
) {
2124
window.scrollTo(0, 0);
2225
}
2326
}, [location]);

‎src/assets/icons/close-gray.svg

Lines changed: 12 additions & 0 deletions
Loading

‎src/assets/images/social/icon_email.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/assets/images/social/icon_facebook.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/assets/images/social/icon_plus.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/assets/images/social/icon_print.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/assets/images/social/icon_twitter.svg

Lines changed: 1 addition & 1 deletion
Loading

‎src/components/DateRangePicker/DateInput/styles.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
}
1919

2020
.date-range-input {
21-
width: 230px;
2221
margin-top: -12px;
2322
font-size: $font-size-sm;
2423

‎src/components/DateRangePicker/index.jsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -551,15 +551,11 @@ function DateRangePicker(props) {
551551
return isBeforeDay(preview.endDate, range.startDate);
552552
};
553553

554-
const className = `
555-
${focusedRange[1] === 1 && styles.endDate}
556-
${" "}
557-
${range.startDate && range.endDate && styles.isRange}
558-
${" "}
559-
${isInvalidPreview() && styles.isInvalidPreview}
560-
${" "}
561-
${(errors.startDate || errors.endDate) && styles.isErrorInput}
562-
`;
554+
const className = `${(focusedRange[1] === 1 && styles.endDate) || ""} ${
555+
(range.startDate && range.endDate && styles.isRange) || ""
556+
} ${(isInvalidPreview() && styles.isInvalidPreview) || ""} ${
557+
((errors.startDate || errors.endDate) && styles.isErrorInput) || ""
558+
}`;
563559

564560
return (
565561
<div styleName="dateRangePicker" className={className}>

‎src/components/DateRangePicker/style.scss

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,25 @@ $darkGreen: #0AB88A;;
5757
@include phone {
5858
.rdrDateRangePickerWrapper {
5959
position: relative !important;
60-
width: 100vw !important;
60+
width: 100% !important;
6161
flex-direction: column-reverse;
6262
align-items: center;
6363
justify-content: flex-end;
6464
padding: 0 20px;
65+
border-radius: 0 !important;
6566

6667
.rdrDefinedRangesWrapper {
67-
width: 100vw;
68-
padding-bottom: 10px;
69-
7068
.rdrStaticRanges {
7169
display: inline-flex;
7270
flex-direction: row;
7371
justify-content: space-around;
72+
flex-wrap: wrap;
7473
margin-top: 10px !important;
75-
border-bottom: 1px solid $tc-gray-20;
76-
width: 100vw;
77-
padding-bottom: 10px;
74+
width: calc(100% - 40px);
75+
76+
.rdrStaticRange {
77+
width: 50%;
78+
}
7879

7980
.rdrStaticRangeLabel {
8081
font-size: 14px;
@@ -83,10 +84,6 @@ $darkGreen: #0AB88A;;
8384
> button:hover .rdrStaticRangeLabel {
8485
background-color: $green;
8586
}
86-
87-
& > *:last-child {
88-
display: none;
89-
}
9087
}
9188
}
9289

@@ -137,14 +134,14 @@ $darkGreen: #0AB88A;;
137134
.rdrDateRangePickerWrapper {
138135
z-index: 15;
139136
position: relative;
140-
background: $tc-white;
137+
// background: $tc-white;
141138
border-bottom-left-radius: 4px;
142139
border-bottom-right-radius: 4px;
143140
overflow: hidden;
144141
width: 455px;
145142

146143
.rdrDefinedRangesWrapper {
147-
width: unset;
144+
width: 100%;
148145
border: none;
149146

150147
.rdrStaticRanges {
@@ -164,6 +161,10 @@ $darkGreen: #0AB88A;;
164161
background-color: $green;
165162
}
166163
}
164+
165+
.rdrInputRanges {
166+
display: none;
167+
}
167168
}
168169
}
169170

@@ -373,7 +374,6 @@ $darkGreen: #0AB88A;;
373374
}
374375

375376
.dateInputWrapper {
376-
display: inline-flex;
377377
position: relative;
378378
text-align: left;
379379
}
@@ -395,26 +395,32 @@ $darkGreen: #0AB88A;;
395395
z-index: 10;
396396

397397
@include phone {
398-
width: 100vw;
398+
width: 100%;
399399
position: fixed;
400400
top: 0;
401401
left: 0;
402-
right: 0;
402+
right: 20px;
403403
bottom: 0;
404404
z-index: 15;
405-
padding: 65px 0 0;
405+
padding: 187px 0 0;
406406
border: 0;
407407
border-radius: 0;
408-
}
408+
background: rgba(#2A2A2A, 0.6);
409409

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

413-
@include phone {
414-
padding: 0 20px;
414+
.calendar-footer {
415+
margin: 0 20px;
416+
padding: 20px 0;
415417
}
416418
}
417419

420+
.calendar-footer {
421+
background: $tc-white;
422+
}
423+
418424
.calendar-button {
419425
@include roboto-bold;
420426

@@ -439,20 +445,18 @@ $darkGreen: #0AB88A;;
439445
}
440446
}
441447

442-
.endDate {
448+
@include tablet {
443449
.calendar-container,
444450
.calendar-inner-container {
445-
left: 0;
451+
right: 0;
446452
}
447453

448454
:global {
449455
.rdrDateRangePickerWrapper {
450-
@include tablet {
451-
.calendar-container,
452-
.calendar-inner-container {
453-
right: auto;
454-
left: 62px;
455-
}
456+
.calendar-container,
457+
.calendar-inner-container {
458+
right: 62px;
459+
left: auto;
456460
}
457461
}
458462
}

‎src/components/DropdownTerms/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import React, { useState, useRef, useEffect } from "react";
55
import PT from "prop-types";
66
import _ from "lodash";
7-
import { Creatable } from "react-select";
7+
import Select from "react-select";
88
import iconDown from "assets/icons/dropdown-arrow.png";
99
import config from "../../../config";
1010
import "./styles.scss";
@@ -100,7 +100,7 @@ function DropdownTerms({
100100
}`}
101101
>
102102
<div styleName="relative">
103-
<Creatable
103+
<Select
104104
onOpen={() => setFocused(true)}
105105
onClose={() => setFocused(false)}
106106
autosize={false}

‎src/components/Editor/MarkdownEditor/style.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
display: block;
1919
font-family: "Roboto Mono", monospace;
2020
padding: 15px 20px;
21+
white-space: pre-wrap;
2122

2223
&:global.inline {
2324
background: $tc-gray-10;

‎src/components/Pagination/index.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ const Pagination = ({ length, pageIndex, pageSize, onChange }) => {
105105
onChange={onChangePageSize}
106106
size="xs"
107107
/>
108+
<span styleName="label">per page</span>
108109
</div>
109110
<ul styleName="pages">
110111
<li styleName={`page previous ${pageIndex === 0 ? "hidden" : ""}`}>
111112
<button onClick={previous}>
112113
<span styleName="arrow">
113114
<IconArrow />
114-
</span>{" "}
115-
PREVIOUS
115+
</span>
116116
</button>
117117
</li>
118118
{displayPages.map((p) => (
@@ -132,7 +132,6 @@ const Pagination = ({ length, pageIndex, pageSize, onChange }) => {
132132
}`}
133133
>
134134
<button onClick={next}>
135-
NEXT{" "}
136135
<span styleName="arrow">
137136
<IconArrow />
138137
</span>

0 commit comments

Comments
 (0)