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

Close Issue #8 and #12 #15

Merged
merged 6 commits into from
Jan 3, 2019
Merged

Conversation

FedeMadoery
Copy link
Contributor

SchedulePage is working for read only, with mock data for now
SchedulePage show messsege when the user hasnt committed any setblock
SideBar is working to nav between days
DayBlocks show a tiny setBlocks, with mock data for now
NavLinkItems now are mark as selected if your are in '/team/somthing' or '/schedule/something'
TeamMember colors is randomly generate, this will be changed soon
TeamPage have a new look and feel
Some functions was renamed to better understand its functionality

Federico Madoery added 2 commits December 18, 2018 16:53
  SchedulePage is working for read only with mock data
  SideBar is working to nav between days
  TeamPage have a new look and feel
  NavLinkItems now are mark as selected if your are in '/team/somthing' or '/schedule/something'
  TeamMember colors is randomly generate, this will be changed soon
  DayBlocks show a tiny setBlocks, with mock data for now
  SchedulePage show messsege when the user hasnt committed any setblock
  Some functions was renamed to better understand its functionality
web/components/DayBlock.jsx Show resolved Hide resolved
web/components/ScheduleHeader.jsx Outdated Show resolved Hide resolved
web/components/SchedulePage.jsx Outdated Show resolved Hide resolved
web/components/SchedulePage.jsx Outdated Show resolved Hide resolved
web/components/SideBar.jsx Outdated Show resolved Hide resolved
web/components/TeamList.js Show resolved Hide resolved
Federico Madoery added 4 commits January 2, 2019 12:34
  Fixed color for circle in the ScheduleHeader
  Action to fech a teamMember by ID was added
  Now Redux managge the CurrentTeamMember and the SelectedDay
  GoToSchedule was moved to SideBar
  Similar Routes have diferents key to make re-mounte when navigate to this extencions
  Several unused constructors were removed
  Not used prop and better declaration of currentTeamMember

Minor feature:

  Since there is a delay in the response of the API, a simple loading componentt is added

if (match.params.dayOfWeek) {
renderIfItReady() {
Copy link
Member

Choose a reason for hiding this comment

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

I think there's a cleaner way to implement loaders I'll have to dig it up from an old repo, but we can revisit this when we are closer to a stable release it's fine as is 👍

</div>
<Flex
row
flexDirection='horizontal'
Copy link
Member

Choose a reason for hiding this comment

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

I don't believe this syntax is necessary for Flex, the row prop should do the trick. Tracking this in #22 for future cleanup since I'd like to just merge this PR and leave these non-critical items for release prep

@otech47 otech47 mentioned this pull request Jan 3, 2019
14 tasks
@otech47 otech47 merged commit 5349540 into setlife-network:master Jan 3, 2019
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.

2 participants