reorganize files

rcorson · Oct 22, 2020 · f5ec66a · f5ec66a
1 parent df927ed
commit f5ec66a
Show file tree

Hide file tree

Showing 21 changed files with 187 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A drag & drop event calendar with data permanence.
 
-![FullCalendar with data permanence](img/main.png)
+![FullCalendar with data permanence](main.png)
 
 ## Purpose
 

diff --git a/class.Event.php b/class.Event.php
diff --git a/class.Recurrence.php b/class.Recurrence.php
diff --git a/class.Week.php b/class.Week.php
diff --git a/addEvent-json.php → core/add-event-json.php b/addEvent-json.php → core/add-event-json.php
@@ -4,17 +4,17 @@
   // ini_set('display_startup_errors', 1);
   // error_reporting(E_ALL);
 
-  require_once('sanitize.php');
+  require_once('../utils/sanitize.php');
 
-  require 'class.Event.php';
-  require 'class.Recurrence.php';
-  require 'class.Week.php';
+  require '../logic/class.Event.php';
+  require '../logic/class.Recurrence.php';
+  require '../logic/class.Week.php';
 
   // if event post
   if (isset($_POST['title'])) {
 
       // get dates data
-      $jsonString = file_get_contents('json/events.json');
+      $jsonString = file_get_contents('../data/events.json');
       $data = json_decode($jsonString, true);
 
       $id = end($data)['id'];
@@ -49,7 +49,7 @@
           // store dates
           $events = array_merge($data, $addRecurrenceEvents);
           $newJsonString = json_encode($events);
-          file_put_contents('json/events.json', $newJsonString);
+          file_put_contents('../data/events.json', $newJsonString);
 
       // if single event
       } else {
@@ -68,7 +68,7 @@
         // store dates
         $data[] = $addSingleEvent;
         $newJsonString = json_encode($data);
-        file_put_contents('json/events.json', $newJsonString);
+        file_put_contents('../data/events.json', $newJsonString);
       }
   }
   // back to fullCalendar

diff --git a/addEvent.php → core/add-event.php b/addEvent.php → core/add-event.php
@@ -1,6 +1,6 @@
 <?php
-require_once('auth.php');
-require_once('sanitize.php');
+require_once('./utils/auth.php');
+require_once('./utils/sanitize.php');
 
 if (isset($_POST['title'])) {
 	$title = sanitizeInput($_POST['title']);

diff --git a/editEventDate-json.php → core/edit-date-json.php b/editEventDate-json.php → core/edit-date-json.php
@@ -1,7 +1,7 @@
 <?php
 
 if (isset($_POST['Event'][0]) && isset($_POST['Event'][1]) && isset($_POST['Event'][2])) {
-	$jsonString = file_get_contents('json/events.json');
+	$jsonString = file_get_contents('../data/events.json');
 	$data = json_decode($jsonString, true);
 
     $start = explode(" ", $_POST['Event'][1]);
@@ -20,7 +20,7 @@
 		}
 	}
 	$newJsonString = json_encode($data);
-	file_put_contents('json/events.json', $newJsonString);
+	file_put_contents('../data/events.json', $newJsonString);
 
 }
 //header('Location: '.$_SERVER['HTTP_REFERER']);

diff --git a/editEventDate.php → core/edit-date.php b/editEventDate.php → core/edit-date.php
@@ -1,7 +1,7 @@
 <?php
 
 // Connexion à la base de données
