Compare commits

..

No commits in common. "main" and "dev" have entirely different histories.
main ... dev

3 changed files with 12 additions and 40 deletions

View File

@ -5,7 +5,7 @@ services:
container_name: nginx container_name: nginx
restart: always restart: always
ports: ports:
- 1001:80 - 80:80
volumes: volumes:
- ./www/public:/var/www/public - ./www/public:/var/www/public
- ./config/nginx/nginx.conf:/etc/nginx/nginx.conf - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf

View File

@ -1,24 +0,0 @@
<!doctype html>
<html>
<head lang="sv"></head>
<body>
<h1>Matematiktest</h1>
<h2>Resultat</h2>
<?php
$ans1 = $_GET['q1'];
$ans2 = $_GET['q2'];
$points = 0;
if ($ans1 == 9)
$points++;
if ($ans2 == 15)
$points++;
echo "<p>Du fick $points av 2 möjliga</p>";
?>
</body>
</html>

View File

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="sv"> <html lang="sv">
<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">
@ -8,19 +7,16 @@
</head> </head>
<body> <body>
<h1>Matematik-test</h1> <h1>Webbservern fungerar NY VERSION 3!</h1>
<form action="evaluate.php" method="get"> <p><strong>Denna sida (index.php) skall bytas ut.</strong></p>
<fieldset>
<legend>Frågor</legend>
<label>4 + 5 = </label>
<input type="text" name="q1">
<br>
<label>3 x 5 = </label>
<input type="text" name="q2">
<br>
<input type="submit" value="Rätta">
</fieldset>
</form>
</body>
<?php
$date = date("Y-m-d");
$v = 3.0;
print "<p>Version $v</p>";
echo "<h2>Hej PHP dagens datum: $date</h2>";
?>
<h3>Efter PHP</h3>
</body>
</html> </html>