4i
/
a1
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'PiotrB' into dev

This commit is contained in:
piotrb 2024-05-20 10:09:18 +02:00
parent c225a7d197 2ac625d825
commit 24dc33d4cf
5 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fetch.js
View File

@ -1,8 +1,8 @@
const url = "http://localhost/P20.05/get.php" const url = "http://localhost/p20/get.php"
fetch(url) fetch(url)
.then(response => response.json()) .then(response => response.json())
.then( data => { .then(data => {
console.log(data) console.log(data)
}) })
@ -15,7 +15,8 @@ function sortujSufiksy() {
document.getElementById('nieposortowane').textContent = formatSufiksy(sufiksy); document.getElementById('nieposortowane').textContent = formatSufiksy(sufiksy);
sufiksy.sort(); sufiksy.sort();
document.getElementById('posortowane').textContent = formatSufiksy(sufiksy); document.getElementById('posortowane').textContent = formatSufiksy(sufiksy);
} }
function formatSufiksy(sufiksy) { function formatSufiksy(sufiksy) {
return sufiksy.map((sufiks, index) => `${index + 1} ${sufiks}`).join('\n'); return sufiksy.map((sufiks, index) => `${index + 1} ${sufiks}`).join('\n');
} }

4
get.php
View File

@ -1,5 +1,9 @@
<?php <?php
<<<<<<< HEAD
$dbhost = "qstack.pl"; $dbhost = "qstack.pl";
=======
$dbhost = "localhost";
>>>>>>> PiotrB
$dbuser = "root"; $dbuser = "root";
$dbpass = ""; $dbpass = "";
$dbname = "db"; $dbname = "db";

4
index.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="pl"> <html lang="pl">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -7,10 +8,11 @@
<link rel="stylesheet" href="styles.css"> <link rel="stylesheet" href="styles.css">
</head> </head>
<body> <body>
<h1>Sortowanie Sufiksów</h1> <h1>Sortowanie Sufiksów</h1>
<input type="text" id="slowo" placeholder="Podaj słowo"> <input type="text" id="slowo" placeholder="Podaj słowo">
<button onclick="sortujSufiksy()">Sortuj Sufiksy</button> <button onclick="sortujSufiksy()">Sortuj Sufiksy</button>
<h2>Nieposortowane Sufiksy</h2> <h2>Nieposortowane Sufiksy</h2>
<pre id="nieposortowane"></pre> <pre id="nieposortowane"></pre>
<h2>Posortowane Sufiksy</h2> <h2>Posortowane Sufiksy</h2>

21
js.js
View File

@ -1,21 +0,0 @@
const url = "http://localhost/P20.05"
fetch('get.php')
.then(response => response.json())
.then( data => {
console.log(data)
})
function sortujSufiksy() {
const slowo = document.getElementById('slowo').value;
const sufiksy = [];
for (let i = 0; i < slowo.length; i++) {
sufiksy.push(slowo.slice(i));
}
document.getElementById('nieposortowane').textContent = formatSufiksy(sufiksy);
sufiksy.sort();
document.getElementById('posortowane').textContent = formatSufiksy(sufiksy);
}git
function formatSufiksy(sufiksy) {
return sufiksy.map((sufiks, index) => `${index + 1} ${sufiks}`).join('\n');
}

4
styles.css
View File

@ -1,4 +1,3 @@
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
background-color: #f5f5f5; background-color: #f5f5f5;
@ -14,7 +13,6 @@ h1 {
margin-bottom: 20px; margin-bottom: 20px;
} }
input[type="text"] { input[type="text"] {
width: calc(100% - 22px); width: calc(100% - 22px);
padding: 10px; padding: 10px;
@ -24,7 +22,6 @@ input[type="text"] {
box-sizing: border-box; box-sizing: border-box;
} }
button { button {
display: block; display: block;
width: 100%; width: 100%;
@ -41,7 +38,6 @@ button:hover {
background-color: #004494; background-color: #004494;
} }
h2 { h2 {
color: #0056b3; color: #0056b3;
border-bottom: 2px solid #0056b3; border-bottom: 2px solid #0056b3;