Merge pull request #22 from SoftServeInc/project_setup

favicon added
SoftServeInc · Dec 24, 2019 · 44eb598 · 44eb598
2 parents 249a1e6 + a7b382c
commit 44eb598
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 9 deletions.
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -82,6 +82,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       filename: path.join(DIST, "index.html"),
       template: 'src/index.ejs',
+      favicon: path.join(SOURCE, "static", "favicon.png"),
       productionMode: false
     }),
     new CopyWebpackPlugin([

diff --git a/build/webpack.build.conf.js b/build/webpack.build.conf.js
@@ -12,6 +12,7 @@ const buildWebpackConfig = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: path.join(DIST, "index.html"),
       template: path.join(SOURCE, "index.ejs"),
+      favicon: path.join(SOURCE, "static", "favicon.png"),
       productionMode: true
     }),
   ]

diff --git a/docs/css/app.46d6b5aabd1a45f3c377.css → docs/css/app.810c9ac2329c0e744819.css b/docs/css/app.46d6b5aabd1a45f3c377.css → docs/css/app.810c9ac2329c0e744819.css
diff --git a/docs/css/vendors.46d6b5aabd1a45f3c377.css → docs/css/vendors.810c9ac2329c0e744819.css b/docs/css/vendors.46d6b5aabd1a45f3c377.css → docs/css/vendors.810c9ac2329c0e744819.css
diff --git a/docs/index.html b/docs/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Software Architecture Design Game</title>
-
+  
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-149145089-1"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
@@ -13,8 +13,8 @@
 
       gtag('config', 'UA-149145089-1');
     </script>
-
-<link href="css/vendors.46d6b5aabd1a45f3c377.css" rel="stylesheet"><link href="css/app.46d6b5aabd1a45f3c377.css" rel="stylesheet"></head>
+  
+<link rel="shortcut icon" href="favicon.png"><link href="css/vendors.810c9ac2329c0e744819.css" rel="stylesheet"><link href="css/app.810c9ac2329c0e744819.css" rel="stylesheet"></head>
 <body>
   <div class="container-fluid bg-pattern">
     <header>
@@ -529,5 +529,5 @@ <h3>About SoftServe:</h3>
       </nav>
     </footer>
   </div>
-<script type="text/javascript" src="js/vendors.bundle.46d6b5aabd1a45f3c377.js"></script><script type="text/javascript" src="js/app.bundle.46d6b5aabd1a45f3c377.js"></script></body>
+<script type="text/javascript" src="js/vendors.bundle.810c9ac2329c0e744819.js"></script><script type="text/javascript" src="js/app.bundle.810c9ac2329c0e744819.js"></script></body>
 </html>
diff --git a/docs/js/app.bundle.46d6b5aabd1a45f3c377.js → docs/js/app.bundle.810c9ac2329c0e744819.js b/docs/js/app.bundle.46d6b5aabd1a45f3c377.js → docs/js/app.bundle.810c9ac2329c0e744819.js
diff --git a/...js/vendors.bundle.46d6b5aabd1a45f3c377.js → ...js/vendors.bundle.810c9ac2329c0e744819.js b/...js/vendors.bundle.46d6b5aabd1a45f3c377.js → ...js/vendors.bundle.810c9ac2329c0e744819.js
diff --git a/src/index.ejs b/src/index.ejs
@@ -22,12 +22,8 @@
         <div class="collapse navbar-collapse collapse" id="collapseExample">
           <div class="navbar-nav w-100">
             <a class="nav-item nav-link scroll" href="#about">about</a>
-            <!-- <a class="nav-item nav-link" href="#instruction">instruction</a> -->
             <a class="nav-item nav-link scroll" href="#card">card</a>
             <a class="nav-item nav-link scroll" href="#benefits">benefits</a>
-            <!-- <a href="#" class="nav-item nav-link" data-toggle="modal" data-target="#request-training">
-              Request training
-            </a> -->
             <div class="links">
 
               <a href="Software-Architecture-Design-Game.zip" download class="btn-rounded download-link">
@@ -40,7 +36,6 @@
               <button type="button" class="btn-rounded email-us" data-toggle="modal" data-target="#email-us">
                 Contact us
               </button>
-              <!-- <a href="mailto:[email protected];[email protected];[email protected];[email protected]?subject=Software%20Architecture%20Design%20Game" -->
             </div>
           </div>
           <img class='d-none close-icon' src="img/close-notification-icon.svg">