From 699f0236e40c9f2c6048d41382fab36cc8cf45b3 Mon Sep 17 00:00:00 2001 From: LP Date: Mon, 5 Dec 2022 13:42:16 -0800 Subject: [PATCH 01/34] starting our peer agreement --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 8e4b04468..dcfb4314a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,13 @@ # Weather Report +- Access needs +- Your learning style + -if one person doesn't get it, the other person shouldn't move on without their partner. + -instead, we should work together until everyone understands before moving on. +- How you prefer to receive feedback +- One team communication skill you want to improve with this experience + + ## Skills Assessed - Following directions and reading comprehension From a4ce73edf95410671212b84d5658eac604a8e816 Mon Sep 17 00:00:00 2001 From: LP Date: Mon, 5 Dec 2022 14:07:14 -0800 Subject: [PATCH 02/34] finished our team checkin --- README.md | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dcfb4314a..54fd2e74e 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,24 @@ # Weather Report -- Access needs -- Your learning style - -if one person doesn't get it, the other person shouldn't move on without their partner. - -instead, we should work together until everyone understands before moving on. -- How you prefer to receive feedback -- One team communication skill you want to improve with this experience +## Team Plan + +* Access needs + * No working on the weekend! + * defined end times <3 + * Let's aim for submission deadline of next Wednesday + * don't work on it on your own. let's work on it together. +* Your learning style + * if one person doesn't get it, the other person shouldn't move on without their partner. + * instead, we should work together until everyone understands before moving on. + * J: hands-on learning, speaking out loud the problem, diagrams are useful, knowing the why of why we're doing something + * L: hands-on learning, knowing the why, speaking out loud the problem, sometimes I need to be slow about understanding it and need to get it before moving on. +* How you prefer to receive feedback + * J: always constructive, don't take it personal, let me know if there's something I'm doing that's not working for you + * L: direct, timely, let me know if there's something I'm doing that's not working for you +* One team communication skill you want to improve with this experience + * making a plan up front for what works (which we're doing) + * put your seatbelt on + * time management! ## Skills Assessed From 3305a2f70dcab1e673191ee10e3ea7c0f3d3dd91 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 13:38:24 -0800 Subject: [PATCH 03/34] Wave 1 skeleton --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 68b320b9a..b50de5d1e 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,6 @@ Weather Report - + \ No newline at end of file From 8d6cf805f7161970d76295070748720f78918066 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 13:40:43 -0800 Subject: [PATCH 04/34] Modifed index.html connector --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index b50de5d1e..d0e036d9e 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ Weather Report + \ No newline at end of file From d92671115972e95fdba49f961cb47e5a96cba26f Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 7 Dec 2022 13:42:35 -0800 Subject: [PATCH 05/34] added script tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index d0e036d9e..0052cd566 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ Weather Report - \ No newline at end of file From fe687b1dea8e8952543c332e49f76b77b3a0571a Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 7 Dec 2022 13:45:57 -0800 Subject: [PATCH 06/34] trying stuff --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 0052cd566..9d89edbe2 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ Weather Report - + \ No newline at end of file From f290d63fb75f1a8ae942e344097d6e610cf33b3c Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 7 Dec 2022 13:48:45 -0800 Subject: [PATCH 07/34] fixed index --- index.html | 2 +- src/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 9d89edbe2..be1d90468 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ Weather Report - + \ No newline at end of file diff --git a/src/index.js b/src/index.js index e69de29bb..526b86c79 100644 --- a/src/index.js +++ b/src/index.js @@ -0,0 +1 @@ +console.log('hello world!'); From fad83af5cc184d18dec5a245a2dff6534ac179a8 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 14:07:58 -0800 Subject: [PATCH 08/34] Modifed the HTML, CSS, and other connections working --- index.html | 10 ++++++++-- src/index.js | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index be1d90468..2155a5d1d 100644 --- a/index.html +++ b/index.html @@ -4,10 +4,16 @@ + + Weather Report + + - + + - \ No newline at end of file + + diff --git a/src/index.js b/src/index.js index 526b86c79..ad9a93a7c 100644 --- a/src/index.js +++ b/src/index.js @@ -1 +1 @@ -console.log('hello world!'); +'use strict'; From d86fb647fe38a41a77ee59c12455bf724d1bd92e Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 14:17:58 -0800 Subject: [PATCH 09/34] Modifed small errors in the HTML. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2155a5d1d..2c5582c69 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - + Weather Report From f14298eb871637d238c88cdb0ce32d4be97f6018 Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 7 Dec 2022 14:24:05 -0800 Subject: [PATCH 10/34] attaching axios , more debugging --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 2c5582c69..e161aef5d 100644 --- a/index.html +++ b/index.html @@ -5,12 +5,13 @@ - + Weather Report + From a738085197a6fd05984ead89bb59e1daf7581807 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 14:27:32 -0800 Subject: [PATCH 11/34] Fixed errors --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e161aef5d..fab34c470 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@ - + From 2e179bed3a304920a90ab41710bc447524e58a3b Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 7 Dec 2022 14:40:50 -0800 Subject: [PATCH 12/34] added a .env file with my api key in it.tried to connect to that api key, but i don't know if it worked yet --- .gitignore | 3 ++- package.json | 3 ++- src/index.js | 6 +++++- yarn.lock | 29 ++++++++++++++++++++--------- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 31b153a9b..8ad729bbf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode .DS_Store node_modules -.cache \ No newline at end of file +.cache +.env \ No newline at end of file diff --git a/package.json b/package.json index 9cf5ca65b..aee2e1e1c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "axios": "^0.27.2" + "axios": "^1.2.1", + "dotenv": "^16.0.3" } } diff --git a/src/index.js b/src/index.js index ad9a93a7c..22c9da649 100644 --- a/src/index.js +++ b/src/index.js @@ -1 +1,5 @@ -'use strict'; +const axios = require('axios'); +const dotenv = require('dotenv').config(); +const API_KEY = process.env.API_KEY; + +('use strict'); diff --git a/yarn.lock b/yarn.lock index 37fbaed29..ec1047823 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,13 +7,14 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== +axios@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a" + integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== dependencies: - follow-redirects "^1.14.9" + follow-redirects "^1.15.0" form-data "^4.0.0" + proxy-from-env "^1.1.0" combined-stream@^1.0.8: version "1.0.8" @@ -27,10 +28,15 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -follow-redirects@^1.14.9: - version "1.15.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" - integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== +dotenv@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" + integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== + +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== form-data@^4.0.0: version "4.0.0" @@ -52,3 +58,8 @@ mime-types@^2.1.12: integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" + +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== From 9ea764366f5d99a4d53ac915616ab30351e6d0a1 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 14:44:24 -0800 Subject: [PATCH 13/34] Modifed packages --- package.json | 3 ++- yarn.lock | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 9cf5ca65b..aee2e1e1c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "axios": "^0.27.2" + "axios": "^1.2.1", + "dotenv": "^16.0.3" } } diff --git a/yarn.lock b/yarn.lock index 37fbaed29..ec1047823 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,13 +7,14 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== +axios@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a" + integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== dependencies: - follow-redirects "^1.14.9" + follow-redirects "^1.15.0" form-data "^4.0.0" + proxy-from-env "^1.1.0" combined-stream@^1.0.8: version "1.0.8" @@ -27,10 +28,15 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -follow-redirects@^1.14.9: - version "1.15.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4" - integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ== +dotenv@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" + integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== + +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== form-data@^4.0.0: version "4.0.0" @@ -52,3 +58,8 @@ mime-types@^2.1.12: integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" + +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== From 263aca1c400da62613be31085d2c0986f82860f0 Mon Sep 17 00:00:00 2001 From: Jessica Date: Wed, 7 Dec 2022 14:52:38 -0800 Subject: [PATCH 14/34] Modifed some of the HTML --- index.html | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index fab34c470..92d24ed3d 100644 --- a/index.html +++ b/index.html @@ -9,12 +9,25 @@ Weather Report + + + + + + + + + + + + + + + - - From 652770025e9e5b454451c73c31200896308ad824 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 8 Dec 2022 14:25:58 -0800 Subject: [PATCH 15/34] Modifed some HTML --- index.html | 23 ++++++++++++++++++++++- package.json | 3 ++- yarn.lock | 12 ++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 92d24ed3d..8fe5c8d51 100644 --- a/index.html +++ b/index.html @@ -9,8 +9,29 @@ Weather Report +
+

