Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

c.30126024 s.374249 - Merge and Fixes #4

Merged
merged 1 commit into from
May 25, 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: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@
},
"browserslist": {
"production": [
"ie 11",
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"ie 11",
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
Expand Down
Binary file added public/sprites.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 0 additions & 25 deletions src/components/AddFiltersModal/Filter/index.jsx

This file was deleted.

22 changes: 0 additions & 22 deletions src/components/AddFiltersModal/Filter/style.module.scss

This file was deleted.

114 changes: 0 additions & 114 deletions src/components/AddFiltersModal/index.jsx

This file was deleted.

68 changes: 0 additions & 68 deletions src/components/AddFiltersModal/style.module.scss

This file was deleted.

15 changes: 10 additions & 5 deletions src/components/EditProfileModal/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ import ProfileCard from '../ProfileCard';

import style from './style.module.scss';

import { makeColorIterator, avatarColors } from '../../lib/colors';
const colorIterator = makeColorIterator(avatarColors);
const nextColor = colorIterator.next();

const COMMON_ATTRIBUTES = [
'role',
'company',
Expand All @@ -32,7 +36,8 @@ export default function EditProfileModal({
api={api}
stripped
updateUser={setLocalUser}
user={localUser}
profile={localUser}
avatarColor={nextColor.value}
/>
<div className={style.editor}>
<div className={style.header}>
Expand Down Expand Up @@ -69,11 +74,11 @@ export default function EditProfileModal({
attributes: localUser.attributes.map(el =>
(el.attributeName === 'role' ? {...el, value: target.value} : el)
),
role: target.value
title: target.value
})
setImmediate(() => target.focus());
}}
value={localUser.role}
value={localUser.title}
/>
<Input
label="Company"
Expand Down Expand Up @@ -108,7 +113,7 @@ export default function EditProfileModal({
<div className={style.pillGroup}>
<input
className={style.input}
onKeyPress={({ key }) => {
onKeyUp={({ key }) => {
if (key === 'Enter') {
const skill = skillInputValue.trim();
if (skill) {
Expand Down Expand Up @@ -168,7 +173,7 @@ export default function EditProfileModal({
<input
className={style.input}
placeholder="Enter achievements to add"
onKeyPress={({ key }) => {
onKeyUp={({ key }) => {
if (key === 'Enter') {
const achie = achieInputValue.trim();
if (achie) {
Expand Down
4 changes: 4 additions & 0 deletions src/components/EditProfileModal/style.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

.container {
display: flex;
height: 791px;
max-height: 791px;
overflow-y: auto;
}

.editor {
Expand Down Expand Up @@ -45,6 +48,7 @@
outline: none;
padding: 0 10px;
width: 100%;
box-sizing: border-box;

&::placeholder {
opacity: 0.5;
Expand Down
36 changes: 0 additions & 36 deletions src/components/FilterGroup/index.jsx

This file was deleted.

36 changes: 0 additions & 36 deletions src/components/FilterGroup/style.module.scss

This file was deleted.

Loading