updates assets and favicons

denisnarush · Aug 4, 2022 · 004befe · 004befe
1 parent 014dcf2
commit 004befe
Show file tree

Hide file tree

Showing 30 changed files with 56 additions and 34 deletions.
diff --git a/angular.json b/angular.json
@@ -20,6 +20,7 @@
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "dist/apps/flowers",
+            "resourcesOutputPath": "resources",
             "baseHref": "/",
             "index": "apps/flowers/src/index.html",
             "main": "apps/flowers/src/main.ts",
@@ -44,7 +45,7 @@
             "assets": [
               {
                 "glob": "**/*",
-                "input": "assets",
+                "input": "assets/default",
                 "output": "assets"
               }
             ],
@@ -162,7 +163,7 @@
             "assets": [
               {
                 "glob": "**/*",
-                "input": "assets",
+                "input": "assets/default",
                 "output": "assets"
               }
             ]

diff --git a/apps/flowers/src/index.html b/apps/flowers/src/index.html
@@ -6,7 +6,32 @@
     <meta name="Description" content="Flowers by subscription." />
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+    <link rel="icon" type="image/x-icon" href="assets/favicons/favicon.ico" />
+    <link type="image/png" sizes="16x16" rel="icon" href="assets/favicons/web/16.png">
+    <link type="image/png" sizes="32x32" rel="icon" href="assets/favicons/web/32.png">
+    <link type="image/png" sizes="96x96" rel="icon" href="assets/favicons/web/96.png">
+    <!-- <link type="image/png" sizes="120x120" rel="icon" href="assets/favicons/web/120.png"> -->
+    <!-- <link rel="icon" type="image/png" sizes="72x72" href="assets/favicons/android/72.png"> -->
+    <!-- <link rel="icon" type="image/png" sizes="96x96" href="assets/favicons/android/96.png"> -->
+    <!-- <link rel="icon" type="image/png" sizes="144x144" href="assets/favicons/android/144.png"> -->
+    <!-- <link rel="icon" type="image/png" sizes="192x192" href="assets/favicons/android/192.png"> -->
+    <!-- <link rel="icon" type="image/png" sizes="512x512" href="assets/favicons/android/512.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="57x57" href="assets/favicons/ios/57.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="60x60" href="assets/favicons/ios/60.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="72x72" href="assets/favicons/ios/72.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="76x76" href="assets/favicons/ios/76.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="114x114" href="assets/favicons/ios/114.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="120x120" href="assets/favicons/ios/120.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="144x144" href="assets/favicons/ios/144.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="152x152" href="assets/favicons/ios/152.png"> -->
+    <!-- <link rel="apple-touch-icon" type="image/png" sizes="180x180" href="assets/favicons/ios/180.png"> -->
+    <!-- <link color="#26E07F" rel="mask-icon" href="assets/favicons/mac/100.svg"> -->
+    <!-- <meta name="msapplication-square70x70logo" content="assets/favicons/windows/70.png"> -->
+    <!-- <meta name="msapplication-TileImage" content="assets/favicons/windows/144.png"> -->
+    <!-- <meta name="msapplication-square150x150logo" content="assets/favicons/windows/150.png"> -->
+    <!-- <meta name="msapplication-square310x310logo" content="assets/favicons/windows/310.png"> -->
+    <meta name="msapplication-TileColor" content="#C0FFEE">
+    <meta name="application-name" content="Flowers">
   </head>
   <body>
     <div s-root class="root"></div>

