Initial commit

author: Mark Powers <markppowers0@gmail.com> 2018-12-09 12:43:06 -0500
committer: Mark Powers <markppowers0@gmail.com> 2018-12-09 12:43:06 -0500
commit: 3d1b09c628b58f8bc9f9c76682d3d78885ae6376 (patch)
tree: a064a57b10202bfad25d46622deed86de115cec2 /src
parent: d00a1a362b04699b246be4ca2ca471fbce60368b (diff)
20 files changed, 344 insertions, 0 deletions
diff --git a/src/css/bootstrap.css b/src/css/bootstrap.css
new file mode 120000
index 0000000..a78be59
--- /dev/null
+++ b/src/css/bootstrap.css
@@ -0,0 +1 @@
+../../node_modules/bootstrap/dist/css/bootstrap.css
+\ No newline at end of file
diff --git a/src/css/styles.css b/src/css/styles.css
new file mode 100644
index 0000000..08a5f38
--- /dev/null
+++ b/src/css/styles.css
@@ -0,0 +1,58 @@
+body {
+    padding: 15px;
+}
+
+.essay{
+    width: 70%;
+}
+
+.figure {
+    border: 1px solid #777777; 
+    background-color: #dddddd;
+    padding: 10px;
+}
+
+.item {
+    margin: 10px;
+    border: 2px solid #777777;
+    border-radius: 5px;
+    padding: 7px;
+}
+
+img {
+    image-orientation: from-image;
+}
+
+.card img {
+    width: 80%;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 2em;
+}
+
+.sidebar {
+    height: 100vh; 
+    width: 15%; 
+    margin: 20px;
+}
+
+.sidebar ul {
+    list-style: none;
+    padding: 0;
+}
+
+.sidebar ul li {
+    display: block;
+    margin: 5px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.btn-primary {
+    width: 100%;
+    height: 2em;
+    border-radius: 0;
+    text-align: center;
+    font-size: 20px;
+}
diff --git a/src/html/bread.html b/src/html/bread.html
new file mode 100644
index 0000000..af2a665
--- /dev/null
+++ b/src/html/bread.html
@@ -0,0 +1,99 @@
+<!doctype html>
+<html lang="en">
+ <head>
+  <title>Mark's Kitchen - Bread</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+  <link rel="stylesheet" type="text/css" href="css/styles.css">
+ </head>
+ <body>
+     <div class="container-fluid">
+         <br>
+         <h1>Bread</h1>
+         <div class="row">
+            <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">First sourdough, mainly wheat</p>
+                        <img src="first-1.jpg">
+                        <img src="first-2.jpg">
+			<br>
+			<p>Aug 9, 2018</p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">Used more white flour this time</p>
+                        <img src="photo/white-1.jpg">
+                        <img src="photo/white-2.jpg">
+			<br>
+			<p>Aug 16, 2018</p>
+                    </div>
+                </div>
+            </div>
+	 </div>	
+         <div class="row">
+            <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">Severely messed up the recipie this time. Tried to double to get two loafs, both turned out flat.</p>
+                        <img src="photo/flat1.jpg">
+                        <img src="photo/flat2.jpg">
+			<br>
+			<p>Aug 30, 2018</p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">First time using a banneton, beautiful shape. Tried a different knead style too. Rye-AP mix</p>
+                        <img src="photo/ban1.jpg">
+                        <img src="photo/ban2.jpg">
+			<br>
+			<p>Sep 19, 2018</p>
+                    </div>
+                </div>
+            </div>
+         </div>
+	 <div class="row">
+            <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">I wanted to try the NY Times no knead recipie. Bread turned out delicious. Will try to tranfer to a loaf shape next time for slices.</p>
+                        <img src="photo/nyt1.jpg">
+                        <img src="photo/nyt2.jpg">
+			<br>
+			<p>Sep 27, 2018</p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">A twist on normal beer bread, using hard cider.</p>
+                        <img src="photo/cider.jpg">
+			<br>
+			<p>Sep 30, 2018</p>
+                    </div>
+                </div>
+            </div>
+	</div>
+	 <div class="row">
+           <div class="col-md">
+                <div class="card">
+                    <div class="card-body">
+                        <p class="card-text">Tried to make something more sandwich-y. 4 hour warm proof with wheat, rye, and corn flours. A bit dense, but not bad.</p>
+                        <img src="photo/wheat.jpg">
+			<br>
+			<p>Sep 30, 2018</p>
+                    </div>
+                </div>
+            </div>
+	</div>
+     </div>
+ </body>
+</html>
diff --git a/src/html/essay.html b/src/html/essay.html
new file mode 100644
index 0000000..a3e88e1
--- /dev/null
+++ b/src/html/essay.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html lang="en">
+ <head>
+  <title>Mark's Kitchen - Essay</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" type="text/css" href="/css/bootstrap.css">
+  <link rel="stylesheet" type="text/css" href="/css/styles.css">
+ </head>
+ <body>
+     <div class="container">
+         <br>
+         <h1>Essay</h1>
+            <div class="card">
+                <div class="card-body">
+                    <p class="card-text">
+                        When digging through generated assembly code, some strange numbers showed
+                        up. This essay briefly explains what was going on.
+                    </p>
+                    <a href="essay/magic-division.html" class="btn btn-primary">Read</a>
+                </div>
+            </div>
+     </div>
+ </body>
+</html>
diff --git a/src/html/essay/magic-division.html b/src/html/essay/magic-division.html
new file mode 100644
index 0000000..f40048d
--- /dev/null
+++ b/src/html/essay/magic-division.html
@@ -0,0 +1,95 @@
+<!doctype html>
+<html lang="en">
+ <head>
+  <title>Magic Division</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  
+ </head>
+ <body>
+    <link rel="stylesheet" type="text/css" href="/css/styles.css">
+    <div class="essay">
+        <h2>Magic Division -- Or Division by Integer Multiplication</h2>
+
+        <p>I noticed something strange in the assembly generated when compiling a program 
+            using <code>gcc</code> an optimization turned off. Here it is in <a href="#figure1">Figure 1</a>
+            (though using optimization level 3 just to simplify, but it still shows in level 0).
+            In this generated assembly, we see instead of using the <code>div</code> operator, 
+            something strange is going on with the number 1717986919 and shifting. My first 
+            attempts at searching for this phenomenon online were not helpful. The first result 
+            for the number was on Amazon as a book identifier. This number also shows up on 
+            stack overflow, however it is no more helpful. No one on the post is talking about 
+            why this number is in the generated code (or perhaps they all know this arcane 
+            secret and don’t wish share). Eventually, I found out what was going on. Even 
+            with no optimization, the compiler prefers to generate multiplication operator 
+            over the division operator.
+        </p>
+        <p>We will consider unsigned integer division first. Let 
+            <span class="math inline"><em>d</em></span> 
+            be some constant divisor, and <span class="math inline"><em>n</em></span> 
+            our numerator (for now let’s make <span class="math inline"><em>n</em></span> 
+            a multiple of <span class="math inline"><em>d</em></span>). We will assume 
+            integers are 32 bits. In order to computer 
+            <span class="math inline"><em>n</em>/<em>d</em></span>, 
+            first we need to know the values <span class="math inline"><em>l</em></span> 
+            and <span class="math inline"><em>i</em></span> where 
+            <span class="math inline"><em>d</em> = <em>l</em>2<sup><em>i</em></sup></span>. 
+            So to begin out division, we can shift <span class="math inline"><em>n</em></span> 
+            by <span class="math inline"><em>i</em></span> bits. Now we must divide this result 
+            be <span class="math inline"><em>l</em></span>. Since 
+            <span class="math inline"><em>l</em></span> will be odd, there exists some 
+            inverse of <span class="math inline"><em>l</em></span>, called 
+            <span class="math inline"><em>j</em></span> where <br />
+            <span class="math display"><em>l</em><em>j</em> = 1(mod 2<sup>32</sup>)</span><br /> 
+            So for any number <span class="math inline"><em>x</em></span>, 
+            <span class="math inline"><em>x</em>/<em>l</em> = (<em>x</em><em>j</em>)/(<em>l</em><em>j</em>)=<em>x</em><em>j</em></span>. 
+            So now all that is left after the shift is to multiply by 
+            <span class="math inline"><em>j</em></span>, and we will 
+            have computed <span class="math inline"><em>n</em>/<em>d</em></span>.</p>
+        <p>Dealing with remainder can go pretty in depth, and I recommend 
+            reading the chapter in Hacker’s Delight about this topic 
+            <a class="citation" href="#hacker">[1]</a>. Another write up can be found
+            in the MSDN blog archive <a class="citation" href="#msdn">[2]</a>.
+        </p>
+
+        <div class="figure">
+        <a name="figure1"><h4>Figure 1</h4></a>
+        <span>Source:</span>
+        <div class="sourceCode" frame="single" numbers="left" language="c">
+        <pre><code class="sourceCode">
+int div20(int n){
+    return a/20;
+}
+        </code></pre></div>
+        <span>Compiled excerpt:</span>
+        <div class="sourceCode" frame="single" numbers="left">
+            <pre><code class="sourceCode">
+.cfi_startproc
+movl    %edi, %eax
+movl    $1717986919, %edx
+sarl    $31, %edi
+imull   %edx
+sarl    $3, %edx
+movl    %edx, %eax
+subl    %edi, %eax
+ret
+.cfi_endproc
+        </code></pre></div>
+        </div>
+
+        <h3>References</h3>
+        <p><a name="hacker">1</a> Hacker’s Delight Chapter 10. 
+            (<em><a href="http://www.hackersdelight.org/divcMore.pdf">
+                http://www.hackersdelight.org/divcMore.pdf
+                </a>
+            </em>)
+        </p>
+        <p><a name="msdn">2</a> MSDN Blog Archive 
+            (<em><a href="https://blogs.msdn.microsoft.com/devdev/2005/12/12/integer-division-by-constants/">
+                https://blogs.msdn.microsoft.com/devdev/2005/12/12/integer-division-by-constants/
+                </a>
+            </em>)
+        </p>
+    </div>
+    </body>
+</html>
+\ No newline at end of file
diff --git a/src/html/index.html b/src/html/index.html
new file mode 100644
index 0000000..0e15b8c
--- /dev/null
+++ b/src/html/index.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html lang="en">
+ <head>
+  <title>Mark's Kitchen</title>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <link rel="stylesheet" type="text/css" href="css/bootstrap.css">
+  <link rel="stylesheet" type="text/css" href="css/styles.css">
+ </head>
+ <body>
+    <h1>Welcome to Mark's Kitchen</h1>
+    <nav class="float-left sidebar">
+        <ul>
+            <li><a href="bread" class="btn btn-primary">Bread</a></li>
+            <li><a href="essay" class="btn btn-primary">Essays</a></li>
+        </ul>
+    </nav>
+    
+    <div>
+        <div class="card item">
+            <div class="card-body">
+                <p class="card-text">
+                    Come check out my gallery of homemade bread, featuring mainly artisan sourdough.
+                </p>
+            </div>
+        </div>
+    </div>
+ </body>
+</html>
diff --git a/src/index.js b/src/index.js
new file mode 100644
index 0000000..767acb5
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1,4 @@
+const server = require('./server');
+server.setUpRoutes();
+server.listen();
+
diff --git a/src/photo/ban1.jpg b/src/photo/ban1.jpg
new file mode 100644
index 0000000..0330443
--- /dev/null
+++ b/src/photo/ban1.jpg
diff --git a/src/photo/ban2.jpg b/src/photo/ban2.jpg
new file mode 100644
index 0000000..f868504
--- /dev/null
+++ b/src/photo/ban2.jpg
diff --git a/src/photo/cider.jpg b/src/photo/cider.jpg
new file mode 100644
index 0000000..176a094
--- /dev/null
+++ b/src/photo/cider.jpg
diff --git a/src/photo/first-1.jpg b/src/photo/first-1.jpg
new file mode 100644
index 0000000..664acd7
--- /dev/null
+++ b/src/photo/first-1.jpg
diff --git a/src/photo/first-2.jpg b/src/photo/first-2.jpg
new file mode 100644
index 0000000..11f2ab7
--- /dev/null
+++ b/src/photo/first-2.jpg
diff --git a/src/photo/flat1.jpg b/src/photo/flat1.jpg
new file mode 100644
index 0000000..ff6df1c
--- /dev/null
+++ b/src/photo/flat1.jpg
diff --git a/src/photo/flat2.jpg b/src/photo/flat2.jpg
new file mode 100644
index 0000000..d07f638
--- /dev/null
+++ b/src/photo/flat2.jpg
diff --git a/src/photo/nyt1.jpg b/src/photo/nyt1.jpg
new file mode 100644
index 0000000..a31e79e
--- /dev/null
+++ b/src/photo/nyt1.jpg
diff --git a/src/photo/nyt2.jpg b/src/photo/nyt2.jpg
new file mode 100644
index 0000000..5c955da
--- /dev/null
+++ b/src/photo/nyt2.jpg
diff --git a/src/photo/wheat.jpg b/src/photo/wheat.jpg
new file mode 100644
index 0000000..b039eb6
--- /dev/null
+++ b/src/photo/wheat.jpg
diff --git a/src/photo/white-1.jpg b/src/photo/white-1.jpg
new file mode 100644
index 0000000..a58d50b
--- /dev/null
+++ b/src/photo/white-1.jpg
diff --git a/src/photo/white-2.jpg b/src/photo/white-2.jpg
new file mode 100644
index 0000000..87b8343
--- /dev/null
+++ b/src/photo/white-2.jpg
diff --git a/src/server.js b/src/server.js
new file mode 100644
index 0000000..e2cfb20
--- /dev/null
+++ b/src/server.js
@@ -0,0 +1,33 @@
+const express = require('express');
+
+const port = 80;
+
+const server = express();
+
+function listen(){
+    server.listen(port, () => console.info(`Listening on port ${port}!`));
+}
+
+function setUpRoutes(){
+    server.get('/', (req, res) => res.sendFile(__dirname + "/html/index.html"))
+    server.get('/bread', (req, res) => res.sendFile(__dirname + "/html/bread.html"));
+    server.get('/essay', (req, res) => res.sendFile(__dirname + "/html/essay.html"));
+
+
+    server.get('/css/:id', (req, res) => {
+        res.sendFile(__dirname + "/css/"+req.params.id);
+    });
+    server.get('/photo/:id', (req, res) => { 
+        res.sendFile(__dirname + "/photo/"+req.params.id);
+    });
+    server.get('/essay/:id', (req, res) => { 
+        res.sendFile(__dirname + "/html/essay/"+req.params.id);
+    });
+
+}
+
+module.exports = {
+    listen,
+    setUpRoutes
+};
+
author	Mark Powers <markppowers0@gmail.com>	2018-12-09 12:43:06 -0500
committer	Mark Powers <markppowers0@gmail.com>	2018-12-09 12:43:06 -0500
commit	3d1b09c628b58f8bc9f9c76682d3d78885ae6376 (patch)
tree	a064a57b10202bfad25d46622deed86de115cec2 /src
parent	d00a1a362b04699b246be4ca2ca471fbce60368b (diff)