-
diff --git a/frontend/src/Components/Profile/ProfilePage.css b/frontend/src/Components/Profile/ProfilePage.css
index 3c54df6..116e0e0 100644
--- a/frontend/src/Components/Profile/ProfilePage.css
+++ b/frontend/src/Components/Profile/ProfilePage.css
@@ -243,3 +243,9 @@ nav > div {
.MuiDialog-paperWidthSm {
max-width: 100% !important;
}
+
+/* 일정검색 */
+.schedule-list:hover {
+ background-color: rgba(161, 159, 159, 0.2);
+ cursor: pointer;
+}
diff --git a/frontend/src/Components/Profile/ScheduleSearch.js b/frontend/src/Components/Profile/ScheduleSearch.js
new file mode 100644
index 0000000..06553d9
--- /dev/null
+++ b/frontend/src/Components/Profile/ScheduleSearch.js
@@ -0,0 +1,169 @@
+import React, { useState } from 'react';
+import * as dateFns from 'date-fns';
+import 'Components/Profile/ProfilePage.css';
+
+import InputBase from '@material-ui/core/InputBase';
+import { fade, makeStyles } from '@material-ui/core/styles';
+import SearchIcon from '@material-ui/icons/Search';
+import Dialog from '@material-ui/core/Dialog';
+import IconButton from '@material-ui/core/IconButton';
+import CloseIcon from '@material-ui/icons/Close';
+import axios from 'axios';
+
+const useStyles = makeStyles(theme => ({
+ search: {
+ position: 'relative',
+ borderRadius: theme.shape.borderRadius,
+ backgroundColor: fade(theme.palette.common.white, 0.1),
+ '&:hover': {
+ backgroundColor: fade(theme.palette.common.white, 0.2)
+ },
+ marginLeft: 0,
+ width: '100%',
+ [theme.breakpoints.up('sm')]: {
+ width: 'auto'
+ }
+ // border: '1px solid rgba(255,255,255,0.8)'
+ },
+ searchIcon: {
+ width: theme.spacing(7),
+ height: '100%',
+ position: 'absolute',
+ pointerEvents: 'none',
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'center',
+ color: fade(theme.palette.common.white, 0.8)
+ },
+ inputRoot: {
+ color: 'inherit'
+ },
+ inputInput: {
+ padding: theme.spacing(1, 1, 1, 7),
+ transition: theme.transitions.create('width'),
+ width: '100%',
+ [theme.breakpoints.up('sm')]: {
+ width: 120,
+ '&:focus': {
+ width: 200
+ }
+ },
+ color: 'white'
+ }
+}));
+
+export default function ScheduleSearch(props) {
+ const classes = useStyles();
+ const data = props.data;
+ const [searchState, setsearchState] = useState(false);
+ const [scheduleSearch, setScheduleSearch] = useState('');
+
+ const SearchedList = () => {
+ const copyList =
+ scheduleSearch === '' ? [...data] : data.filter(value => new RegExp(scheduleSearch, 'i').exec(value.ex));
+ console.log(scheduleSearch, data);
+ return copyList.map(value => (
+
+
+ ));
+ };
+ const setEnterKeyPress = () => {
+ if (searchState === true) {
+ console.log(data);
+ return (
+
+ );
+ }
+ return null;
+ };
+
+ const handleKeyPress = async e => {
+ if (e.key === 'Enter') {
+ // const userData = (await axios.get("http://172.30.1.47:8080/user/search", {params : { userSearch : userSearch}})).data;
+ // const groupData = (await axios.get("http://172.30.1.47:8080/group/search", {params : { groupSearch : userSearch}})).data;
+ // console.log(data);
+
+ setsearchState(true);
+ }
+ };
+
+ return (
+ 
{value.nm}
@@ -341,7 +341,9 @@ const Chatting = ({ isOpen }) => {
backgroundColor: 'white',
display: 'flex',
justifyContent: 'center',
- alignItems: 'center'
+ alignItems: 'center',
+ borderBottomLeftRadius: '5px',
+ borderBottomRightRadius: '5px'
}}
>
+
+
+
+ {value.ex}
+
+
+ {dateFns.differenceInCalendarDays(value.start, value.end) === 0
+ ? dateFns.format(value.start, 'yyyy-MM-dd')
+ : `${dateFns.format(value.start, 'yyyy-MM-dd')}
+ ~${dateFns.format(value.end, 'yyyy-MM-dd')}`}
+
+
+
+ );
+}
From 84987247bbc0b6514f9b92c9668135842df0c44b Mon Sep 17 00:00:00 2001
From: sukyeongh <50071076+sukyeongh@users.noreply.github.com>
Date: Mon, 30 Mar 2020 18:09:48 +0900
Subject: [PATCH 02/98] =?UTF-8?q?[frontend]=20=EC=B1=84=ED=8C=85=20?=
=?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=83=89=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/src/Components/Main/Chatting.js | 12 +++++++-----
frontend/src/Components/Main/MainPageButton.js | 2 +-
frontend/src/Components/Main/mainPage.css | 2 +-
frontend/src/Components/Other/ChattingButton.js | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/frontend/src/Components/Main/Chatting.js b/frontend/src/Components/Main/Chatting.js
index 2a785eb..d4e8d03 100644
--- a/frontend/src/Components/Main/Chatting.js
+++ b/frontend/src/Components/Main/Chatting.js
@@ -162,7 +162,7 @@ const Chatting = ({ isOpen }) => {
height: '60px',
display: 'flex',
borderBottom: '1px solid lightgray',
- borderLeft: value.isLogin ? '5px solid green' : 'none',
+ borderLeft: value.isLogin ? '5px solid rgb(145, 0, 51)' : 'none',
paddingLeft: value.isLogin ? '5px' : '10px'
}}
onClick={() => setSelectedUser(value.id)}
@@ -235,7 +235,7 @@ const Chatting = ({ isOpen }) => {
style={{
height: '10%',
display: 'flex',
- backgroundColor: '#f50057',
+ backgroundColor: '#910033',
borderTopLeftRadius: '10px',
borderTopRightRadius: '10px'
}}
@@ -256,7 +256,7 @@ const Chatting = ({ isOpen }) => {
>
+ {
+ setScheduleSearch(e.target.value);
+ }}
+ />
+
+ {setEnterKeyPress()}
+
+
+