Skip to content
This repository was archived by the owner on Oct 17, 2021. It is now read-only.

Commit b0f8293

Browse files
waldronmattwaldronmatt
authored
Merge pull request #6 from waldronmatt/mw-feature/recurrence-updates
weekly occurrence
2 parents 22b2e5c + 2e76fc1 commit b0f8293

27 files changed

+12036
-12124
lines changed

‎LICENSE‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
MIT License
2-
3-
Copyright (c) 2019 Matthew Waldron
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
MIT License
2+
3+
Copyright (c) 2019 Matthew Waldron
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎README.md‎

Lines changed: 75 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,75 @@
1-
# fullcalendar-BS4-PHP-MySQL-JSON
2-
FullCalendar 3 integration with boostrap4, php, mysql, json
3-
4-
## Purpose
5-
6-
Updates and expands on jamelbaz's FullCalendar-BS3-PHP-MySQL repository.
7-
8-
* Supports event scheduling using JSON
9-
* MySQL event scheduling updated
10-
* FullCalendar updated from 2.6.1 to 3.9.0
11-
* Clickable calendar date numbers
12-
* Added the calendar list view
13-
* Includes business hours and now indicator
14-
* Bootstrap updated from BS3 to BS4
15-
* Event title and description display on hover integration (popper.js)
16-
* Added event description field
17-
* Revamped delete button
18-
* Calendar resizing for optimal screen real estate
19-
* Week and Day views set to display times 8:00AM to 4:30PM without scroll
20-
21-
## Getting Started
22-
23-
* Go to your MySQL via localhost, create a table called "calendar", and create the tables found in calendar.sql
24-
25-
* Open bdd.php and enter your database password
26-
27-
* Go to localhost and navigate to the project directory
28-
29-
* index.php enables event scheduling integration with PHP and MySQL
30-
31-
* index-json.php and associated files enable event scheduling integration with PHP and JSON
32-
33-
# Features
34-
35-
* Add events by clicking and dragging on the calendar
36-
37-
* Edit/delete events by double clicking them
38-
39-
* Supports event title, description, start date/time, end date/time, and color attributes
40-
41-
* Utilizes popper.js to show event title and description on hover
42-
43-
## Additional Readings & Resources
44-
45-
* FullCalendar documentation: https://fullcalendar.io/docs#toc
46-
47-
## Built With
48-
49-
* Bootstrap4
50-
* PHP5
51-
* SQL/MySQL
52-
* JSON/jQuery/JavaScript
53-
* HTML5
54-
* CSS3
55-
* FullCalendar v3.9
56-
* FullCalendar-BS3-PHP-MySQL Framework
57-
58-
## Contributing
59-
60-
When contributing to this repository, you may fork and submit a pull request. Add a description of what you are doing and I'll review it.
61-
62-
## Versioning
63-
64-
Version 1.0.0
65-
66-
## Authors
67-
68-
* **Matthew Waldron** - (http://waldronmatthew.com)
69-
* **FullCalendar** - (https://fullcalendar.io)
70-
* **jamelbaz** https://github.com/jamelbaz/FullCalendar-BS3-PHP-MySQL
71-
72-
## License
73-
74-
This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details.
75-
76-
## Acknowledgments
77-
78-
* Project forked from jamelbaz's repository: https://github.com/jamelbaz/FullCalendar-BS3-PHP-MySQL
79-
* JSON blog code used in the creation of event php forms: https://www.taniarascia.com/how-to-use-json-data-with-php-or-javascript/
1+
# fullcalendar-BS4-PHP-MySQL-JSON
2+
FullCalendar 3 integration with boostrap4, php, mysql / bootstrap4, php, json
3+
4+
## Purpose
5+
6+
Updates and expands on jamelbaz's FullCalendar-BS3-PHP-MySQL repository.
7+
8+
* Supports event scheduling using JSON / MySQL event scheduling updated
9+
* FullCalendar updated from 2.6.1 to 3.9.0
10+
* Clickable calendar date numbers
11+
* Added the calendar list view
12+
* Includes business hours and now indicator
13+
* Bootstrap updated from BS3 to BS4
14+
* Event title and description display on hover integration (popper.js)
15+
* Added event description field
16+
* Revamped delete button
17+
* Calendar resizing for optimal screen real estate
18+
* Week and Day views set to display times 8:00AM to 4:30PM without scroll
19+
20+
## Getting Started
21+
22+
* Go to your MySQL via localhost, create a table called "calendar", and create the tables found in calendar.sql
23+
24+
* Open bdd.php and enter your database password
25+
26+
* Go to localhost and navigate to the project directory
27+
28+
* index.php enables event scheduling integration with PHP and MySQL
29+
30+
* index-json.php and associated files enable event scheduling integration with PHP and JSON
31+
32+
# Features
33+
34+
* Add events by clicking and dragging on the calendar
35+
36+
* Edit/delete events by double clicking them
37+
38+
* Supports event title, description, start date/time, end date/time, and color attributes
39+
40+
* Utilizes popper.js to show event title and description on hover
41+
42+
## Additional Readings & Resources
43+
44+
* FullCalendar documentation: https://fullcalendar.io/docs#toc
45+
46+
## Built With
47+
48+
* Bootstrap
49+
* PHP5
50+
* MySQL
51+
* JSON / jQuery / JavaScript
52+
* HTML / CSS
53+
54+
## Contributing
55+
56+
When contributing to this repository, you may fork and submit a pull request. Add a description of what you are doing and I'll review it.
57+
58+
## Versioning
59+
60+
Version 1.0.0
61+
62+
## Authors
63+
64+
* **Matthew Waldron** - (http://waldronmatthew.com)
65+
* **FullCalendar** - (https://fullcalendar.io)
66+
* **jamelbaz** https://github.com/jamelbaz/FullCalendar-BS3-PHP-MySQL
67+
68+
## License
69+
70+
This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details.
71+
72+
## Acknowledgments
73+
74+
* Project forked from jamelbaz's repository: https://github.com/jamelbaz/FullCalendar-BS3-PHP-MySQL
75+
* JSON blog code used in the creation of event php forms: https://www.taniarascia.com/how-to-use-json-data-with-php-or-javascript/

0 commit comments

Comments
 (0)