Skip to content
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.

Sign up for GitHub

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

Jump to bottom

deploy staging -> master #1885

Merged
merged 16 commits into from
Jul 22, 2021
Merged

deploy staging -> master #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
060c85d
remove fetching all venues across the codebase (#1620)
mike-lvov Jul 21, 2021
e28a8e1
Bump @fortawesome/free-solid-svg-icons from 5.15.1 to 5.15.3 (#1275)
dependabot[bot] Jul 22, 2021
5b54937
adds ability to modify iframe on posterpage/admin (#1526)
margulies Jul 22, 2021
0c363cc
Set UserAvatar image size in pixels, not percents (#1870)
goran-peoski-work Jul 22, 2021
e210927
update @types/puppeteer (#1877)
yurii-lubynets Jul 22, 2021
b066aab
update @types/qs 6.9.7 (#1878)
yurii-lubynets Jul 22, 2021
484d061
Update eslint-plugin-promise (#1875)
yurii-lubynets Jul 22, 2021
6ff567b
Fix tables generator: rows/columns issue (#1531)
sunny-viktoryia Jul 22, 2021
d934ae7
fixed short event icon (#1842)
alexey-petrov Jul 22, 2021
6d1cf38
update Accessibility of this page (#1881)
ermiaSparkle Jul 22, 2021
a713126
removed background image library text if collection is empty (#1876)
alexey-petrov Jul 22, 2021
0c31b15
Styling tweak to expand the Questions properly (#1884)
mike-lvov Jul 22, 2021
de2c172
Bump glob-parent from 5.1.1 to 5.1.2 in /functions (#1535)
dependabot[bot] Jul 22, 2021
f4451f4
Bump normalize-url from 4.5.0 to 4.5.1 in /functions (#1537)
dependabot[bot] Jul 22, 2021
35ef20a
adds support for webp image type (#1601)
margulies Jul 22, 2021
4a9b26c
clean up + unify some duplicated aspects of our validations (#1341)
malaikaaiyar Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions functions/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"eslint": "^7.19.0",
"eslint-plugin-promise": "^4.0.1",
"eslint-plugin-promise": "^5.1.0",
"firebase-functions-test": "^0.2.3",
"firebase-tools": "^9.2.2",
"prettier": "^2.2.1"
Expand Down
34 changes: 20 additions & 14 deletions package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-brands-svg-icons": "^5.15.1",
"@fortawesome/free-regular-svg-icons": "^5.15.1",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.13",
"@reduxjs/toolkit": "^1.6.0",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"@types/mixpanel-browser": "^2.35.4",
"@types/mousetrap": "^1.6.4",
"@types/qs": "^6.9.3",
"@types/qs": "^6.9.7",
"@types/react-resize-detector": "^4.2.0",
"@types/styled-components": "^5.1.4",
"@types/ws": "^7.2.6",
Expand All @@ -27,6 +27,7 @@
"date-fns": "^2.22.1",
"dayjs": "^1.8.35",
"emoji-mart": "^3.0.1",
"eslint-plugin-promise": "^5.1.0",
"esm": "^3.2.25",
"firebase": "^7.14.2",
"fuse.js": "^6.4.1",
Expand Down Expand Up @@ -155,7 +156,6 @@
"babel-plugin-lodash": "^3.3.4",
"cypress": "^4.11.0",
"cypress-file-upload": "^4.0.7",
"eslint-plugin-promise": "^4.2.1",
"firebase-admin": "^9.1.1",
"firebase-tools": "^8.6.0",
"gifwrap": "^0.9.2",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@

<body>
<noscript>You need to enable JavaScript to use Sparkle.</noscript>
<div id="root"></div>
<div id="root">Loading...</div>
</body>
</html>
6 changes: 3 additions & 3 deletions reporting/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion reporting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"private": true,
"devDependencies": {
"@types/puppeteer": "^5.4.3"
"@types/puppeteer": "^5.4.4"
}
}
59 changes: 33 additions & 26 deletions src/components/atoms/UserAvatar/UserAvatar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
@import "scss/constants";

.UserAvatar {
$avatar-sizes-map: (
small: 25px,
medium: 40px,
large: 54px,
full: 100%,
);
$indicator-sizes-map: (
small: 8px,
medium: 10px,
large: 12px,
full: 25%,
);

// NOTE: parent and img mismatch due to legacy reasons
$default-avatar-size: 25px;
$default-image-size: 100%;
$default-indicator-size: 8px;

@include square-size($default-avatar-size);
position: relative;
width: 25px;
height: 25px;

&:hover {
.UserAvatar__nametag--hover {
Expand All @@ -19,25 +36,24 @@
}

&__image {
height: 100%;
width: 100%;
@include square-size($default-image-size);
border-radius: 50%;
vertical-align: unset;
}

&__status-indicator {
position: absolute;
bottom: -1px;
right: -1px;
bottom: 0;
right: 0;
border-radius: 50%;
height: 8px;
width: 8px;
z-index: z(user-avatar-status-indicator);
display: block;
@include square-size($default-indicator-size);

&--large {
height: 12px;
width: 12px;
@each $modifier, $size in $indicator-sizes-map {
&--#{$modifier} {
@include square-size($size);
}
}
}

Expand All @@ -49,19 +65,11 @@
}
}

&--small {
width: 25px;
height: 25px;
}

&--medium {
height: 40px;
width: 40px;
}

&--large {
height: 54px;
width: 54px;
@each $modifier, $size in $avatar-sizes-map {
&--#{$modifier},
&--#{$modifier} img {
@include square-size($size);
}
}

&__nametag {
Expand All @@ -74,12 +82,11 @@

text-align: center;

margin: 0 auto;
margin: 0 -50% 0 auto;
padding: 0 $spacing--xs;

bottom: 10%;
left: 50%;
margin-right: -50%;

border-radius: $border-radius--md;

Expand Down
13 changes: 6 additions & 7 deletions src/components/atoms/UserAvatar/UserAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@ import { useVenueId } from "hooks/useVenueId";

import "./UserAvatar.scss";

export type UserAvatarSize = "small" | "medium" | "large" | "full";

export interface UserAvatarProps {
user?: WithId<User>;
containerClassName?: string;
imageClassName?: string;
showNametag?: UsernameVisibility;
showStatus?: boolean;
onClick?: () => void;
large?: boolean;
medium?: boolean;
size?: UserAvatarSize;
}

// @debt the UserProfilePicture component serves a very similar purpose to this, we should unify them as much as possible
Expand All @@ -33,8 +34,7 @@ export const _UserAvatar: React.FC<UserAvatarProps> = ({
showNametag,
onClick,
showStatus,
large,
medium,
size,
}) => {
const venueId = useVenueId();

Expand All @@ -56,8 +56,7 @@ export const _UserAvatar: React.FC<UserAvatarProps> = ({

const containerClasses = classNames("UserAvatar", containerClassName, {
"UserAvatar--clickable": onClick !== undefined,
"UserAvatar--large": large,
"UserAvatar--medium": medium,
[`UserAvatar--${size}`]: size,
});

const isOnline = useMemo(
Expand All @@ -76,7 +75,7 @@ export const _UserAvatar: React.FC<UserAvatarProps> = ({
const statusIndicatorClasses = classNames("UserAvatar__status-indicator", {
"UserAvatar__status-indicator--online": isOnline,
[`UserAvatar__status-indicator--${status}`]: isOnline && status,
"UserAvatar__status-indicator--large": large,
[`UserAvatar__status-indicator--${size}`]: size,
});

const statusIndicatorStyles = useMemo(
Expand Down
12 changes: 8 additions & 4 deletions src/components/molecules/ImageInput/ImageCollectionInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ export const ImageCollectionInput: React.FC<ImageInputProps> = (props) => {
[]
);

const hasImageCollections = !!imageCollection.length;

// this keeps the component state synchronised with the parent form state
useEffect(() => {
if (selectedCollectionImageUrl) {
Expand Down Expand Up @@ -108,7 +110,7 @@ export const ImageCollectionInput: React.FC<ImageInputProps> = (props) => {
disabled={disabled}
type="file"
onChange={handleFileChange}
accept="image/png,image/x-png,image/gif,image/jpeg"
accept={ACCEPTED_IMAGE_TYPES}
className="default-input"
ref={register}
/>
Expand All @@ -131,9 +133,11 @@ export const ImageCollectionInput: React.FC<ImageInputProps> = (props) => {
value={imageUrlForPreview}
/>
{error?.message && <span className="input-error">{error.message}</span>}
<div style={{ marginTop: 10, fontSize: "16px" }}>
{`Or choose one of our popular ${imageType}`}
</div>
{hasImageCollections && (
<div style={{ marginTop: 10, fontSize: "16px" }}>
{`Or choose one of our popular ${imageType}`}
</div>
)}
<div
style={{
display: "flex",
Expand Down
2 changes: 1 addition & 1 deletion src/components/molecules/NavBar/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export const NavBar: React.FC<NavBarPropsType> = ({ hasBackButton = true }) => {
overlay={ProfilePopover}
rootClose={true}
>
<UserAvatar user={userWithId} showStatus medium />
<UserAvatar user={userWithId} showStatus size="medium" />
</OverlayTrigger>
</div>
)}
Expand Down