From 0cf080d9e59d3ae2213fa1b684d99d4c5f854e25 Mon Sep 17 00:00:00 2001 From: monlaeng Date: Sat, 19 Nov 2022 17:58:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=B5=9C=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-311.pyc | Bin 2806 -> 3093 bytes backend/backend/settings.py | 28 ++++++++++- backend/db.sqlite3 | Bin 147456 -> 147456 bytes new_year_message/package-lock.json | 14 ++++++ new_year_message/package.json | 1 + new_year_message/src/pages/Category.js | 6 +-- new_year_message/src/pages/MCheck.js | 44 ++++++++++++++++-- new_year_message/src/pages/Mainpage.js | 10 ++-- new_year_message/yarn.lock | 5 ++ 9 files changed, 95 insertions(+), 13 deletions(-) diff --git a/backend/backend/__pycache__/settings.cpython-311.pyc b/backend/backend/__pycache__/settings.cpython-311.pyc index 2da3acfd302d7c7693ace316dbeb5c0d50f62502..45069dd72d1f028c7b4cfe4969b6ac2615aaa3ec 100644 GIT binary patch delta 412 zcmew+I#q&iIWI340}wFJs7QXsKao#@@!Lf8_dHP&DRNPgDe}P#nhKkx7}v8gvQ2)- zE?s0T3Em85{8DdGjX;}&axV~DfIEtUZP;E-F)0ihw9oVVB#lao^mN~-ulbbUdIZfag~ zeoAIu`YqnX(vpn)qRgtqlFanR!)QrNya5 zx{2vP*(&Y|-Q?n;w37Vn)VwNz3f-dA!qU{@lGGI4^30M9KTWAy?D6p_`N{F|x7Z63 zOEPjYlZu!@j^l`rPur}=A;_q4OUT(jC^+8H$HzZB-q$t6!`~$sMa;w1(Zw|=c(Ofb u7?&APFC!2a$8Vm`>B^|Y#39LafkE_x2)h`N7WyE>1*U;aASyBesssSsb$u%U delta 91 zcmbO#@lBL(IWI340}yN#t4I#uo5&}@_->;5dzN4ZO}WiVjO*DLnI~UjcV+g|l-T@} mLzi)~A6FQcHc&ky5EuJzUdQFiD8#}d$#j816oQI0fieIxw-ufM diff --git a/backend/backend/settings.py b/backend/backend/settings.py index 6747826..f78b853 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -130,9 +130,33 @@ # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' - CORS_ORIGIN_WHITELIST = ( 'http://localhost:3000', 'http://localhost:8000', - 'http://127.0.0.1:8000' + 'http://127.0.0.1:8000', + 'http://127.0.0.1:3000', + + 'http://10.90.0.232:3000', + 'http://10.90.0.232:8000', ) + +CORS_ALLOW_METHODS = ( + 'DELETE', + 'GET', + 'OPTIONS', + 'PATCH', + 'POST', + 'PUT', +) + +CORS_ALLOW_HEADERS = ( + 'accept', + 'accept-encoding', + 'authorization', + 'content-type', + 'dnt', + 'origin', + 'user-agent', + 'x-csrftoken', + 'x-requested-with', +) \ No newline at end of file diff --git a/backend/db.sqlite3 b/backend/db.sqlite3 index e200f5dfa240b5e7fbfe45cc4ec3f2e3e78edaa6..b319965d95d5ed8a5a8b471da5ff5413b35bdf8f 100644 GIT binary patch delta 306 zcmZo@;B08%oFL6;J5k1&(RO2kw>~59<~8~e1rogcdl~ru@PFrjz<-$D^#W?7AXdDf|O~ZE0Z@gGImH$%uUS9(M!(H YMbo6s0kwl2s~!Ak%C~Q`WAb7I03U*2B>(^b delta 89 zcmV-f0H*(dfC+$r36L8BHjx}d0XDH - setModalIsOpen(false)} + setModalIsOpen(false)} style={{ overlay: { position: "fixed", @@ -81,10 +81,10 @@ function Mainpage() { transform: "translate(-51.8%)", width: "335px", height: "270px", - borderRadius: "25px 25px 0 0", + borderRadius: "25px 25px 0 0", }, - }}> + }} >
카테고리
{select(); setCate(1)}}>{CATEGORIES[0].title}
diff --git a/new_year_message/src/pages/MCheck.js b/new_year_message/src/pages/MCheck.js index 8ff636b..d375b56 100644 --- a/new_year_message/src/pages/MCheck.js +++ b/new_year_message/src/pages/MCheck.js @@ -1,4 +1,4 @@ -import React, {useState, useEffect} from 'react' +import React, {useState, useEffect, useRef, useCallback} from 'react' import styled from 'styled-components'; import * as S from '../styles/Majorcss'; import "../styles/main.css" @@ -11,6 +11,7 @@ import ginger1 from '../img/Gingerbread.png'; import ginger2 from '../img/Gingerbread2.png'; import axios from 'axios'; +import moment from "moment"; const MainButton = styled.button` background: #FFFFFF; @@ -36,6 +37,7 @@ color: #8571FF; ` + function MCheck() { //리덕스 let a = useSelector((state) => { return state } ) @@ -66,18 +68,52 @@ function MCheck() { document.querySelector(".countP").innerHTML = cnt; document.querySelector(".progress-level").style.width = per + "%"; } + const countDownTimer = useCallback((date) => { + let _vDate = moment(date); + let _second = 1000; + let _minute = _second * 60; + let _hour = _minute * 60; + let _day = _hour * 24; + let timer; + + function showRemaining() { + try { + let now = moment(); + let distDt = _vDate - now; + + if (distDt < 0) { + clearInterval(timer); + let HapDate = '0' + '일 ' + '0' + '시간 ' + '0' + '분 ' + '0' + '초 :)'; + document.getElementById('timer').innerHTML = HapDate; + return; + } + let days = Math.floor(distDt / _day); + let hours = Math.floor((distDt % _day) / _hour); + let minutes = Math.floor((distDt % _hour) / _minute); + let seconds = Math.floor((distDt % _minute) / _second); + + let HapDate = parseInt(days) + '일 ' + parseInt(hours) + '시간 ' + parseInt(minutes) + '분 ' + parseInt(seconds) + '초:)'; + document.getElementById('timer').innerHTML = HapDate; + } + catch (e) { + console.log(e); + } + } + timer = setInterval(showRemaining, 1000); + }, []); + return ( - 메시지 확인까지
13시간 12분 15초 남았어요! + 메시지 확인까지
{countDownTimer('2023-01-01')}
-
+
현재 작성된 메시지 총  -

100

+

 

개
diff --git a/new_year_message/src/pages/Mainpage.js b/new_year_message/src/pages/Mainpage.js index 413acd2..9b36b07 100644 --- a/new_year_message/src/pages/Mainpage.js +++ b/new_year_message/src/pages/Mainpage.js @@ -33,6 +33,7 @@ color: #8571FF; function Mainpage() { + const [DB, setDB]= useState([]); const getDate = async()=>{ @@ -49,9 +50,10 @@ function Mainpage() { const cnt = DB.length; const per = cnt * 10; - console.log(cnt); + document.querySelector(".countP").innerHTML = cnt; document.querySelector(".progress-level").style.width = per + "%"; + } return ( <> @@ -61,12 +63,12 @@ function Mainpage() {
응원의 메시지를
작성해주세요 🍀 -
-
+
+
현재 작성된 메시지 총  -

100

+

 

개
diff --git a/new_year_message/yarn.lock b/new_year_message/yarn.lock index 8aef9b8..97f4027 100644 --- a/new_year_message/yarn.lock +++ b/new_year_message/yarn.lock @@ -9722,6 +9722,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.6, mkdirp@~0.5.1: dependencies: minimist "^1.2.6" +moment@*: + version "2.29.4" + resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz" From 9ab5ef43d0e0e9b9a7c7de3c195f259d08962505 Mon Sep 17 00:00:00 2001 From: monlaeng Date: Sat, 19 Nov 2022 18:08:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B5=9C=EC=B5=9C=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- new_year_message/src/pages/MCheck.js | 2 +- new_year_message/src/pages/Mainpage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/new_year_message/src/pages/MCheck.js b/new_year_message/src/pages/MCheck.js index d375b56..af2fcb3 100644 --- a/new_year_message/src/pages/MCheck.js +++ b/new_year_message/src/pages/MCheck.js @@ -63,7 +63,7 @@ function MCheck() { const cnt = DB.length; - const per = cnt * 10; + const per = cnt * 2; console.log(cnt); document.querySelector(".countP").innerHTML = cnt; document.querySelector(".progress-level").style.width = per + "%"; diff --git a/new_year_message/src/pages/Mainpage.js b/new_year_message/src/pages/Mainpage.js index 9b36b07..7a35a88 100644 --- a/new_year_message/src/pages/Mainpage.js +++ b/new_year_message/src/pages/Mainpage.js @@ -49,7 +49,7 @@ function Mainpage() { const cnt = DB.length; - const per = cnt * 10; + const per = cnt * 2; document.querySelector(".countP").innerHTML = cnt; document.querySelector(".progress-level").style.width = per + "%";