Code

Amethyst - Hannah & Phalesa #72

Code

Open

Hannah1Watkins wants to merge 43 commits intoAda-C19:mainAda-C19/weather-report:mainfrom Hannah1Watkins:mainHannah1Watkins/weather-report:mainCopy head branch name to clipboard

+363-2

Commits

Commits on Jun 8, 2023

• change index html

  Hannah1Watkins

  committed
  8b0a401

  Copy full SHA for 8b0a401

• Wireframe

  PhePhe123

  committed
  176f03d

  Copy full SHA for 176f03d

• use strict

  Hannah1Watkins

  committed
  8c71b2c

  Copy full SHA for 8c71b2c

• partially completed wave 2 - also added images for different seasons

  Hannah1Watkins

  committed
  00da206

  Copy full SHA for 00da206

• not all my commits went through before- added pictures wave 2 complete

  Hannah1Watkins

  committed
  3f5f45c

  Copy full SHA for 3f5f45c

• parcially done w/ wave 3

  Hannah1Watkins

  committed
  421bd7f

  Copy full SHA for 421bd7f

• changed index.css visuals

  Hannah1Watkins

  committed
  1b48e60

  Copy full SHA for 1b48e60

• added winter emojis to html

  Hannah1Watkins

  committed
  6f8a7ac

  Copy full SHA for 6f8a7ac

Commits on Jun 9, 2023

• changed css file, removed emojis from html

  Hannah1Watkins

  committed
  43a079a

  Copy full SHA for 43a079a

Commits on Jun 12, 2023

• Emoji and City Input box

  PhePhe123

  committed
  27e35eb

  Copy full SHA for 27e35eb

Commits on Jun 13, 2023

• changed files to re-arragnge emojis

  Hannah1Watkins

  committed
  221024b

  Copy full SHA for 221024b

• changed files to re-arragnge emojis

  Hannah1Watkins

  committed
  93263c0

  Copy full SHA for 93263c0

• commiting to accept incomming changes

  Hannah1Watkins

  committed
  cb8d964

  Copy full SHA for cb8d964

• changed background color, added picture to main page

  Hannah1Watkins

  committed
  12aac09

  Copy full SHA for 12aac09

• Updated temp emoj-sky

  PhePhe123

  committed
  c8b99ff

  Copy full SHA for c8b99ff

• Updated temp emoj-sky2

  PhePhe123

  committed
  387f6a2

  Copy full SHA for 387f6a2

• changed site visual

  Hannah1Watkins

  committed
  997f4fe

  Copy full SHA for 997f4fe

• changed site visual

  Hannah1Watkins

  committed
  ba0ba43

  Copy full SHA for ba0ba43

• changed site visual

  Hannah1Watkins

  committed
  14e2f74

  Copy full SHA for 14e2f74

• Updated default view

  PhePhe123

  committed
  17084c3

  Copy full SHA for 17084c3

• Updated default view

  PhePhe123

  committed
  91acfdb

  Copy full SHA for 91acfdb

• Resolved merge errors

  PhePhe123

  committed
  02364bc

  Copy full SHA for 02364bc

• Testing Sky Emojis

  PhePhe123

  committed
  d6934b8

  Copy full SHA for d6934b8

• changes index.css

  Hannah1Watkins

  committed
  1b83c61

  Copy full SHA for 1b83c61

• commiting so I can pull

  Hannah1Watkins

  committed
  d83b5f7

  Copy full SHA for d83b5f7

Commits on Jun 14, 2023

• Sky Emojis updating with dropdown

  PhePhe123

  committed
  89cdf50

  Copy full SHA for 89cdf50

• completed wave 6 reset button

  Hannah1Watkins

  committed
  ce1b7e8

  Copy full SHA for ce1b7e8

• Merge branch 'main' of https://github.com/Hannah1Watkins/weather-report

  Hannah1Watkins

  committed
  ade628c

  Copy full SHA for ade628c

• completed wave 6 reset button

  Hannah1Watkins

  committed
  9bcdb86

  Copy full SHA for 9bcdb86

• added changes for wave 6

  Hannah1Watkins

  committed
  a073f1c

  Copy full SHA for a073f1c

• Return City Wave 3

  PhePhe123

  committed
  d373cc8

  Copy full SHA for d373cc8

• changed button spacing in css

  Hannah1Watkins

  committed
  9731098

  Copy full SHA for 9731098

• changed text color to white in header

  Hannah1Watkins

  committed
  84b5c4f

  Copy full SHA for 84b5c4f

• created api requests for wave 4

  Hannah1Watkins

  committed
  0bc23da

  Copy full SHA for 0bc23da

• Minor updates

  PhePhe123

  committed
  4d15522

  Copy full SHA for 4d15522

• Merge branch 'main' of https://github.com/Hannah1Watkins/weather-report

  PhePhe123

  committed
  c7dd31d

  Copy full SHA for c7dd31d

Commits on Jun 15, 2023

• Tryingto go back

  PhePhe123

  committed
  8c95f50

  Copy full SHA for 8c95f50

• changed index.js to get current temp, used state

  Hannah1Watkins

  committed
  30510a9

  Copy full SHA for 30510a9

• changed index.js to get current temp, used state

  Hannah1Watkins

  committed
  f7f3108

  Copy full SHA for f7f3108

• made change to correct button error

  Hannah1Watkins

  committed
  f2e42ac

  Copy full SHA for f2e42ac

• Updated API Calls

  PhePhe123

  committed
  67becf5

  Copy full SHA for 67becf5

• Updated API Calls2

  PhePhe123

  committed
  cb88ad3

  Copy full SHA for cb88ad3

Commits on Jun 16, 2023

• All Waves Functioning

  PhePhe123

  committed
  12f9284

  Copy full SHA for 12f9284