Ryan Rix 2 years ago
parent
commit
f4cc32fd2d
33 changed files with 10681 additions and 199 deletions
  1. 3 2
      arcology-checkin.el
  2. 11 10
      arcology.el
  3. BIN
      blorg-images/25ZLKRlf.jpg
  4. BIN
      blorg-images/Emacs-icon.sh.png
  5. BIN
      blorg-images/IMG_0559.JPG
  6. BIN
      blorg-images/bcs-lifestream1.jpg
  7. BIN
      blorg-images/cjs1.jpg
  8. BIN
      blorg-images/cjs2.jpg
  9. BIN
      blorg-images/kindle-planck.jpg
  10. 28 12
      css/notes.css
  11. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070315.JPG
  12. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070316.JPG
  13. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070317.JPG
  14. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070319_2016-11-06_19-55-46.JPG
  15. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070320_2016-11-06_19-55-59.JPG
  16. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070321_2016-11-06_19-56-10.JPG
  17. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070323_2016-11-06_19-56-14.JPG
  18. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070325_2016-11-06_19-56-21.JPG
  19. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070327_2016-11-06_19-56-35.JPG
  20. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070329_2016-11-06_19-56-43.JPG
  21. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070330_2016-11-06_19-56-48.JPG
  22. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070332_2016-11-06_19-56-58.JPG
  23. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070333_2016-11-06_19-57-06.JPG
  24. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070335_2016-11-06_19-57-22.JPG
  25. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070336_2016-11-06_19-57-34.JPG
  26. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070337_2016-11-06_19-57-44.JPG
  27. BIN
      data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070338_2016-11-06_19-57-55.JPG
  28. 10634 170
      index.org
  29. 1 1
      templates/default.html
  30. 1 1
      templates/index.html
  31. 1 1
      templates/note.html
  32. 1 1
      templates/reply.html
  33. 1 1
      templates/review.html

+ 3 - 2
arcology-checkin.el

