Compare commits
No commits in common. "53d2ff7547f1a1f24d8e41100a8616ed528fc9f7" and "b5aaafd494acbaab7578643c8633df3148eccfd5" have entirely different histories.
53d2ff7547
...
b5aaafd494
@ -13,42 +13,32 @@ class AboutView extends View
|
||||
public function page()
|
||||
{
|
||||
$body = <<<HTML
|
||||
<h1>Roster:</h1>
|
||||
<div class="team">
|
||||
<h1>Roster:</h1>
|
||||
<div class="card">
|
||||
<h2>James Murray - Project Manager</h2>
|
||||
<img src="assets/james_murray.jpg" height="1365" width="1372" alt="James Murray">
|
||||
<div class="member">
|
||||
<h2>Project Manager - James</h2>
|
||||
<p>
|
||||
A senior at Michigan State University majoring in Computer Science,
|
||||
James has a strong love for software development,
|
||||
especially the creation of desktop applications.
|
||||
blurb.
|
||||
</p> </div>
|
||||
<div class="card">
|
||||
<h2>Sean Joseph - Artifacts Manager</h2>
|
||||
<img src="assets/sean_joseph.jpg" height="960" width="952" alt="Sean Joseph">
|
||||
<div class="member">
|
||||
<h2>Artifacts Manager - Sean</h2>
|
||||
<p>
|
||||
Senior Computer Science Major at Michigan State University.
|
||||
I enjoy long walks on the beach and casual conversation about
|
||||
vimrc files. <a href="https://www.egr.msu.edu/~joseph62">Homepage Here</a>
|
||||
blurb.
|
||||
</p> </div>
|
||||
<div class="card">
|
||||
<h2>Stephen Alfa - Project Facilitator</h2>
|
||||
<img src="assets/stephen_alfa.jpg" width="960" height="959" alt="Stephen Alfa">
|
||||
<p> </p> </div>
|
||||
<div class="card">
|
||||
<h2>Logan Arent - Safety/Security Engineer</h2>
|
||||
<img src="assets/logan_arent.jpg" height="696" width="696" alt="Logan Arent">
|
||||
<div class="member">
|
||||
<h2>Project Facilitator - Stephen</h2>
|
||||
<p>
|
||||
Senior in Computer Science at Michigan State University.
|
||||
Working to gain as much knowledge as possible about software development.
|
||||
blurb.
|
||||
</p> </div>
|
||||
<div class="card">
|
||||
<h2>Colin Coppersmith - Domain Expert/Customer Liaison</h2>
|
||||
<img src="assets/colin_coppersmith.jpg" height="999" width="693" alt="Colin Coppersmith">
|
||||
<div class="member">
|
||||
<h2>Safety/Security Engineer - Logan</h2>
|
||||
<p>
|
||||
20 years old, from Clarkston, MI.
|
||||
Graduating in May of 2018 with a B.S. in Computer Science.
|
||||
Currently in a web development internship for Jackson National Life supporting the Mobile Technologies department.
|
||||
blurb.
|
||||
</p> </div>
|
||||
<div class="member">
|
||||
<h2>Domain Expert/Customer Liaison - Colin</h2>
|
||||
<p>
|
||||
blurb.
|
||||
</p> </div>
|
||||
</div>
|
||||
HTML;
|
||||
|
||||
@ -11,36 +11,8 @@ class LandingView extends View
|
||||
public function page()
|
||||
{
|
||||
$body = <<<HTML
|
||||
<div class="card">
|
||||
<h2>Project Description</h2>
|
||||
<p>
|
||||
Our project is to automate the recording of paint defects and the creation of reports.
|
||||
Analysts will use the system instead of paper diagrams to record paint defects.
|
||||
It will automatically create daily reports and allow for easy creation of the reports for larger time periods.
|
||||
The system will be safe, reliable, and secure.
|
||||
It will be used at the following GM plants: Lansing Delta Township, Lansing Grand River, and Lake Orion Assembly.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>Project Background</h2>
|
||||
<p>
|
||||
General Motors automotive plants check for paint defects at points along the assembly line so that the defects can be fixed and so sources of defects can be found and eliminated.
|
||||
Currently, analysts examine the cars and record defects on paper diagrams.
|
||||
Later the analyst will compile the data and create daily reports and summary reports for larger time periods.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<h2>Other Resources</h2>
|
||||
<ul>
|
||||
<li><a href="https://cse.msu.edu/~cse435/Projects/F2017/Project-Description-Assignment.pdf">Project Specification</a></li>
|
||||
<li><a href=".">Software Reqirement Specs</a></li>
|
||||
<li><a href=".">Prototype</a></li>
|
||||
<li><a href=".">Bibliography</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<h1>Paint Defect Reporting!</h1>
|
||||
<p>Find those defects, boys!</p>
|
||||
HTML;
|
||||
return $body;
|
||||
}
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: sean
|
||||
* Date: 10/29/17
|
||||
* Time: 6:59 PM
|
||||
*/
|
||||
class LoginController
|
||||
{
|
||||
public function __construct($get, $post, $logins)
|
||||
{
|
||||
|
||||
$this->get = $get;
|
||||
$this->post = $post;
|
||||
$this->logins = $logins;
|
||||
|
||||
if(isset($post['username'])){
|
||||
$username = $post['username'];
|
||||
if(array_key_exists($username,$logins)){
|
||||
if(isset($post['password'])) {
|
||||
$hash = hash("sha256", $post['password']);
|
||||
if ($hash == $logins[$username]) {
|
||||
$this->success = true;
|
||||
$this->redirect = "secure/minutes.php";
|
||||
}
|
||||
else{
|
||||
$this->redirect = "secure/index.php";
|
||||
}
|
||||
}
|
||||
else{
|
||||
$this->redirect = "secure/index.php";
|
||||
}
|
||||
|
||||
}
|
||||
else{
|
||||
$this->redirect = "secure/index.php";
|
||||
}
|
||||
}
|
||||
else{
|
||||
$this->redirect = "secure/index.php";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function getRedirect(){
|
||||
return $this->redirect;
|
||||
}
|
||||
|
||||
public function validLogin(){
|
||||
return $this->success;
|
||||
}
|
||||
|
||||
private $get; //Get data
|
||||
private $post; //Post data
|
||||
private $logins; //Login data
|
||||
private $success = false; // successful login flag
|
||||
private $redirect; //Redirect location
|
||||
}
|
||||
@ -14,7 +14,6 @@ class View
|
||||
$this->addNav("Progress", "./");
|
||||
$this->addNav("Meet The Team", "./about.php");
|
||||
$this->addNav("Course Site", "https://cse.msu.edu/~cse435/");
|
||||
$this->addNav("Secure", "./secure");
|
||||
}
|
||||
|
||||
public function head(){
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: sean
|
||||
* Date: 10/29/17
|
||||
* Time: 7:22 PM
|
||||
*/
|
||||
|
||||
//Login credentials for the protected pages
|
||||
$logins = array(
|
||||
"team6" => "1b598bb7f24d7d258a6bd2264177fb88896744e43214f86daa9f4738e5e8b5be",
|
||||
"cse435" => "0f0484da86e5949eb820290270ab76e5fc63f1c4c06b0bb412cd3c551623069f",
|
||||
);
|
||||
@ -1,9 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* This file should be included for any entry point.
|
||||
* Constants and session stuff will be saved here.
|
||||
*/
|
||||
|
||||
session_start();
|
||||
define("LOGIN","login");//login session constant
|
||||
define("ROOT", "/~joseph62/cse435/");
|
||||
@ -1,15 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: sean
|
||||
* Date: 10/29/17
|
||||
* Time: 6:49 PM
|
||||
*/
|
||||
require_once "prelude.inc.php";
|
||||
|
||||
if(!$open){
|
||||
if(!isset($_SESSION[LOGIN])){
|
||||
header("Location: ../secure/index.php");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: sean
|
||||
* Date: 10/29/17
|
||||
* Time: 6:59 PM
|
||||
*/
|
||||
require_once "../lib/prelude.inc.php";
|
||||
require_once "../lib/logins.inc.php";
|
||||
require_once "../lib/LoginController.php";
|
||||
|
||||
$controller = new LoginController($_GET,$_POST,$logins);
|
||||
|
||||
if($controller->validLogin()){
|
||||
|
||||
$_SESSION[LOGIN] = "We really out here.";
|
||||
}
|
||||
|
||||
header("Location: " . ROOT . $controller->getRedirect());
|
||||
|
||||
12
secure/.htaccess
Normal file
12
secure/.htaccess
Normal file
@ -0,0 +1,12 @@
|
||||
AuthType Basic
|
||||
AuthBasicProvider ldap
|
||||
AuthName "Roaming Access"
|
||||
AuthLDAPURL ldap://ds.cse.msu.edu:389/ou=People,dc=cse,dc=msu,dc=edu?uid?sub
|
||||
AuthLDAPGroupAttribute memberUid
|
||||
AuthLDAPGroupAttributeIsDN off
|
||||
Require user cse435
|
||||
Require user joseph62
|
||||
Require user alphastep
|
||||
Require user arentlog
|
||||
Require user coppers4
|
||||
Require user murra203
|
||||
@ -1,28 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
require_once "../lib/prelude.inc.php";
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Secure Pages Login</title>
|
||||
<link href="../style/default.css" type="text/css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
<h1>Secure Pages Login</h1>
|
||||
<form action="../post/login.php" method="post">
|
||||
<fieldset>
|
||||
<legend>Login</legend>
|
||||
<p>
|
||||
<label for="username">Username:</label>
|
||||
<input type="text" id="username" name="username" placeholder="Username">
|
||||
</p>
|
||||
<p>
|
||||
<label for="password">Password:</label>
|
||||
<input type="password" id="password" name="password" placeholder="Password">
|
||||
</p>
|
||||
<input type="submit" name="Submit" value="Submit">
|
||||
</fieldset>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,15 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<?php
|
||||
require_once "../lib/prelude.inc.php";
|
||||
require_once "../lib/protected.inc.php";
|
||||
?>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link href="../style/default.css" rel="stylesheet" type="text/css">
|
||||
<title>Meeting Minutes</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>Meeting Minutes</h1>
|
||||
</body>
|
||||
</html>
|
||||
@ -21,20 +21,13 @@ time, mark, audio, video
|
||||
background:transparent;
|
||||
}
|
||||
|
||||
/*
|
||||
body {
|
||||
background-image: url("../assets/redcedarbackground.jpg");
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
}
|
||||
*/
|
||||
body{
|
||||
background: darkgreen;
|
||||
background : lightgrey;
|
||||
}
|
||||
|
||||
header {
|
||||
padding-top: 1em;
|
||||
background : rgba(255,255,255,1);
|
||||
background : white;
|
||||
text-align: center;
|
||||
line-height: 3em;
|
||||
}
|
||||
@ -43,57 +36,20 @@ header h1 {
|
||||
font-size : 2em;
|
||||
}
|
||||
|
||||
a{
|
||||
color : rgba(100,100,100,1);
|
||||
nav a{
|
||||
color : darkgray;
|
||||
font-style: normal;
|
||||
text-decoration : none;
|
||||
background : inherit;
|
||||
}
|
||||
|
||||
a:hover{
|
||||
color : rgba(0,0,0,1);
|
||||
nav a:hover{
|
||||
color : black;
|
||||
background: lightgrey;
|
||||
font-size:1.1em;
|
||||
}
|
||||
|
||||
div.card{
|
||||
text-align: left;
|
||||
margin: 1em auto;
|
||||
border: medium solid black;
|
||||
border-radius: 10px;
|
||||
/*height: 550px;*/
|
||||
width: 700px;
|
||||
background: rgba(255,255,255,1);
|
||||
}
|
||||
|
||||
div.card h2{
|
||||
margin-top: 0.75em;
|
||||
margin-bottom: 0.75em;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
div.card img{
|
||||
height:400px;
|
||||
width:300px;
|
||||
border:thick solid black;
|
||||
display:block;
|
||||
padding: 5px;
|
||||
margin: auto;
|
||||
|
||||
}
|
||||
|
||||
div.card p{
|
||||
padding: 0 4em;
|
||||
margin: 0.75em 0;
|
||||
}
|
||||
|
||||
div.card ul{
|
||||
margin-left: 75px;
|
||||
margin-bottom: 25px;
|
||||
display: block;
|
||||
}
|
||||
|
||||
div.team h1{
|
||||
font-size: 3em;
|
||||
text-align: center;
|
||||
margin: 0.75em 0;
|
||||
color: white;
|
||||
border:thick black;
|
||||
display:inline-block;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user