diff --git a/README.md b/README.md index d8d6388..e1219a8 100644 --- a/README.md +++ b/README.md @@ -2,21 +2,18 @@ ### Goal: Use data returned from one api to make a request to another api and display the data returned -### How to submit your code for review: +![Alt text](Screenshot.png "screenshot") -- Fork and clone this repo -- Create a new branch called answer -- Checkout answer branch -- Push to your fork -- Issue a pull request -- Your pull request description should contain the following: - - (1 to 5 no 3) I completed the challenge - - (1 to 5 no 3) I feel good about my code - - Anything specific on which you want feedback! +#### About +* Using a weather API and the pokemon database, compare the real region entered +to their pokemon world equivalent and display a random pokemon from that region +* Else, display a random pokemon -Example: -``` -I completed the challenge: 5 -I feel good about my code: 4 -I'm not sure if my constructors are setup cleanly... -``` +##### Tech used +* JavaScript +* HTML +* CSS + +##### Lessons Learned +* Improved creating and navigating arrays +* Combining navigating arrays with navigating API's \ No newline at end of file diff --git a/Screenshot.png b/Screenshot.png new file mode 100644 index 0000000..d8c6ac3 Binary files /dev/null and b/Screenshot.png differ diff --git a/css/normalize.css b/css/normalize.css new file mode 100644 index 0000000..192eb9c --- /dev/null +++ b/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/css/reset.css b/css/reset.css new file mode 100644 index 0000000..5bc7dcd --- /dev/null +++ b/css/reset.css @@ -0,0 +1,47 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/css/style.css b/css/style.css new file mode 100644 index 0000000..4c0f1e1 --- /dev/null +++ b/css/style.css @@ -0,0 +1,33 @@ +/****************************************** +/* CSS +/*******************************************/ + +/* Box Model Hack */ +*{ + box-sizing: border-box; +} + +/****************************************** +/* LAYOUT +/*******************************************/ + +body { + margin: 5% 20% 30% 20%; + background: #1e1e1e url('../img/bg.png') center/cover no-repeat fixed; + color: rgb(166, 0, 0); + font-size: larger; +} +fieldset { + background-color: #1e1e1e83; + font-size: large; + color: rgb(255, 0, 0); + text-align: center; +} +.pt1, .pt2 { + background-color: #1e1e1e83; + text-align: center; +} + +/****************************************** +/* ADDITIONAL STYLES +/*******************************************/ diff --git a/img/bg.png b/img/bg.png new file mode 100644 index 0000000..d6cef85 Binary files /dev/null and b/img/bg.png differ diff --git a/index.html b/index.html new file mode 100644 index 0000000..28e9560 --- /dev/null +++ b/index.html @@ -0,0 +1,39 @@ + + + + + + + + Pokemon Weather Search + + + + + + + +
+ Search Region + + + +
+
+

Weather

+

+

+

+

+

Region

+

This region's Pokemon equivalent is:

+
+
+

Random Pokemon Name

