Skip to content

Commit 28cfb60

Browse files
author
Federico Madoery
committed
[WIP] Issue setlife-network#22
UI Polish Remove "Set Team" component from Team Page and add a simple "Team" header On the TeamPage, make sure the color bubbles are vertically center-aligned On the TeamPage, make sure the team member names are vertically left-aligned On the TeamPage, remove the filter/sliders icon on the right On the SchedulePage, change "Hours Counter: X" text to "X work hours scheduled" On the SideBar, the small setblocks should be vertically left/center-aligned
1 parent be0a42d commit 28cfb60

File tree

6 files changed

+13
-40
lines changed

6 files changed

+13
-40
lines changed

web/components/CommitBlock.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class CommitBlock extends React.Component {
8282
size='10px'
8383
ml='-10rem'
8484
>
85-
{' Hours Counter: ' + this.countHours()}
85+
{this.countHours() + ' work hours scheduled'}
8686
</Text>
8787

8888
<Flex row center>

web/components/DayBlock.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class DayBlock extends React.Component {
1818
<Card
1919
key={setBlock.id}
2020
height='8px'
21-
width='5px'
21+
width='8px'
2222
borderBottom={setBlock.blockFraction === 1.0 ? '4px #F93B6A solid' : (setBlock.blockFraction === 0.5 ? '4px #F93B6A solid' : '')}
2323
borderTop={setBlock.blockFraction === 1.0 ? '4px #F93B6A solid' : (setBlock.blockFraction === -0.5 ? '4px #F93B6A solid' : '')}
2424
bg='lightGrey'
@@ -48,12 +48,12 @@ class DayBlock extends React.Component {
4848
onClick={() => onClick(day)}
4949
>
5050
<Flex row center>
51-
<Flex column>
51+
<Flex column mx='auto'>
5252
{ // If you are waiting for the API to respond, it does not render
5353
!fetchingData && this.renderTinySetBlocks(currentWeeklySetblocks, day)
5454
}
5555
</Flex>
56-
<Flex column>
56+
<Flex column mr='auto'>
5757
<Text align='center' mb='0rem' color={selected ? 'red' : 'textSecondary'}>
5858
{day.getDate()}
5959
</Text>

web/components/SetBlock.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ class SetBlock extends React.Component {
283283
<Card
284284
height='16px'
285285
width='16px'
286-
borderRight={data.blockFraction === 1.0 ? '8px #F93B6A solid' : (data.blockFraction === 0.5 ? '8px #F93B6A solid' : '')}
287-
borderLeft={data.blockFraction === 1.0 ? '8px #F93B6A solid' : (data.blockFraction === -0.5 ? '8px #F93B6A solid' : '')}
286+
borderBottom={data.blockFraction === 1.0 ? '8px #F93B6A solid' : (data.blockFraction === 0.5 ? '8px #F93B6A solid' : '')}
287+
borderTop={data.blockFraction === 1.0 ? '8px #F93B6A solid' : (data.blockFraction === -0.5 ? '8px #F93B6A solid' : '')}
288288
bg='lightGrey'
289289
mx='1rem'
290290
>

web/components/TeamLogo.jsx

-24
This file was deleted.

web/components/TeamMember.jsx

+3-8
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ export default class TeamMember extends React.Component {
2323
>
2424
<Flex
2525
direction='row'
26-
justifyContent='space-evenly'
2726
mb='2rem'
2827
width='100%'
29-
height='50px'
28+
height='60px'
3029
onClick={goToPage}
3130
>
3231
<Card
@@ -35,20 +34,16 @@ export default class TeamMember extends React.Component {
3534
bg={color}
3635
borderRadius={50}
3736
my='auto'
37+
ml='20%'
3838
/>
3939
<Text
4040
color='textSecondary'
4141
size='1rem'
4242
weight='600'
43+
ml='15%'
4344
>
4445
{name}
4546
</Text>
46-
47-
<Image
48-
my='auto'
49-
height='20px'
50-
src={require('../images/SettingsIcon.png')}
51-
/>
5247
</Flex>
5348
</Card>
5449
</>

web/components/TeamPage.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react';
22

33
import TeamList from './TeamList';
4-
import TeamLogo from './TeamLogo';
54
import Header from './Header';
65
import Flex from './Flex';
6+
import Text from './Text';
77

88

99
export default class TeamPage extends React.Component {
@@ -24,7 +24,9 @@ export default class TeamPage extends React.Component {
2424
>
2525
<Header />
2626

27-
<TeamLogo />
27+
<Text align='center' size='2rem' my='0.5rem' weight='900'>
28+
{'Team'}
29+
</Text>
2830

2931
<TeamList goToPage={this.goToPage} />
3032
</Flex>

0 commit comments

Comments
 (0)