Weather App

+

Weather for the city of Seattle

- +
+ +
    +
  1. sometimes red or pink
    2. +
  2. Can be rly small or rly big
    3. +
  3. Haaaarrrtttttt πŸ΄β€β˜ οΈ
    4. +
  4. Hearts can be hard
    5. +
  5. Everyone has a heart. so don't forget to use it!
    6. +
+
+ +
+ +
+ +
+ +
+
diff --git a/package.json b/package.json index aee2e1e1c..7a5796d8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "dependencies": { "axios": "^1.2.1", - "dotenv": "^16.0.3" + "dotenv": "^16.0.3", + "node": "^19.2.0" } } diff --git a/yarn.lock b/yarn.lock index ec1047823..91790c01c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -59,6 +59,18 @@ mime-types@^2.1.12: dependencies: mime-db "1.52.0" +node-bin-setup@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/node-bin-setup/-/node-bin-setup-1.1.3.tgz#d45d5220e3b2ecc3a94263a56116f727f6c1bb14" + integrity sha512-opgw9iSCAzT2+6wJOETCpeRYAQxSopqQ2z+N6BXwIMsQQ7Zj5M8MaafQY8JMlolRR6R1UXg2WmhKp0p9lSOivg== + +node@^19.2.0: + version "19.2.0" + resolved "https://registry.yarnpkg.com/node/-/node-19.2.0.tgz#f377e046002065fd1a9a23dd7bffc8026be77847" + integrity sha512-ETicZqrcApHCufk8L7HCO6eUe6HmZFN3YmAklYdETyp8Gi10UZGFvVJ/AvihE9i5CueXsebEP/7DgFKjohHXHw== + dependencies: + node-bin-setup "^1.0.0" + proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" From f98f8c6bc3716f8f1e0032ce495166cc686063d7 Mon Sep 17 00:00:00 2001 From: LP Date: Thu, 8 Dec 2022 14:29:57 -0800 Subject: [PATCH 16/34] sketching out the layout --- index.html | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index 8fe5c8d51..c5681afb7 100644 --- a/index.html +++ b/index.html @@ -10,8 +10,19 @@
-

