Merge pull request #28 from googleanalytics/portsfix

[fix] address issues with starting deno from each directory

Author: matt-landers

src/index.ts

@@ -2,14 +2,12 @@ import * as path from "https://deno.land/[email protected]/path/mod.ts";
 import { Eta } from "https://deno.land/x/[email protected]/src/index.ts";
 import { parseArgs } from "jsr:@std/cli/parse-args";
 
-const __dirname = path.dirname(path.fromFileUrl(import.meta.url));
-
-const viewpath = Deno.cwd() + "/public/";
-const eta = new Eta({ views: viewpath, cache: true });
+const __dirname = new URL(".", import.meta.url).pathname;
+const eta = new Eta({ views: path.join(__dirname, 'public'), cache: true });
 
 const flags = parseArgs(Deno.args, {
   string: ["port"],
-  default: { port: "3000" },
+  default: { port: "80" },
 });
 
 async function handler(request: Request) {

tutorials/1-initial-setup/src/index.ts

@@ -19,7 +19,10 @@ async function handleHttp(conn: Deno.Conn) {
     for await (const requestEvent of httpConn) {
 
         const url = new URL(requestEvent.request.url);
-        const filepath = decodeURIComponent(url.pathname);
+        let filepath = decodeURIComponent(url.pathname);
+        if(filepath === "/") {
+            filepath = "/index.html"
+        }
 
         let file;
         try {

tutorials/1-initial-setup/src/public/index.html

@@ -38,9 +38,6 @@
                     <li class="nav-item">
                         <a class="nav-link active" aria-current="page" href="/index.html">Home</a>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="/about.html">About</a>
-                    </li>
                 </ul>
             </div>
         </div>

tutorials/2-events/src/public/index.html

@@ -39,9 +39,6 @@
                     <li class="nav-item">
                         <a class="nav-link active" aria-current="page" href="/index.html">Home</a>
                     </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="/about.html">About</a>
-                    </li>
                 </ul>
             </div>
         </div>

tutorials/3-custom-events/index.ts

@@ -1,5 +1,13 @@
-const server = Deno.listen({ port: 80 });
-console.log("File server running on http://localhost:80/index.html");
+import { parse } from "https://deno.land/[email protected]/flags/mod.ts";
+
+const flags = parse(Deno.args, {
+  string: [ "port" ],
+  default: { port: 80 },
+});
+
+const server = Deno.listen({ port: flags.port });
+console.log("File server running on http://localhost:" + flags.port + "/");
+
 const __dirname = new URL(".", import.meta.url).pathname;
 
 for await (const conn of server) {
@@ -9,7 +17,7 @@ for await (const conn of server) {
 async function handleHttp(conn: Deno.Conn) {
     const httpConn = Deno.serveHttp(conn);
     for await (const requestEvent of httpConn) {
-        
+
         const url = new URL(requestEvent.request.url);
         let filepath = decodeURIComponent(url.pathname);
         if(filepath === "/") {
@@ -32,4 +40,4 @@ async function handleHttp(conn: Deno.Conn) {
         const response = new Response(readableStream);
         await requestEvent.respondWith(response);
     }
-}
+}

tutorials/3-custom-events/src/index.ts

@@ -1,5 +1,5 @@
 {
   "tasks": {
-    "start": "deno run -A --watch=public/ index.ts"
+    "start": "deno run --allow-net --allow-read --watch=public/ index.ts"
   }
 }