Merge branch 'main' of https://github.com/Lim-Jiaxian/SEER_GPS_Tracker

Lim-Jiaxian · Nov 16, 2023 · 738c960 · 738c960
2 parents e50fd8f + 789841c
commit 738c960
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 40 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -1,41 +1,39 @@
+*{
+    margin: 0;
+    padding: 0;
+    font-family: 'Poppins', sans-serif;
+}
+
 body{
     margin: 0;
     background-color:#202F37;
     overflow-x: hidden;
     text-align: center;
 }
 
-.topnav {
-    background-color: #172933; /* Set the background color */
-    overflow: hidden; /* Hide overflowing content */
+.header{
+    min-height: 100vh;
     width: 100%;
-    padding: 30px;
-    border-bottom: 2px solid aliceblue;
-
-  }
-
-  .topnav a {
-    float: center; /* Float the navigation links to the left */
-    color: #f2f2f2; /* Set the text color */
-    text-align: center; /* Center-align the text */
-    padding: 20px 28px; /* Add padding around the links */
-    text-decoration: none; /* Remove underline from links */
-    font-size: 20px;
-    border-top-left-radius:30px;
-    border-bottom-left-radius:30px; 
-    border-top-right-radius:30px;
-    border-bottom-right-radius:30px;  
-  }
-
-  .topnav a:hover {
-    background-color: #ddd; /* Change the background color on hover */
-    color: black; /* Change the text color on hover */
-  }
-
-  .topnav a.active {
-    background-color: #FFC92F; /* Set the active link's background color */
-    color: black; /* Set the active link's text color */
-  }
+}
+nav{
+    display: flex;
+    padding: 2% 6%;
+    justify-content: space-between;
+    align-items: center;
+}
+nav img{
+    width: 150px;
+}
+.nav-links{
+    flex: 1;
+    text-align: right;
+}
+.nav-links ul li{
+    list-style: none;
+    display: inline-block;
+    padding: 8px 12px;
+    position: relative;
+}
 
 p{
     text-align: center;
@@ -88,6 +86,7 @@ h2, h3{
 }
 img{
     border-radius: 5px;
+    float: left;
 }
 @media only screen and (max-width: 900px) {
     .blog-post{
@@ -118,7 +117,9 @@ select{
 select:focus{
     outline:none;
 }
+
 label{
     font-size: 20px;
     color: #FFC92F;
-}
+}
+
diff --git a/html/seer.html b/html/seer.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Project SEER</title>
     <!-- linking to css -->
-    <link rel="stylesheet" href="../css" />
+    <link rel="stylesheet" href="../css/styles.css" />
     <!-- linking to PyScript assets -->
     <link rel="stylesheet" href="https://pyscript.net/alpha/pyscript.css" />
     <script defer src="https://pyscript.net/alpha/pyscript.js"></script>

diff --git a/index.html b/index.html
@@ -6,19 +6,26 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Project SEER</title>
     <link rel="stylesheet" href="css/styles.css">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,300;0,400;0,600;0,700;1,200&display=swap" rel="stylesheet">
 </head>
 
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
 
 
 <body>
-    <div class="logo"><a href = "#"><img src ="SEER.png"></a></div>
-    <div class="topnav">
-        <a class="active" href="index.html">Home</a>
-        <a href="about.html">About</a>
-        <a href="services.html">Services</a>
-        <a href="contact.html">Contact</a>
-      </div>
+    <section class="header">
+        <nav>
+            <a href="index.html"><img src="Images/SEER.png"></a>
+            <div class="nav-links">
+                <ul>
+                    <li><a href="">HOME</a></li>
+                    <li><a href="">ABOUT</a></li>
+                    <li><a href="">SERVICES</a></li>
+                    <li><a href="">CONTACT</a></li>    
+                </ul>
+            </div>
+        </nav>
       <br>
 
     <div class="blog-post" style="background-color:whitesmoke;">

diff --git a/python/seer.py b/python/seer.py
@@ -85,3 +85,4 @@ def image_spoof(self, tile): # this function pretends not to be a Python script
     transform = ccrs.PlateCarree()._as_mpl_transform(ax1) # set transform for annotations
 
     plt.pause(0.001) # pause between point plots
+    plt.savefig('Images/map.png', format='png', dpi=300) # save the figure to a file
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ def image_spoof(self, tile): # this function pretends not to be a Python script
		transform = ccrs.PlateCarree()._as_mpl_transform(ax1) # set transform for annotations

		plt.pause(0.001) # pause between point plots
		plt.savefig('Images/map.png', format='png', dpi=300) # save the figure to a file