Skip to content

PR for submission of weather app project #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
72de4b7
first commit with ground documents creation
govargas Mar 18, 2025
b38b396
setting up the api call
christina-baldwin Mar 18, 2025
695a58c
creating an interface for the weatherdata object, using tsc --build i…
christina-baldwin Mar 19, 2025
85fab2a
adding the main page structure in a loadmainpage function
christina-baldwin Mar 19, 2025
46ed946
changing the api url (weather interface now in commented out code)
christina-baldwin Mar 19, 2025
4a953a6
Merge pull request #1 from govargas/api-call
christina-baldwin Mar 19, 2025
3e1eb9c
adding the main page structure in a loadmainpage function
christina-baldwin Mar 19, 2025
08bb023
Merge branch 'main-page' of https://github.com/govargas/js-project-we…
christina-baldwin Mar 19, 2025
ca1ec88
landing page basic layout and styling, minus button
jszor Mar 18, 2025
ffe9774
added button, style and layout
jszor Mar 18, 2025
dbd6cab
setting up the data
christina-baldwin Mar 19, 2025
dec92c8
Merge pull request #2 from govargas/main-page
christina-baldwin Mar 19, 2025
753bc9c
Merge branch 'main' into landing-page
jszor Mar 19, 2025
933bcb9
Merge pull request #3 from govargas/landing-page
jszor Mar 19, 2025
4014ebe
Add hamburger menu icon and positioning
govargas Mar 19, 2025
adac498
created navbar
govargas Mar 19, 2025
6314074
added cities to the navbar
govargas Mar 19, 2025
7a6264b
added hamburger menu and navbar styling
govargas Mar 19, 2025
4762437
added hamburger menu and navbar
govargas Mar 19, 2025
e3d760a
Merge pull request #4 from govargas/hamburger-menu
govargas Mar 19, 2025
5f6318d
inital css branch commit
Bianka2112 Mar 18, 2025
255826d
basic colors and font css
Bianka2112 Mar 18, 2025
6b62481
getting local time from unix, day/night-time code based on time, upda…
Bianka2112 Mar 19, 2025
c1cbd4e
fixed 24hr time and css angle
Bianka2112 Mar 19, 2025
f76e6ba
merged with main, rebase
Bianka2112 Mar 19, 2025
29f9765
added missing code from prev merges, added page toggle, format degree…
Bianka2112 Mar 20, 2025
3ad4d5d
Merge pull request #5 from govargas/bianka-test
Bianka2112 Mar 20, 2025
c86358a
setting up working branch, getting the filtered weather days
christina-baldwin Mar 20, 2025
c047a32
styling the table and main page
christina-baldwin Mar 20, 2025
ee0e102
adding the assets for the table icons and having them show on the table
christina-baldwin Mar 20, 2025
81f79ce
white background in table
christina-baldwin Mar 20, 2025
214db7a
fixing the sun outline colours
christina-baldwin Mar 20, 2025
3fa98f5
fixing the day name acronyms in the table
christina-baldwin Mar 20, 2025
3c3ea03
updating the todo
christina-baldwin Mar 20, 2025
06bdc4d
Merge pull request #6 from govargas/working-branch
christina-baldwin Mar 20, 2025
a8ec850
fixed wthr icons code and svg. media queries/responsiveness
Bianka2112 Mar 21, 2025
1984af6
navbar update for hamburger cities
Bianka2112 Mar 21, 2025
df6b5d5
fixed icons, menu pointer, padding on mobile
Bianka2112 Mar 21, 2025
dc6f861
Merge pull request #7 from govargas/friday-working
Bianka2112 Mar 21, 2025
0549ab4
Fix hour differences between main and table view
govargas Mar 23, 2025
be055c0
Merge pull request #8 from govargas/fix-hour-difference
christina-baldwin Mar 23, 2025
9bd0485
fixing max temp and min temp so it shows the accurate max and min for…
christina-baldwin Mar 24, 2025
a467f02
removing console.logs
christina-baldwin Mar 24, 2025
e84089e
Merge pull request #9 from govargas/min-max-fix
christina-baldwin Mar 24, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
46 changes: 46 additions & 0 deletions WeatherData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
"use strict";
// export interface WeatherData {
// coord: Coord;
// weather: WeatherItem[];
// base: string;
// main: Main;
// visibility: number;
// wind: Wind;
// clouds: Clouds;
// dt: number;
// sys: Sys;
// timezone: number;
// id: number;
// name: string;
// cod: number;
// }
// type Coord = { lon: number; lat: number };
// type WeatherItem = {
// id: number;
// main: string;
// description: string;
// icon: string;
// };
// type Main = {
// temp: number;
// feels_like: number;
// temp_min: number;
// temp_max: number;
// pressure: number;
// humidity: number;
// sea_level: number;
// grnd_level: number;
// };
// type Wind = {
// speed: number;
// deg: number;
// gust: number;
// };
// type Clouds = { all: number };
// type Sys = {
// type: number;
// id: number;
// country: string;
// sunrise: number;
// sunset: number;
// };
46 changes: 46 additions & 0 deletions WeatherData.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// export interface WeatherData {
// coord: Coord;
// weather: WeatherItem[];
// base: string;
// main: Main;
// visibility: number;
// wind: Wind;
// clouds: Clouds;
// dt: number;
// sys: Sys;
// timezone: number;
// id: number;
// name: string;
// cod: number;
// }

// type Coord = { lon: number; lat: number };
// type WeatherItem = {
// id: number;
// main: string;
// description: string;
// icon: string;
// };
// type Main = {
// temp: number;
// feels_like: number;
// temp_min: number;
// temp_max: number;
// pressure: number;
// humidity: number;
// sea_level: number;
// grnd_level: number;
// };
// type Wind = {
// speed: number;
// deg: number;
// gust: number;
// };
// type Clouds = { all: number };
// type Sys = {
// type: number;
// id: number;
// country: string;
// sunrise: number;
// sunset: number;
// };
Binary file added assets/.DS_Store
Binary file not shown.
20 changes: 20 additions & 0 deletions assets/button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/night.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/overcast.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/partly-cloudy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions assets/sunny-g.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions assets/sunny-w.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>WIND I WEATHER APP</title>
<link rel="stylesheet" href="style.css">
<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>
</head>
<body>
<!-- hamburger menu -->
<div id="menu-icon" class="menu-icon">
<span></span>
<span></span>
<span></span>
</div>
<!-- Navbar (hidden by default) -->
<nav class="navbar">
<ul>
<li>Gothenburg</li>
<li>Oslo</li>
<li>Miami</li>
<li>Santiago</li>
</ul>
</nav>
<div class="container">
<div class="main-content">
<div class="hero"></div>
<h1></h1>
<div class="temp-table"></div>
</div>
</div>
<script src="./script.js"></script>
</body>
</html>
Loading