Ajouter README.md

meta
fix
2025-05-21 10:38:18 +02:00 · 2025-05-09 11:50:32 +02:00 · 2025-05-09 11:13:29 +02:00 · 2025-05-06 18:20:08 +02:00 · 2025-05-05 23:18:26 +02:00 · 2024-05-12 11:17:03 +02:00
13 changed files with 101 additions and 130 deletions
--- a/400.php
+++ b/400.php
@ -6,6 +6,9 @@
        <title>Requête incorrecte</title>
    </head>
    <body>
+        <nav class="navbar mb-4">
+            <h1 class="display-4 text-center m-auto">Sudoku</h1>
+        </nav>
        <main class="container my-4">
            <header>
                <h1 class="mb-4">Requête incorrecte</h1>
@ -15,7 +18,7 @@
            <em>grille</em> étant une suite de 81 caractères représentant la grille de gauche à droite puis de haut en bas, soit :
            <ul>
                <li>un chiffre entre 1 et 9 pour les cases connues</li>
-                <li>un point pour les case vides</li>
+                <li>un tiret (-) pour les case vides</li>
            </ul>
            Exemple :<br/>
            <a href='<?=$newGridUrl?>'><?=$newGridUrl?></a>
--- a/README.md
+++ b/README.md
@ -0,0 +1,5 @@
+# Sudoku
+
+Web sudoku assistant
+
+![screenshot](https://git.malingrey.fr/adrien/sudoku/raw/branch/master/thumbnail.png)
--- a/classes.php
+++ b/classes.php
@ -1,5 +1,5 @@
 <?php
-    const UNKNOWN = ".";
+    const UNKNOWN = "-";

    $validGrids = array();

@ -27,15 +27,19 @@
        
    class Box {
        public $values = array('1', '2', '3', '4', '5', '6', '7', '8', '9');
-    
+        public $value = UNKNOWN; 
+        public $rowId;
+        public $columnId;
+        public $regionId;
+        public $candidates;
+        public $candidateRemoved = array();
+        public $neighbourhood = array();
+
        function __construct($rowId, $columnId, $regionId) {
-            $this->value = UNKNOWN;
            $this->rowId = $rowId;
            $this->columnId = $columnId;
            $this->regionId = $regionId;
            $this->candidates = $this->values;
-            $this->candidateRemoved = array();
-            $this->neighbourhood = array();
        }
        
        function searchCandidates() {
@ -48,8 +52,13 @@
    }
    
    class Grid {
-        function __construct() {
-            $this->boxes = array();
+
+        private $boxes = array();
+        private $rows;
+        private $columns;
+        private $regions;
+
+        function __construct($gridStr="") {
            $this->rows = array_fill(0, 9, array());
            $this->columns = array_fill(0, 9, array());
            $this->regions = array_fill(0, 9, array());
@ -74,6 +83,12 @@
                    if ($box != $neighbour && !in_array($neighbour, $box->neighbourhood))
                        $box->neighbourhood[] = $neighbour;
            }
+
+            if ($gridStr) {
+                $this->import($gridStr);
+            } else {
+                $this->generate();
+            }
        }

        function import($gridStr) {
--- a/favicon.png
+++ b/favicon.png
--- a/head.php
+++ b/head.php
@ -1,9 +1,18 @@
-        <script src="https://getbootstrap.com/docs/5.3/assets/js/color-modes.js"></script>
        <meta charset="utf-8" />
-        <title>Sudoku</title>
+        <title>Sudoku</title><meta property="og:title" content="Sudoku" />
+        <meta property="og:type" content="game" />
+        <meta name="description" property="og:description" content="Remplissez la grille de sorte que chaque ligne, colonne et région (carré de 3×3 cases) contienne tous les chiffres de 1 à 9." />
+        <link rel="canonical" href="<?=$_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].dirname($_SERVER["DOCUMENT_URI"])?>" />
+        <meta property="og:url" content="<?=$_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].$_SERVER["DOCUMENT_URI"]?>" />
+        <meta property="og:image" content="<?=$_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].dirname($_SERVER["DOCUMENT_URI"])?>/thumbnail.php?size=200&grid=<?=$currentGrid?>" />
+        <meta property="og:image:width" content="200" />
+        <meta property="og:image:height" content="200" />
+        <meta name="Language" CONTENT="fr" /><meta property="og:locale" content="fr_FR" />
+        <meta property="og:site_name" content="<?=$_SERVER["HTTP_HOST"]?>" />
+        
        <meta name="viewport" content="width=device-width, initial-scale=1" />

-        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap-dark-5@1.1.3/dist/css/bootstrap-dark.min.css" rel="stylesheet">
        <link href="https://cdn.jsdelivr.net/npm/remixicon@3.2.0/fonts/remixicon.css" rel="stylesheet">
        <link href="style.css" rel="stylesheet" type="text/css" />

@ -21,13 +30,3 @@
        <link href="thumbnail.php?grid=<?=$currentGrid?>&size=60"  sizes="60x60"   rel="apple-touch-icon">
        <link href="thumbnail.php?grid=<?=$currentGrid?>&size=76"  sizes="76x76"   rel="apple-touch-icon">
        <link href="manifest.php?grid=<?=$currentGrid?>" rel="manifest">
-
-        <meta property="og:title" content="Sudoku" />
-        <meta property="og:type" content="website" />
-        <meta property="og:url" content="<?=$_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].$_SERVER["DOCUMENT_URI"]?>" />
-        <meta property="og:image" content="<?=$_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].dirname($_SERVER["DOCUMENT_URI"])?>/thumbnail.php?size=200&grid=<?=$currentGrid?>" />
-        <meta property="og:image:width" content="200" />
-        <meta property="og:image:height" content="200" />
-        <meta property="og:description" content="Remplissez la grille de sorte que chaque ligne, colonne et région (carré de 3×3 cases) contienne tous les chiffres de 1 à 9." />
-        <meta property="og:locale" content="fr_FR" />
-        <meta property="og:site_name" content="<?=$_SERVER["HTTP_HOST"]?>" />
--- a/index.php
+++ b/index.php
@ -1,21 +1,19 @@
 <?php 
    require("classes.php");
-    session_start();
-    if (!array_key_exists("sudokuGridSolutions", $_SESSION)) {
-        $_SESSION["sudokuGridSolutions"] = array();
-    }

    $fullUrl = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].$_SERVER["DOCUMENT_URI"];
    $dirUrl = dirname($fullUrl);
    $currentGrid = strip_tags($_SERVER['QUERY_STRING']);

-    if (preg_match("/^[1-9.]{81}$/", $currentGrid)) {
-        if (!array_key_exists($currentGrid, $_SESSION["sudokuGridSolutions"])) {
-            $grid = new Grid();
-            $grid->import($currentGrid);
-            $_SESSION["sudokuGridSolutions"][$currentGrid] = $grid->containsDuplicates() ? -1 : $grid->countSolutions(2);
+    if (preg_match("/^[1-9-]{81}$/", $currentGrid)) {
+        session_id($currentGrid);
+        session_start(["use_cookies" => false]);
+
+        if (!array_key_exists("nbSolutions", $_SESSION)) {
+            $grid = new Grid($currentGrid);
+            $_SESSION["nbSolutions"] = $grid->containsDuplicates() ? -1 : $grid->countSolutions(2);
        }
-        switch($_SESSION["sudokuGridSolutions"][$currentGrid]) {
+        switch($_SESSION["nbSolutions"]) {
            case -1:
                $warning = "Cette grille contient des doublons.";
                break;
@ -29,14 +27,18 @@
        }
        require("sudoku.php");
    } else {
-        $grid = new Grid();
-        $grid->generate();
-        $gridAsString = $grid->toString();
-        $newGridUrl = "$dirUrl/?$gridAsString";
-        $_SESSION["sudokuGridSolutions"][$gridAsString] = 1;
        if ($currentGrid) {
            require("400.php");
        } else {
+            $grid = new Grid();
+            $gridAsString = $grid->toString();
+            $newGridUrl = "$dirUrl/?$gridAsString";
+    
+            session_id($gridAsString);
+            session_start(["use_cookies" => false]);
+    
+            $_SESSION["nbSolutions"] = 1;
+
            header("Location: $newGridUrl");
        }
    }
--- a/manifest.php
+++ b/manifest.php
--- a/service-worker.js
+++ b/service-worker.js
--- a/style.css
+++ b/style.css
@ -20,7 +20,7 @@ table input {
    padding: 0 !important;
    margin: 0 !important;
    text-align: center;
-    -moz-appearance: textfield !important;
+    appearance: textfield !important;
    border-radius: 0 !important;
 }

@ -33,6 +33,10 @@ table input:not([disabled]) {
    color: inherit !important;
 }

+table input:not([disabled]):hover {
+    background: #9fb9b945 !important;
+}
+
 table input:disabled {
    background-position: center !important;
 }
--- a/sudoku.js
+++ b/sudoku.js
@ -35,12 +35,12 @@ window.onload = function() {
        for (let box of row.getElementsByTagName('input')) {
            let regionId = rowId - rowId % 3 + Math.floor(columnId / 3)
            if (!box.disabled) {
-                box.onfocus             = onfocus
-                box.oninput             = oninput
-                box.onblur              = onblur
-                box.onclick             = onclick
-                box.onmouseenter        = onmouseenter
-                box.onmouseleave        = onmouseleave
+                box.onfocus      = onfocus
+                box.oninput      = oninput
+                box.onblur       = onblur
+                box.onclick      = onclick
+                box.onmouseenter = onmouseenter
+                box.onmouseleave = onmouseleave
            }
            box.oncontextmenu = oncontextmenu
            box.rowId         = rowId
@ -82,10 +82,6 @@ window.onload = function() {
    }

    loadGame(history.state)
-
-    if ("serviceWorker" in navigator) {
-        navigator.serviceWorker.register(`service-worker.js`)
-    }
 }

 window.onpopstate = (event) => loadGame(event.state)
--- a/sudoku.php
+++ b/sudoku.php
@ -36,54 +36,44 @@
                    <form id='sudokuForm' class='needs-validation' novalidate>
                        <table id='grid' class='table mb-2'>
                            <tbody>
-<?php
-        for ($row = 0; $row < 81; $row += 9) {
-?>
+<?php for ($row = 0; $row < 81; $row += 9): ?>
                                <tr class="input-group d-inline-block w-auto">
-<?php
-        for ($column = 0; $column < 9; $column++) {
-            $value = $currentGrid[$row+$column];
-            if ($value == UNKNOWN) {
-?>
+    <?php for ($column = 0; $column < 9; $column++): $value = $currentGrid[$row+$column]; ?>
+        <?php if ($value == UNKNOWN): ?>
                                    <td><input type='number' min='1' max='9' step='1' value=''  class='form-control' /></td>
-<?php
-                } else {
-?>
+        <?php else: ?>
                                    <td><input type='number' min='1' max='9' step='1' value='<?=$value?>' class='form-control' disabled /></td>
-<?php
-            }                                                            
-        }
-?>
-                            </tr>
-<?php
-   }
-?>
-                        </tbody>
-                    </table>
-                </form>
-                <div class='d-flex mb-4'>
-                    <div id='insertRadioGroup' class='radioGroup btn-group flex-fill'>
-                        <input type='radio' class='btn-check' id='insertRadio0' value=''  name='insertRadioGroup' onclick='insert(this)' accesskey='0' checked  /><label for='insertRadio0' class='btn btn-primary' title='Clavier'><i class="ri-input-cursor-move"></i></label>
-<?php
-        for($value=1; $value<=9; $value++) {
-            echo "                        <input type='radio' class='btn-check' id='insertRadio$value' value='$value' name='insertRadioGroup' onclick='insert(this)' accesskey='$value' disabled /><label for='insertRadio$value' class='btn btn-primary' title='Insérer un $value'>$value</label>\n";
-        }
-?>
+        <?php endif ?>
+    <?php endfor?>
+                                </tr>
+<?php endfor?>
+                            </tbody>
+                        </table>
+                    </form>
+                    <div class='d-flex mb-4'>
+                        <div id='insertRadioGroup' class='radioGroup btn-group flex-fill'>
+                            <input type='radio' class='btn-check' id='insertRadio0' value=''  name='insertRadioGroup' onclick='insert(this)' accesskey='0' checked  /><label for='insertRadio0' class='btn btn-primary' title='Clavier'><i class="ri-input-cursor-move"></i></label>
+<?php for($value=1; $value<=9; $value++): ?>
+                            <input type='radio' class='btn-check' id='insertRadio<?=$value?>' value='<?=$value?>' name='insertRadioGroup' onclick='insert(this)' accesskey='<?=$value?>' disabled />
+                            <label for='insertRadio<?=$value?>' class='btn btn-primary' title='Insérer un <?=$value?>'><?=$value?></label>
+<?php endfor ?>
+                        </div>
+                    </div>
+                    <div class='mb-3'>
+<?php if (isset($warning)): ?>
+                        <strong>⚠️ <?=$warning?> ⚠️</strong><br/>
+<?php else: ?>
+                    Remplissez la grille de sorte que chaque ligne, colonne et région (carré de 3×3 cases) contienne tous les chiffres de 1 à 9.
+<?php endif?>
                    </div>
                </div>
-                <div class='mb-3'><?php
-    if (isset($warning))
-        echo("<strong>⚠️ $warning ⚠️</strong><br/>");
-    else
-        echo("Remplissez la grille de sorte que chaque ligne, colonne et région (carré de 3×3 cases) contienne tous les chiffres de 1 à 9.")
-?></div>
            </main>
            <aside class="col-md-3 text-center text-md-start">
                <div class="d-flex flex-column flex-shrink-0 p-3">
                    <ul class="nav nav-pills flex-column">
                        <li><a href="." class="nav-link link-body-emphasis">Nouvelle grille</a></li>
                        <li><a href="" class="nav-link link-body-emphasis">Lien vers cette grille</a></li>
-                        <li><a href="?................................................................................." class="nav-link link-body-emphasis">Grille vierge</a></li>
+                        <li><a href="?---------------------------------------------------------------------------------" class="nav-link link-body-emphasis">Grille vierge</a></li>
                        <li><a id="fixGridLink" href="" class="nav-link link-body-emphasis">Figer la grille</a></li>
                        <li><a href="https://git.malingrey.fr/adrien/Sudoku" class="nav-link link-body-emphasis">Code source</a></li>
                        <li><a href=".." class="nav-link link-body-emphasis">Autres jeux</a></li>
@ -92,52 +82,9 @@
            </aside>
        </div>
        <ul id='contextMenu' class='context-menu modal-content shadow list-group w-auto position-absolute'></ul>
-        <svg xmlns="http://www.w3.org/2000/svg" class="d-none">
-            <symbol id="check2" viewBox="0 0 16 16">
-                <path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"></path>
-            </symbol>
-            <symbol id="circle-half" viewBox="0 0 16 16">
-                <path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"></path>
-            </symbol>
-            <symbol id="moon-stars-fill" viewBox="0 0 16 16">
-                <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"></path>
-                <path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z"></path>
-            </symbol>
-            <symbol id="sun-fill" viewBox="0 0 16 16">
-                <path d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"></path>
-            </symbol>
-        </svg>
-        <div class="dropdown position-fixed bottom-0 end-0 mb-3 me-3 mode-toggle">
-            <button class="btn btn-primary py-2 dropdown-toggle d-flex align-items-center" id="theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" aria-label="Toggle theme (dark)">
-                <svg class="bi my-1 theme-icon-active" width="1em" height="1em"><use href="#moon-stars-fill"></use></svg>
-                <span class="visually-hidden" id="theme-text">Toggle theme</span>
-            </button>
-            <ul class="dropdown-menu dropdown-menu-end shadow" aria-labelledby="theme-text">
-                <li>
-                <button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="light" aria-pressed="false">
-                    <svg class="bi me-2 opacity-50 theme-icon" width="1em" height="1em"><use href="#sun-fill"></use></svg>
-                    Light
-                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
-                </button>
-                </li>
-                <li>
-                <button type="button" class="dropdown-item d-flex align-items-center active" data-bs-theme-value="dark" aria-pressed="true">
-                    <svg class="bi me-2 opacity-50 theme-icon" width="1em" height="1em"><use href="#moon-stars-fill"></use></svg>
-                    Dark
-                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
-                </button>
-                </li>
-                <li>
-                <button type="button" class="dropdown-item d-flex align-items-center" data-bs-theme-value="auto" aria-pressed="false">
-                    <svg class="bi me-2 opacity-50 theme-icon" width="1em" height="1em"><use href="#circle-half"></use></svg>
-                    Auto
-                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
-                </button>
-                </li>
-            </ul>
-        </div>
        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ENjdO4Dr2bkBIFxQpeoTz1HIcje39Wm4jDKdf19U8gI4ddQ3GYNS7NTKfAdVQSZe" crossorigin="anonymous"></script>
        <script src='sudoku.js' defer></script>
+        <script>navigator?.serviceWorker.register('service-worker.js')</script>
    </body>

 </html>
--- a/thumbnail.php
+++ b/thumbnail.php
@ -1,9 +1,9 @@
 <?php
    require("classes.php");
-    if (isset($_GET["grid"]) && preg_match("/^[1-9.]{81}$/", $_GET["grid"]))
+    if (isset($_GET["grid"]) && preg_match("/^[1-9-]{81}$/", $_GET["grid"]))
        $currentGrid = $_GET["grid"];
    else
-        $currentGrid = ".528.3....4.9.1...39.562......73.129...1.64.7...42.3656.13.5...28.6.4...4.5287...";
+        $currentGrid = "-528-3----4-9-1---39-562------73-129---1-64-7---42-3656-13-5---28-6-4---4-5287---";
    header ("Content-type: image/png");
    if (isset($_GET['size']))
        $size = (int) $_GET['size'];
--- a/thumbnail.png
+++ b/thumbnail.png
Author	SHA1	Message	Date
Adrien MALINGREY	c477355fe9	Ajouter README.md	2025-05-21 10:38:18 +02:00
adrien	f52c970bef	meta	2025-05-09 11:50:32 +02:00
adrien	cf0a5a465e	fix	2025-05-09 11:13:29 +02:00
adrien	310a1883d2	declare properties, use session without cookies	2025-05-06 18:20:08 +02:00
adrien	4b92464c94	format	2025-05-05 23:18:26 +02:00
adrien	c09ed80a52	serviceWorker in html	2024-05-12 11:17:03 +02:00
adrien	b145ae566a	hover	2024-04-09 01:38:42 +02:00
adrien	21e8f4134f	auto import	2023-12-23 13:25:04 +01:00
adrien	31a40a7e93	format	2023-12-23 13:24:44 +01:00
adrien	ad3992ac30	navbar	2023-12-23 13:24:22 +01:00
adrien	5feaa65955	global $sudokuGridSolutions	2023-12-23 13:24:12 +01:00
adrien	ed5795a6cc	save directly nbsolutions in $_SESSION	2023-12-12 18:36:37 +01:00
adrien	bdb1a094c3	back to bootstrap dark	2023-12-11 09:13:35 +01:00