Merge pull request #1 from stansakl/master

Merge to my Suraj Repo
stansakl · Nov 6, 2017 · 49410a4 · 49410a4
2 parents bbc31c3 + 0884691
commit 49410a4
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.zip
diff --git a/DB/project_table.sql b/DB/project_table.sql
@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS `voluntrack`.`USER_PROJECT` (
+  `USER_ID` INT UNSIGNED NOT NULL,
+  `PROJECT_ID` INT UNSIGNED NOT NULL,
+  `PROJECT_START_DATE_TIME` DATETIME(0) NOT NULL,
+  `PROJECT_END_DATE_TIME` DATETIME(0) NOT NULL,
+  INDEX `PROJECT_ID_idx` (`PROJECT_ID` ASC, `USER_ID` ASC),
+  INDEX `User_id _idx` (`USER_ID` ASC))
+ENGINE = InnoDB;
diff --git a/DB/user_project_db.sql b/DB/user_project_db.sql
@@ -0,0 +1,8 @@
+CREATE TABLE  IF NOT EXISTS `user_project` (
+  `USER_ID` int(10) unsigned NOT NULL,
+  `PROJECT_ID` int(10) unsigned NOT NULL,
+  `PROJECT_START_DATE_TIME` datetime NOT NULL,
+  `PROJECT_END_DATE_TIME` datetime NOT NULL,
+  KEY `User_id _idx` (`USER_ID`),
+  KEY `PROJECT_ID_idx` (`PROJECT_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/src/index.php b/src/index.php
@@ -16,11 +16,17 @@
 //echo phpinfo();
 //var_dump($_SESSION);
 if(isset($_SESSION['logged_in']) && ($_SESSION['logged_in'] == true)) {
-    echo "<a href=\"voluntrack/logout.php\">Logout</a>";
+    echo "<a href=\"voluntrack/logout.php\">Logout</a><br>";
 }
 else {
-    echo "<a href=\"voluntrack/login_view.php\">Login</a>";
+    echo "<a href=\"voluntrack/login_view.php\">Login</a><br>";
     echo "<a href=\"voluntrack/register_view.php\">Register</a>";
 }
+
+if(isset($_SESSION['logged_in']) && ($_SESSION['logged_in'] == true)) {
+    echo "<a href=\"voluntrack/timeentry_view.php\">Enter Time</a><br>";
+}
 ?>
+
+
 </body>
diff --git a/src/voluntrack/DBManager.php b/src/voluntrack/DBManager.php
@@ -35,8 +35,10 @@ public static function get_instance() {
     private function connect_to_database($value='')
     {
         $servername = "localhost";
+        //$servername = "aa10nntj8dofc1n.cixyo4eg79dc.us-east-2.rds.amazonaws.com";
         $username = "voluntrack";
         $password = "voluntrack";
+        $conn = null;
 
 
         try
@@ -47,7 +49,7 @@ private function connect_to_database($value='')
             //echo "Connected successfully";
 
         }
-        catch(PDOException $e)
+        catch(\PDOException $e)
         {
             echo "Connection failed: " . $e->getMessage();
         }
@@ -79,12 +81,11 @@ public function register_user($first, $last, $middle, $username, $password)
             $stmt->execute();
 
         } catch (\Exception $e) {
-            throw new \Exception("Error registering user. Username may not be unique!", 1);
+            throw new \Exception("Error registering user!", 1);
 
         }
     }
 
-<<<<<<< HEAD
     /**
      * Returns 1 if user is allowed to login, else 0;
      */
@@ -94,7 +95,7 @@ public function attempt_login($user, $password)
         $hash = password_hash($password, PASSWORD_DEFAULT);
 
         try {
-            $conn = self::get_connection();
+            $conn = $this->get_connection();
             $stmt = $conn->prepare("SELECT USERNAME, PASSWORD FROM USERS WHERE USERNAME = :username");
             $stmt->bindParam(':username', $user);
             $stmt->execute();
@@ -117,8 +118,5 @@ public function attempt_login($user, $password)
         } catch (\Exception $e) {
             throw $e;
         }
-
-=======
->>>>>>> register_user
     }
 }
diff --git a/src/voluntrack/register.php b/src/voluntrack/register.php
@@ -4,15 +4,17 @@
 //echo "Registration Logic goes here!";
 //session_start();
 $dbm = DBManager::get_instance();
-
+/*
 if ($_POST['password'] !== $_POST['confirmpwd']) {
     echo "Passwords do not match!";
     header("location: register.php");
 }
-
+*/
 try {
     $dbm->register_user($_POST['firstname'],$_POST['lastname'],$_POST['middlename'],$_POST['email'],$_POST['password']);
+    header("location: login.php");
 
 } catch (\Exception $e) {
     echo "Cannot register user: " . $e->getMessage();
+    header("location: register.php");
 }
diff --git a/src/voluntrack/timeentry_view.php b/src/voluntrack/timeentry_view.php
@@ -0,0 +1,20 @@
+<?php
+session_start();
+require "htmlconstants.php";
+//namespace voluntrack;
+//require '../vendor/autoload.php';
+?>
+ <?php
+ ?>
+ <!DOCTYPE html>
+ <?php echo HEADER; ?>
+
+
+ <body>
+     <main class="container">
+         <form class="col-md-12" action="timeentry.php" method="post">
+             <input type="submit" name="loginbtn" value="Enter My Time">
+         </form>
+     </main>
+
+ </body>