Skip to content

[Release Ready] Bug Bash - Release 3 #291

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 15 commits into from
Dec 7, 2021
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
29 changes: 29 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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
5 changes: 4 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ const App = () => {
varsRef.current = { previousLocation };

useEffect(() => {
if (location.pathname !== varsRef.current.previousLocation.pathname) {
if (
location.pathname !== varsRef.current.previousLocation.pathname ||
location.search !== varsRef.current.previousLocation.search
) {
window.scrollTo(0, 0);
}
}, [location]);
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
Loading