From f68ade8ddb3a56bfb1fae1c807f7966e7793eb02 Mon Sep 17 00:00:00 2001
From: "guilhem.carron" <gcarron@grandlyon.com>
Date: Tue, 27 Jul 2021 16:30:45 +0200
Subject: [PATCH] Add favicon + block datenavigation if not empty
---
public/favicon.ico | Bin 3870 -> 1150 bytes
src/components/DateSelector/DateSelector.tsx | 10 ++++----
src/components/DateSelector/dateSelector.scss | 13 +++++-----
src/components/Editing/Editing.tsx | 18 ++++++++++---
src/services/editor.service.ts | 24 +++++++++++++++++-
5 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/public/favicon.ico b/public/favicon.ico
index a11777cc471a4344702741ab1c8a588998b1311a..9de53fc215d7c5f6237dc683a227df9bef053ced 100644
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#F5B~pWWH|cYpW)d5V+_r=k2AE~
z31n#a&qR~~NB<iD^_^u|fB%q_qwf`IL#Nwpg}aY2G~K$u(0bbluNlYwCovxSc~inO
z;-Zp_^nYY5Y2tm2vEk}XhNe4dSj{;8-;Z(Mm#YeDnxByMA+zO`)V?s*UcAE4d@BgW
zj5Gha7>@kCC#Prf99ca!w!E6&3x=kf_Zd2G@WRbF_CJSv;*NbV^&&}?|3#9k|4RfU
z{ud~l@?Xxt^gnm+=Kl(+8el*1B+TB=(0r#DuK)P|tx_)j*J1j3TbKXmZCmwUD68c^
z`{E1#Wh@;31H<&cyp|qVzqFzAO<=t2gzG>0?}3t>>>qUf!Wj+!IToD3(61yb^A{Kf
zkKp<b|9J${3!-86E2^mem(w@-FKcY|pW(=#{|agl_k+{`!{8AED4l@7;XjYD=|>h*
zR8mHXPlm?pPvQEH{6(=}$|dl>luHnbdStV}_BY;m40r#r{}0jS3GspH@gb7_TZ#$_
zKM3i8%Y(!3_B|y1dl?V?dc?Hz-3896dk;wX#$u#j3Cn;>+$oFqGu52Ez}R^GAu#+8
z!}Wt0`~R~r9R9BajOREY-okj``wfw}(i5W2Nv9a=FJEV9y1fmU595LHuFTM|ADGJt
zfMfqPfO&W$L(A<=3~jfyaH;+w&%p43pMl{4I|IW3W(I}^V2q+*pvDFeMiU3A{bSF-
F006FMTLu6C
literal 3870
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
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@
diff --git a/src/components/DateSelector/DateSelector.tsx b/src/components/DateSelector/DateSelector.tsx
index aebd7a3a..0cce0223 100644
--- a/src/components/DateSelector/DateSelector.tsx
+++ b/src/components/DateSelector/DateSelector.tsx
@@ -6,21 +6,23 @@ import rightChevron from '../../assets/icons/right-chevron.svg'
interface DateSelectorProps {
date: Date
setDate: React.Dispatch<React.SetStateAction<Date>>
+ isEmpty: () => boolean
}
const DateSelector: React.FC<DateSelectorProps> = ({
date,
setDate,
+ isEmpty,
}: DateSelectorProps) => {
const handleNextMonth = () => {
const incremented: Date = new Date(date.setMonth(date.getMonth() + 1))
console.log('incremented', incremented)
- setDate(incremented)
+ if (isEmpty()) setDate(incremented)
}
const handlePrevMonth = () => {
const decremented: Date = new Date(date.setMonth(date.getMonth() - 1))
- setDate(decremented)
+ if (isEmpty()) setDate(decremented)
}
return (
<div className="date-selector">
@@ -31,9 +33,7 @@ const DateSelector: React.FC<DateSelectorProps> = ({
className="arrow"
/>
<div className="text">
- <span>
- {date.toLocaleString('default', { month: 'long', year: 'numeric' })}
- </span>
+ {date.toLocaleString('default', { month: 'long', year: 'numeric' })}
</div>
<img
src={rightChevron}
diff --git a/src/components/DateSelector/dateSelector.scss b/src/components/DateSelector/dateSelector.scss
index 81c75313..bbc98d03 100644
--- a/src/components/DateSelector/dateSelector.scss
+++ b/src/components/DateSelector/dateSelector.scss
@@ -8,12 +8,13 @@
margin: auto;
max-width: 250px;
.text {
- span {
- @include text-large();
- color: white;
- font-weight: 600;
- margin: 0 0.4rem;
- }
+ @include text-large();
+ color: white;
+ font-weight: 600;
+ margin: 0 0.4rem;
+ min-width: 150px;
+ text-align: center;
+ margin: auto;
}
.arrow {
cursor: pointer;
diff --git a/src/components/Editing/Editing.tsx b/src/components/Editing/Editing.tsx
index 17ed3747..901ddd6a 100644
--- a/src/components/Editing/Editing.tsx
+++ b/src/components/Editing/Editing.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useCallback, useState } from 'react'
import 'react-datepicker/dist/react-datepicker.css'
import { Editor } from '@tinymce/tinymce-react'
import DateSelector from '../DateSelector/DateSelector'
@@ -14,6 +14,15 @@ const Editing: React.FC = () => {
const editorService = new EditorService()
await editorService.sendQuotation(date, header, quote)
}
+ const handleCancel = useCallback(() => {
+ setQuote('')
+ setHeader('')
+ }, [])
+ const isEmpty = (): boolean => {
+ if (quote !== '' || header !== '') {
+ return false
+ } else return true
+ }
return (
<>
@@ -23,7 +32,7 @@ const Editing: React.FC = () => {
</p>
</div>
<div className="content">
- <DateSelector date={date} setDate={setDate} />
+ <DateSelector date={date} setDate={setDate} isEmpty={isEmpty} />
<div className="subtitle">
<p className="title">Informations du mois</p>
</div>
@@ -49,9 +58,12 @@ const Editing: React.FC = () => {
toolbar:
'undo redo | bold italic underline | alignleft aligncenter alignright | code',
}}
+ value={quote}
onEditorChange={(newQuote, editor) => setQuote(newQuote)}
/>
- <button className="btnCancel">Annuler</button>
+ <button className="btnCancel" onClick={handleCancel}>
+ Annuler
+ </button>
<button className="btnValid" onClick={handleSave}>
Sauvegarder
</button>
diff --git a/src/services/editor.service.ts b/src/services/editor.service.ts
index 245c8e04..7ea86880 100644
--- a/src/services/editor.service.ts
+++ b/src/services/editor.service.ts
@@ -1,6 +1,6 @@
export class EditorService {
/**
- * Createsa quotation and header for selected month
+ * Creates a quotation and header for selected month
* @param date
* @param header
* @param quote
@@ -33,4 +33,26 @@ export class EditorService {
console.log(e)
}
}
+
+ /**
+ * Gets a quotation and header for selected month
+ */
+ public getQuotation = async (): Promise<any> => {
+ try {
+ const response = await fetch(
+ 'https://localhost:1443/api/admin/monthlyNews',
+ {
+ method: 'GET',
+ }
+ )
+ if (response.status !== 201) {
+ throw new Error(
+ `Erreur lors de la récupération (code ${response.status})`
+ )
+ }
+ return response.json()
+ } catch (e) {
+ console.log(e)
+ }
+ }
}
--
GitLab