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.

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

Community #61

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Community #61

wants to merge 22 commits into from

Conversation

alexsuslov
Copy link
Contributor

Посмотрите как работает фильтр и подробнее.

alexsuslov and others added 13 commits January 26, 2020 08:39
* master: (49 commits)
  refactor About
  fix App.js
  add Header in HomePage
  refactor Header
  Changed necessary props for component
  Added lint rule to Makefile
  Created new component
  move about images into asset
  corrects according to the reviewer comments
  remove buggy deps, remove doubled icons
  fix BEM naming
  update lock file
  add footer
  remove buggy deps, remove doubled icons
  fix lint
  fix BEM naming
  update lock file
  add footer
  add created UI components
  Update README
  ...

# Conflicts:
#	app/components/Community/CommunityList.js
* master:
  refactor layout wrapping
  delete 'run' from npm install
  fix main page layout
  fix Layout bug
  fix style .InnerPageContentContainer-Inner
  add on pr to tests workflows
  delete Header and Footer from Participants
  add global layout, remove header & footer from homepage
  add Header, Footer to Participants
  add author to activity, move routes to config, update header
  change header footer theme on main
  fix BEM naming
  use explicit Fragement
  add InnerPageContentContainer
  refactoring Participants
  fixed white-space
  delete store from package-lock.json
  delete store from package.json
  create header for Participants
  create route /participants, create component Participants

# Conflicts:
#	app/App.js
#	app/components/Community/CommunityList.js

.header-wrapper::after {
position: absolute;
bottom: -20px;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

почему отрицательный?


padding: 26px;
width: 380px;
/*height: 156px;*/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

удалить

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

удалил

const splitList = arr => {
if (arr.length === 1) {
return [[arr[0]], []]
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

чет сложно, проще нельзя сделать ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

это костыль, падало при условии 1 записи в выдаче фильтра.

const { user, community, dispatch } = useStoreon('community', 'user')
const [filtered, setFiltered] = useState(community.list)
// console.log(filtered, community.list)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

если код не нужен, то удалить console.log() везде

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

}

setMore = more => {
// const style = more ? descStyle: { }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

что за комментарии по всем файлам раскиданы?

<Icon
className="title__icon"
onClick={onSort}
type="sort-ascending"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

зачем 2 Icon, у тебя же только тип меняется и соответственно и Icon. Меняй тип по условию

Copy link
Contributor Author

@alexsuslov alexsuslov Jan 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нужно делать сортировку по имени, кол-ву людей, послед. активностям?
может нужно сделать popup с вариантами сортировки?

enmalafeev and others added 9 commits January 30, 2020 23:01
* master: (45 commits)
  add styles to map
  Update build.yml
  move apiKey to dotenv
  add map
  add partners
  Refactor activity list filter
  Fix paths for activity
  Fix activity page after refactor
  Refactor activity page
  fix CSS PastEvents
  add real images
  add autoplay for Carousel
  add communities
  add styles for PastEvents
  Update css activity item filter block
  refactor ActivityList
  fix merged files
  merge master
  add program section
  add link to community
  ...

# Conflicts:
#	app/components/Community/CommunityList.js
#	package.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants