diff --git a/net/web/src/constants/Colors.js b/net/web/src/constants/Colors.js index 8127b79c..0834d7fa 100644 --- a/net/web/src/constants/Colors.js +++ b/net/web/src/constants/Colors.js @@ -1,7 +1,8 @@ const Colors = { background: '#8fbea7', primary: '#448866', - formBackground: '#f4f4f4', + formBackground: '#f2f2f2', + formFocus: '#f8f8f8', formHover: '#e8e8e8', grey: '#888888', white: '#ffffff', diff --git a/net/web/src/session/Session.jsx b/net/web/src/session/Session.jsx index f494c3ae..59e61f7b 100644 --- a/net/web/src/session/Session.jsx +++ b/net/web/src/session/Session.jsx @@ -35,7 +35,7 @@ export function Session() { { (viewport.state.display === 'xlarge') && (
- +
@@ -75,7 +75,7 @@ export function Session() { { (viewport.state.display === 'large' || viewport.state.display === 'medium') && (
- +
@@ -87,16 +87,16 @@ export function Session() {
)} - + { state.details && (
)} - + { state.cards && ( )} - + { state.contact && ( )} diff --git a/net/web/src/session/Session.styled.js b/net/web/src/session/Session.styled.js index 2bb116a1..ace3c393 100644 --- a/net/web/src/session/Session.styled.js +++ b/net/web/src/session/Session.styled.js @@ -68,9 +68,13 @@ export const SessionWrapper = styled.div` height: calc(100% - 64px); } } - .center { + .right { flex-grow: 1; position: relative; + + .drawer { + padding: 0px; + } } } @@ -87,7 +91,7 @@ export const SessionWrapper = styled.div` .bottom { height: 48px; position: relative; - box-shadow: 0px -8px 16px 0px rgba(0,0,0,0.3); + box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.3); } } `; diff --git a/net/web/src/session/bottomNav/BottomNav.styled.js b/net/web/src/session/bottomNav/BottomNav.styled.js index 8d8b993d..759a0150 100644 --- a/net/web/src/session/bottomNav/BottomNav.styled.js +++ b/net/web/src/session/bottomNav/BottomNav.styled.js @@ -8,7 +8,7 @@ export const BottomNavWrapper = styled.div` flex-direction: row; align-items: center; justify-content: center; - background-color: ${Colors.formBackground}; + background-color: ${Colors.primary}; .nav-item { width: 33%; @@ -27,7 +27,7 @@ export const BottomNavWrapper = styled.div` .nav-active { width: 100%; height: 100%; - color: ${Colors.enabled}; + color: ${Colors.formFocus}; padding-top: 8px; padding-bottom: 8px; font-size: 24px; diff --git a/net/web/src/session/cards/Cards.jsx b/net/web/src/session/cards/Cards.jsx index a9f18de8..8772ec27 100644 --- a/net/web/src/session/cards/Cards.jsx +++ b/net/web/src/session/cards/Cards.jsx @@ -1,4 +1,28 @@ +import { Input, List } from 'antd'; +import { CardsWrapper } from './Cards.styled'; +import { SearchOutlined } from '@ant-design/icons'; +import { useCards } from './useCards.hook'; +import { CardItem } from './cardItem/CardItem'; + export function Cards() { - return
CARDS
+ + const { state, actions } = useCards(); + + return ( + +
+ + ( + + )} /> +
+
+ ); } diff --git a/net/web/src/session/cards/cardItem/CardItem.jsx b/net/web/src/session/cards/cardItem/CardItem.jsx new file mode 100644 index 00000000..ad322efb --- /dev/null +++ b/net/web/src/session/cards/cardItem/CardItem.jsx @@ -0,0 +1,3 @@ +export function CardItem() { + return
CARD ITEM
+} diff --git a/net/web/src/session/cards/useCards.hook.js b/net/web/src/session/cards/useCards.hook.js new file mode 100644 index 00000000..616ce18d --- /dev/null +++ b/net/web/src/session/cards/useCards.hook.js @@ -0,0 +1,29 @@ +import { useContext, useState, useEffect } from 'react'; +import { CardContext } from 'context/CardContext'; + +export function useCards() { + + const [filter, setFilter] = useState(null); + + const [state, setState] = useState({ + cards: [], + busy: false } + ); + + const card = useContext(CardContext); + + const updateState = (value) => { + setState((s) => ({ ...s, ...value })); + } + + const actions = { + onFilter: (value) => { + setFilter(value.toUpperCase()); + }, + }; + + useEffect(() => { + }, [card]); + + return { state, actions }; +} diff --git a/net/web/src/session/channels/Channels.styled.js b/net/web/src/session/channels/Channels.styled.js index 78c6386e..d9b14674 100644 --- a/net/web/src/session/channels/Channels.styled.js +++ b/net/web/src/session/channels/Channels.styled.js @@ -6,7 +6,7 @@ export const ChannelsWrapper = styled.div` width: 100%; display: flex; flex-direction: column; - background-color: ${Colors.formBackground}; + background-color: ${Colors.formFocus}; .view { min-height: 0; diff --git a/net/web/src/session/channels/addTopic/AddTopic.jsx b/net/web/src/session/channels/addTopic/AddTopic.jsx index cf8d3f5a..faac5845 100644 --- a/net/web/src/session/channels/addTopic/AddTopic.jsx +++ b/net/web/src/session/channels/addTopic/AddTopic.jsx @@ -12,12 +12,12 @@ export function AddTopic() {
-
New Topic
+
New Channel
)} { state.mode === 'button' && ( -
New Topic
+
New Channel
)} ); diff --git a/net/web/src/session/channels/addTopic/AddTopic.styled.js b/net/web/src/session/channels/addTopic/AddTopic.styled.js index afd7a605..850e07b1 100644 --- a/net/web/src/session/channels/addTopic/AddTopic.styled.js +++ b/net/web/src/session/channels/addTopic/AddTopic.styled.js @@ -2,6 +2,7 @@ import styled from 'styled-components'; import Colors from 'constants/Colors'; export const AddTopicWrapper = styled.div` + background-color: ${Colors.formBackground}; .button { position: absolute; diff --git a/net/web/src/session/identity/Identity.jsx b/net/web/src/session/identity/Identity.jsx index c6779b46..990f4560 100644 --- a/net/web/src/session/identity/Identity.jsx +++ b/net/web/src/session/identity/Identity.jsx @@ -4,7 +4,7 @@ import { IdentityWrapper } from './Identity.styled'; import { useIdentity } from './useIdentity.hook'; import { ExclamationCircleOutlined, DownOutlined } from '@ant-design/icons'; -export function Identity() { +export function Identity({ openCards }) { const { state, actions } = useIdentity(); @@ -14,7 +14,7 @@ export function Identity() {
Edit Profile
-
Change Login
+
Manage Contacts
Logout