From b63862f71d7a9e2bf5b1b68cbf94622091ed5ea6 Mon Sep 17 00:00:00 2001 From: mbashia Date: Tue, 20 Aug 2024 09:31:50 +0300 Subject: [PATCH 1/9] complete order summary component --- .../images/favicon-32x32.png | Bin 0 -> 1063 bytes .../images/icon-music.svg | 1 + .../images/illustration-hero.svg | 1 + .../images/pattern-background-desktop.svg | 1 + .../images/pattern-background-mobile.svg | 1 + challenges/order_summary_component/index.html | 104 +++++++++++++++--- .../tailwind.config.js | 21 ++++ 7 files changed, 111 insertions(+), 18 deletions(-) create mode 100644 challenges/order_summary_component/images/favicon-32x32.png create mode 100644 challenges/order_summary_component/images/icon-music.svg create mode 100644 challenges/order_summary_component/images/illustration-hero.svg create mode 100644 challenges/order_summary_component/images/pattern-background-desktop.svg create mode 100644 challenges/order_summary_component/images/pattern-background-mobile.svg diff --git a/challenges/order_summary_component/images/favicon-32x32.png b/challenges/order_summary_component/images/favicon-32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..1e2df7f089f46dd930239e418bf13e8e4c1cca0f GIT binary patch literal 1063 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+081EY0-Plzi}!G9Wnr(eF` z|M+F+!xzhMK3;zF(cgdn_B?v|`rD7+fB)V2@MY=EN9|{BEWPpQ{f}RtfBl|!^+Ea3 z%d2iZe)i@2x9`6{eg66V&!4ULpSPU4KJ)Uu^RM22`~BzO$wz&&PyPA(@7<4I`yRjQ zJAZr1#XB#){D-o5+r^Vjdc3)fsquh@R{^yA;Z|8C!Zw`1zDvzMNK{QUFr z^G~yvU&yK5nOnE3q5ts2d8Z#d`S9=G|MwriU%2{m%ii0owp@Sy>dXGuA$NemCsPvS z7YvLEt(>(tKmBDkpML+hROc(RL;oBPGFiO5x8~1ErS?rgb&N^g?k~Ih+L^ zk;M!Q+`=Ht$S`Y;1W=H@#M9T6{SlWiKeL>x)y)*39#2mf#}JFtt&`J}n+ycniko-@ z3;26vOWyCzeS7I$?C$UX{_kIKV}WAF+24(KRQ;Wbm=(hXgpO=b(eBb|byZ~P5M3dt zyDB-nDx`Zw9LoWN-GrY`kHxRfy}Q3KfBxRdclJCv_%N_mL-x0j+x*I+s%JIY&vgg3Y zTes?8j%DMbh5PocynFBNZJq}$w`Q+tKfe6=^y}tkkv_Zb+uQBmSHB|O-+X(*4%OrO zQF%8%OSj*z`t$7X`oHyz%ReTa40^8r7Z}c}C9V-ADTyViR>?)FK#IZ0z|cb1&_LJF zGQ`l-%D~vl*g)IB$jZQAv*1E06b-rgDVb@NxHTN|kz5AU01WSllAy$Lg@U5|w9K4T zg_6pGRE5lfl4J&kiaC!z@o*G|X=t4CKYhmYX%GXmGPhnbx3IFX_hb=fVFi~4lfx;@ u%9}$JPT#n4;>ejJGDp}?H+U@Y(qnifE?Dx($#g2v3I \ No newline at end of file diff --git a/challenges/order_summary_component/images/illustration-hero.svg b/challenges/order_summary_component/images/illustration-hero.svg new file mode 100644 index 00000000..c7f3534f --- /dev/null +++ b/challenges/order_summary_component/images/illustration-hero.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/challenges/order_summary_component/images/pattern-background-desktop.svg b/challenges/order_summary_component/images/pattern-background-desktop.svg new file mode 100644 index 00000000..fa06d570 --- /dev/null +++ b/challenges/order_summary_component/images/pattern-background-desktop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/challenges/order_summary_component/images/pattern-background-mobile.svg b/challenges/order_summary_component/images/pattern-background-mobile.svg new file mode 100644 index 00000000..905cb4ba --- /dev/null +++ b/challenges/order_summary_component/images/pattern-background-mobile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/challenges/order_summary_component/index.html b/challenges/order_summary_component/index.html index f838b6e5..cb5738b6 100644 --- a/challenges/order_summary_component/index.html +++ b/challenges/order_summary_component/index.html @@ -27,37 +27,105 @@ /> + + + + - +
-
+
+
+
+
+ Order Summary +
+
+ You can now listen to millions of songs, audiobooks, and podcasts on + any device anywhere you like! +
+
+
+
+ + + + + + +
+
+ Annual Plan + $59.99/year +
+
+
+ Change +
+
+
+ +
+ Cancel Order +
+
+
+
+
+
+

Frontend Mentor challenge -

-
for - Optimum BH - Internship. -
- -
+ Internship +

+

Source code -

+

diff --git a/challenges/order_summary_component/tailwind.config.js b/challenges/order_summary_component/tailwind.config.js index e10a8224..dd314e08 100644 --- a/challenges/order_summary_component/tailwind.config.js +++ b/challenges/order_summary_component/tailwind.config.js @@ -5,6 +5,27 @@ module.exports = { colors: { 'optimum-blue': '#009efc', 'optimum-darkblue': '#0389e1', + 'pale-blue': 'hsl(225, 100%, 94%)', + 'bright-blue': 'hsl(245, 75%, 52%)', + 'very-pale-blue': 'hsl(225, 100%, 98%)', + 'desaturated-blue': 'hsl(224, 23%, 55%)', + 'dark-blue': 'hsl(223, 47%, 23%)', + }, + fontFamily: { + red_hat: ['Red Hat Display'], + }, + fontWeight: { + extra_light: 200, + regular: 500, + light: 400, + bold: 700, + extra_bold: 900, + }, + backgroundImage: { + 'mobile-pattern': "url('images/pattern-background-mobile.svg')", + + 'bottom-pattern': "url('images/pattern-background-desktop.svg')", + illustration: "url('images/illustration-hero.svg')", }, }, }, From 617dbbec965419ecccc4b9b9f32517c91d94bc26 Mon Sep 17 00:00:00 2001 From: mbashia Date: Fri, 23 Aug 2024 05:07:07 +0300 Subject: [PATCH 2/9] fix order summary component --- challenges/order_summary_component/index.html | 4 ++-- challenges/order_summary_component/tailwind.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/challenges/order_summary_component/index.html b/challenges/order_summary_component/index.html index cb5738b6..a338fcaa 100644 --- a/challenges/order_summary_component/index.html +++ b/challenges/order_summary_component/index.html @@ -50,7 +50,7 @@ Order Summary
You can now listen to millions of songs, audiobooks, and podcasts on any device anywhere you like! @@ -76,7 +76,7 @@ class="font-red_hat text-dark-blue text-sm font-bold md:text-base" >Annual Plan - $59.99/year
diff --git a/challenges/order_summary_component/tailwind.config.js b/challenges/order_summary_component/tailwind.config.js index dd314e08..73bc8626 100644 --- a/challenges/order_summary_component/tailwind.config.js +++ b/challenges/order_summary_component/tailwind.config.js @@ -12,7 +12,7 @@ module.exports = { 'dark-blue': 'hsl(223, 47%, 23%)', }, fontFamily: { - red_hat: ['Red Hat Display'], + red_hat: ['Red Hat Display', 'sans-serif'], }, fontWeight: { extra_light: 200, From 264dba5d0445c92b47debf6844b75f1786320351 Mon Sep 17 00:00:00 2001 From: mbashia Date: Tue, 27 Aug 2024 16:20:17 +0300 Subject: [PATCH 3/9] fix order summary component --- challenges/order_summary_component/index.html | 4 ++-- challenges/order_summary_component/tailwind.config.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/challenges/order_summary_component/index.html b/challenges/order_summary_component/index.html index a338fcaa..9da8f1ca 100644 --- a/challenges/order_summary_component/index.html +++ b/challenges/order_summary_component/index.html @@ -37,7 +37,7 @@
Change
diff --git a/challenges/order_summary_component/tailwind.config.js b/challenges/order_summary_component/tailwind.config.js index 73bc8626..dedc3c7e 100644 --- a/challenges/order_summary_component/tailwind.config.js +++ b/challenges/order_summary_component/tailwind.config.js @@ -15,9 +15,7 @@ module.exports = { red_hat: ['Red Hat Display', 'sans-serif'], }, fontWeight: { - extra_light: 200, regular: 500, - light: 400, bold: 700, extra_bold: 900, }, From e0197c200f7abd663e89569b245c75ee4656456c Mon Sep 17 00:00:00 2001 From: mbashia Date: Wed, 11 Sep 2024 11:51:28 +0300 Subject: [PATCH 4/9] test screenshots in github actions --- challenges/order_summary_component/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/challenges/order_summary_component/style.css b/challenges/order_summary_component/style.css index b5c61c95..aa4366da 100644 --- a/challenges/order_summary_component/style.css +++ b/challenges/order_summary_component/style.css @@ -1,3 +1,4 @@ @tailwind base; @tailwind components; @tailwind utilities; +/* test */ \ No newline at end of file From ef076ae31651684e224c21a66075268f6c38c957 Mon Sep 17 00:00:00 2001 From: mbashia Date: Wed, 11 Sep 2024 11:54:36 +0300 Subject: [PATCH 5/9] upgrade version of upload-artifact --- .github/workflows/cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 15b7fdc3..95aa55bb 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -31,7 +31,7 @@ jobs: npm run test - name: Save screenshots - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: screenshots From 07efec1643352cc8b8c80ad280d39ed2251684d6 Mon Sep 17 00:00:00 2001 From: mbashia Date: Wed, 11 Sep 2024 11:56:12 +0300 Subject: [PATCH 6/9] run prettier --- challenges/order_summary_component/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/challenges/order_summary_component/style.css b/challenges/order_summary_component/style.css index aa4366da..a6bc3f1c 100644 --- a/challenges/order_summary_component/style.css +++ b/challenges/order_summary_component/style.css @@ -1,4 +1,4 @@ @tailwind base; @tailwind components; @tailwind utilities; -/* test */ \ No newline at end of file +/* test */ From 555bbdfd4043118b9e2fc7c4b9df7c37718c8af1 Mon Sep 17 00:00:00 2001 From: mbashia Date: Wed, 11 Sep 2024 12:05:18 +0300 Subject: [PATCH 7/9] upgrade upload-artifact to v4 --- .github/workflows/cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 95aa55bb..d9538699 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -31,7 +31,7 @@ jobs: npm run test - name: Save screenshots - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: screenshots From ccef3dc8c2632be0630dbfa9580d1779e7a04ce3 Mon Sep 17 00:00:00 2001 From: mbashia Date: Fri, 13 Sep 2024 05:00:03 +0300 Subject: [PATCH 8/9] upload-artifact-v3 --- .github/workflows/cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index d9538699..95aa55bb 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -31,7 +31,7 @@ jobs: npm run test - name: Save screenshots - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: screenshots From 33fb3124226c166d4757d82e119a9746437038c2 Mon Sep 17 00:00:00 2001 From: mbashia Date: Fri, 13 Sep 2024 08:57:35 +0300 Subject: [PATCH 9/9] removed unneccessary diff --- challenges/order_summary_component/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/challenges/order_summary_component/style.css b/challenges/order_summary_component/style.css index a6bc3f1c..b5c61c95 100644 --- a/challenges/order_summary_component/style.css +++ b/challenges/order_summary_component/style.css @@ -1,4 +1,3 @@ @tailwind base; @tailwind components; @tailwind utilities; -/* test */