From 1a9919a27b64a90ec2e3c43350b52fbe06fe5674 Mon Sep 17 00:00:00 2001 From: songtaejin1 Date: Mon, 17 Jun 2024 01:48:22 +0900 Subject: [PATCH] =?UTF-8?q?mainpage=20=EB=B2=84=ED=8A=BC=20=EC=82=AC?= =?UTF-8?q?=EC=A7=84=20=EB=84=A3=EA=B8=B0=20#1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/Image/Beacon.png | Bin 0 -> 5838 bytes frontend/src/Image/NFC.png | Bin 0 -> 18009 bytes frontend/src/components/Register.tsx | 33 +++- .../ChangeInformationPage.tsx | 13 +- frontend/src/containers/Mainpage/Mainpage.tsx | 154 +++--------------- frontend/src/containers/MyPage/Mypage.tsx | 30 ++-- 6 files changed, 78 insertions(+), 152 deletions(-) create mode 100644 frontend/src/Image/Beacon.png create mode 100644 frontend/src/Image/NFC.png diff --git a/frontend/src/Image/Beacon.png b/frontend/src/Image/Beacon.png new file mode 100644 index 0000000000000000000000000000000000000000..0829cc3d4317b7189e9915bcf0c52b40ce3873b7 GIT binary patch literal 5838 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%0A9yYG-u$SRgg92kkB^K0P%r=nce>T% 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 literal 0 HcmV?d00001 diff --git a/frontend/src/components/Register.tsx b/frontend/src/components/Register.tsx index cb1e3e0..20bcabe 100644 --- a/frontend/src/components/Register.tsx +++ b/frontend/src/components/Register.tsx @@ -1,13 +1,27 @@ +import React, { useState, useEffect } from "react"; import styled from "styled-components"; -function Register (){ - return( -
- - 등록 - -
- ) +function Register() { + const [alertMessage, setAlertMessage] = useState(""); + + const handleRegisterClick = () => { + setAlertMessage("수정이 완료되었습니다"); + }; + + useEffect(() => { + if (alertMessage) { + alert(alertMessage); + setAlertMessage(""); // 알람을 표시한 후 메시지 초기화 + } + }, [alertMessage]); + + return ( +
+ + 수정 + +
+ ); } export default Register; @@ -28,7 +42,8 @@ const RegisterBar = styled.div` left: 50%; transform: translateX(-50%); `; -const ResgisterBtn = styled.button` + +const RegisterBtn = styled.button` border: none; outline: none; background-color: transparent; diff --git a/frontend/src/containers/ChangeInformationPage/ChangeInformationPage.tsx b/frontend/src/containers/ChangeInformationPage/ChangeInformationPage.tsx index 416a7d6..40c9715 100644 --- a/frontend/src/containers/ChangeInformationPage/ChangeInformationPage.tsx +++ b/frontend/src/containers/ChangeInformationPage/ChangeInformationPage.tsx @@ -1,11 +1,18 @@ import React, { useState } from "react"; import styled from "styled-components"; import RegisterBar from "../../components/Register"; +import {useNavigate} from "react-router-dom"; function ChangeInformationPage() { const [thirdChecked, setThirdChecked] = useState(false); const [seventhChecked, setSeventhChecked] = useState(false); + const movebtn = useNavigate(); + + const ChangeBtn = () => { + movebtn("/main") + }; + const handleThirdCheckboxChange = () => { if (!thirdChecked) { setThirdChecked(true); @@ -24,7 +31,7 @@ function ChangeInformationPage() {
- CheQ + CheQ 정보 수정 @@ -111,9 +118,6 @@ function ChangeInformationPage() { - {/* - - */}
@@ -139,6 +143,7 @@ const AttendanceTitle = styled.div` const MainTitle = styled.h1` color: #375cde; margin-right: 28px; + cursor: pointer; `; const SubTitle = styled.h2` color: #375cde; diff --git a/frontend/src/containers/Mainpage/Mainpage.tsx b/frontend/src/containers/Mainpage/Mainpage.tsx index 1fa9dc9..38245e1 100644 --- a/frontend/src/containers/Mainpage/Mainpage.tsx +++ b/frontend/src/containers/Mainpage/Mainpage.tsx @@ -1,22 +1,10 @@ -<<<<<<< HEAD -//복사생성자 deep copy경우 2가지가 필요 (깊은 복사를 할수있게해야한다.) -//{}연산자 ()연산자 꼭 알아야한다. -//상속하는거와 다형성 부모타입으로 하는것을 추상화 객체타입을 부모타입으로 자식객체를 부모타입으로 (참조 and 포인터) -//virtual 메소드 -//template 함수와 크래스 템플릿 -//vector 사용할수있게 제거하고 참조하고 조회 -//알고리즘 sort, find만 알면된다. -//반복자 vector interator 사용 -import React, { useState, useEffect } from 'react'; -import styled from 'styled-components'; -import Nav from '../../components/NavBar'; -import axios from 'axios'; -======= + import React, { useState, useEffect } from "react"; import styled from "styled-components"; import Nav from "../../components/NavBar"; +import NFCImage from "../../Image/NFC.png"; +import BeaconImage from "../../Image/Beacon.png"; import axios from "axios"; ->>>>>>> 33c2d9c62bebf15d054d7dbbdc6d483124b20b2e const images = [ "https://pimg.hackers.com/land/main/land_default.jpg", @@ -39,75 +27,8 @@ const Mainpage = () => { return () => clearInterval(interval); // Cleanup function }, []); -<<<<<<< HEAD - // const onSubmit = async (data: any) => { - // if (NFC) { - // return; - - // } - - // try { - // const response = await axios.post("http://isaacnas.duckdns.org:8083/attendance/nfc", { - // mac_address: data.address, - // nfc_position: data.position, - // attendanceTime: new Date().toISOString() // or any appropriate time format - // }, { - // headers: { - // 'Authorization': 'Bearer your-auth-token' // Include your token here - // } - // }); - // console.log('Response:', response.data);//응답처리 - // //응답 실패 - // } catch (error) { - // alert("오류가 뜹니다") - // } - // }; - - // axios.post("http://isaacnas.duckdns.org:8083/attendance/nfc", { - // uuid: " ", - // nfc_position: " ", - // attendanceTime: " " - // }) - // .then(response => { - // alert("성공했습니다") - // }).catch(error => { - // alert("오류가발생") - // }).then(() => { - // //항상실행 - // }) - - const attendanceStatuses = ['present', 'absent', 'late']; // Updated to 3 statuses -======= - const onSubmit = async (data: any) => { - if (NFC) { - return; - } - - try { - const response = await axios.post( - "http://isaacnas.duckdns.org:8083/attendance/nfc", - { - mac_address: data.address, - nfc_position: data.position, - attendanceTime: new Date().toISOString(), // or any appropriate time format - }, - { - headers: { - Authorization: "Bearer your-auth-token", // Include your token here - }, - } - ); - console.log("Response:", response.data); //응답처리 - //응답 실패 - } catch (error) { - console.error(error); - } - }; - - const attendanceStatuses = ["present", "absent", "late"]; // Updated to 3 statuses ->>>>>>> 33c2d9c62bebf15d054d7dbbdc6d483124b20b2e const getColor = (status: string): string => { switch (status) { @@ -124,19 +45,18 @@ const Mainpage = () => { // Example data for buttons from the backend const buttonsData = [ -<<<<<<< HEAD - { label: 'Menu 1' }, - { label: 'Menu 2' }, + { label: 'NFC', image: NFCImage }, + { label: 'Beacon', image: BeaconImage }, { label: 'Menu 3' }, { label: 'Menu 4' }, -======= - { label: "Menu 1" }, - { label: "Menu 2" }, - { label: "Menu 3" }, - { label: "Menu 4" }, ->>>>>>> 33c2d9c62bebf15d054d7dbbdc6d483124b20b2e ]; + // function Register(){ + // const handleMenu1Click = () => { + // alert("Menu 1 clicked") + // } + // } + const handleMenu1Click = () => { axios.post("http://isaacnas.duckdns.org:8083/attendance/nfc", { uuid: "", @@ -205,9 +125,9 @@ const Mainpage = () => { - - 채플현황 - + + 채플현황 + @@ -217,42 +137,16 @@ const Mainpage = () => { -<<<<<<< HEAD {buttonsData.map((button, index) => ( - - {button.label} + + {button.image ? ( + + ): (button.label)} ))} -======= - - {buttonsData.map((button, index) => ( - - onSubmit({ - address: "exampleAddress", - position: "examplePosition", - }) - : undefined - } - > - {button.label} - - ))} - - ->>>>>>> 33c2d9c62bebf15d054d7dbbdc6d483124b20b2e