Weather App

-

Weather for the city of Seattle

+
+

Weather App

+ + +
+
+

Weather for the city of Seattle

+ + + + + +
@@ -34,12 +45,7 @@

Weather App

- - - - - - + From dd1b5b9aba5f30cc44570af7d2279999880332a2 Mon Sep 17 00:00:00 2001 From: Jessica Date: Thu, 8 Dec 2022 14:49:40 -0800 Subject: [PATCH 17/34] FInshed HTML presentation --- index.html | 24 +++--------------------- styles/index.css | 13 +++++++++++++ 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/index.html b/index.html index c5681afb7..8b6268531 100644 --- a/index.html +++ b/index.html @@ -9,13 +9,13 @@ Weather Report -
-
+
+

Weather App

-
+

Weather for the city of Seattle

@@ -24,24 +24,6 @@

Weather App

-
- -
    -
  1. sometimes red or pink
    2. -
  2. Can be rly small or rly big
    3. -
  3. Haaaarrrtttttt πŸ΄β€β˜ οΈ
    4. -
  4. Hearts can be hard
    5. -
  5. Everyone has a heart. so don't forget to use it!
    6. -
-
- -
- -
- -
- -
diff --git a/styles/index.css b/styles/index.css index e69de29bb..e1f51d763 100644 --- a/styles/index.css +++ b/styles/index.css @@ -0,0 +1,13 @@ +.grid-container { + display: grid; + grid-template-columns: auto auto auto; + background-color: #2196F3; + padding: 10px; +} +.grid-item { + background-color: rgba(255, 255, 255, 0.8); + border: 1px solid rgba(0, 0, 0, 0.8); + padding: 20px; + font-size: 30px; + text-align: center; +} \ No newline at end of file From f893db69bace540c8f7f2fce5bef97cf01e280b9 Mon Sep 17 00:00:00 2001 From: LP Date: Thu, 8 Dec 2022 14:55:04 -0800 Subject: [PATCH 18/34] adding some useful links --- ada-project-docs/useful links we found | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ada-project-docs/useful links we found diff --git a/ada-project-docs/useful links we found b/ada-project-docs/useful links we found new file mode 100644 index 000000000..ce5aed7f8 --- /dev/null +++ b/ada-project-docs/useful links we found @@ -0,0 +1,3 @@ +https://api.openweathermap.org/data/2.5/weather this is where to call the api + +here is the documentation website for open weather: https://openweathermap.org/current \ No newline at end of file From dc93e488888b73fc29bb801094b99e358d2f4f3e Mon Sep 17 00:00:00 2001 From: LP Date: Mon, 12 Dec 2022 13:02:04 -0800 Subject: [PATCH 19/34] got axios call to weather report working woooooo --- index.html | 3 ++- src/index.js | 18 +++++++++++++++--- weather-report-proxy-server | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) create mode 160000 weather-report-proxy-server diff --git a/index.html b/index.html index 8b6268531..517121a46 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,8 @@

Weather App

Weather for the city of Seattle

- + + diff --git a/src/index.js b/src/index.js index 22c9da649..239c4a1b4 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,17 @@ -const axios = require('axios'); -const dotenv = require('dotenv').config(); -const API_KEY = process.env.API_KEY; +//const axios = require('axios'); +//const dotenv = require('dotenv').config(); +//const API_KEY = process.env.API_KEY; ('use strict'); +//call to the flask app to get weather +const lat = 47.6038321; +const lon = -122.330062; + +//later, change +axios + .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) + .then((response) => { + console.log(response); + }); + +//if loading, diff --git a/weather-report-proxy-server b/weather-report-proxy-server new file mode 160000 index 000000000..ea5dd1a76 --- /dev/null +++ b/weather-report-proxy-server @@ -0,0 +1 @@ +Subproject commit ea5dd1a768fd69f8a879aee21b638aeb1cb52fae From 10ff7f048aae25c64bc2bf58361159cd7cb53d62 Mon Sep 17 00:00:00 2001 From: LP Date: Mon, 12 Dec 2022 13:04:31 -0800 Subject: [PATCH 20/34] got the temp returned woo --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 239c4a1b4..a36b634dc 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,7 @@ const lon = -122.330062; axios .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) .then((response) => { - console.log(response); + console.log(response.data.main.temp); }); //if loading, From bfaddcddc26da56e0a3ecad1034d9271b2d49dbf Mon Sep 17 00:00:00 2001 From: Jessica Date: Mon, 12 Dec 2022 13:26:00 -0800 Subject: [PATCH 21/34] Got the tempature to show up --- index.html | 1 + src/index.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 517121a46..dd8c331ce 100644 --- a/index.html +++ b/index.html @@ -19,6 +19,7 @@

Weather App

Weather for the city of Seattle

+

temp

diff --git a/src/index.js b/src/index.js index a36b634dc..e9dd8b6cd 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,10 @@ const lon = -122.330062; axios .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) .then((response) => { - console.log(response.data.main.temp); + const temp = response.data.main.temp; + console.log(temp); + const appearanceHeading = document.getElementById('temperaturenumber'); + appearanceHeading.textContent = temp + ' Β°F'; }); //if loading, From d36da953b8f093fc95cf32c1a3b410efc99d87ee Mon Sep 17 00:00:00 2001 From: LP Date: Mon, 12 Dec 2022 13:33:52 -0800 Subject: [PATCH 22/34] made the conversion to farenheit in the code. rounded the number down. --- src/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index e9dd8b6cd..9e9fdf767 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,8 @@ const lon = -122.330062; axios .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) .then((response) => { - const temp = response.data.main.temp; + var temp = response.data.main.temp; + temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit console.log(temp); const appearanceHeading = document.getElementById('temperaturenumber'); appearanceHeading.textContent = temp + ' Β°F'; From d2e3a4108011b1e9fe51159d371d81630bc43f5c Mon Sep 17 00:00:00 2001 From: Jessica Date: Mon, 12 Dec 2022 14:28:56 -0800 Subject: [PATCH 23/34] Worked on wave 2, stuck on making tempature increase --- index.html | 7 ++++--- src/index.js | 25 +++++++++++++++++++++++++ styles/index.css | 4 ++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index dd8c331ce..bf7a73611 100644 --- a/index.html +++ b/index.html @@ -19,11 +19,12 @@

