Commit Graph

107 Commits

Author SHA1 Message Date
Logan McInnis
0f7bf31a62 did stuff 2019-12-02 18:36:54 -08:00
Logan McInnis
d4f7ac7387 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 10:41:45 -08:00
WilliamMiceli
a2e66af73c Removed die(); as it might be messing with things. 2019-11-25 13:40:24 -05:00
Bryan
fcf59fe3e3 update the index page 2019-11-25 13:36:33 -05:00
WilliamMiceli
49e5b074ab Added index directive 2019-11-25 13:32:35 -05:00
Bryan
f58264e674 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 13:29:12 -05:00
Bryan
e3b7fcc646 fix the nginx conf file 2019-11-25 13:28:38 -05:00
WilliamMiceli
900b9c5c88 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 13:25:44 -05:00
WilliamMiceli
145146a561 Trying to fix login issue 2019-11-25 13:25:29 -05:00
Bryan
36beca341f updating the searching 2019-11-25 13:24:32 -05:00
William Miceli
e975293cab Lots and lots of stuff... 2019-11-25 06:06:27 -05:00
William Miceli
acc4dcb4ec Indentation fix 2019-11-25 05:57:54 -05:00
William Miceli
1431c5273a Indentation 2019-11-25 05:57:33 -05:00
William Miceli
f1fcba3e83 User authentication setup - first test 2019-11-25 04:31:19 -05:00
Bryan
3a7e7ced94 Cosmetic fix for the search site 2019-11-25 03:30:23 -05:00
Bryan
b90e6961de Deleting the unused html files 2019-11-25 03:25:08 -05:00
Bryan
9e56fe8d46 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-25 03:22:57 -05:00
Bryan
235c55285d fixing the search, now does it for full name or username, not complete just yet 2019-11-25 03:17:21 -05:00
William Miceli
70373d1453 Fixed missing end tag; page works again 2019-11-25 01:26:53 -05:00
Bryan
7728958a94 Merge branch 'master' of https://git.williammiceli.systems/williammiceli-educational/CS4430-Project 2019-11-24 23:09:10 -05:00
Bryan
d5f977e7d1 Updating search and sendMessage. Also correcting the landing page to redirect to redirect to the new pages 2019-11-24 23:07:11 -05:00
William Miceli
e24d376cb0 Explicitly using desired versions; added nano editor into dockerfile (less logs) 2019-11-24 23:00:53 -05:00
William Miceli
e7edd119f9 Small fix 2019-11-24 23:00:10 -05:00
William Miceli
cef19f325d Added back Port 3306 just in case for debugging 2019-11-24 22:34:59 -05:00
William Miceli
dc0c7f4381 Using PHP's PDO syntax now 2019-11-24 22:26:17 -05:00
William Miceli
064d1e25c3 Automatically install nano editor to make things a little easier 2019-11-24 14:42:17 -05:00
William Miceli
a235858693 Changed to use camelCase 2019-11-24 14:32:13 -05:00
William Miceli
0f527de9a7 Added command to execute friendBook SQL script 2019-11-24 14:25:51 -05:00
William Miceli
3dec2ea750 Removed since the friendBook database is made before startup 2019-11-24 14:19:10 -05:00
William Miceli
7a3e2e00fb Replaced tabs with 4 spaces 2019-11-24 14:17:58 -05:00
William Miceli
5b87ac68d7 Moved to scripts folder 2019-11-24 14:17:34 -05:00
Logan McInnis
95d57554f9 this will start database and create a few values 2019-11-24 13:57:51 -05:00
Logan McInnis
d068ea3449 Upload New File 2019-11-24 13:56:57 -05:00
Logan McInnis
4f9afcc46f mysql file that creates databse 2019-11-24 10:51:22 -08:00
WilliamMiceli
8e7b68966c Updated username and password 2019-11-23 00:45:17 -05:00
WilliamMiceli
1c2980c416 Added the database and a user to test out the PHP pages with 2019-11-23 00:35:47 -05:00
WilliamMiceli
30d39c3559 Let's see if this now works 2019-11-23 00:19:47 -05:00
WilliamMiceli
6870eb425a Learned that services are only running within the Docker build layer they are started in it seems... 2019-11-23 00:13:06 -05:00
WilliamMiceli
d84df24e08 Removed unneeded MySQL port 2019-11-23 00:12:20 -05:00
WilliamMiceli
ed85d2dc78 Testing 2019-11-23 00:09:22 -05:00
WilliamMiceli
215d0322ff Moved starting services to inside dockerfile; side-benefit of faster startups 2019-11-23 00:06:40 -05:00
WilliamMiceli
6f1f9f63ac IT WORKS!!!!!!!!!!!!!!!!!!!!!!... now to clean up. 2019-11-22 23:56:58 -05:00
WilliamMiceli
4891d8cf7c 100th time's the charm? 2019-11-22 23:53:20 -05:00
WilliamMiceli
52864bad21 Maybe......? 2019-11-22 23:39:40 -05:00
WilliamMiceli
38824d4bec And again, but this time I might have found out why... 2019-11-22 23:37:05 -05:00
WilliamMiceli
3398507780 And again 2019-11-22 23:30:14 -05:00
WilliamMiceli
d69e50f732 And again 2019-11-22 23:28:58 -05:00
WilliamMiceli
80d082aef4 And again 2019-11-22 23:27:38 -05:00
WilliamMiceli
707c74c700 And again 2019-11-22 23:23:50 -05:00
WilliamMiceli
4bb62e068e Yet again 2019-11-22 23:21:23 -05:00