From eccdf316d6c8612ced982e983db65e0c49c0e37d Mon Sep 17 00:00:00 2001 From: heesoo <11junghs@gmail.com> Date: Fri, 6 May 2022 15:29:43 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[5=EC=9B=94=206=EC=9D=BC]=20local=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Room.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Room.js b/src/components/Room.js index e4d4dca..52aab43 100644 --- a/src/components/Room.js +++ b/src/components/Room.js @@ -99,7 +99,7 @@ const Room = (props) => { // socketRef.current = io.connect("https://10.200.11.221:8000"); //현재 커넥트 정보 저장 // console.log(socketRef.current) // ======= - socketRef.current = io.connect("https://192.168.0.28:8000"); //현재 커넥트 정보 저장 + socketRef.current = io.connect("https://10.200.11.221:8000"); //현재 커넥트 정보 저장 // >>>>>>> main navigator.mediaDevices.getUserMedia({ video: videoConstraints, audio: false }) @@ -216,7 +216,7 @@ const Room = (props) => { // ======= var response; if(mode) { //자동 측정 on 모드 - response = await fetch('https://192.168.0.28:5000/image', { //https://223.131.223.239:5000/image + response = await fetch('https://10.200.11.221:5000/image', { //https://223.131.223.239:5000/image method: "POST", body: formData, signal: abortController.signal, From c387622b48b42d1008e46ae0085e021c3bf49c04 Mon Sep 17 00:00:00 2001 From: heesoo <11junghs@gmail.com> Date: Tue, 17 May 2022 15:14:52 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[5=EC=9B=94=2017=EC=9D=BC]=20UI=20=EB=B0=94?= =?UTF-8?q?=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- public/img/studydo.png | Bin 0 -> 37010 bytes src/components/AllStudy.js | 84 +++++++++++++++-- src/components/MyStudy.js | 88 +++++++++++++++++- src/components/Room.js | 4 +- src/components/auth/AuthForm.js | 12 ++- src/components/auth/AuthTemplate.js | 4 +- .../common/{Button.js => Button_2.js} | 7 +- src/components/common/Header.js | 2 +- src/components/manage/PenaltyCard.js | 2 +- src/pages/PostListPage.js | 2 +- src/pages/StudyCreatePage/StudyCreate.js | 2 +- 12 files changed, 186 insertions(+), 23 deletions(-) create mode 100644 public/img/studydo.png rename src/components/common/{Button.js => Button_2.js} (86%) diff --git a/package.json b/package.json index 8904143..6fed2ae 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nd-front", "version": "0.1.0", "private": true, - "proxy": "https://10.200.11.221:8000", + "proxy": "https://10.200.9.241:8000", "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-brands-svg-icons": "^5.15.4", diff --git a/public/img/studydo.png b/public/img/studydo.png new file mode 100644 index 0000000000000000000000000000000000000000..8bdd7d96c79489f3490c0a7994699e244be95430 GIT binary patch literal 37010 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 { const study = props.study; @@ -45,17 +93,39 @@ const StudiesComp = (props) => { {study.title} - 목표 시간: {study.target_time}
- 멤버 수: {study.member_number}
- 하루 벌금: {study.penalty}
- 스터디 정보: {study.info}
- 방장이름: {study.leader}
- 스터디 아이디: {study.id}
+ + 방장 + {study.leader} + + +
+ + 목표 시간 + {study.target_time} + + + + 하루 벌금 + {study.penalty} + + + + 멤버 수 + {study.member_number} + + +
+ + 스터디 정보 + {study.info} + + +
{ (study.is_recruit === true)? <> - + : null } diff --git a/src/components/MyStudy.js b/src/components/MyStudy.js index 3bf991f..dd0f962 100644 --- a/src/components/MyStudy.js +++ b/src/components/MyStudy.js @@ -3,6 +3,55 @@ import { withRouter } from 'react-router'; import {createBrowserHistory} from 'history'; import axios from 'axios'; import {Card,Button} from 'react-bootstrap'; +import styled from 'styled-components'; + +const Container = styled.div` + padding: 20px; +`; + +// +const Ranking_font = styled.div` + font-size: xx-large; + font-weight: bold; +`; +// + +const Date_font = styled.div` + font-size: large; + font-weight: bold; + text-align: center; +`; + +const ContentBox = styled.div` + display: flex; + gap: 0.25rem; + + align-items: center; + grid-area: content; + justify-content: center; +`; +const Content1 = styled.div` + padding: 0.25rem; + // background: yellow; + text-align: left; + width: 30%; + height: 100%; +`; +const Content2 = styled.div` + padding: 0.25rem; + // background: yellow; + text-align: left; + width: 50%; + height: 100%; + font-size: large; +`; +const Content3 = styled.div` + padding: 0.25rem; + // background: yellow; + text-align: center; + width: 100%; + height: 100%; +`; const MyStudy = (props) => { const mystudy = props.mystudy; @@ -65,20 +114,51 @@ const MyStudy = (props) => { {mystudy.topic} {mystudy.title} + - 목표 시간: {mystudy.target_time}
+ + 방장 + {mystudy.leader} + + +
+ + 목표 시간 + {mystudy.target_time} + + + + 하루 벌금 + {mystudy.penalty} + + + + 멤버 수 + {mystudy.member_number} + + +
+ + 스터디 정보 + {mystudy.info} + + +
+ + {/* 목표 시간: {mystudy.target_time}
멤버 수: {mystudy.member_number}
하루 벌금: {mystudy.penalty}
스터디 정보: {mystudy.info}
방장이름: {mystudy.leader}
- 스터디 아이디: {mystudy.id}
+ 스터디 아이디: {mystudy.id}
*/}
+ { (mystudy.is_recruit===false)? <> - +   - +   : diff --git a/src/components/Room.js b/src/components/Room.js index 52aab43..124def8 100644 --- a/src/components/Room.js +++ b/src/components/Room.js @@ -99,7 +99,7 @@ const Room = (props) => { // socketRef.current = io.connect("https://10.200.11.221:8000"); //현재 커넥트 정보 저장 // console.log(socketRef.current) // ======= - socketRef.current = io.connect("https://10.200.11.221:8000"); //현재 커넥트 정보 저장 + socketRef.current = io.connect("https://192.168.35.64:8000"); //현재 커넥트 정보 저장 // >>>>>>> main navigator.mediaDevices.getUserMedia({ video: videoConstraints, audio: false }) @@ -216,7 +216,7 @@ const Room = (props) => { // ======= var response; if(mode) { //자동 측정 on 모드 - response = await fetch('https://10.200.11.221:5000/image', { //https://223.131.223.239:5000/image + response = await fetch('https://192.168.35.64:5000/image', { //https://223.131.223.239:5000/image method: "POST", body: formData, signal: abortController.signal, diff --git a/src/components/auth/AuthForm.js b/src/components/auth/AuthForm.js index e1bd020..27d5b0b 100644 --- a/src/components/auth/AuthForm.js +++ b/src/components/auth/AuthForm.js @@ -2,7 +2,8 @@ import React from 'react'; import { Link } from 'react-router-dom'; import styled from 'styled-components'; import palette from '../../lib/styles/palette'; -import Button from '../common/Button'; +import Button_2 from '../common/Button_2'; +// import {Card,Button} from 'react-bootstrap'; /* 회원가입, 로그인 폼을 보여주는 component */ @@ -87,13 +88,20 @@ const AuthForm = ({type,form,onChange,onSubmit}) => { value={form.passwordConfirm} /> )} - + {/* {text} */} + {text} + {/*
*/} + {/*
+ +
*/}