Merge pull request #1 from AldessScratch/main

Changes made by aldess
2024-03-20 20:18:47 +01:00 · 2024-03-20 20:18:47 +01:00 · 0b5096b377
commit 0b5096b377
parent 8e5b67b5e8 d4b4a45be6
5 changed files with 231 additions and 154 deletions
--- a/package.json
+++ b/package.json
@ -7,7 +7,7 @@
  },
  "name": "collaborative-pixel-art",
  "version": "1.0.0",
-  "main": "index.js",
+  "main": "server.js",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1"
  },
--- a/public/index.html
+++ b/public/index.html
@ -7,28 +7,50 @@
  <title>Collaborative Pixel Art</title>
  <link rel="stylesheet" href="styles.css">
 </head>
-<body>
+<body onload="
+    document.getElementById('intro').classList.add('fadeout')
+    setTimeout(() => {
+        document.getElementById('intro').style.display = 'none'
+    }, 800);
+">
+    <div id="intro" class="intro">
+        <h2>Collaborative Pixel Art</h2>
+    </div>
  <div class="header">
    <h1>Collaborative Pixel Art</h1>
-    <div id="pixel-count"></div> <!-- Element to display pixel count -->
+    <div id="pixel-count">En cours de chargement...</div> <!-- Element to display pixel count -->
  </div>
  <div class="container">
    <div id="canvas">
      <!-- Canvas will be generated dynamically -->
    </div>

-    <div class="color-selector">
-      <div class="color-option" style="background-color: #000000;"></div>
-      <div class="color-option" style="background-color: #FF0000;"></div>
-      <div class="color-option" style="background-color: #00FF00;"></div>
-      <div class="color-option" style="background-color: #0000FF;"></div>
-      <div class="color-option" style="background-color: #FFFF00;"></div>
-      <div class="color-option" style="background-color: #FF00FF;"></div>
-      <div class="color-option" style="background-color: #00FFFF;"></div>
-      <div class="color-option" style="background-color: #FFFFFF;"></div>
-    </div>
-  </div>
    
+  </div>
+  <div class="color-selector">
+    <div class="color-option" style="background-color: #0000ff;"></div>
+    <div class="color-option alt" style="background-color: #5454ff;"></div>
+    <div class="color-option" style="background-color: #00bbff;"></div>
+    <div class="color-option alt" style="background-color: #00ffff;"></div>
+    <div class="color-option alt" style="background-color: #0d5421;"></div>
+    <div class="color-option" style="background-color: #2e7d44;"></div>
+    <div class="color-option" style="background-color: #5ee834;"></div>
+    <div class="color-option" style="background-color: #f9cb9c;"></div>
+    <div class="color-option" style="background-color: #eeff00;"></div>
+    <div class="color-option alt" style="background-color: #ffe600;"></div>
+    <div class="color-option" style="background-color: #ff9900;"></div>
+    <div class="color-option" style="background-color: #FF0000;"></div>
+    <div class="color-option alt" style="background-color: #ff89a4;"></div>
+    <div class="color-option" style="background-color: #ff89ff;"></div>
+    <div class="color-option" style="background-color: #a04cf9;"></div>
+    <div class="color-option" style="background-color: #a48067;"></div>
+    <div class="color-option alt" style="background-color: #512f17;"></div>
+    <div class="color-option alt" style="background-color: #545454;"></div>
+    <div class="color-option" style="background-color: #bdbdbd;"></div>
+    <div class="color-option" style="background-color: #FFFFFF;"></div>
+    <div class="color-option" style="background-color: #000000;"></div>
+  </div>
+  <p>Made by Dolez M.</p>
  <script src="/socket.io/socket.io.js"></script>
  <script src="script.js"></script>
 </body>
