From 092cefd3d53fd2aea6331f47a22ac469d3fa1e9f Mon Sep 17 00:00:00 2001 From: "Meryem L." <82731366+L-Meryem@users.noreply.github.com> Date: Fri, 3 Oct 2025 14:05:33 -0400 Subject: [PATCH 1/4] Add amiibos filtered by date or year --- css/.DS_Store | Bin 0 -> 6148 bytes css/normalize.css | 349 ++++++++++++++++++++++++++++++++++++++++++++++ css/reset.css | 47 +++++++ css/style.css | 68 +++++++++ index.html | 26 ++++ js/main.js | 83 +++++++++++ 6 files changed, 573 insertions(+) create mode 100644 css/.DS_Store create mode 100755 css/normalize.css create mode 100755 css/reset.css create mode 100755 css/style.css create mode 100755 index.html create mode 100644 js/main.js diff --git a/css/.DS_Store b/css/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c6e2cf39a3e14e8ce521f3e78a7ec819c49c9b09 GIT binary patch literal 6148 zcmeHKF;2rk5Zr|nK{P38knRPM_`xX(1vMW)3F$0F!cfq;<2gJLW^R|r#?VrrS!s9f z_I7;s6y7^C^UcfSjoHe~mT;oIG0ctY^qHMyhUo1X&$hO`_152Yv+AD{T2Q;*yzYNI#34z>LQZ@f1$u9Mvy2@ literal 0 HcmV?d00001 diff --git a/css/normalize.css b/css/normalize.css new file mode 100755 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 100755 index 0000000..2ee7ab0 --- /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 100755 index 0000000..8f0c24b --- /dev/null +++ b/css/style.css @@ -0,0 +1,68 @@ +/* Box Model Hack */ +* { + box-sizing: border-box; +} + +/* Clear fix hack */ +.clearfix:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + line-height: 0; + height: 0; +} + +.clear { + clear: both; +} + +/****************************************** +/* BASE STYLES +/*******************************************/ + +body { + font-family: "Trebuchet MS", sans-serif; +} + + +/****************************************** +/* LAYOUT +/*******************************************/ +header { + +} + +footer { + +} + +/****************************************** +/* ADDITIONAL STYLES +/*******************************************/ + +.cards{ + display: grid; + width: 80%; + margin: auto; + grid-template-columns: repeat(3,1fr); + font-size: 2rem; +} + +.card{ + /* width: 200px; */ + display: flex; + flex-direction: column; + align-items: center; + + border: 1px solid gray; + text-align: center; + padding: 5px; +} + +.image{ + width: 80%; + +} + + diff --git a/index.html b/index.html new file mode 100755 index 0000000..18981c2 --- /dev/null +++ b/index.html @@ -0,0 +1,26 @@ + + + + + + + + + Amiibos + + + + + + +
+ + + +
+
+
+ + + + diff --git a/js/main.js b/js/main.js new file mode 100644 index 0000000..471d3c4 --- /dev/null +++ b/js/main.js @@ -0,0 +1,83 @@ +/* +figure not card +filter by release date and location: na +show + image + name + amiiboSeries + release date +*/ + +const button = document.querySelector('button'); +button.addEventListener('click', getAmiibos); + + +function getAmiibos() { + clearCards(); + const date = document.querySelector('#date').value; + + const url = `https://www.amiiboapi.com/api/amiibo?type=figure&release.na=${date} `; + + fetch(url) + .then(res => res.json()) + .then(data => { + //If an amiibo was released on the date you entered I will return it + //if not, I will return all amiibos tha come out that year + let filteredAmiibos; + const amiinoReleasedThatDay = data.amiibo.filter(fig => fig.release.na === date); + + if (amiinoReleasedThatDay.length) + filteredAmiibos = amiinoReleasedThatDay; + else { + filteredAmiibos = data.amiibo.filter(fig => { + const year = new Date(date).getFullYear(); + const releaseYear = new Date(fig.release.na).getFullYear(); + return year === releaseYear; + }); + } + // console.log(filteredAmiibos); + filteredAmiibos.forEach(fig => { + console.log(fig); + // Create a card inside section cards + const { h2, series, releaseDate, img } = createCard(); + // Fill in the card + h2.innerText = fig.name; + series.innerText = fig.amiiboSeries; + releaseDate.innerText = fig.release.na; + img.src = fig.image; + img.alt = fig.name; + }) + }) + .catch(error => console.log(error)); + +} + +function clearCards(){ + const cards = document.querySelector('.cards') + cards.replaceChildren(); +} + +function createCard() { + //Create a card + const cards = document.querySelector('.cards'); + const div = document.createElement('div'); + div.className = 'card'; + //Create card's content + const h2 = document.createElement('h2'); + h2.className = 'name'; + const series = document.createElement('small'); + series.className = 'series'; + const releaseDate = document.createElement('small'); + releaseDate.className = 'release_date'; + const img = document.createElement('img'); + img.src = ''; + img.alt = ''; + //Adding style + div.classList.add('card'); + img.classList.add('image'); + //Connect tags + div.append(h2, series, releaseDate, img); + cards.append(div); + //return tags as an {} to diconstruct + return { h2, series, releaseDate, img }; +} \ No newline at end of file From 6bc969d5b038147e47cd88fc483f7b02778b70a9 Mon Sep 17 00:00:00 2001 From: "Meryem L." <82731366+L-Meryem@users.noreply.github.com> Date: Fri, 3 Oct 2025 21:51:36 -0400 Subject: [PATCH 2/4] Add style and sort by new --- css/style.css | 104 +++++++++++++++++++++++++++++++++++++++++--------- index.html | 51 +++++++++++++++---------- js/main.js | 18 +++++---- 3 files changed, 128 insertions(+), 45 deletions(-) diff --git a/css/style.css b/css/style.css index 8f0c24b..0deef06 100755 --- a/css/style.css +++ b/css/style.css @@ -25,44 +25,114 @@ body { font-family: "Trebuchet MS", sans-serif; } +header{ + background-color: black; + padding: 2rem; +} + +main{ + margin-top: 50px; + width: 80%; + margin: auto; +} /****************************************** /* LAYOUT /*******************************************/ -header { - -} - -footer { - -} /****************************************** /* ADDITIONAL STYLES /*******************************************/ +h1{ + font-size: 2rem; + text-align: center; + color: white; +} + +.search{ + /* width: */ + margin: 20px auto; + display: flex; + justify-content: center; +} .cards{ display: grid; - width: 80%; margin: auto; grid-template-columns: repeat(3,1fr); + font-size: 2rem; + gap: 20px; } .card{ - /* width: 200px; */ - display: flex; - flex-direction: column; - align-items: center; - - border: 1px solid gray; - text-align: center; - padding: 5px; + display: flex; + flex-direction: column; + align-items: center; + border: 2px solid black; + box-shadow: 10px 5px gray; + text-align: center; + justify-content: space-between; + padding-bottom: 10px; } .image{ - width: 80%; + width: 98%; + height: auto; +} + +.description{ + width: 100%; + padding: 10px 0; + margin-bottom: 20px; +} + +.description .name{ + font-size: 1.5rem; +} +.description small{ + font-size: 0.8rem; + color: gray; + display: block; + margin-top: 5px; } +button { + border: 2px solid black; + box-shadow: 10px 5px gray; + font-size: 1.5rem; + padding: 2px; + width: 40%; +} + +input{ + width: 40%; + font-size: 1.5rem; + padding: 2px; + box-shadow: 10px 5px gray; + margin-right: 20px; + +} + +@media screen and (max-width: 790px){ + .cards{ + grid-template-columns: 1fr 1fr; + } +} + +@media screen and (max-width: 610px){ + .cards{ + grid-template-columns: 1fr; + } + + .search{ + flex-direction: column; + gap: 10px; + } + button, input, .card{ + width: 100%; + min-width: 200px; + } +} diff --git a/index.html b/index.html index 18981c2..2b105e4 100755 --- a/index.html +++ b/index.html @@ -1,26 +1,35 @@ - - - - - - - Amiibos - - - - - -
+ + + + + + + Amiibos + + + + + + + +
+

Browse all amiibos released in North America

+
+
+
- - -
-
-
+ + + + +
+
+
+ + + - - - + \ No newline at end of file diff --git a/js/main.js b/js/main.js index 471d3c4..1c4910f 100644 --- a/js/main.js +++ b/js/main.js @@ -8,7 +8,10 @@ show release date */ -const button = document.querySelector('button'); +document.querySelector('#date').valueAsDate = new Date(); +getAmiibos(); + +const button = document.querySelector('#search'); button.addEventListener('click', getAmiibos); @@ -35,9 +38,7 @@ function getAmiibos() { return year === releaseYear; }); } - // console.log(filteredAmiibos); - filteredAmiibos.forEach(fig => { - console.log(fig); + filteredAmiibos.sort((a, b) => new Date(b.release.na) - new Date(a.release.na)).forEach(fig => { // Create a card inside section cards const { h2, series, releaseDate, img } = createCard(); // Fill in the card @@ -52,17 +53,19 @@ function getAmiibos() { } -function clearCards(){ +function clearCards() { const cards = document.querySelector('.cards') cards.replaceChildren(); } -function createCard() { +function createCard(char) { //Create a card const cards = document.querySelector('.cards'); const div = document.createElement('div'); div.className = 'card'; //Create card's content + const description = document.createElement('div'); + description.className = 'description'; const h2 = document.createElement('h2'); h2.className = 'name'; const series = document.createElement('small'); @@ -76,7 +79,8 @@ function createCard() { div.classList.add('card'); img.classList.add('image'); //Connect tags - div.append(h2, series, releaseDate, img); + description.append(h2, series, releaseDate) + div.append(description, img); cards.append(div); //return tags as an {} to diconstruct return { h2, series, releaseDate, img }; From b4ba3b1b5e77570008981300b757681bd62d5495 Mon Sep 17 00:00:00 2001 From: "Meryem L." <82731366+L-Meryem@users.noreply.github.com> Date: Fri, 3 Oct 2025 21:58:47 -0400 Subject: [PATCH 3/4] Add proxy to solve CORS error --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index 1c4910f..78d40ef 100644 --- a/js/main.js +++ b/js/main.js @@ -19,7 +19,7 @@ function getAmiibos() { clearCards(); const date = document.querySelector('#date').value; - const url = `https://www.amiiboapi.com/api/amiibo?type=figure&release.na=${date} `; + const url = `https://corsproxy.io/?url=https://www.amiiboapi.com/api/amiibo?type=figure&release.na=${date} `; fetch(url) .then(res => res.json()) From b3e628bd2365c4f5122570dd9bca875f9a5517a9 Mon Sep 17 00:00:00 2001 From: "Meryem L." Date: Sun, 5 Oct 2025 11:11:07 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index a9a4cc6..0584ac4 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,17 @@ -# 📊 Project: Simple API 1 +## Description +Browse released Amiibos in North America -### Goal: Display data returned from an api +[Try the Live project!](https://l-meryem.github.io/amiibos/) -### How to submit your code for review: -- 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! +Amiibos by date + -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 + + - `HTML` + - `CSS` + - `JavaScript` + - `AmiiboAPI.com`