Merge pull request #39 from ClubCedille/antoinebou12-patch-1

small scoller for stock price
ClubCedille · Jan 15, 2024 · 029839e · 029839e
2 parents 29c77c5 + 37fb5d5
commit 029839e
Show file tree

Hide file tree

Showing 41 changed files with 3,064 additions and 444 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "start": "gulp serve"
   },
   "dependencies": {
+    "axios": "^1.6.5",
     "browser-sync": "^3.0.2",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^8.0.0",

diff --git a/source/about.html b/source/about.html
@@ -1,6 +1,7 @@
+@@include('blocks/scroller.htm')
 @@include('header.htm')
 
-@@include('blocks/navigation.htm', {"about":"active", "company":"active"})
+@@include('blocks/navigation.html', {"about":"active", "company":"active"})
 
 @@include('blocks/page-title.htm', {
 	"page-name": "À Propos",

diff --git a/source/blog-grid.html b/source/blog-grid.html
@@ -1,6 +1,7 @@
+@@include('blocks/scroller.htm')
 @@include('header.htm')
 
-@@include('blocks/navigation.htm',{"blog":"active", "blogGrid":"active"})
+@@include('blocks/navigation.html',{"blog":"active", "blogGrid":"active"})
 
 @@include('blocks/page-title.htm', { "page-name": "Our blog", "title": "Blog articles" })
 

diff --git a/source/blog-sidebar.html b/source/blog-sidebar.html
@@ -1,6 +1,7 @@
+@@include('blocks/scroller.htm')
 @@include('header.htm')
 
-@@include('blocks/navigation.htm',{"blog":"active", "blogSidebar":"active"})
+@@include('blocks/navigation.html',{"blog":"active", "blogSidebar":"active"})
 
 @@include('blocks/page-title.htm', { "page-name": "Our blog", "title": "Blog articles" })
 

diff --git a/source/blog-single.html b/source/blog-single.html
@@ -1,6 +1,7 @@
+@@include('blocks/scroller.htm')
 @@include('header.htm')
 
-@@include('blocks/navigation.htm',{"blog":"active", "blogSingle":"active"})
+@@include('blocks/navigation.html',{"blog":"active", "blogSingle":"active"})
 
 @@include('blocks/page-title.htm', { "page-name": "News details", "title": "Blog Single" })
 

diff --git a/source/contact.html b/source/contact.html
@@ -1,8 +1,9 @@
+@@include('blocks/scroller.htm')
 @@include('header.htm')
 
-@@include('blocks/navigation.htm',{"contact":"active"})
+@@include('blocks/navigation.html',{"contact":"active"})
 
-@@include('blocks/page-title.htm', { "page-name": "Contact", "title": "Entrez en Contact avec AlgoÉTS", "background-image-url": "images/competition/concentration.jpg" })
+@@include('blocks/page-title.htm', { "page-name": "Contact", "title": "Contacter nous", "background-image-url": "images/competition/concentration.jpg" })
 
 <!-- contact form start -->
 <section class="contact-form-wrap section">

diff --git a/source/images/paternaire/Ferique2.png b/source/images/paternaire/Ferique2.png
diff --git a/source/images/paternaire/bombardier.png b/source/images/paternaire/bombardier.png
diff --git a/source/images/paternaire/dejardin.png b/source/images/paternaire/dejardin.png
diff --git a/source/images/paternaire/ets-1536x740.png b/source/images/paternaire/ets-1536x740.png
diff --git a/source/images/paternaire/logo_sherweb-1536x279.jpg b/source/images/paternaire/logo_sherweb-1536x279.jpg
diff --git a/source/index.html b/source/index.html
@@ -1,6 +1,7 @@
+@@include('blocks/scroller.htm')
 @@include('header.htm')
 
-@@include('blocks/navigation.htm',{"home":"active"})
+@@include('blocks/navigation.html',{"home":"active"})
 
 <!-- Slider Start -->
 @@include('blocks/slider.htm')

diff --git a/source/partials/blocks/footer.htm b/source/partials/blocks/footer.htm
@@ -39,7 +39,7 @@ <h6><a href="mailto:algoets@ens.etsmtl.ca" target="_blank">algoets@ens.etsmtl.ca
       <div class="row">
         <div class="col-lg-12 text-center">
           <div class="copyright">
-            Copyright &copy; 2023, Personnalisée et déployée par <a href="https://cedille.etsmtl.ca/">Club Cédille</a>
+            Copyright &copy; 2024, Personnalisée et déployée par <a href="https://cedille.etsmtl.ca/">Club Cédille</a>
             <br>
           </div>
         </div>

diff --git a/source/partials/blocks/navigation.htm → source/partials/blocks/navigation.html b/source/partials/blocks/navigation.htm → source/partials/blocks/navigation.html
@@ -1,28 +1,6 @@
 <!-- Header Start -->
 <header class="navigation">
   <div class="header-top">
-    <div class="container">
-      <div class="row justify-content-between align-items-center">
-        <div class="col-lg-2 col-md-4">
-          <div class="header-top-socials text-center text-lg-left text-md-left">
-            <a href="https://www.facebook.com/ClubAlgoETS" aria-label="facebook" target="_blank"><i
-                class="fab fa-facebook-f"></i></a>
-            <a href="https://ca.linkedin.com/company/algoets" aria-label="twitter" target="_blank"><i
-                class="fab fa-linkedin"></i></a>
-            <a href="https://github.com/AlgoETS" aria-label="github" target="_blank"><i class="fab fa-github"></i></a>
-            <a href="https://discord.com/invite/PbWxX7B6dx" aria-label="github" target="_blank"><i
-                class="fab fa-discord"></i></a>
-          </div>
-        </div>
-        <div class="col-lg-10 col-md-8 text-center text-lg-right text-md-right">
-          <div class="header-top-info mb-2 mb-md-0">
-            <a href="mailto:algoets@ens.etsmtl.ca" target="_blank"><i
-                class="fas fa-envelope mr-2"></i><span>algoets@ens.etsmtl.ca</span></a>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
 
   <div id="navbar">
     <div class="container">

diff --git a/source/partials/blocks/page-title.htm b/source/partials/blocks/page-title.htm
@@ -1,4 +1,4 @@
-<section class="page-title" style="background-image: url('@@background-image-url');">
+<section class="page-title" style="background-image: url('@@background-image-url'); background-size: auto;">
   <div class="container">
     <div class="row">
       <div class="col-md-12">