Repository: conner-chil32/Blueprint
Pull request #4: Scrum 124, 126. Making the beginnings of the Project View and the Website Backend.
Author: login: bomrr
Created: 2025-03-15T21:54:32Z | Merged: 2025-03-16T02:31:40Z



Diff:
diff --git a/src/routes.js b/src/routes.js
index bd365f3..ee95d02 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -3,17 +3,33 @@
  * Registers all routes for the app
  * @param {Express} app - The express app to register the routes on
  */
+
+const express = require('express');
+const path = require('path');
+
 function registerRoutes(app) {
+    app.use(express.static(path.join(__dirname, 'view')));
 
     //TODO: SCRUM-47'S tasks for routing will mainly be implemented here
 
-
     //  !!!     ROUTES     !!!
     app.get('/', (req, res) => {
         console.log('GET / sending ./res/index.html');
         res.sendFile('./view/index.html', { root: __dirname });
     });
 
+    // Project View
+    app.get('/ProjectView', (req, res) => {
+        console.log('GET /ProjectView sending ./res/ProjectView.html');
+        res.sendFile('./view/ProjectView.html', { root: __dirname });
+    });
+
+    // User Website Backend, shows statistics on their site
+    app.get('/UserWebBackend', (req, res) => {
+        console.log('GET /UserWebBackend sending ./res/UserWebBackend.html');
+        res.sendFile('./view/UserWebBackend.html', { root: __dirname });
+    });
+
 }
 
 module.exports = {
diff --git a/src/view/Blueprint.png b/src/view/Blueprint.png
new file mode 100644
index 0000000..e002900
Binary files /dev/null and b/src/view/Blueprint.png differ
diff --git a/src/view/Blueprint_trans.png b/src/view/Blueprint_trans.png
new file mode 100644
index 0000000..bc3f132
Binary files /dev/null and b/src/view/Blueprint_trans.png differ
diff --git a/src/view/ProjectView.html b/src/view/ProjectView.html
new file mode 100644
index 0000000..32b90a0
--- /dev/null
+++ b/src/view/ProjectView.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang = "en">
+    <!-- Ensure the page fits within aspect ratios -->
+    <head>
+        <meta charset = "UTF-8">
+        <meta name = "viewport" content = "width = device-width, initial-scale = 1.0">
+        <title>Project View</title>
+
+        <!-- Link to the Generals.css file -->
+        <link rel = "stylesheet" type = "text/css" href = "css/Generals.css">
+    </head>
+
+    <body>
+        <div class = "TopBar">
+            <!-- A dark grey bar across the top of the screen -->
+             <!-- <div class = "topBarBackground"></div> Experimental. Commented out as it is not in the Figma -->
+
+            <!-- A button that when clicked links to the LoggedOutPage.html -->
+            <a href = "Login.html">
+                <button class = "logoutButton generalButton generalText">Log Out</button>
+            </a>
+
+            <!-- A logo in the top left, links back to the home page when clicked -->
+            <a href = "HomePage.html">
+                <img title = "Logo" src = "Blueprint_trans.png" class = "logoStyle">
+            </a>
+        </div>
+
+        <div class = "Text generalText">
+            <!-- A "Welcome" title -->
+            <h1 class = "largeTitleText">Welcome</h1>
+
+            <!-- "Your Websites" -->
+             <h2 class = "mediumTitleText">Your Websites</h2>
+
+        </div>
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/src/view/UserWebBackend.html b/src/view/UserWebBackend.html
new file mode 100644
index 0000000..14e78fc
--- /dev/null
+++ b/src/view/UserWebBackend.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+
+<!-- CSS -->
+ <style>
+    .backButton {
+        /* Appearance */
+        background-color: white;
+        border: none;
+        /* Position */
+        position: fixed;
+        top: 80px;
+    }
+ </style>
+
+<html lang = "en">
+    <!-- Ensure the page fits within aspect ratios -->
+    <head>
+        <meta charset = "UTF-8">
+        <meta name = "viewport" content = "width = device-width, initial-scale = 1.0">
+        <title>Project View</title>
+
+        <!-- Link to the Generals.css file -->
+        <link rel = "stylesheet" type = "text/css" href = "css/Generals.css">
+    </head>
+
+    <body>
+        <div class = "TopBar">
+            <!-- A dark grey bar across the top of the screen -->
+             <!-- <div class = "topBarBackground"></div> Experimental. Commented out as it is not in the Figma -->
+
+            <!-- A button that when clicked links to the LoggedOutPage.html -->
+            <a href = "Login.html">
+                <button class = "logoutButton generalButton generalText">Log Out</button>
+            </a>
+
+            <!-- A logo in the top left, links back to the home page when clicked -->
+            <a href = "HomePage.html">
+                <img title = "Logo" src = "Blueprint_trans.png" class = "logoStyle">
+            </a>
+        </div>
+
+        <!-- Back button in the top left below the bar -->
+         <div>
+            <a href = "HomePage.html">
+                <button class = "backButton generalButton generalText">Back</button>
+            </a>
+         </div>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/src/view/css/Generals.css b/src/view/css/Generals.css
new file mode 100644
index 0000000..6e7fe1c
--- /dev/null
+++ b/src/view/css/Generals.css
@@ -0,0 +1,74 @@
+@import url('https://fonts.googleapis.com/css2?family=Alexandria:wght@100..900&display=swap');
+
+body {
+    font-family: "Alexandria", sans-serif;
+    background-color: #707070;
+}
+
+.generalText {
+    font-family: "Alexandria", sans-serif;
+}
+
+.logoStyle {
+    /* Appearance */
+    width: 50px;
+    height: 50px;
+    /* Positioning */
+    position: fixed;
+    top: 10px;
+    left: 10px;
+}
+
+.largeTitleText {
+    /* Fonts */
+    font-size: 70px;
+    font-weight: 700;
+    color: white;
+    /* Positioning */
+    position: fixed;
+    left: 30px;
+    top: 40px;
+}
+
+.mediumTitleText {
+    /* Fonts */
+    font-size: 30px;
+    font-weight: 500;
+    color: white;
+    /* Positioning */
+    position: fixed;
+    left: 30px;
+    top: 150px;
+}
+
+.generalButton {
+    /* Button Appearance */
+    border-radius: 20px;
+}
+
+.topBarBackground {
+    /* Appearance */
+    background-color: #282828;
+    /* Positioning */
+    width: 100%;
+    height: 70px;
+    margin: 0;
+    padding: 0;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+}
+
+.logoutButton {
+    /* Fonts */
+    font-size: 20px;
+    font-weight: 400;
+    /* Button scalars */
+    width: 110px;
+    height: 45px;
+    /* Positioning */
+    position: fixed;
+    top: 13px;
+    right: 15px;
+}
\ No newline at end of file


Reviews:
user: login: LJJones123
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-03-15T22:18:28Z
user: login: LJJones123
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-03-15T22:18:52Z
user: login: LJJones123
state: COMMENTED
author_association: COLLABORATOR
submitted_at: 2025-03-15T22:22:20Z
user: login: LJJones123
body: Awsome job formatting name conventions, as well gathering all of the css together

You'll need to resolve the issues with the css and the image not quite loading, test this by TEMPORARILY replacing the path to index.html in the routes.js file to your HomePage.html.

Please make a note in the readme or the documentation that you are making a call out to somewhere for the css as we need to review if that has any copyright policies that may conflict with our own.


state: CHANGES_REQUESTED
author_association: COLLABORATOR
submitted_at: 2025-03-15T22:22:57Z

Review comments:
diff_hunk: @@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang = "en">
+    <!-- Ensure the page fits within aspect ratios -->
+    <head>
+        <meta charset = "UTF-8">
+        <meta name = "viewport" content = "width = device-width, initial-scale = 1.0">
+        <title>Project View</title>
+
+        <!-- Link to the Generals.css file -->
+        <link rel = "stylesheet" type = "text/css" href = "css/Generals.css">
path: src/view/ProjectView.html
user: login: LJJones123
body: The css did not load, please resolve this
created_at: 2025-03-15T22:18:28Z
author_association: COLLABORATOR
diff_hunk: @@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang = "en">
+    <!-- Ensure the page fits within aspect ratios -->
+    <head>
+        <meta charset = "UTF-8">
+        <meta name = "viewport" content = "width = device-width, initial-scale = 1.0">
+        <title>Project View</title>
+
+        <!-- Link to the Generals.css file -->
+        <link rel = "stylesheet" type = "text/css" href = "css/Generals.css">
+    </head>
+
+    <body>
+        <div class = "TopBar">
+            <!-- A dark grey bar across the top of the screen -->
+             <!-- <div class = "topBarBackground"></div> Experimental. Commented out as it is not in the Figma -->
+
+            <!-- A button that when clicked links to the LoggedOutPage.html -->
+            <a href = "Login.html">
+                <button class = "logoutButton generalButton generalText">Log Out</button>
+            </a>
+
+            <!-- A logo in the top left, links back to the home page when clicked -->
+            <a href = "HomePage.html">
+                <img title = "Logo" src = "Blueprint_trans.png" class = "logoStyle">
path: src/view/ProjectView.html
user: login: LJJones123
body: the image did not load, please resolve this
created_at: 2025-03-15T22:18:52Z
author_association: COLLABORATOR
diff_hunk: @@ -0,0 +1,74 @@
+@import url('https://fonts.googleapis.com/css2?family=Alexandria:wght@100..900&display=swap');
path: src/view/css/Generals.css
user: login: LJJones123
body: we need to review over the policy for this one
created_at: 2025-03-15T22:22:20Z
author_association: COLLABORATOR

PR comments:
user: login: bomrr
created_at: 2025-03-16T01:56:53Z
body: Addition made for Scrum 155 and 156, setting up the routing for the Project view and User Web Backend pages.
author_association: COLLABORATOR
user: login: conner-chil32
created_at: 2025-03-16T02:31:37Z
body: signed off
author_association: COLLABORATOR