diff --git a/lib/AboutView.php b/lib/AboutView.php index edfec5e..26cdff5 100644 --- a/lib/AboutView.php +++ b/lib/AboutView.php @@ -13,8 +13,7 @@ class AboutView extends View public function page() { $body = << -

Roster:

+

James Murray - Project Manager

James Murray diff --git a/lib/MinutesView.php b/lib/MinutesView.php new file mode 100644 index 0000000..a48d098 --- /dev/null +++ b/lib/MinutesView.php @@ -0,0 +1,22 @@ + +
+
+
+

+ + +

+

+ + +

+

+
+
+
+
+HTML; + + return $body; + } + +} \ No newline at end of file diff --git a/lib/View.php b/lib/View.php index 62eee0e..abc6d0c 100644 --- a/lib/View.php +++ b/lib/View.php @@ -1,4 +1,5 @@ addNav("Home", "./"); - $this->addNav("Progress", "./"); - $this->addNav("Meet The Team", "./about.php"); + $this->addNav("Home", ROOT); + $this->addNav("Meet The Team", ROOT . "about.php"); + $this->addNav("Secure", ROOT ."secure"); $this->addNav("Course Site", "https://cse.msu.edu/~cse435/"); - $this->addNav("Secure", "./secure"); } public function head(){ - + $root = ROOT; $html = << + $this->title - + HTML; return $html; @@ -80,6 +80,6 @@ HTML; } private $links = array(); - private $title = "Not Set!"; + protected $title = "Not Set!"; } diff --git a/lib/protected.inc.php b/lib/protected.inc.php index 4c40a0a..5248238 100644 --- a/lib/protected.inc.php +++ b/lib/protected.inc.php @@ -7,9 +7,10 @@ */ require_once "prelude.inc.php"; + if(!$open){ if(!isset($_SESSION[LOGIN])){ - header("Location: ../secure/index.php"); + header("Location: " . ROOT . "secure/index.php"); } } diff --git a/post/login.php b/post/login.php index 12b1c8d..dc37f44 100644 --- a/post/login.php +++ b/post/login.php @@ -7,9 +7,9 @@ */ require_once "../lib/prelude.inc.php"; require_once "../lib/logins.inc.php"; -require_once "../lib/LoginController.php"; +require_once "../lib/SecureLoginController.php"; -$controller = new LoginController($_GET,$_POST,$logins); +$controller = new SecureLoginController($_GET,$_POST,$logins); if($controller->validLogin()){ diff --git a/secure/index.php b/secure/index.php index d847efb..8901d2c 100644 --- a/secure/index.php +++ b/secure/index.php @@ -1,28 +1,21 @@ setTitle("Secure Pages Login"); ?> - - Secure Pages Login - + head(); + ?> -

Secure Pages Login

-
-
- Login -

- - -

-

- - -

- -
-
+ header(); + echo $view->page(); + echo $view->footer(); + ?> diff --git a/secure/minutes.php b/secure/minutes.php index 437dfa3..bb54b03 100644 --- a/secure/minutes.php +++ b/secure/minutes.php @@ -2,14 +2,21 @@ setTitle("Meeting Minutes"); ?> - - - Meeting Minutes + head(); + ?> -

Meeting Minutes

+header(); +echo $view->page(); +echo $view->footer(); +?> diff --git a/style/default.css b/style/default.css index f9b5cec..3721c8e 100644 --- a/style/default.css +++ b/style/default.css @@ -30,6 +30,7 @@ body { */ body{ background: darkgreen; + font-family: Serif; } header { @@ -37,6 +38,7 @@ header { background : rgba(255,255,255,1); text-align: center; line-height: 3em; + border-bottom: 20px solid gray; } header h1 { @@ -74,6 +76,7 @@ div.card img{ height:400px; width:300px; border:thick solid black; + border-radius: 10px; display:block; padding: 5px; margin: auto; @@ -81,8 +84,8 @@ div.card img{ } div.card p{ - padding: 0 4em; - margin: 0.75em 0; + width: 400px; + margin: 0.75em auto; } div.card ul{ @@ -91,9 +94,19 @@ div.card ul{ display: block; } -div.team h1{ +div.content h1{ font-size: 3em; text-align: center; margin: 0.75em 0; color: white; } + +div.card form{ + padding: 25px; + +} + +div.card form fieldset{ + border: thin solid black; + text-align: center; +}