diff --git a/assets/default/favicons/favicon.ico b/assets/default/favicons/favicon.ico
diff --git a/assets/default/favicons/web/16.png b/assets/default/favicons/web/16.png
diff --git a/assets/default/favicons/web/32.png b/assets/default/favicons/web/32.png
diff --git a/assets/default/favicons/web/96.png b/assets/default/favicons/web/96.png
diff --git a/assets/images/calendar.svg → assets/default/images/calendar.svg b/assets/images/calendar.svg → assets/default/images/calendar.svg
diff --git a/assets/images/fall-thyk.svg → assets/default/images/fall-thyk.svg b/assets/images/fall-thyk.svg → assets/default/images/fall-thyk.svg
diff --git a/assets/images/flower-0.jpg → assets/default/images/flower-0.jpg b/assets/images/flower-0.jpg → assets/default/images/flower-0.jpg
diff --git a/assets/images/flower-1.jpg → assets/default/images/flower-1.jpg b/assets/images/flower-1.jpg → assets/default/images/flower-1.jpg
diff --git a/assets/images/flower-2.jpg → assets/default/images/flower-2.jpg b/assets/images/flower-2.jpg → assets/default/images/flower-2.jpg
diff --git a/assets/images/flower-3.jpg → assets/default/images/flower-3.jpg b/assets/images/flower-3.jpg → assets/default/images/flower-3.jpg
diff --git a/assets/images/moving-forward.svg → assets/default/images/moving-forward.svg b/assets/images/moving-forward.svg → assets/default/images/moving-forward.svg
diff --git a/assets/images/on-the-way.svg → assets/default/images/on-the-way.svg b/assets/images/on-the-way.svg → assets/default/images/on-the-way.svg
diff --git a/assets/images/online-payments.svg → assets/default/images/online-payments.svg b/assets/images/online-payments.svg → assets/default/images/online-payments.svg
diff --git a/assets/images/page-not-found.svg → assets/default/images/page-not-found.svg b/assets/images/page-not-found.svg → assets/default/images/page-not-found.svg
diff --git a/assets/images/takeout-boxes.svg → assets/default/images/takeout-boxes.svg b/assets/images/takeout-boxes.svg → assets/default/images/takeout-boxes.svg
diff --git a/assets/icons/log-out.svg b/assets/icons/log-out.svg
diff --git a/assets/icons/vector-prev.svg b/assets/icons/vector-prev.svg
diff --git a/...ry-confirmed/src/lib/feature-delivery-confirmed/feature-delivery-confirmed.component.html b/...ry-confirmed/src/lib/feature-delivery-confirmed/feature-delivery-confirmed.component.html
@@ -1,5 +1,7 @@
 <div s-feature-confirmed class="page">
-  <div confirmed__image class="l l__image"></div>
+  <div confirmed__image class="l l__image">
+    <img src="assets/images/on-the-way.svg" alt="" width="100%">
+  </div>
   <h1 confirmed__title class="l l__title">
     <h1 class="title title_centered">
       On The Way

diff --git a/...ry-confirmed/src/lib/feature-delivery-confirmed/feature-delivery-confirmed.component.less b/...ry-confirmed/src/lib/feature-delivery-confirmed/feature-delivery-confirmed.component.less
@@ -19,10 +19,8 @@
       position: relative;
       left: -10px;
 