-require_once('auth.php');
+require_once('./utils/auth.php');
 
 if (isset($_POST['Event'][0]) && isset($_POST['Event'][1]) && isset($_POST['Event'][2])){
 

diff --git a/editEventTitle-json.php → core/edit-title-json.php b/editEventTitle-json.php → core/edit-title-json.php
@@ -1,29 +1,29 @@
 <?php
 
 if (isset($_POST['delete']) && isset($_POST['id'])) {
-	$jsonString = file_get_contents('json/events.json');
+	$jsonString = file_get_contents('../data/events.json');
 	$data = json_decode($jsonString, true);
 	foreach ($data as $key => $entry) {
 		if ($entry['id'] == $_POST['id']) {
             unset($data[$key]);
 		}
 	}
 	$newJsonString = json_encode($data);
-	file_put_contents('json/events.json', $newJsonString);
+	file_put_contents('../data/events.json', $newJsonString);
 
 } else if (isset($_POST['deleteRecurrence']) && isset($_POST['rid'])) {
-	$jsonString = file_get_contents('json/events.json');
+	$jsonString = file_get_contents('../data/events.json');
 	$data = json_decode($jsonString, true);
 	foreach ($data as $key => $entry) {
 		if ($entry['rid'] == $_POST['rid']) {
             unset($data[$key]);
 		}
 	}
 	$newJsonString = json_encode($data);
-	file_put_contents('json/events.json', $newJsonString);
+	file_put_contents('../data/events.json', $newJsonString);
 
 } else if (isset($_POST['title']) && isset($_POST['description']) && isset($_POST['color']) && isset($_POST['id'])) {
-	$jsonString = file_get_contents('json/events.json');
+	$jsonString = file_get_contents('../data/events.json');
 	$data = json_decode($jsonString, true);
     foreach ($data as $key => $entry) {
         if ($entry['id'] == $_POST['id']) {
@@ -33,9 +33,9 @@
         }
     }
     $newJsonString = json_encode($data);
-    file_put_contents('json/events.json', $newJsonString);
+    file_put_contents('../data/events.json', $newJsonString);
 
 }
-header('Location: index-json.php');
+header('Location: ../index-json.php');
 
 ?>
diff --git a/editEventTitle.php → core/editEventTitle.php b/editEventTitle.php → core/editEventTitle.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('auth.php');
+require_once('./utils/auth.php');
 if (isset($_POST['delete']) && isset($_POST['id'])){
 
 
@@ -40,7 +40,7 @@
 	}
 
 }
-header('Location: index.php');
+header('Location: ../index.php');
 
 
 ?>
diff --git a/calendar.sql → data/calendar.sql b/calendar.sql → data/calendar.sql
diff --git a/json/events.json → data/events.json b/json/events.json → data/events.json
diff --git a/index-json.php b/index-json.php
@@ -80,7 +80,7 @@
 	<div class="modal fade" id="ModalAdd" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
-				<form class="form-horizontal" method="POST" action="addEvent-json.php">
+				<form class="form-horizontal" method="POST" action="./core/add-event-json.php">
 				<div class="modal-header">
 					<h4 class="modal-title" id="myModalLabel">Add Event</h4>
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -254,7 +254,7 @@
 	<div class="modal fade" id="ModalEdit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
-				<form class="form-horizontal" method="POST" action="editEventTitle-json.php">
+				<form class="form-horizontal" method="POST" action="./core/edit-title-json.php">
 				<div class="modal-header">
 					<h4 class="modal-title" id="myModalLabel">Edit Event</h4>
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -402,7 +402,7 @@
 		},
 		eventAfterRender: function(eventObj, $el) {
 			var request = new XMLHttpRequest();
-			request.open('GET', 'json/events.json', true);
+			request.open('GET', 'data/events.json', true);
 			request.onload = function () {
 				$el.popover({
 					title: eventObj.title,
@@ -462,7 +462,7 @@ function edit(event) {
 		Event[2] = end;
 		
 		$.ajax({
-			url: 'editEventDate-json.php',
+			url: './core/edit-date-json.php',
 			type: "POST",
 			data: {Event:Event},
 			success: function(rep) {

diff --git a/index.php b/index.php
@@ -1,5 +1,5 @@
 <?php
-require_once('auth.php');
+require_once('./utils/auth.php');
 
 
 $sql = "SELECT id, title, description, start, end, color FROM events ";
@@ -93,7 +93,7 @@
 <div class="modal fade" id="ModalAdd" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
-     <form class="form-horizontal" method="POST" action="addEvent.php">
+     <form class="form-horizontal" method="POST" action="./core/add-event.php">
 
 			  <div class="modal-header">
 			  <h4 class="modal-title" id="myModalLabel">Add Event</h4>
@@ -158,8 +158,7 @@
 <div class="modal fade" id="ModalEdit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
-     <form class="form-horizontal" method="POST" action="editEventTitle.php">
-			<form class="form-horizontal" method="POST" action="editEventTitle.php">
+			<form class="form-horizontal" method="POST" action="./core/edit-title.php">
 			  <div class="modal-header">
 			  <h4 class="modal-title" id="myModalLabel">Edit Event</h4>
 				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -353,7 +352,7 @@ function edit(event){
 			Event[2] = end;
 
 			$.ajax({
-			 url: 'editEventDate.php',
+			 url: './core/edit-date.php',
 			 type: "POST",
 			 data: {Event:Event},
 			 success: function(rep) {