Weather App

Weather for the city of Seattle

+

temperaturecounter

+ +

temp

+ - - -
diff --git a/src/index.js b/src/index.js index 9e9fdf767..d2a1c7671 100644 --- a/src/index.js +++ b/src/index.js @@ -18,4 +18,29 @@ axios appearanceHeading.textContent = temp + ' Β°F'; }); +const state = { + tempCount: temp, +}; + +// adding temperature number +async function f() { + let promise = new + + + temp = (event) => { + state.tempCount += 1; +}; +const registerEventHandlers = (event) => { + // console.log('in registerEventHandelers:', event); + const upButton = document.querySelector('#Up'); + upButton.addEventListener('click', addtemp); +}; + +// state.tempCount += 1; +// const bookCountContainer = document.querySelector("#bookCount"); +// bookCountContainer.textContent = `Book Count: ${state.bookCount}`; +// }; + +//registering event handler + //if loading, diff --git a/styles/index.css b/styles/index.css index e1f51d763..36a2c3368 100644 --- a/styles/index.css +++ b/styles/index.css @@ -10,4 +10,8 @@ padding: 20px; font-size: 30px; text-align: center; +} + +button { + font-size: x-large; } \ No newline at end of file From 44aadf2830a88e472c0a7486123e1be62d008abb Mon Sep 17 00:00:00 2001 From: LP Date: Mon, 12 Dec 2022 14:38:09 -0800 Subject: [PATCH 24/34] trying to make await work, putting in our tries --- src/index.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/index.js b/src/index.js index d2a1c7671..70f8646fb 100644 --- a/src/index.js +++ b/src/index.js @@ -23,11 +23,14 @@ const state = { }; // adding temperature number -async function f() { - let promise = new - - - temp = (event) => { +// async function f() { +// let promise = new + +// async function addTemp(event) { +// state.tempCount += 1; +// } + +const addTemp = (event) => { state.tempCount += 1; }; const registerEventHandlers = (event) => { From f8f5262775874215edf863443cb61eb72ac95101 Mon Sep 17 00:00:00 2001 From: Jessica Date: Mon, 12 Dec 2022 14:59:33 -0800 Subject: [PATCH 25/34] Modifed most of the waves --- index.html | 1 - src/index.js | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index bf7a73611..539701854 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,6 @@