-      background-image: url(assets/images/on-the-way.svg);
-      background-position: bottom center;
-      background-size: contain;
-      background-repeat: no-repeat;
+      display: grid;
+      align-content: end;
     }
     &__title {
       grid-area: title;

diff --git a/...eature-delivery-reschedule-confirmed/feature-delivery-reschedule-confirmed.component.html b/...eature-delivery-reschedule-confirmed/feature-delivery-reschedule-confirmed.component.html
@@ -1,5 +1,7 @@
 <div s-feature-confirmed class="page">
-  <div confirmed__image class="l l__image"></div>
+  <div confirmed__image class="l l__image">
+    <img src="assets/images/moving-forward.svg" alt="" width="100%">
+  </div>
   <h1 confirmed__title class="l l__title">
     <h1 class="title title_centered">
       Moving Forward

diff --git a/...eature-delivery-reschedule-confirmed/feature-delivery-reschedule-confirmed.component.less b/...eature-delivery-reschedule-confirmed/feature-delivery-reschedule-confirmed.component.less
@@ -16,10 +16,8 @@
       align-self: end;
       height: 100%;
 
-      background-image: url(assets/images/moving-forward.svg);
-      background-position: bottom center;
-      background-size: contain;
-      background-repeat: no-repeat;
+      display: grid;
+      align-content: end;
     }
     &__title {
       grid-area: title;

diff --git a/libs/flowers/pages/feature-home/src/lib/feature-home/feature-home.component.html b/libs/flowers/pages/feature-home/src/lib/feature-home/feature-home.component.html
@@ -8,7 +8,9 @@
 </header>
 
 <main class="s-ui-content">
-  <div class="l l__image"></div>
+  <div class="l l__image">
+    <img src="assets/images/takeout-boxes.svg" alt="" width="100%">
+  </div>
   <div class="l l__title">
     <h1 class="title title_centered">
       <ng-container i18n="@@mainTitle">Subscribe Me</ng-container>

diff --git a/libs/flowers/pages/feature-home/src/lib/feature-home/feature-home.component.less b/libs/flowers/pages/feature-home/src/lib/feature-home/feature-home.component.less
@@ -26,10 +26,8 @@
       position: relative;
       left: -10px;
 
-      background-image: url(assets/images/takeout-boxes.svg);
-      background-position: bottom center;
-      background-size: contain;
-      background-repeat: no-repeat;
+      display: grid;
+      align-content: end;
     }
     &__title {
       grid-area: title;

diff --git a/...ment-confirmed/src/lib/feature-payment-confirmed/feature-payment-confirmed.component.html b/...ment-confirmed/src/lib/feature-payment-confirmed/feature-payment-confirmed.component.html
@@ -1,5 +1,7 @@
 <div s-feature-confirmed class="page">
-  <div confirmed__image class="l l__image"></div>
+  <div confirmed__image class="l l__image">
+    <img src="assets/images/online-payments.svg" alt="" width="100%">
+  </div>
   <h1 confirmed__title class="l l__title">
     <h1 class="title title_centered">
       Confirmed

diff --git a/...ment-confirmed/src/lib/feature-payment-confirmed/feature-payment-confirmed.component.less b/...ment-confirmed/src/lib/feature-payment-confirmed/feature-payment-confirmed.component.less
@@ -22,10 +22,8 @@
       position: relative;
       top: 11.5px;
 
-      background-image: url(assets/images/online-payments.svg);
-      background-position: bottom center;
-      background-size: contain;
-      background-repeat: no-repeat;
+      display: grid;
+      align-content: end;
     }
     &__title {
       grid-area: title;

diff --git a/...shared/pages/feature-not-found/src/lib/feature-not-found/feature-not-found.component.html b/...shared/pages/feature-not-found/src/lib/feature-not-found/feature-not-found.component.html
@@ -1,6 +1,8 @@
 <header class="s-ui-header"></header>
 <main class="s-ui-content">
-  <div class="l l__image"></div>
+  <div class="l l__image">
+    <img src="assets/images/page-not-found.svg" alt="" width="100%">
+  </div>
   <div class="l l__title">
     <h1 class="title title_centered">
       Not found

diff --git a/...shared/pages/feature-not-found/src/lib/feature-not-found/feature-not-found.component.less b/...shared/pages/feature-not-found/src/lib/feature-not-found/feature-not-found.component.less
@@ -16,10 +16,8 @@
       align-self: end;
       height: 100%;
 
-      background-image: url(assets/images/page-not-found.svg);
-      background-position: bottom center;
-      background-size: contain;
-      background-repeat: no-repeat;
+      display: grid;
+      align-content: end;
     }
     &__title {
       grid-area: title;

diff --git a/libs/theme/src/lib/-components/icon.less b/libs/theme/src/lib/-components/icon.less
@@ -9,13 +9,13 @@
   }
 
   &_logout {
-    background-image: ~'url("assets/icons/log-out.svg")';
+    background-image: url(data:image/svg+xml;base64,PHN2ZyBpZD0ibGlnaHQiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDI0IDI0IiBoZWlnaHQ9IjUxMiIgdmlld0JveD0iMCAwIDI0IDI0IiB3aWR0aD0iNTEyIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxnPjxwYXRoIGQ9Im0xMy41IDIxaC00Yy0uMjc2IDAtLjUtLjIyNC0uNS0uNXMuMjI0LS41LjUtLjVoNGMuODI3IDAgMS41LS42NzMgMS41LTEuNXYtNWMwLS4yNzYuMjI0LS41LjUtLjVzLjUuMjI0LjUuNXY1YzAgMS4zNzgtMS4xMjEgMi41LTIuNSAyLjV6Ii8+PC9nPjxnPjxwYXRoIGQ9Im0yMy41IDExaC0xMGMtLjI3NiAwLS41LS4yMjQtLjUtLjVzLjIyNC0uNS41LS41aDEwYy4yNzYgMCAuNS4yMjQuNS41cy0uMjI0LjUtLjUuNXoiLz48L2c+PGc+PHBhdGggZD0ibTggMjRjLS4yMiAwLS40MzUtLjAzNy0uNjM4LS4xMDlsLTUuOTktMS45OTdjLS44Mi0uMjczLTEuMzcyLTEuMDM1LTEuMzcyLTEuODk0di0xOGMwLTEuMTAzLjg5Ny0yIDItMiAuMjIyIDAgLjQzOC4wMzcuNjM5LjExbDUuOTg5IDEuOTk2Yy44Mi4yNzIgMS4zNzIgMS4wMzQgMS4zNzIgMS44OTR2MThjMCAxLjEwMy0uODk3IDItMiAyem0tNi0yM2MtLjU1MiAwLTEgLjQ0OS0xIDF2MThjMCAuNDI4LjI3Ni44MDguNjg4Ljk0Nmw2IDJjLjY1Ni4yMzMgMS4zMTItLjI5MiAxLjMxMi0uOTQ2di0xOGMwLS40MjktLjI3Ni0uODA5LS42ODgtLjk0NWwtNi0yYy0uMTAzLS4wMzctLjIwOC0uMDU1LS4zMTItLjA1NXoiLz48L2c+PGc+PHBhdGggZD0ibTE1LjUgOGMtLjI3NiAwLS41LS4yMjQtLjUtLjV2LTVjMC0uODI3LS42NzMtMS41LTEuNS0xLjVoLTExLjVjLS4yNzYgMC0uNS0uMjI0LS41LS41cy4yMjQtLjUuNS0uNWgxMS41YzEuMzc5IDAgMi41IDEuMTIyIDIuNSAyLjV2NWMwIC4yNzYtLjIyNC41LS41LjV6Ii8+PC9nPjxnPjxwYXRoIGQ9Im0xOS41IDE1Yy0uMTI4IDAtLjI1Ni0uMDQ5LS4zNTQtLjE0Ni0uMTk1LS4xOTUtLjE5NS0uNTEyIDAtLjcwN2wzLjY0Ni0zLjY0Ni0zLjY0Ni0zLjY0NmMtLjE5NS0uMTk1LS4xOTUtLjUxMiAwLS43MDdzLjUxMi0uMTk1LjcwNyAwbDQgNGMfuMTk1LjE5NS4xOTUuNTEyIDAgLjcwN2wtNCA0Yy0uMDk3LjA5Ni0uMjI1LjE0NS0uMzUzLjE0NXoiLz48L2c+PC9zdmc+);
     width: 1.625rem;
     height: 1.625rem;
   }
 
   &_back {
-    background-image: ~'url("assets/icons/vector-prev.svg")';
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTQiIGhlaWdodD0iMjYiIHZpZXdCb3g9IjAgMCAxNCAyNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCjxwYXRoIGQ9Ik0xLjkxMDkgMTIuOTk5M0wxMy42NTI5IDEuMjU3M0MxMy45NDE3IDAuOTY4NTEzIDEzLjk0MTcgMC41MDUzNyAxMy42NTI5IDAuMjE2NTg3QzEzLjM2NDEgLTAuMDcyMTk1NyAxMi45MDEgLTAuMDcyMTk1NyAxMi42MTIyIDAuMjE2NTg3TDAuMzQ3MTExIDEyLjQ4MTdDMC4wNTgzMjc5IDEyLjc3MDUgMC4wNTgzMjc5IDEzLjIzMzYgMC4zNDcxMTEgMTMuNTIyNEwxMi42MTIyIDI1Ljc4MkMxMi43NTM5IDI1LjkyMzcgMTIuOTQ0NiAyNiAxMy4xMjk4IDI2QzEzLjMxNTEgMjYgMTMuNTA1OCAyNS45MjkyIDEzLjY0NzUgMjUuNzgyQzEzLjkzNjMgMjUuNDkzMyAxMy45MzYzIDI1LjAzMDEgMTMuNjQ3NSAyNC43NDEzTDEuOTEwOSAxMi45OTkzWiIgZmlsbD0iYmxhY2siLz4NCjwvc3ZnPg0K);
     width: 0.875rem;
     height: 1.625rem;
   }