Merge pull request #13 from DoodleyJC/dev

added more colours and navbar
DaiseyD · Jun 5, 2024 · 3c4c450 · 3c4c450
2 parents 2bedecd + 0def085
commit 3c4c450
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 24 deletions.
diff --git a/bluenps/src/app/app.component.css b/bluenps/src/app/app.component.css
@@ -0,0 +1,3 @@
+.navbarcolor{
+    background-color: rgb(229, 78, 78);
+}
diff --git a/bluenps/src/app/app.component.html b/bluenps/src/app/app.component.html
@@ -1 +1,21 @@
-<router-outlet></router-outlet>
+
+
+<div class="orangeColour">
+    <nav class="navbar navbar-expand-lg navbar-light navbarcolor">
+        <div class="container-fluid">
+        <a class="navbar-brand" href="#">Navbar</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+            <li class="nav-item">
+                <a class="nav-link active" aria-current="page" href="#">Home</a>
+            </li>
+            </ul>
+        </div>
+        </div>
+    </nav>
+    <router-outlet></router-outlet>
+</div>
+
diff --git a/bluenps/src/app/home-page/home-page.component.html b/bluenps/src/app/home-page/home-page.component.html
@@ -1,3 +1,6 @@
-<html>
-  <app-signups></app-signups>  
-</html>
+<div class="container">
+  <app-signups></app-signups> 
+</div>
+
+
+
diff --git a/bluenps/src/app/signups/signups.component.css b/bluenps/src/app/signups/signups.component.css
@@ -9,7 +9,3 @@
     padding-top: 3px;
     padding-bottom: 3px;
 }
-
-.tablestyle{
-    background-color: rgb(255, 165, 0);
-}
diff --git a/bluenps/src/app/signups/signups.component.html b/bluenps/src/app/signups/signups.component.html
@@ -1,16 +1,5 @@
-<div class="tablestyle">
-
-
-    <div class="row">
-        <div class="col border border-danger">
-        Blue
-        </div>
-        <div class="col border border-danger">
-        NPS
-        </div>
-    </div>
-
-    <div class="container">
+<div>
+    <div class="container border border-dark mb-1">
         <div class="mt-3 mb-3">
         <select class="form-select" aria-label="courtSelection" id="courtSelection">
             <option value="nps" selected="selected">NPS</option>
@@ -23,7 +12,11 @@
     </div>
 
 
-    <div class="container pt-3 pb-3">
+    <div class="container pt-3 pb-3 border border-dark">
+        <div class="row">
+            <div class="col text-center">NPS</div>
+            <div class="col text-center">BLUE</div>
+        </div>
         <div class="row">
         <div class="col">
             <div class="container npscourt border border-dark" *ngFor="let player of npsdata">

diff --git a/bluenps/src/index.html b/bluenps/src/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" style="height: 100%; ">
 <head>
   <meta charset="utf-8">
   <title>Bluenps</title>
@@ -8,6 +8,6 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
-  <app-root></app-root>
+    <app-root></app-root>
 </body>
 </html>
diff --git a/bluenps/src/styles.css b/bluenps/src/styles.css
@@ -1 +1,6 @@
 /* You can add global styles to this file, and also import other style files */
+
+
+body{
+    background-color: rgb(255, 165, 0);
+}
diff --git a/bluenpsbackend/db.sqlite3 b/bluenpsbackend/db.sqlite3