feat: Добавил поддержку различной статики

2e11c91e · Ilya Petrovanov · 0498fed9 · 2e11c91e · 2e11c91e · 2e11c91e
Commit 2e11c91e authored 1 year ago by Ilya Petrovanov
Hide whitespace changes
Inline Side-by-side

Showing

with 14 additions and 5 deletions
+14 -5
--- a/config/ktemplate.yaml
+++ b/config/ktemplate.yaml
 ktemplate:
-  path: /app/public/css
+  path: /app/public/static
  url: "http://localhost:8800"
  template_path: /app/templates
\ No newline at end of file
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
            - .:/app

        ports:
-            - "8800:8800"
+            - "8801:8800"

        working_dir: /app/public
        entrypoint: php -S 0.0.0.0:8800
@@ -21,10 +21,10 @@ services:
            - .:/app

        ports:
-            - "8801:8801"
+            - "8800:8800"

        working_dir: /app
-        entrypoint: kphp_out/server -H 8801 -f 1 --user root
+        command: kphp_out/server -H 8800 -f 10 --user root


    database:

--- a/public/css/style.css
+++ b/public/css/style.css
--- a/public/static/js/script.js
+++ b/public/static/js/script.js
+let num1 = 5;
+let num2 = 10;
+let sum = num1 + num2;
+document.getElementById("consoleOutput").innerHTML += "Sum " + num1 + " and " + num2 + " equals " + sum + "<br>";
--- a/public/static/pepe.png
+++ b/public/static/pepe.png
--- a/templates/greeting
+++ b/templates/greeting
@@ -9,10 +9,15 @@
    Test
 </header>
 <body>
-    <link  rel="stylesheet" type="text/css" href="{{ asset("style.css") }}" />
+    <img src="{{ asset("pepe.png", "png") }}">

+    <p id="consoleOutput"></p>
+    <script src="{{ asset("js/script.js", "js") }}"></script>
+    <link  rel="stylesheet" type="text/css" href="{{ asset("css/style.css", "css") }}" />
    <p>This text will be red as defined in the external stylesheet.</p>
    <p>Hello, {{ name }}</p>
+    <img src="{{ asset("pepe.png", "png") }}">
+
    <p style="color: blue">The <code>style</code> attribute can override it, though.</p>
 </body>
 <footer>