diff --git a/INFO-1273 (Databases 1)/Labs/Lab 4/school_db.mwb b/INFO-1273 (Databases 1)/Labs/Lab 4/school_db.mwb new file mode 100644 index 0000000..2cd5611 Binary files /dev/null and b/INFO-1273 (Databases 1)/Labs/Lab 4/school_db.mwb differ diff --git a/INFO-1273 (Databases 1)/Labs/Lab 4/school_db.mwb.bak b/INFO-1273 (Databases 1)/Labs/Lab 4/school_db.mwb.bak new file mode 100644 index 0000000..caefa08 Binary files /dev/null and b/INFO-1273 (Databases 1)/Labs/Lab 4/school_db.mwb.bak differ diff --git a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/css/style.css b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/css/style.css index 8e1ec3c..34637dc 100644 --- a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/css/style.css +++ b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/css/style.css @@ -1,8 +1,101 @@ -table { - border: 2px solid black; +/* Full disclosure, I am really bad at styling. Just not the creative type... */ +/* Body and other basic elements styling */ +body { + background-color: gray; + font-family: 'Courier New', Courier, monospace; + padding: 0; + margin: 0; } +h1 { + text-align: center; +} + +/* Nav styling */ +nav ul { + list-style: none; + display: flex; + padding: 0; + margin: 0; + justify-content: center; + gap: 15px; +} + +nav a { + text-decoration: none; +} + +/* Inputs styling */ +fieldset input { + max-width: 120px; + padding: 3px 5px; + margin-right: 5px; +} + +/* Button styling */ +button { + background-color: lime; + font-weight: bold; + padding: 5px 10px; + cursor: pointer; + border: 1px solid black; + transition: background-color 0.2; +} + +button:hover { + background-color: #a6ff00; +} + +#resetFilterBtn { + background-color: red; +} + +#resetFilterBtn:hover { + background-color: #ff5555; +} + +#downloadBtn{ + display: block; + margin: 10px auto; +} + +/* Fieldset legend and table captions */ +legend, caption { + font-weight: bold; +} + +/* Table Styling */ +table { + border: 2px solid black; + background-color: white; + margin: 0px auto; + border-collapse: collapse; + width: 90%; + max-width: 1200px; +} + +table td, table th { + border: 2px solid black; + padding: 6px 10px; + text-align: center; +} + +table th { + background-color: #f0f0f0; +} + +table tr:nth-child(even) { /* Make every even row a different colour */ + background-color: #f9f9f9; +} + +table tr:hover { + background-color: #e0e0e0; +} + +/* Map Styling */ #map { - height: 720px; - width: 100%; + border: 2px solid black; + height: 700px; + width: 90%; + margin: 20px auto; } \ No newline at end of file diff --git a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/index.html b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/index.html index 61ac8bc..9a9dd3f 100644 --- a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/index.html +++ b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/index.html @@ -8,8 +8,16 @@ -

Nasa Meteorite Explorer

-
+
+

Nasa Meteorite Explorer

+ +
+
@@ -21,7 +29,7 @@ -
+
@@ -52,7 +60,7 @@
- + diff --git a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/dataHandler.js b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/dataHandler.js index eb40a6f..23b8300 100644 --- a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/dataHandler.js +++ b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/dataHandler.js @@ -3,7 +3,7 @@ fetch('./js/Meteorite_Landings.json') .then(data => { console.log(data); const tableBody = document.getElementById("meteorTableBody"); - data.forEach(meteor => { + data.splice(0,50).forEach(meteor => { // Just get 50 values for now const row = document.createElement("tr"); const id = document.createElement("td"); id.textContent = meteor.id ?? "-"; diff --git a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/map.js b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/map.js index 2033f81..ca922b9 100644 --- a/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/map.js +++ b/INFO-3168 (JS 2)/Project/LeviMclean_nasa-meteorite-explorer/js/map.js @@ -1,6 +1,9 @@ +// Load the map from the Google Maps JS API function loadMap() { const map = new google.maps.Map(document.getElementById("map"), { center: {lat: 0, lng: 0}, // Center of the globe zoom: 2 }); -} \ No newline at end of file +} + +// Add custom markers from meteor data \ No newline at end of file