Merge pull request #16 from Fer-Bar/hotfix/github-actions-ci

Hotfix github actions CI adding secrets
Fer-Bar · May 9, 2024 · cc93f98 · cc93f98
2 parents 560ab95 + bda93e8
commit cc93f98
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 63 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -9,6 +9,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment: DEV_ENV
 
     strategy:
       max-parallel: 4
@@ -22,11 +23,12 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Poetry
-      run: |
-        curl -sSL https://install.python-poetry.org | python -
+      run: curl -sSL https://install.python-poetry.org | python -
+    - name: Set Environment Variables
+      env:
+        SECRET_KEY: ${{ secrets.SECRET_KEY }}
+      run: echo "SECRET_KEY=${SECRET_KEY}" > ./envs/.env
     - name: Install Dependencies
-      run: |
-        poetry install
+      run: poetry install
     - name: Run Tests
-      run: |
-        poetry run python manage.py test
+      run: poetry run python manage.py test
diff --git a/pet/static/pet/js/carousel.js b/pet/static/pet/js/carousel.js
@@ -1,47 +1,59 @@
-const wrapper = document.querySelector(".wrapper-carousel");
 const carousel = document.querySelector(".carousel-secondary");
-const firstCardWidth = carousel.querySelector(".card-secondary").offsetWidth;
 const arrowBtns = document.querySelectorAll(".wrapper-carousel i");
-const carouselChildren = [...carousel.children];
+let carouselChildren = [...carousel.children];
+const cardCount = carouselChildren.length;
 
-let isDragging = false, isAutoPlay = false, startX, startScrollLeft, timeoutId;
+let isDragging = false, startX, startScrollLeft;
 
-// Get the number of cards that can fit in the carousel at once
-let cardPerView = Math.round(carousel.offsetWidth / firstCardWidth);
-
-// Insert copies of the last few cards to beginning of carousel for infinite scrolling
-carouselChildren.slice(-cardPerView).reverse().forEach(card => {
-    carousel.insertAdjacentHTML("afterbegin", card.outerHTML);
-});
-
-// Insert copies of the first few cards to end of carousel for infinite scrolling
-carouselChildren.slice(0, cardPerView).forEach(card => {
-    carousel.insertAdjacentHTML("beforeend", card.outerHTML);
-});
+function getFirstCardWidth() {
+    return carousel.querySelector("ul > li.card-secondary").offsetWidth; // 1st secondary-card
+}
 
-// Scroll the carousel at appropriate position to hide first few duplicate cards on Firefox
-carousel.classList.add("no-transition");
-carousel.scrollLeft = carousel.offsetWidth;
-carousel.classList.remove("no-transition");
+function getCardPerView() {
+    return Math.round(carousel.offsetWidth / getFirstCardWidth());
+}
 
 // Add event listeners for the arrow buttons to scroll the carousel left and right
-arrowBtns.forEach(btn => {
-    btn.addEventListener("click", () => {
-        carousel.scrollLeft += btn.id === "left" ? -firstCardWidth : firstCardWidth;
+function addArrowButtonListeners() {
+    arrowBtns.forEach(btn => {
+        btn.addEventListener("click", () => {
+            let firstCardWidth = getFirstCardWidth();
+            carousel.scrollLeft += btn.id === "left" ? -firstCardWidth : firstCardWidth;
+
+            if (btn.id === "left") {
+                // Remove the last card and add it to the beginning
+                let lastCard = carouselChildren.pop();
+                carouselChildren.unshift(lastCard);
+                carousel.insertBefore(lastCard, carousel.firstChild);
+            } else {
+                // Remove the first card and add it to the end
+                let firstCard = carouselChildren.shift();
+                carouselChildren.push(firstCard);
+                carousel.removeChild(firstCard);
+                carousel.appendChild(firstCard);
+            }
+        });
     });
-});
+}
+
+function checkArrowVisibility() {
+    let cardPerView = getCardPerView();
+    if (cardCount >= cardPerView) {
+        arrowBtns.forEach(btn => btn.style.display = "block");
+    } else {
+        arrowBtns.forEach(btn => btn.style.display = "none");
+    }
+}
 
 const dragStart = (e) => {
     isDragging = true;
     carousel.classList.add("dragging");
-    // Records the initial cursor and scroll position of the carousel
     startX = e.pageX;
     startScrollLeft = carousel.scrollLeft;
 }
 
 const dragging = (e) => {
-    if(!isDragging) return; // if isDragging is false return from here
-    // Updates the scroll position of the carousel based on the cursor movement
+    if(!isDragging) return;
     carousel.scrollLeft = startScrollLeft - (e.pageX - startX);
 }
 
@@ -50,35 +62,9 @@ const dragStop = () => {
     carousel.classList.remove("dragging");
 }
 
-const infiniteScroll = () => {
-    // If the carousel is at the beginning, scroll to the end
-    if(carousel.scrollLeft === 0) {
-        carousel.classList.add("no-transition");
-        carousel.scrollLeft = carousel.scrollWidth - (2 * carousel.offsetWidth);
-        carousel.classList.remove("no-transition");
-    }
-    // If the carousel is at the end, scroll to the beginning
-    else if(Math.ceil(carousel.scrollLeft) === carousel.scrollWidth - carousel.offsetWidth) {
-        carousel.classList.add("no-transition");
-        carousel.scrollLeft = carousel.offsetWidth;
-        carousel.classList.remove("no-transition");
-    }
-
-    // Clear existing timeout & start autoplay if mouse is not hovering over carousel
-    clearTimeout(timeoutId);
-    if(!wrapper.matches(":hover")) autoPlay();
-}
-
-const autoPlay = () => {
-    if(window.innerWidth < 800 || !isAutoPlay) return; // Return if window is smaller than 800 or isAutoPlay is false
-    // Autoplay the carousel after every 2500 ms
-    timeoutId = setTimeout(() => carousel.scrollLeft += firstCardWidth, 2500);
-}
-autoPlay();
-
+addArrowButtonListeners();
+window.addEventListener("load", checkArrowVisibility);
+window.addEventListener("resize", checkArrowVisibility);
 carousel.addEventListener("mousedown", dragStart);
 carousel.addEventListener("mousemove", dragging);
-document.addEventListener("mouseup", dragStop);
-carousel.addEventListener("scroll", infiniteScroll);
-wrapper.addEventListener("mouseenter", () => clearTimeout(timeoutId));
-wrapper.addEventListener("mouseleave", autoPlay);
+document.addEventListener("mouseup", dragStop);