start on main webpage

RyanTorok · Sep 9, 2018 · e7e5f8c · e7e5f8c
1 parent 41b92c5
commit e7e5f8c
Show file tree

Hide file tree

Showing 8 changed files with 291 additions and 319 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+public_html/jquery
+.idea
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/public_html/index.css b/public_html/index.css
@@ -0,0 +1,64 @@
+#titleBar {
+    background: black;
+    margin-top: -3em;
+    margin-left: -.5em;
+    margin-right: -.5em;
+    padding-top: .25em;
+    padding-bottom: .25em;
+}
+
+#title {
+    color: white;
+    margin-left: .4em;
+    font-size: 36pt;
+    font-family: Comfortaa, sans-serif;
+    font-style: normal;
+}
+
+#subtitle {
+    color: white;
+    padding-left: 1.25em;
+    margin-top: -2.25em;
+    margin-bottom: .5em;
+    font-size: 14pt;
+    font-style: italic;
+    font-family: sans-serif;
+}
+
+.asRow {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+}
+
+#barMenus {
+    margin-top: 3.5em;
+    margin-left: 10em;
+}
+
+.barMenu {
+    color: white;
+    font-family: sans-serif;
+    font-size: 13pt;
+    padding-right: 3em;
+    cursor: pointer;
+}
+
+.barMenu:hover {
+    text-decoration: underline;
+}
+
+#titleBarBorder {
+    background: #663366;
+    margin-left: -.5em;
+    margin-right: -.5em;
+    height: .5em;
+}
+
+#scrollBar {
+    background: #885588;
+    margin-right: -.5em;
+    height: .5em;
+    width: 3.5em;
+    margin-left: 30em;
+}
diff --git a/public_html/index.js b/public_html/index.js
diff --git a/public_html/index.php b/public_html/index.php
@@ -1,13 +1,33 @@
 <?php
-echo ('<p>This is php output</p>');
 
 ?>
 
 <html>
   <head>
     <title>Paintbrush LMS Home Page</title>
+      <link rel="stylesheet" href="index.css">
+      <script type="text/javascript" src="index.js"></script>
   </head>
   <body>
+    <div id="titleBarWrapper">
+        <div id="titleBar" class="asRow">
+            <div>
+                <p id="title">paintbrush.</p>
+                <p id="subtitle">Let's get something done today.</p>
+            </div>
+            <div id="barMenus" class="asRow">
+                <p class="barMenu">About</p>
+                <p class="barMenu">For Students</p>
+                <p class="barMenu">For Teachers</p>
+                <p class="barMenu">For Schools</p>
+            </div>
+        </div>
+        <div id="titleBarBorder">
+            <div id="scrollBar">
+
+            </div>
+        </div>
+    </div>
     <p>This is a web server used for the function of the Paintbrush LMS client program. Please visit our home page for more information.</p>
   </body>
 </html>
diff --git a/public_html/post/getPosts.php b/public_html/post/getPosts.php
@@ -79,13 +79,32 @@
                 $stmt->execute();
                 $numLikes = $stmt->get_result()->fetch_row()[0];
 
+                $first = "Anonymous";
+                $last = "";
+                $posterUN = "Anonymous";
+
+                $notAnonymous = $row[7] == "true";
+                if ($notAnonymous) {
+                    $userId = (is_numeric($row[3]) ? (int) $row[3] : 0);
+                    $stmt = $connection-> prepare("SELECT `first`, `last`, username FROM users WHERE id = ?");
+                    $stmt->bind_param("i", $userId);
+                    $stmt->execute();
+                    $posterData = $stmt->get_result();
+                    $posterRow = $posterData->fetch_row();
+                    $first = $row[0];
+                    $last = $row[1];
+                    $posterUN = $row[2];
+                }
+
                 //encode post
-                $postLiteral =
-                    escape($row[0]) . ";" . escape($row[1]) . ";" . escape($row[2]) . ";" .
-                    escape($row[3]) . ";" . escape($row[4]). ";" . escape($row[5]). ";" .
-                    escape($row[6]). ";" .  escape($row[7]). ";" . escape($row[8]). ";" .
-                    escape($row[9]). ";" . escape($row[10]) . ";" . $likedThis ? 1 : 0 . ";" . $numLikes . ";" . $viewedThis ? 1 : 0 . ";" . $numViews;
-                    echo base64_encode($postLiteral . "\n");
+                //not all of these really needed to be escaped, but it's better to be safe
+                $postLiteral = escape($row[0]) . ";" . escape($row[1]) . ";" . escape($row[2]) . ";" .
+                    escape($row[3]) . ";" . escape($row[4]) . ";" . escape($row[5]) . ";" . escape($row[6]) . ";" .
+                    escape($row[7]) . ";" . escape($row[8]) . ";" . escape($row[9]) . ";" . escape($row[10]) . ";" .
+                    escape($row[11]) . ";" . escape($numLikes) . ";" . escape($likedThis) . ";" . escape($numViews) . ";" .
+                    escape($viewedThis) . ";" . escape($first) . ";" . escape($last) . ";" . escape($posterUN);
+
+                echo base64_encode($postLiteral . "\n");
             }
         }
 

diff --git a/public_html/util/time.php b/public_html/util/time.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: rtorok
+ * Date: 8/15/18
+ * Time: 4:33 PM
+ */
+
+//outputs the current unix timestamp in milliseconds
+echo (int) round(1000 * microtime(true));