Weather App

Weather for the city of Seattle

-

temperaturecounter

temp

diff --git a/src/index.js b/src/index.js index 70f8646fb..761f2e29e 100644 --- a/src/index.js +++ b/src/index.js @@ -33,12 +33,25 @@ const state = { const addTemp = (event) => { state.tempCount += 1; }; + const registerEventHandlers = (event) => { // console.log('in registerEventHandelers:', event); const upButton = document.querySelector('#Up'); upButton.addEventListener('click', addtemp); }; +async function get_temp(query) { + let response = await axios.get; +} + +// const getPromise = (time) => { +// const timeoutTime = time * 1000; +// const myPromise = new Promise((resolve, reject) => { +// setTimeout(() => resolve("It's go time!"), timeoutTime); +// }); +// return myPromise; +// }; + // state.tempCount += 1; // const bookCountContainer = document.querySelector("#bookCount"); // bookCountContainer.textContent = `Book Count: ${state.bookCount}`; From 453fda05db22803e81f34ec2831c36c88d40d5cf Mon Sep 17 00:00:00 2001 From: LP Date: Tue, 13 Dec 2022 09:53:04 -0800 Subject: [PATCH 26/34] with jasmine's help, I did a lot of debugging. i got the button click to be registered. then i got event handlers to be called (before, it wasn't being called --- index.html | 4 ++-- src/index.js | 64 +++++++++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/index.html b/index.html index 539701854..2e3dff8e6 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@

Weather App

-

temp

+

tempcount

@@ -37,7 +37,7 @@

Weather App

- + diff --git a/src/index.js b/src/index.js index 761f2e29e..5fe5d34aa 100644 --- a/src/index.js +++ b/src/index.js @@ -2,47 +2,55 @@ //const dotenv = require('dotenv').config(); //const API_KEY = process.env.API_KEY; -('use strict'); -//call to the flask app to get weather -const lat = 47.6038321; -const lon = -122.330062; - -//later, change -axios - .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) - .then((response) => { - var temp = response.data.main.temp; - temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit - console.log(temp); - const appearanceHeading = document.getElementById('temperaturenumber'); - appearanceHeading.textContent = temp + ' Β°F'; - }); +//CODE FOR BUTTON: const state = { - tempCount: temp, + tempCount: 60, //was temp }; -// adding temperature number -// async function f() { -// let promise = new - -// async function addTemp(event) { -// state.tempCount += 1; -// } - const addTemp = (event) => { state.tempCount += 1; + console.log('the button was clicked!!!'); }; const registerEventHandlers = (event) => { // console.log('in registerEventHandelers:', event); const upButton = document.querySelector('#Up'); - upButton.addEventListener('click', addtemp); + console.log(upButton); + upButton.addEventListener('click', addTemp); }; -async function get_temp(query) { - let response = await axios.get; -} +registerEventHandlers(undefined); + +//THIS WAS UNCOMMENTED. IM COMMENTING IT OUT TO GET THE BUTTONS WORKING FIRST + +// ('use strict'); +// //call to the flask app to get weather +// const lat = 47.6038321; +// const lon = -122.330062; +// axios +// .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) +// .then((response) => { +// var temp = response.data.main.temp; +// temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit +// console.log(temp); +// const appearanceHeading = document.getElementById('temperaturenumber'); +// appearanceHeading.textContent = temp + ' Β°F'; +// }); + +// async function get_temp(query) { +// let response = await axios.get; +// } + +//END UNCOMMENTED STUFF ----------- + +// adding temperature number +// async function f() { +// let promise = new + +// async function addTemp(event) { +// state.tempCount += 1; +// } // const getPromise = (time) => { // const timeoutTime = time * 1000; From e3928a602eeeea3698cae752475e0fb8be70e67d Mon Sep 17 00:00:00 2001 From: LP Date: Tue, 13 Dec 2022 09:55:56 -0800 Subject: [PATCH 27/34] added a to-do-list at top of page --- src/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/index.js b/src/index.js index 5fe5d34aa..e6d88d141 100644 --- a/src/index.js +++ b/src/index.js @@ -1,3 +1,7 @@ +//NEXT STEPS FOR LP: GET THE BUTTON TO ADD VALUE TO THE TEMP COUNT. +//GET THE AXIOS CALL WORKING +//LOOK AT THE 7-WONDERS CODE TO TRY TO GET THE PROMISE AND THE ASYNC AND AWAIT FUNCTION WORKING. + //const axios = require('axios'); //const dotenv = require('dotenv').config(); //const API_KEY = process.env.API_KEY; From 012f1cd3be3512f258b21c620a768c924cb5fb15 Mon Sep 17 00:00:00 2001 From: LP Date: Tue, 13 Dec 2022 19:16:13 -0800 Subject: [PATCH 28/34] got temp count to show up as the temp number. got the up button working. --- index.html | 2 +- src/index.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 2e3dff8e6..03b5554ff 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@

Weather App

-

tempcount

+

tempcount

diff --git a/src/index.js b/src/index.js index e6d88d141..57dbee34e 100644 --- a/src/index.js +++ b/src/index.js @@ -12,9 +12,13 @@ const state = { tempCount: 60, //was temp }; +const tempCountContainter = document.querySelector('#tempCount'); +tempCountContainter.textContent = state.tempCount; + const addTemp = (event) => { state.tempCount += 1; - console.log('the button was clicked!!!'); + const tempCountContainter = document.querySelector('#tempCount'); + tempCountContainter.textContent = state.tempCount; }; const registerEventHandlers = (event) => { From c22657e05c26e20e547e6968c10810ee45eed26e Mon Sep 17 00:00:00 2001 From: LP Date: Tue, 13 Dec 2022 21:09:44 -0800 Subject: [PATCH 29/34] got the down button working. --- index.html | 4 ++-- src/index.js | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 03b5554ff..20d1e66aa 100644 --- a/index.html +++ b/index.html @@ -19,10 +19,10 @@

Weather App

Weather for the city of Seattle

- +

tempcount

- + diff --git a/src/index.js b/src/index.js index 57dbee34e..7a87316e6 100644 --- a/src/index.js +++ b/src/index.js @@ -12,20 +12,29 @@ const state = { tempCount: 60, //was temp }; -const tempCountContainter = document.querySelector('#tempCount'); -tempCountContainter.textContent = state.tempCount; +var tempCountContainer = document.querySelector('#tempCount'); +tempCountContainer.textContent = state.tempCount; const addTemp = (event) => { state.tempCount += 1; - const tempCountContainter = document.querySelector('#tempCount'); - tempCountContainter.textContent = state.tempCount; + tempCountContainer = document.querySelector('#tempCount'); + tempCountContainer.textContent = state.tempCount; +}; + +const subtractTemp = (event) => { + state.tempCount -= 1; + tempCountContainer = document.querySelector('#tempCount'); + tempCountContainer.textContent = state.tempCount; }; const registerEventHandlers = (event) => { // console.log('in registerEventHandelers:', event); - const upButton = document.querySelector('#Up'); + const upButton = document.querySelector('#upButton'); + const downButton = document.querySelector('#downButton'); console.log(upButton); upButton.addEventListener('click', addTemp); + downButton.addEventListener('click', subtractTemp); + console.log(downButton); }; registerEventHandlers(undefined); From 54ab58af8c44de064470bb242e8c60dc14e2853e Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 14 Dec 2022 09:15:10 -0800 Subject: [PATCH 30/34] got axios recognized with no errors. --- index.html | 2 +- src/index.js | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index 20d1e66aa..048fea112 100644 --- a/index.html +++ b/index.html @@ -37,7 +37,7 @@

Weather App

- + diff --git a/src/index.js b/src/index.js index 7a87316e6..9a617769e 100644 --- a/src/index.js +++ b/src/index.js @@ -1,11 +1,6 @@ -//NEXT STEPS FOR LP: GET THE BUTTON TO ADD VALUE TO THE TEMP COUNT. //GET THE AXIOS CALL WORKING //LOOK AT THE 7-WONDERS CODE TO TRY TO GET THE PROMISE AND THE ASYNC AND AWAIT FUNCTION WORKING. -//const axios = require('axios'); -//const dotenv = require('dotenv').config(); -//const API_KEY = process.env.API_KEY; - //CODE FOR BUTTON: const state = { @@ -39,8 +34,6 @@ const registerEventHandlers = (event) => { registerEventHandlers(undefined); -//THIS WAS UNCOMMENTED. IM COMMENTING IT OUT TO GET THE BUTTONS WORKING FIRST - // ('use strict'); // //call to the flask app to get weather // const lat = 47.6038321; @@ -51,7 +44,7 @@ registerEventHandlers(undefined); // var temp = response.data.main.temp; // temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit // console.log(temp); -// const appearanceHeading = document.getElementById('temperaturenumber'); +// const appearanceHeading = document.getElementById('tempCount'); //change this to query selector? // appearanceHeading.textContent = temp + ' Β°F'; // }); @@ -59,8 +52,6 @@ registerEventHandlers(undefined); // let response = await axios.get; // } -//END UNCOMMENTED STUFF ----------- - // adding temperature number // async function f() { // let promise = new From 91af768be8bc577642bc1d3134f454d34a3e6110 Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 14 Dec 2022 09:23:46 -0800 Subject: [PATCH 31/34] got the temperature to display on the webpage. but when i press the buttons, it goes back to 60 degrees as a baseline. --- src/index.js | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/index.js b/src/index.js index 9a617769e..c6f3c40c5 100644 --- a/src/index.js +++ b/src/index.js @@ -34,19 +34,24 @@ const registerEventHandlers = (event) => { registerEventHandlers(undefined); +//AXIOS CODE + // ('use strict'); -// //call to the flask app to get weather -// const lat = 47.6038321; -// const lon = -122.330062; -// axios -// .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) -// .then((response) => { -// var temp = response.data.main.temp; -// temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit -// console.log(temp); -// const appearanceHeading = document.getElementById('tempCount'); //change this to query selector? -// appearanceHeading.textContent = temp + ' Β°F'; -// }); +//call to the flask app to get weather +const lat = 47.6038321; +const lon = -122.330062; +axios + .get('http://127.0.0.1:5000/weather' + '?lat=' + lat + '&lon=' + lon) + .then((response) => { + var temp = response.data.main.temp; + temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit + console.log(temp); + const appearanceHeading = document.getElementById('tempCount'); //change this to query selector? + appearanceHeading.textContent = temp + ' Β°F'; + }) + .catch((error) => { + console.log(`there has been an error in the axios call. Cause: ${error}`); + }); // async function get_temp(query) { // let response = await axios.get; From 2fb179b9ae2b30f93b5993c33a3cacbe2353005a Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 14 Dec 2022 09:38:38 -0800 Subject: [PATCH 32/34] got temperature working 100%. it renders the current temp for seattle. then it increments up or down when i press the buttons. yay --- src/index.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/index.js b/src/index.js index c6f3c40c5..15d09a27e 100644 --- a/src/index.js +++ b/src/index.js @@ -6,20 +6,22 @@ const state = { tempCount: 60, //was temp }; - var tempCountContainer = document.querySelector('#tempCount'); -tempCountContainer.textContent = state.tempCount; + +const renderTemp = () => { + tempCountContainer.textContent = state.tempCount + ' Β°F'; +}; + +renderTemp(); const addTemp = (event) => { state.tempCount += 1; - tempCountContainer = document.querySelector('#tempCount'); - tempCountContainer.textContent = state.tempCount; + renderTemp(); }; const subtractTemp = (event) => { state.tempCount -= 1; - tempCountContainer = document.querySelector('#tempCount'); - tempCountContainer.textContent = state.tempCount; + renderTemp(); }; const registerEventHandlers = (event) => { @@ -46,13 +48,19 @@ axios var temp = response.data.main.temp; temp = Math.round(((temp - 273.15) * 9) / 5 + 32); //convert to Farenheit console.log(temp); - const appearanceHeading = document.getElementById('tempCount'); //change this to query selector? - appearanceHeading.textContent = temp + ' Β°F'; + + //need to update the state. + state.tempCount = temp; + renderTemp(); }) .catch((error) => { console.log(`there has been an error in the axios call. Cause: ${error}`); }); +//write a function that changes the display text. +//appearanceHeading.textContent = temp + ' Β°F'; +//have it rely on state.tempCount. + // async function get_temp(query) { // let response = await axios.get; // } From 5c7ba0752fa38feec3aab1b8a4cf4c5d44919b33 Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 14 Dec 2022 09:51:49 -0800 Subject: [PATCH 33/34] got the color of the temperature backround to change based on the temperature. --- src/index.js | 21 +++++++++++++++++---- styles/index.css | 4 ++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index 15d09a27e..5fdf9c95a 100644 --- a/src/index.js +++ b/src/index.js @@ -8,8 +8,24 @@ const state = { }; var tempCountContainer = document.querySelector('#tempCount'); +//changing the background color temp function +const setTempColor = () => { + if (state.tempCount <= 49) { + tempCountContainer.style.backgroundColor = 'teal'; + } else if (state.tempCount >= 50 && state.tempCount <= 59) { + tempCountContainer.style.backgroundColor = 'green'; + } else if (state.tempCount >= 60 && state.tempCount <= 69) { + tempCountContainer.style.backgroundColor = 'yellow'; + } else if (state.tempCount >= 70 && state.tempCount <= 79) { + tempCountContainer.style.backgroundColor = 'orange'; + } else if (state.tempCount >= 80) { + tempCountContainer.style.backgroundColor = 'red'; + } +}; + const renderTemp = () => { tempCountContainer.textContent = state.tempCount + ' Β°F'; + setTempColor(); }; renderTemp(); @@ -38,7 +54,6 @@ registerEventHandlers(undefined); //AXIOS CODE -// ('use strict'); //call to the flask app to get weather const lat = 47.6038321; const lon = -122.330062; @@ -57,9 +72,7 @@ axios console.log(`there has been an error in the axios call. Cause: ${error}`); }); -//write a function that changes the display text. -//appearanceHeading.textContent = temp + ' Β°F'; -//have it rely on state.tempCount. +//what we tried to get async functions working. // async function get_temp(query) { // let response = await axios.get; diff --git a/styles/index.css b/styles/index.css index 36a2c3368..0665136fa 100644 --- a/styles/index.css +++ b/styles/index.css @@ -14,4 +14,8 @@ button { font-size: x-large; +} + +#tempCount { + background-color: pink; } \ No newline at end of file From 39e630061effecc87db32ae422e4a43f4ce51b11 Mon Sep 17 00:00:00 2001 From: LP Date: Wed, 14 Dec 2022 09:59:45 -0800 Subject: [PATCH 34/34] got the garden displayed. waves 1, 2, and 4 are now all passed. --- index.html | 8 +++++--- src/index.js | 6 ++++++ styles/index.css | 13 +++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 048fea112..cd8d78bed 100644 --- a/index.html +++ b/index.html @@ -10,12 +10,14 @@
-
+

Weather App

- +

Weather Garden

+

Garden

+
-
+

Weather for the city of Seattle

diff --git a/src/index.js b/src/index.js index 5fdf9c95a..82b597480 100644 --- a/src/index.js +++ b/src/index.js @@ -7,19 +7,25 @@ const state = { tempCount: 60, //was temp }; var tempCountContainer = document.querySelector('#tempCount'); +var gardenContainer = document.querySelector('#garden'); //changing the background color temp function const setTempColor = () => { if (state.tempCount <= 49) { tempCountContainer.style.backgroundColor = 'teal'; + gardenContainer.textContent = 'πŸŒ²πŸŒ²β›„οΈπŸŒ²β›„οΈπŸ‚πŸŒ²πŸπŸŒ²πŸŒ²β›„οΈπŸ‚πŸŒ²'; } else if (state.tempCount >= 50 && state.tempCount <= 59) { tempCountContainer.style.backgroundColor = 'green'; + gardenContainer.textContent = 'πŸŒ²πŸŒ²β›„οΈπŸŒ²β›„οΈπŸ‚πŸŒ²πŸπŸŒ²πŸŒ²β›„οΈπŸ‚πŸŒ²'; } else if (state.tempCount >= 60 && state.tempCount <= 69) { tempCountContainer.style.backgroundColor = 'yellow'; + gardenContainer.textContent = '🌾🌾_πŸƒ_πŸͺ¨__πŸ›€_🌾🌾🌾_πŸƒ'; } else if (state.tempCount >= 70 && state.tempCount <= 79) { tempCountContainer.style.backgroundColor = 'orange'; + gardenContainer.textContent = '🌸🌿🌼__🌷🌻🌿_☘️🌱_🌻🌷'; } else if (state.tempCount >= 80) { tempCountContainer.style.backgroundColor = 'red'; + gardenContainer.textContent = '🌡__🐍_πŸ¦‚_🌡🌡__🐍_🏜_πŸ¦‚'; } }; diff --git a/styles/index.css b/styles/index.css index 0665136fa..efbfde968 100644 --- a/styles/index.css +++ b/styles/index.css @@ -18,4 +18,17 @@ button { #tempCount { background-color: pink; +} + +#pink-section { + background-color: lightpink; +} + +#garden { + background-color: white; + border: 1px solid black; +} + +h2 { + font-size : 20px; } \ No newline at end of file