From 604d42f707caec201a2dc42e9cf2d87b91303e9a Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 4 Dec 2019 16:05:42 -0500 Subject: [PATCH 1/3] Removed duplicate --- friendbook.sql | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 friendbook.sql diff --git a/friendbook.sql b/friendbook.sql deleted file mode 100644 index 6002f5a..0000000 --- a/friendbook.sql +++ /dev/null @@ -1,48 +0,0 @@ -drop database if exists friendbook; - -create database friendbook; - -use friendbook; - -create table login( - username varchar(25), - pword varchar(25), - primary key(username)); - -create table contacts( - username varchar(25), - fname varchar(25), - lnam varchar(25), - primary key(username), - foreign key(username) references login(username)); - -create table messages( - messageID int, - sender varchar(25), - recipient varchar(25), - message text, - date date, - haveread varchar(1), - primary key(messageID), - foreign key(sender) references contacts(username), - foreign key(recipient) references contacts(username)); - -create table friendList( - username varchar(25), - friend varchar(25), - confirm boolean); - -insert into login - values ('user1', 'password1'); -insert into login - values ('user2', 'password2'); - -insert into contacts - values ('user1', 'num1', 'uno'); -insert into contacts - values ('user2', 'num2', 'dos'); - -insert into messages - values ('1', 'user1', 'user2', 'hello, how are you', now(), 'Y'); -insert into messages - values ('2', 'user2', 'user1', 'im doing good, thanks', now(), 'N'); From 85ab536dd1ee5f000f739cbe6c2ca80e9cca9bb2 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 4 Dec 2019 16:05:58 -0500 Subject: [PATCH 2/3] Moved into the navigation bar --- var/www/index.html | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 var/www/index.html diff --git a/var/www/index.html b/var/www/index.html deleted file mode 100644 index 1843f05..0000000 --- a/var/www/index.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - friendbook - - - - -

friendbook

- - -

- -

- -

- -

- -

- - - - - From 62486df5fb261d53f99b01f8c014eebba8969b2c Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Wed, 4 Dec 2019 16:06:13 -0500 Subject: [PATCH 3/3] Login page is now the default landing page --- etc/nginx/conf.d/cs4430.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/nginx/conf.d/cs4430.conf b/etc/nginx/conf.d/cs4430.conf index 1b6411d..89a69ba 100644 --- a/etc/nginx/conf.d/cs4430.conf +++ b/etc/nginx/conf.d/cs4430.conf @@ -3,14 +3,14 @@ server { listen [::]:80; root /var/www/; - index index.html; + index login.php; server_name _; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; location / { - try_files $uri $uri/ /index.html =404; + try_files $uri $uri/ /login.php =404; ssi on; }