--- a/public/script.js
+++ b/public/script.js
@ -49,8 +49,8 @@ function placePixel(index, color) {

 // Create the canvas
 const canvasDiv = document.getElementById('canvas');
-const canvasWidth = 50;
-const canvasHeight = 50;
+const canvasWidth = 200;
+const canvasHeight = 200;

 function createCanvas() {
  for (let i = 0; i < canvasWidth * canvasHeight; i++) {
--- a/public/styles.css
+++ b/public/styles.css
@ -1,114 +1,169 @@
 /* styles.css */
-
+@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600;700&display=swap');
 /* General styling for the body and page layout */
 body {
    display: flex;
    flex-direction: column;
    justify-content: center;
    align-items: center;
-  height: 100vh;
+    min-height: 100vh;
+    width: 100%;
    margin: 0;
-  font-family: Arial, sans-serif; /* Set font family for the entire page */
-  background-color: #f0f0f0; /* Light gray background color */
+    font-family: 'Poppins', sans-serif; /* Set font family for the entire page */
+    background-color: var(--bg); /* Light gray background color */
+  }
+  .intro {
+    position: absolute;
+    top: 0;
+    z-index: 2;
+    background-color: #000;
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
 }
+.fadeout {
+    animation-name: fadeout;
+    animation-duration: 1s;

-/* Styling for the header section */
-.header {
-  margin-bottom: 20px; /* Add spacing at the bottom of the header */
-  color: #333; /* Dark text color */
-  font-size: 24px; /* Larger font size for the header */
-  font-weight: bold; /* Make the header text bold */
-  text-align: center; /* Center-align the text within the header */
 }
+@keyframes fadeout {
+    from {
+      opacity: 1;
+    }
+    to {
+      opacity: 0;
+    }
+  }
+  @keyframes fadeIn {
+    from {
+        opacity: 0;
+        transform: translateX(-50%);
+    }
+    to {
+      opacity: 1;
+      transform: translateX(0);
+    }
+  }
+  .intro h2{
+    font-size: 35px;
+    font-weight: 600; 
+    text-align: center; 
+    color: #fff;
+    animation-name: fadeIn;
+    animation-duration: .8s;
+  }

-/* Styling for the pixel count display */
-#pixel-count {
+  /* Styling for the header section */
+  .header {
+    margin-bottom: 20px;
+  }
+  :root {
+    --bg: #f0f0f0;
+    --text-color: #333;
+    --text-color2: #666;
+  }
+  /* thème sombre */
+  @media (prefers-color-scheme: dark){
+    :root {
+        --bg: #171717;
+        --text-color: #fff;
+        --text-color2: #eee;
+    }
+    .navbar .time, i, .brandname, .matiere {
+      filter: drop-shadow(1px 1px 2px rgb(0 0 0 / 0.4));
+    }
+  }
+  h1 {
+    color: var(--text-color);
+    font-size: 30px;
+    font-weight: 600; 
+    text-align: center; 
+  }
+  /* Styling for the pixel count display */
+  #pixel-count {
    font-size: 16px;
-  color: #666;
+    color: var(--text-color2);
    text-align: center;
    margin-top: 10px; /* Add spacing above the pixel count */
-}
+  }

-/* Styling for the main container that wraps canvas and color selector */
-.container {
+  /* Styling for the main container that wraps canvas and color selector */
+  .container {
    display: flex;
    flex-wrap: wrap; /* Allow the container to wrap on smaller screens */
    justify-content: center; /* Center the content horizontally */
    align-items: center; /* Center the content vertically */
-  background-color: #fff; /* White background color */
-  border-radius: 8px; /* Rounded corners for the container */
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* Subtle shadow effect */
+    background-color: #fffffff3; /* White background color */
+    border-radius: 15px; /* Rounded corners for the container */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
    padding: 20px; /* Add padding inside the container */
-  max-width: 800px; /* Set a maximum width for the container */
-}
+    margin-bottom: 10px;
+  } 

-/* Styling for the canvas where pixels will be placed */
-#canvas {
-  width: 500px;
-  height: 500px;
+  /* Styling for the canvas where pixels will be placed */
+  #canvas {
+    padding: 10px;
+    overflow-x: scroll;
+    width: 95vw;
+    height: 95vw;
    display: grid;
-  grid-template-columns: repeat(50, 10px); /* Create 50 columns of 10px each */
-  grid-template-rows: repeat(50, 10px); /* Create 50 rows of 10px each */
+    grid-template-columns: repeat(200, 10px); /* Create 50 columns of 10px each */
+    grid-template-rows: repeat(200, 10px); /* Create 50 rows of 10px each */
    gap: 0; /* Remove any gap between pixels */
-}
+  }

-/* Styling for individual pixels */
-.pixel {
+  /* Styling for individual pixels */
+  .pixel {
    width: 10px;
    height: 10px;
    display: inline-block;
-  border: 1px solid #ccc; /* Add a 1px border around each pixel */
-}
+    border: .1px solid #ccc; /* Add a 1px border around each pixel */
+  }

-/* Styling for the color selector section */
-.color-selector {
+  /* Styling for the color selector section */
+  .color-selector {
+    position: fixed;
+    background-color: #fffffff3;
+    border-radius: 30px;
+    padding: 10px;
+    bottom: 0;
    display: flex;
-  flex-direction: column; /* Color options arranged vertically */
+    flex-wrap: wrap;
    align-items: center; /* Center color options horizontally */
-  margin-left: 20px; /* Add some space to the left of the color selector */
-}
+    margin: 20px; /* Add some space to the left of the color selector */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  }

-/* Styling for individual color options */
-.color-option {
-  width: 30px;
-  height: 30px;
+  /* Styling for individual color options */
+  .color-option {
+    width: 28px;
+    height: 28px;
    border-radius: 50%; /* Make the color options circular */
    margin: 5px; /* Add spacing between color options */
    cursor: pointer; /* Show pointer cursor on hover */
    border: 2px solid #ccc; /* Add a 2px border around each color option */
    /* Color options will have their background color set dynamically */
-}
-
-/* Styling for the currently selected color option */
-.color-option.selected {
-  border-color: #000; /* Change the border color for the selected color */
-}
-
-/* Responsive design for phone-friendly UI */
-@media (max-width: 768px) {
-  .container {
-    flex-direction: column; /* Stack canvas and color selector vertically */
  }

-  #canvas {
-    width: 90%; /* Adjust canvas width to fit smaller screens */
-    height: auto; /* Allow canvas height to adapt based on content */
-    margin: 20px 0; /* Add some spacing around the canvas */
+  /* Styling for the currently selected color option */
+  .color-option.selected {
+    border-color: #000;
  }

-  .color-selector {
-    flex-direction: row; /* Arrange color options horizontally */
-    justify-content: center; /* Center color options horizontally */
-    margin: 0; /* Remove any margin on smaller screens */
-    margin-top: 20px; /* Add some spacing above the color selector */
+
+  p {
+    margin-bottom: 100px;
  }

-  .color-option {
-    margin: 5px 8px; /* Adjust spacing between color options */
+  @media screen and (max-width: 520px) {
+    .alt {
+      display: none;
    }

-  /* Adjust pixel count styles for phone-friendly UI */
-  #pixel-count {
-    font-size: 14px;
+
  }
-}
--- a/server.js
+++ b/server.js
@ -6,8 +6,8 @@ const io = require('socket.io')(http);
 const fs = require('fs');

 const initialPixelColor = '#FFFFFF'; // Default color: White
-const canvasWidth = 50;
-const canvasHeight = 50;
+const canvasWidth = 200;
+const canvasHeight = 200;
 let pixels = new Array(canvasWidth * canvasHeight).fill(initialPixelColor);
 let totalPixelsPlaced = 0; // Counter for total pixels placed by everyone