overflow_backup_2018_0455/overflow_app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.loafle.net/overflow/overflow_app

Browse Source
This commit is contained in:
crusader 2017-07-21 16:08:16 +09:00
commit 8c67e143d0
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ts/@overflow/app/views/layout/LogoBar.tsx
View File

@ -1,5 +1,11 @@
import * as React from 'react'; import * as React from 'react';
import { Menu, Header, Container } from 'semantic-ui-react'; import {
Menu,
Header,
Container,
Popup,
} from 'semantic-ui-react';
import { Notification } from '@overflow/commons/react/component/Notification';
export class LogoBar extends React.Component<any, any> { export class LogoBar extends React.Component<any, any> {
@ -19,17 +25,20 @@ export class LogoBar extends React.Component<any, any> {
public render(): JSX.Element { public render(): JSX.Element {
return ( return (
<Container fluid style={{background:'#f8f8f8', 'paddingRight':'7px'}}> <Container fluid style={{ background: '#f8f8f8', 'paddingRight': '7px' }}>
<Menu borderless secondary > <Menu borderless secondary >
<Menu.Item name='logo'> <Menu.Item name='logo'>
{/* <Image src='https://lh3.googleusercontent.com/EaEViB7RYr3Rhhez8zY0TYsNsS5Rv2i63kyiQ5ym0rhQh38KRXBh7BDFo4mjDTDU_Hm6FAVg35247ZM1wE6cO-TuBP4wxYW2SG4hYoojqkUomu587xg3t50VGUSceK17-LUZhM-5XoCsXUXBHtfXVMqMZ2rUb23tgm7Kuv7eTgZZz0o9_dB0lApoi57EBVBNX8_qIDSH3YmGfvqhnKeh5AYnnBG_QXlTg1JExwtMehCe8KgXs4-vLuVicPCCuJ2AXSoWFpVXL9TVhrrMOkeuGd-6PGAFiNxeTG6NylQKwbQikx3Mx7KmGq3iSc8mqp0AmwjptG2DtS7nqwNaAZAi1DtraHYgJcE_tfpEgnZfFSWmVYQYcUe98pfZR11OfJErdJxE3w-mL1b4MoyufB0VkSlFM1BpMlfP3OsnnDIdNAXthT6MuLtI2iLv_CNeoDKi3fdH-zIcSmoArgAFrAo0-9oYUfvQDdaC_8MMddc97b_L78fzFOPRGIf52Ajr-Ia6sjdyDFdJ46-wPKfMW8XHnFfA96NsIcA-HYRZ7GTteJOzVq6HEabwnurZdTxdmCjzGHcb7OEu00DkVMhM6WbWZ0L8HWpIk92sy-sKbprHe-9oh_9WaxJzPrlG=w180-h30-no' {/* <Image src='https://lh3.googleusercontent.com/EaEViB7RYr3Rhhez8zY0TYsNsS5Rv2i63kyiQ5ym0rhQh38KRXBh7BDFo4mjDTDU_Hm6FAVg35247ZM1wE6cO-TuBP4wxYW2SG4hYoojqkUomu587xg3t50VGUSceK17-LUZhM-5XoCsXUXBHtfXVMqMZ2rUb23tgm7Kuv7eTgZZz0o9_dB0lApoi57EBVBNX8_qIDSH3YmGfvqhnKeh5AYnnBG_QXlTg1JExwtMehCe8KgXs4-vLuVicPCCuJ2AXSoWFpVXL9TVhrrMOkeuGd-6PGAFiNxeTG6NylQKwbQikx3Mx7KmGq3iSc8mqp0AmwjptG2DtS7nqwNaAZAi1DtraHYgJcE_tfpEgnZfFSWmVYQYcUe98pfZR11OfJErdJxE3w-mL1b4MoyufB0VkSlFM1BpMlfP3OsnnDIdNAXthT6MuLtI2iLv_CNeoDKi3fdH-zIcSmoArgAFrAo0-9oYUfvQDdaC_8MMddc97b_L78fzFOPRGIf52Ajr-Ia6sjdyDFdJ46-wPKfMW8XHnFfA96NsIcA-HYRZ7GTteJOzVq6HEabwnurZdTxdmCjzGHcb7OEu00DkVMhM6WbWZ0L8HWpIk92sy-sKbprHe-9oh_9WaxJzPrlG=w180-h30-no'
style={{width:'120px'}} onClick={this.handleLogoClick} /> */} style={{width:'120px'}} onClick={this.handleLogoClick} /> */}
</Menu.Item> </Menu.Item>
<Menu.Item <Popup trigger={<Menu.Item
position='right' position='right'
icon='bell' icon='bell'
onClick={this.handleNotiClick} />}
/> on='click' basic wide >
<Notification />
</Popup>
</Menu> </Menu>
</Container> </Container>
); );

68
src/ts/@overflow/commons/react/component/Notification.tsx
View File

@ -1,8 +1,8 @@
import * as React from 'react'; import * as React from 'react';
import { import {
Container, Container,
Card, List,
Feed, Header,
} from 'semantic-ui-react'; } from 'semantic-ui-react';
export interface Props { export interface Props {
@ -23,45 +23,31 @@ export class Notification extends React.Component<Props, State> {
public render(): JSX.Element { public render(): JSX.Element {
return ( return (
<Container> <Container fluid>
<Card fluid> <Header as='h4' content='User Notifications'/>
<Card.Content> <List divided relaxed>
<Card.Header>User Notifications</Card.Header> <List.Item>
</Card.Content> <List.Icon name='github' size='large' verticalAlign='middle' />
<Card.Content> <List.Content>
<Feed> <List.Header as='a'>Semantic-Org/Semantic-UI</List.Header>
<Feed.Event> <List.Description as='a'>Updated 10 mins ago</List.Description>
<Feed.Label icon='task' /> </List.Content>
<Feed.Content> </List.Item>
<Feed.Date content='1 day ago' /> <List.Item>
<Feed.Summary> <List.Icon name='github' size='large' verticalAlign='middle' />
You added <a>Jenny Hess</a> to your <a>coworker</a> group. <List.Content>
</Feed.Summary> <List.Header as='a'>Semantic-Org/Semantic-UI-Docs</List.Header>
</Feed.Content> <List.Description as='a'>Updated 22 mins ago</List.Description>
</Feed.Event> </List.Content>
</List.Item>
<Feed.Event> <List.Item>
<Feed.Label icon='privacy' /> <List.Icon name='github' size='large' verticalAlign='middle' />
<Feed.Content> <List.Content>
<Feed.Date content='3 days ago' /> <List.Header as='a'>Semantic-Org/Semantic-UI-Meteor</List.Header>
<Feed.Summary> <List.Description as='a'>Updated 34 mins ago</List.Description>
You added <a>Molly Malone</a> as a friend. </List.Content>
</Feed.Summary> </List.Item>
</Feed.Content> </List>
</Feed.Event>
<Feed.Event>
<Feed.Label icon='alarm' />
<Feed.Content>
<Feed.Date content='4 days ago' />
<Feed.Summary>
You added <a>Elliot Baker</a> to your <a>musicians</a> group.
</Feed.Summary>
</Feed.Content>
</Feed.Event>
</Feed>
</Card.Content>
</Card>
</Container> </Container>
); );
} }