+ + +
+ + + + diff --git a/js/main.js b/js/main.js new file mode 100644 index 0000000..e35ae09 --- /dev/null +++ b/js/main.js @@ -0,0 +1,162 @@ +//Weather => Pokemon +//Enter Location => Get Weather in that location +//AND get random Pokemon from that region +//Unova = East Coast US +//Kalos = France/Western Europe +//Alola = Hawaii Tropical Region +//Galar = UK/Eastern Europe +//Paldea = Spain/Southern Europe +//Orre = West Coast/US +//Sinnoh = Japan + + +let us_eastCoast = ['Maine','New Hampshire','Vermont','Massachusetts', 'New York','Rhode Island', + 'Connecticut','New Jersey','Pennsylvania', 'Delaware', 'Maryland', 'District of Columbia', 'West Virginia', + 'Ohio', 'Kentucky', 'Tennessee', 'Indiana', 'Wisconsin', 'Illinois', 'Alabama', 'Georgia', 'North Carolina', + 'South Carolina', 'Florida', 'Mississippi', 'Minnesota', 'Iowa', 'Missouri', 'Arkansas', 'Louisiana', 'Puerto Rico' +]; +let us_westCoast = ['North Dakota', 'South Dakota', 'Nebraska', 'Kansas', 'Oklahoma', 'Montana', 'Wyoming', + 'Colorado', 'Idaho', 'Washington', 'Oregon', 'California', 'Hawaii', + 'Alaska' +]; +let us_desert = ['Utah','Nevada','Arizona','New Mexico','Texas'] +let europe = ['Iceland', 'United Kingdom', 'Norway', 'Sweden', 'Finland','Belarus', 'Ukraine', 'Estonia', + 'Lativa', 'Lithuania', 'Poland', 'Poland', 'Romania', 'Slovakia', 'Bulgaria', 'Austria', 'Germany', 'France', + 'Spain' +]; +let africa = ['Egypt', 'Libya', 'Algeria', 'Tunisia', 'Morocco', 'Mauritania', 'Mali', 'Niger', 'Chad', 'Sudan', + 'Eritrea', 'Djibouti', 'Ethiopia', 'Somalia', 'Sudan', 'Chad', 'Nigeria', 'Senegal', 'The Gambia', 'Guinea', + 'Ghana', 'Liberia', 'Sierra Leone', 'Cameroon', 'Central African Republic', 'Uganda', 'Kenya', 'Tanzania', + 'Remocratic Republic of the Congo', 'Gabon', 'Angola', 'Zambia', 'Malawi', 'Madagascar', 'Mozambique', + 'Zimbabwe', 'Botswana', 'Nambibia', 'Eswatini', 'South Africa' +]; +let asia = ['China', 'Mongolia', 'Russia', 'Korea', 'Japan', 'Taiwan', 'Philippines', + 'India', 'Pakistan', 'Nepal', 'Bangladesh', 'Myanmar', 'Laos', 'Thailand', 'Cambodia', 'Vietnam', + 'Malaysia', 'Singapore', 'Indonesia', +] + +let regions = ['Unova', 'Orre', 'Paldea', 'Galar', 'Alola', 'Kalos', 'Sinnoh', + 'Kanto', 'Johto', 'Hoenn' +]; + +let generations = ['generation i', 'generation ii', 'generation iii', 'generation iv', + 'generation v', 'generation vi', 'generation vii', 'generation viii', 'generation ix' +] + +const regionDexRanges = { + 'Kanto': [1, 151], + 'Johto': [152, 251], + 'Hoenn': [252, 386], + 'Sinnoh': [387, 493], + 'Unova': [494, 649], + 'Kalos': [650, 721], + 'Alola': [722, 809], + 'Galar': [810, 905], + 'Paldea': [906, 1025], + 'Orre': [10000, 10010], +}; + +document.querySelector('button').addEventListener('click',getRealRegion); + +async function getRealRegion() { + const wildCardInput = document.querySelector('#wildCard').value; + const kagi = '573e39e3da904aa38cf155148250310'; + const wildCardUrl = `https://api.weatherapi.com/v1/current.json?key=${kagi}&q=${wildCardInput}`; + + try { + const response = await fetch(wildCardUrl); + if (!response.ok) throw new Error(`HTTP error! Status: ${response.status}`); + + const data = await response.json(); + + + const locCountry = data.location.country; + const locName = data.location.name; + + document.querySelector('#temp_f').innerText = data.current.temp_f; + document.querySelector('#weatherConditions').innerText = data.current.condition.text; + document.querySelector('#country').innerText = locCountry; + document.querySelector('#locName').innerText = locName; + + getPokeRegion(locName, locCountry); + + } catch (error) { + console.error('Fetch error:', error); + } +} + +function mapToPokeRegion(locName, locCountry) { + if (us_eastCoast.includes(locName) || us_eastCoast.includes(locCountry)) { + return 'Unova'; // East Coast + } + if (us_westCoast.includes(locName) || us_westCoast.includes(locCountry)) { + return 'Orre'; // West Coast + } + if (us_desert.includes(locName) || us_desert.includes(locCountry)) { + return 'Orre'; // Desert = Orre region + } + + if (europe.includes(locCountry)) { + if (locCountry === 'France') return 'Kalos'; + if (locCountry === 'United Kingdom') return 'Galar'; + if (locCountry === 'Spain') return 'Paldea'; + return 'Galar'; + } + + if (asia.includes(locCountry)) { + if (locCountry === 'Japan') return 'Sinnoh'; + return 'Kanto'; + } + + if (africa.includes(locCountry)) { + return 'Hoenn'; + } + + if (locCountry === 'Hawaii' || locName === 'Honolulu') { + return 'Alola'; + } + + return 'Unknown Region'; +} + +function getPokeRegion(locName, locCountry) { + + console.log(`Location Name: ${locName}`); + console.log(`Country: ${locCountry}`); + + const pokeRegion = mapToPokeRegion(locName, locCountry); + getRandomPokemonFromRegion(pokeRegion); + document.querySelector('#regionText').innerText = pokeRegion; + + //let search = document.querySelector('#wildCard').value; + //let pokeID = 2; + //let url = `https://pokeapi.co/api/v2/pokedex/${pokeID}/`; + // let url = `https://pokeapi.co/api/v2/pokemon/${search}`; + + //fetch(url) //fetch at this url + // .then(response => response.json()) //then get the response data + // .then(fetched => { //renamed to fetched because the actual data array is called 'data' smh + //console.table(fetched) + //document.querySelector('#monName').innerText = ; + //document.querySelector('#monType').innerText = fetched.types[0].type.name; + //document.querySelector('#pkmnRegion').innerText = fetched + // }) //then start using the data + // .catch(error => console.error(error)); //catch errors instead of crashing or something +} + +async function getRandomPokemonFromRegion(region) { + const [start, end] = regionDexRanges[region] || [1, 1025]; + const randomId = Math.floor(Math.random() * (end - start + 1)) + start; + const url = `https://pokeapi.co/api/v2/pokemon/${randomId}/`; + + const response = await fetch(url); + const data = await response.json(); + + document.querySelector('#monName').innerText = data.name; + document.querySelector('#sprite').src = data.sprites.front_default; + document.querySelector('#typeOne').innerText = data.types[0].type.name; + document.querySelector('#typeTwo').innerText = data.types[1]?.type.name || ''; + + console.log(`Fetched ${data.name} from ${region}`); +} +