From 19218d758d4fc0f8f5db5a97eb9dcfdb5086f844 Mon Sep 17 00:00:00 2001 From: Maksymilian Jopek Date: Sat, 25 Feb 2023 19:06:54 +0100 Subject: Remove path from repo Add start script --- api/add.php | 4 ++-- api/change-order.php | 4 ++-- api/export.php | 24 +++++++++++++----------- api/remove.php | 20 +++++++++++++++++--- index.php | 17 ++++++++++------- set-pwd.sh | 9 +++++++++ src/data.php | 2 +- src/db.xml | 22 ++++++++++++++-------- start | 4 +--- 9 files changed, 69 insertions(+), 37 deletions(-) create mode 100755 set-pwd.sh diff --git a/api/add.php b/api/add.php index 780a3b4..7edeb3b 100644 --- a/api/add.php +++ b/api/add.php @@ -8,8 +8,8 @@ foreach ($req_keys as $key) { exit(0); } } -$path = "/home/maks/school/clientApps/mlos/src/db.xml"; -require_once "/home/maks/school/clientApps/mlos/src/data.php"; +$path = "%PWD%src/db.xml"; +require_once "%PWD%src/data.php"; $name = $_POST["name"]; $author = $_POST["author"]; diff --git a/api/change-order.php b/api/change-order.php index b498605..8901187 100644 --- a/api/change-order.php +++ b/api/change-order.php @@ -4,8 +4,8 @@ if (empty($_POST["old-order"]) || empty($_POST["new-order"])) { error_log("not enough post"); exit(0); } -$path = "/home/maks/school/clientApps/mlos/src/db.xml"; -require_once "/home/maks/school/clientApps/mlos/src/data.php"; +$path = "%PWD%src/db.xml"; +require_once "%PWD%src/data.php"; $old_order = $_POST["old-order"]; $new_order = $_POST["new-order"]; diff --git a/api/export.php b/api/export.php index 77e36a2..625283e 100644 --- a/api/export.php +++ b/api/export.php @@ -1,6 +1,6 @@ setCellValue('A' . $row, $d["name"]); - $drawing = new Drawing(); - $drawing->setName($d["name"]); - $drawing->setPath("../imgs/" . $d["thumbnail"]); - $drawing->setHeight(200); - - $comment = $active_sheet->getComment('A' . $row); - $comment->setBackgroundImage($drawing); - $comment->setSizeAsBackgroundImage(); - + $path = "%PWD%imgs/" . $d["thumbnail"]; + if(file_exists($path)) { + $drawing = new Drawing(); + $drawing->setName($d["name"]); + $drawing->setPath($path); + $drawing->setHeight(200); + + $comment = $active_sheet->getComment('A' . $row); + $comment->setBackgroundImage($drawing); + $comment->setSizeAsBackgroundImage(); + } $active_sheet->setCellValue('B' . $row, $d["author"]); $active_sheet->setCellValue('C' . $row, $d["magazine"]); diff --git a/api/remove.php b/api/remove.php index 65f1a82..0ef23e5 100644 --- a/api/remove.php +++ b/api/remove.php @@ -1,10 +1,11 @@ query('//game[@id="' . $id . '"]')->item(0); $game->parentNode->removeChild($game); $count = $doc->getElementsByTagName("count")->item(0); -$count->nodeValue = intval($count->nodeValue) - 1; +$icount = intval($count->nodeValue) - 1; +$count->nodeValue = $icount; + + +[$data, $_] = get_data(); +$i = 1; +foreach($data as $d) { + if($d["id"] === $id) continue; + $g = $xpath->query('//game[@id="' . $d["id"] . '"]')->item(0); + var_dump('//game[@id="' . $d["id"] . '"]'); + $g->setAttribute("order", $i); + $i++; +} $doc->save($path); header("Location: " . $_SERVER["HTTP_REFERER"]); + diff --git a/index.php b/index.php index 77f2825..aacae31 100644 --- a/index.php +++ b/index.php @@ -45,7 +45,7 @@ function is_pos(): bool
- + "> "> @@ -64,7 +64,7 @@ function is_pos(): bool
-
+
@@ -93,10 +93,10 @@ function is_pos(): bool - - " width="200" /> - - + + " width="200" /> + +
@@ -118,7 +118,10 @@ function is_pos(): bool - Export to xlsx + + Export to xlsx
+ Sources + diff --git a/set-pwd.sh b/set-pwd.sh new file mode 100755 index 0000000..c6963f5 --- /dev/null +++ b/set-pwd.sh @@ -0,0 +1,9 @@ +#!/bin/sh +files="api/change-order.php api/export.php api/add.php api/remove.php src/data.php" + +[ -z "$1" ] && echo "\$1 has to be directory where project lives" && exit 1 +path="$(readlink -e "$1")" + +for file in $files; do + sed -i "s;%PWD%;$1/;" "$file" +done diff --git a/src/data.php b/src/data.php index aaf9d88..1028a8f 100644 --- a/src/data.php +++ b/src/data.php @@ -6,7 +6,7 @@ function get_node_value($from, string $name): string function get_doc(): DOMDocument { $doc = new DOMDocument(); - $path = "/home/maks/school/clientApps/mlos/src/db.xml"; + $path = "%PWD%src/db.xml"; $doc->load($path); return $doc; } diff --git a/src/db.xml b/src/db.xml index 6cdcf11..3185c7c 100644 --- a/src/db.xml +++ b/src/db.xml @@ -1,16 +1,16 @@ - 18 - 5 - - Wiedzmiń + 28 + 7 + + Wiedzmińnnn wiedzmin.png Ąndrzej Sępkiewicz Fantastyka - + Władca pierścieni - ring.png222 + ring.png Tolkien Sapkowski CDAction 1999 @@ -20,10 +20,16 @@ NotSoArchDev Torvalds 1987 - + 🥶 🤑 🙊.png 🙊 -<h1>Thinkpad</h1><br>Lenovo<br>thinkpad.png<br><b>Thinkpad Magazine</b><br><br> + + <h1>Thinkpad</h1> + <br>Lenovo + <br>thinkpad.png + <br><b>Thinkpad Magazine</b><br><br> + + diff --git a/start b/start index 5176169..c3a84e0 100755 --- a/start +++ b/start @@ -1,4 +1,2 @@ #!/bin/sh -#st -e pnpm dev & -st -e php -S 0.0.0.0:8000 & -lvim . +php -S 0.0.0.0:8000 -- cgit v1.3.1