@@ -102,7 +102,7 @@ Register an app at https://foursquare.com/developers/apps."
 (defun arcology-checkin-venue-cached (id)
   (let ((filename (concat arcology-checkin-cache-location
                           "/" id ".el")))
-    (if (file-exists-p filename) 
+    (if (file-exists-p filename)
         (with-current-buffer (find-file-noselect filename)
           (let ((v (read (current-buffer))))
             (kill-buffer)
@@ -155,7 +155,8 @@ Used if the ID is already known, but the venue is uncached."
                                 ("m" . "foursquare"))
                       :parser 'json-read
                       :sync t)))
-    (let* ((venue (arcology-alist-get 'venue (cdar (request-response-data req))))
+    (let* ((response (arcology-alist-get 'response (request-response-data req)))
+           (venue (arcology-alist-get 'venue response))
            (venue-id (arcology-alist-get 'id venue)))
       (arcology-checkin-write-cache-venue id venue)
       venue)))

+ 11 - 10
arcology.el

@@ -145,6 +145,8 @@ cache. If PREVIEW is non-nil, skip publishing."
       (setq arcology-entry-cache nil)
       (setq arcology-full-postlist nil)
       (arcology-index-entries config))
+    (unless (file-exists-p arcology-site-root)
+      (mkdir arcology-site-root))
     (arcology-generate-modified-entries config)
     (arcology-generate-indices config))
   (unless preview
@@ -152,7 +154,7 @@ cache. If PREVIEW is non-nil, skip publishing."
     (copy-file "~/Projects/notes/go.png" (concat arcology-site-root "/go.png") t)
     (copy-file "~/Projects/notes/favicon.gif" (concat arcology-site-root "/favicon.gif") t)
     (copy-directory "~/Projects/notes/css" (concat arcology-site-root "/"))
-    (copy-directory "~/Projects/notes/font" (concat arcology-site-root "/")) 
+    (copy-directory "~/Projects/notes/font" (concat arcology-site-root "/"))
     (arcology-publish)))
 
 (defun arcology-publish ()
@@ -223,7 +225,7 @@ cache. If PREVIEW is non-nil, skip publishing."
                                                        entry-type))
                                 (entry (lax-plist-get entry-list
                                                       key)))
-                           (format "<div class=\"h-entry\"><div class=\"row\"><i class=\"icon-%s\" aria-hidden=true></i><h2 style=\"display: inline\" class=\"p-name\">%s</h2> <a class=\"u-url\" href=\"%s\"><time class=\"dt-published\" datetime=\"%s\">%s</time></a></div><div class=\"row\">%s</div></div>"
+                           (format "<div class=\"h-entry\"><div class=\"row\"><i class=\"icon-%s\" aria-hidden=true></i><h2 class=\"p-name\">%s</h2> <a class=\"u-url\" href=\"%s\"><time class=\"dt-published\" datetime=\"%s\">%s</time></a></div><div class=\"row\">%s</div></div>"
                                    (replace-regexp-in-string ":" "" (prin1-to-string entry-type))
                                    (plist-get entry :title-html)
                                    (elt metadata 3)
@@ -275,7 +277,7 @@ cache. If PREVIEW is non-nil, skip publishing."
                   (title-html (plist-get entry :title-html))
                   (content (funcall ,content-generator entry))
                   (base-url (plist-get arcology-publish-config :html-link-home))
-                  (full-url (concat base-url "/" filename))
+                  (full-url (concat "/" filename))
                   (syn-twitter-url (arcology-alist-get "SYN-TWITTER" (plist-get entry :properties)))
                   (syn-facebook-url (arcology-alist-get "SYN-FACEBOOK" (plist-get entry :properties)))
                   (syn-twitter-href (if (> (length syn-twitter-url) 0)
@@ -291,7 +293,7 @@ cache. If PREVIEW is non-nil, skip publishing."
                  extra-body)
              (arcology-write-template fullpath ,(if (boundp template-file-var)
                                                     template-file-var
-                                                  arcology-default-template-file) 
+                                                  arcology-default-template-file)
                                       :content content
                                       :title title
                                       :title-html title-html
@@ -397,9 +399,7 @@ inferring the post type of a given entry."
         (t :article)))
 
 (defun arcology-index-snippet-for-entry-at-point ()
-  (cond ((> (length (if (org-attach-dir)
-                        (org-attach-file-list (org-attach-dir))
-                      '())) 0)
+  (cond ((> (length (if (org-attach-dir) (org-attach-file-list (org-attach-dir)) '())) 0)
          (arcology-add-image-content-at-point 10))
         (t "")))
 
@@ -488,13 +488,14 @@ inferring the post type of a given entry."
      (mapconcat (lambda (file)
                   (let ((file- (concat attach-dir "/" file))
                         (newfile (concat arcology-site-root "/" id "-" file)))
+                    (message "%s" id)
                     (unless (file-exists-p newfile)
                       (copy-file file- newfile)
                       (set-file-modes newfile 420))
                     (format "%s%s%s"
-                            (concat "<a href=\"" id "-" file "\">")
-                            (concat "<img style=\"width: "
-                                    (number-to-string real-width) "%\" src=\"" id "-" file "\" class=\"u-photo\"/>")
+                            (concat "<a style=\"width: "
+                                    (number-to-string real-width) "%\" href=\"" id "-" file "\">")
+                            (concat "<img src=\"" id "-" file "\" class=\"u-photo\"/>")
                             "</a>")))
                 file-list
                 "\n"))))

BIN
blorg-images/25ZLKRlf.jpg


BIN
blorg-images/Emacs-icon.sh.png


BIN
blorg-images/IMG_0559.JPG


BIN
blorg-images/bcs-lifestream1.jpg


BIN
blorg-images/cjs1.jpg


BIN
blorg-images/cjs2.jpg


BIN
blorg-images/kindle-planck.jpg


+ 28 - 12
css/notes.css

@@ -68,6 +68,9 @@ textarea { overflow-x: auto; }
 
 
 pre {
+  overflow: auto;
+  word-wrap: normal;
+  white-space: pre;
     display: block;
     margin: 0 0 14px;
     padding: 15px;
@@ -113,31 +116,38 @@ h1,h2,h3{
 .h-feed .h-entry .dt-published {
     font-size: 0.6em !important;
 }
-.h-feed .p-name {
-  display: inline-block;
-  width: 70%;
-}
+
 .h-feed .h-entry {
   margin-bottom: 1em;
   border: solid 1px #888;
   border-radius: 5px;
   background-color: rgba(220,220,220,1);
   padding: 0.2em;
-  align-items: center;
 }
 
-.h-feed .hentry .row {
+.h-feed .h-entry .row {
+  align-items: center;
   display: flex;
 }
 
-.h-feed .h-entry .row * {
-  flex: auto;
+.h-feed .h-entry .row > i,h2,.u-url {
+  flex: 0 0 auto;
 }
 
-.h-feed .h-entry .row h2 {
-  display: inline-flex;
+.h-feed .h-entry .row > h2 {
+  display: inline;
   font-size: 1em;
   font-weight: 100;
+  flex: 3 3 auto
+}
+
+.h-feed .h-entry .row > a {
+  flex: 0 0 auto;
+  width: 18%;
+}
+
+.h-feed .h-entry .row > a > img {
+  width: 100%;
 }
 
 ul.webmentions li {
@@ -155,7 +165,7 @@ ul.webmentions li div {
 }
 
 ul.webmentions li > a {
-    width: 350px; 
+    width: 350px;
     height: 75px;
     width: 75px;
     background: url("/go.png");
@@ -174,7 +184,13 @@ ul.webmentions li div img {
 }
 
 img.u-photo {
-    display: inline;
+  display: inline;
+  width: 100%
+}
+
+.figure img {
+  display: inline;
+  width: 100%
 }
 
 @font-face {

BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070315.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070316.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070317.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070319_2016-11-06_19-55-46.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070320_2016-11-06_19-55-59.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070321_2016-11-06_19-56-10.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070323_2016-11-06_19-56-14.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070325_2016-11-06_19-56-21.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070327_2016-11-06_19-56-35.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070329_2016-11-06_19-56-43.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070330_2016-11-06_19-56-48.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070332_2016-11-06_19-56-58.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070333_2016-11-06_19-57-06.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070335_2016-11-06_19-57-22.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070336_2016-11-06_19-57-34.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070337_2016-11-06_19-57-44.JPG


BIN
data/0a/a70bae-4ea4-49fd-aaf3-e5eed8a46577/PB070338_2016-11-06_19-57-55.JPG


File diff suppressed because it is too large
+ 10634 - 170
index.org


+ 1 - 1
templates/default.html

@@ -85,7 +85,7 @@
                         <img style="width: 100%;" class="u-photo" src="http://notes.whatthefuck.computer/~rrix/25ZLKRlf.jpg"/>
                     </div>
                     <div style="display: inline-block; width: 75%" class="p-note">
-                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:whatthefuck.computer</span>.
+                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:kickass.systems</span>.
                     </div>
                     <div style="display: inline-block; width: 100%;">
                         <a href="/article.html"><i class="icon-article"></i></a>&nbsp;

+ 1 - 1
templates/index.html

@@ -80,7 +80,7 @@
                         <img style="width: 100%;" class="u-photo" src="http://notes.whatthefuck.computer/~rrix/25ZLKRlf.jpg"/>
                     </div>
                     <div style="display: inline-block; width: 75%" class="p-note">
-                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:whatthefuck.computer</span>.
+                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:kickass.systems</span>.
                     </div>
                     <div style="display: inline-block; width: 100%;">
                         <a href="/article.html"><i class="icon-article"></i></a>&nbsp;

+ 1 - 1
templates/note.html

@@ -83,7 +83,7 @@
                         <img style="width: 100%;" class="u-photo" src="http://notes.whatthefuck.computer/~rrix/25ZLKRlf.jpg"/>
                     </div>
                     <div style="display: inline-block; width: 75%" class="p-note">
-                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:whatthefuck.computer</span>.
+                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:kickass.systems</span>.
                     </div>
                     <div style="display: inline-block; width: 100%;">
                         <a href="/article.html"><i class="icon-article"></i></a>&nbsp;

+ 1 - 1
templates/reply.html

@@ -83,7 +83,7 @@
                         <img style="width: 100%;" class="u-photo" src="http://notes.whatthefuck.computer/~rrix/25ZLKRlf.jpg"/>
                     </div>
                     <div style="display: inline-block; width: 75%" class="p-note">
-                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:whatthefuck.computer</span>.
+                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:kickass.systems</span>.
                     </div>
                     <div style="display: inline-block; width: 100%;">
                         <a href="/article.html"><i class="icon-article"></i></a>&nbsp;

+ 1 - 1
templates/review.html

@@ -85,7 +85,7 @@
                         <img style="width: 100%;" class="u-photo" src="http://notes.whatthefuck.computer/~rrix/25ZLKRlf.jpg"/>
                     </div>
                     <div style="display: inline-block; width: 75%" class="p-note">
-                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:whatthefuck.computer</span>.
+                        <span class="p-name">Ryan Rix</span> is a computer infrastructure fanboy who dabbles in decentralized systems. Reach him on <a href="http://twitter.com/rrrrrrrix" rel="me" class="u-url">twitter as @rrrrrrrix</a>, via email to <a href="mailto:ryan@whatthefuck.computer" class="u-email" rel="me">ryan@whatthefuck.computer</a> or on <a rel="me" href="https://facebook.com/rjrix">Facebook</a> or on Matrix as <span rel="me" class="u-uid">@rrix:kickass.systems</span>.
                     </div>
                     <div style="display: inline-block; width: 100%;">
                         <a href="/article.html"><i class="icon-article"></i></a>&nbsp;