Refactoring WIP

Francesca Cella · Francesca Cella · commit 6a0924607d60 · 2020-10-03T14:26:59.000+02:00
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "bootstrap": "^4.3.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-scripts": "3.2.0"
+    "react-scripts": "^3.4.3"
   },
   "scripts": {
     "start": "react-scripts start",
diff --git a/public/index.html b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Calendario Turni</title>
 
   </head>
   <body>
diff --git a/src/App.css b/src/App.css
diff --git a/src/App.js b/src/App.js
@@ -1,51 +1,55 @@
 import React from 'react';
-import './App.css';
 
-import CleanTurns from './Components/CleanTurns';
-import StreetTurns from "./Components/StreetTurns";
-import TrashTurns from "./Components/TrashTurns";
-
-const cleanInitialDate = '2019-11-11'; //data di inizio elenco pulizie, coincide col turno della persona alla posizione 0
-const trashInitialDate  = '2019-11-01'; //data di inizio primo ciclo dei turni delle pulizie
-
-const curDate = new Date().toISOString().substr(0, 10);
+import { CleanTurns, StreetTurns, TrashTurns } from './components';
 
 class App extends React.Component{
 	constructor(props) {
 		super(props);
 
-		//inizializzazione dello stato con la data corrente
+		const cleanInitialDate = '2019-11-11';
+		const trashInitialDate  = '2019-11-01';
+
+		const curDate = new Date().toISOString().substr(0, 10);
+
 		this.state = {
-			date: curDate
+			date: curDate,
+			curDate,
+			cleanInitialDate,
+			trashInitialDate
 		};
 	}
 
 	dateChanged(event) {
-		this.setState({date: event.target.value});
+		this.setState({ date: event.target.value });
 	}
 
 	render() {
 		return (
 			<div className="App container">
 				<div className="row justify-content-center align-items-center">
-					<div className="jumbotron col-12 wrapper">
+					<div className="jumbotron col-12 wrapper" align="center">
 						<h1 className="display-4">Calendario Turni</h1>
 						<hr className="my-4"/>
 						<div className="row justify-content-center align-items-center">
 							<div className="col-md-4">
 								<p className="lead">Data: </p>
 							</div>
 							<div className="col-md-4">
-								<input type="date" onChange={this.dateChanged.bind(this)} defaultValue={this.state.date} min={curDate}/>
+								<input
+									type="date"
+									onChange={this.dateChanged.bind(this)}
+									defaultValue={this.state.date}
+									min={this.state.curDate}
+								/>
 							</div>
 						</div>
 					</div>
 				</div>
 				<div className="row justify-content-center align-items-center">
-					<TrashTurns date={this.state.date} initialDate={trashInitialDate}/>
+					<TrashTurns date={this.state.date} initialDate={this.state.trashInitialDate}/>
 				</div>
 				<div className="row justify-content-center align-items-center">
-					<CleanTurns date={this.state.date} initialDate={cleanInitialDate}/>
+					<CleanTurns date={this.state.date} initialDate={this.state.cleanInitialDate}/>
 				</div>
 				<div className="row justify-content-center align-items-center">
 					<StreetTurns date={this.state.date}/>
diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/components/CleanTurns.js b/src/components/CleanTurns.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import data from '../data.json';
+import data from '../data/data.json';
 
 const monday = 1; //primo giorno della settimana, costante per evitare magic numbers
 const totalPeople = 5; //totale inquilini
@@ -48,4 +48,4 @@ class CleanTurns extends React.Component {
 	}
 }
 
-export default CleanTurns;
+export default CleanTurns;
diff --git a/src/components/StreetTurns.js b/src/components/StreetTurns.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import data from '../data.json';
+import data from '../data/data.json';
 
 const totalDays = 7;
 
@@ -52,4 +52,4 @@ class StreetTurns extends React.Component {
 	}
 }
 
-export default StreetTurns;
+export default StreetTurns;
diff --git a/src/components/TrashTurns.js b/src/components/TrashTurns.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import data from '../data.json';
+import data from '../data/data.json';
 
 const timeDivider = 1000 * 60 * 60 * 24; //divisore, indica i giorni trascorsi da una certa data
 const totalTrash = 5; //totale turni spazzatura
@@ -85,4 +85,4 @@ class TrashTurns extends React.Component {
 	}
 }
 
-export default TrashTurns;
+export default TrashTurns;
diff --git a/src/components/index.js b/src/components/index.js
@@ -0,0 +1,9 @@
+import CleanTurns from './CleanTurns';
+import StreetTurns from './StreetTurns';
+import TrashTurns from './TrashTurns';
+
+export {
+	CleanTurns,
+	StreetTurns,
+	TrashTurns
+};
diff --git a/src/data/data.json b/src/data/data.json
diff --git a/src/index.css b/src/index.css
@@ -1,6 +1,6 @@
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+  font-family: "Trebuchet MS", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
   "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
   sans-serif;
   -webkit-font-smoothing: antialiased;
diff --git a/src/logo.svg b/src/logo.svg

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import React from 'react';`
`2`		`-import data from '../data.json';`
	`2`	`+import data from '../data/data.json';`
`3`	`3`
`4`	`4`	`const monday = 1; //primo giorno della settimana, costante per evitare magic numbers`
`5`	`5`	`const totalPeople = 5; //totale inquilini`
`@@ -48,4 +48,4 @@ class CleanTurns extends React.Component {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-export default CleanTurns;`
	`51`	`+export default CleanTurns;`