4 files changed, 145 insertions, 20 deletions

@@ -1,13 +1,13 @@
 !!! 5
 %html
   %head
-    %title Thoughts - Admin
+    %title= content_for?(:title) ? "Four Island - Admin - #{yield(:title)}" : "Four Island - Admin"
     = csrf_meta_tags
     = stylesheet_link_tag    'admin', media: 'all', 'data-turbolinks-track': 'reload'
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
   %body
     #banner
-      = link_to "Thoughts", root_url
+      = link_to "Four Island", root_url
       - if flash[:alert]
         #flash.flash-alert
           %span.flash-tag ERROR:
@@ -29,5 +29,21 @@
           = link_to "Streams", admin_streams_url, class: "major-link"
           %ul.minors
             %li.minor= link_to "New stream", new_admin_stream_url
+        %li{major_sidebar_attrs("links")}
+          = link_to "Links", admin_links_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "New link", new_admin_link_url
+        %li{major_sidebar_attrs("games")}
+          = link_to "Games", admin_games_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "New game", new_admin_game_url
+        %li{major_sidebar_attrs("comments")}
+          = link_to "Comments", admin_comments_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "Pending", pending_admin_comments_url
+        %li{major_sidebar_attrs("quotes")}
+          = link_to "Quotes", admin_quotes_url, class: "major-link"
+          %ul.minors
+            %li.minor= link_to "Pending", pending_admin_quotes_url
       #main
         = yield
@@ -1,29 +1,97 @@
 !!! 5
 %html
   %head
-    %title Thoughts
+    %title= content_for?(:title) ? "Four Island - #{yield(:title)}" : "Four Island"
     = csrf_meta_tags
     = stylesheet_link_tag    'main', media: 'all', 'data-turbolinks-track': 'reload'
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+    = display_meta_tags og: { site_name: "Four Island" }
+    %link{rel: "me", href: "mailto:fefferburbia+thoughts@gmail.com"}
+    %link{rel: "webmention", href: webmentions_url}
+    %link{rel: "alternate", type: "application/atom+xml", href: blogs_url(format: :atom)}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
   %body#main-body
     - if flash[:alert]
       %div#flash.flash-alert= flash[:alert]
     - if flash[:notice]
       %div#flash.flash-notice= flash[:notice]
     #container
-      #sidebar
-        .sidebar-module
-          %h2 I'm Fef.
-          %p Coding is what I do. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot.
-          %p B.S. in CS, Carnegie Mellon 2017
-        .sidebar-module
-          %h2 Meta
-          %ul
-            - if not user_signed_in?
-              %li= link_to "Log in", new_user_session_path
-            - if user_signed_in?
-              %li= link_to "Admin", admin_url
-              %li= link_to "Log out", destroy_user_session_path, method: :delete
-      #main
-        %header#banner= link_to "feffernoo.se", root_url
-        #content= yield
+      %header#banner
+        %h1 Four Island
+        = link_to image_tag("fourisland_header.png"), root_url
+      #page-body
+        #sidebar
+          .sidebar-module
+            %blockquote.pimped.bubble.rounded.bottom
+              %h2 I'm Hatkirby.
+              %p Coding is what I do. I make a lot of things, including Twitter bots. I really like Pokémon, and I write about it a lot.
+              %p B.S. in CS, Carnegie Mellon 2017
+            %cite.bubble
+              <strong>Hatkirby</strong> on Four Island
+          .sidebar-module.fun-links
+            .bubble.rounded
+              %h2 Me, elsewhere
+              %ul
+                %li
+                  = image_tag "user_comment.png"
+                  = link_to "Mastodon", "https://beppo.online/@starlight", rel: "me"
+                %li
+                  = image_tag "rainbow.png"
+                  = link_to "Archive of Our Own", "https://archiveofourown.org/users/StarlightSystem"
+                %li
+                  = image_tag "bricks.png"
+                  = link_to "itch.io", "https://hatkirby.itch.io"
+                %li
+                  = image_tag "controller.png"
+                  = link_to "Speedrun.com", "https://www.speedrun.com/users/hatkirby"
+          .sidebar-module.fun-links
+            .bubble.rounded
+              %h2 Projects
+              %ul
+                - links_sidebar().each do |link|
+                  %li
+                    = image_tag "tag_#{cycle("blue", "green", "orange", "pink", "purple", "red", "yellow")}.png"
+                    = link_to link[:title], link[:url], link.include?(:extra) ? link[:extra] : {}
+          .sidebar-module.fun-links
+            .bubble.rounded
+              %h2 Friends
+              %ul
+                - friends_sidebar().each do |link|
+                  %li
+                    = image_tag "tag_#{cycle("blue", "green", "orange", "pink", "purple", "red", "yellow")}.png"
+                    = link_to link[:title], link[:url], link.include?(:extra) ? link[:extra] : {}
+          .sidebar-module.fun-links
+            .bubble.rounded
+              %h2 Blog links
+              %ul
+                %li
+                  = image_tag "book_open.png"
+                  = link_to "Archive", blogs_url
+                %li
+                  = image_tag "tag_blue.png"
+                  = link_to "Tag cloud", tags_url
+                %li
+                  = image_tag "feed.png"
+                  = link_to "Atom feed", blogs_url(format: :atom)
+          - unless @random_song.nil?
+            .sidebar-module#scrobble-box
+              .bubble.rounded
+                %h2 Listening to
+                = image_tag @random_song.image, width: "174px"
+                %p
+                  %strong= @random_song.title
+                  by
+                  = @random_song.artist
+                %p= @random_song.album
+          .sidebar-module
+            .bubble.rounded
+              %h2 Meta
+              %ul
+                - if not user_signed_in?
+                  %li= link_to "Log in", new_user_session_path
+                - if user_signed_in?
+                  = yield :meta_sidebar_content
+                  %li= link_to "Admin", admin_url
+                  %li= link_to "Log out", destroy_user_session_path, method: :delete
+        #main
+          #content= yield
@@ -0,0 +1,41 @@
+!!! 5
+%html
+  %head
+    %title The Four Island Quotes DB
+    %meta{ :charset => "utf-8" }
+    = stylesheet_link_tag "quotes"
+    = javascript_include_tag "application"
+    = csrf_meta_tag
+    = auto_discovery_link_tag :atom, latest_quotes_url(:atom)
+    = display_meta_tags og: { site_name: "Four Island" }
+    %link{rel: "alternate", type: "application/atom+xml", href: latest_quotes_url(:atom)}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
+  %body
+    #wrap
+      %header#banner
+        %h1#banner-title= link_to "The Four Island Quotes DB", quotes_url
+        #banner-abbr FIQDB
+        .cleardiv
+      %nav#top-bar
+        %ul
+          %li= link_to_unless_current "Home", quotes_url
+          %li= link_to_unless_current "Latest", latest_quotes_url
+          %li= link_to_unless_current "Top", top_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to "Random", random_quotes_url
+          - if user_signed_in?
+            %li= link_to_unless_current "Submit", new_quote_url
+          %li= link_to_unless_current "Tags", tags_quotes_url
+          %li= link_to_unless_current "Search", search_form_quotes_url
+          %li{"data-turbolinks" => "false"}= link_to_unless_current "Stats", stats_quotes_url 
+          %li= link_to_unless_current "Feed", latest_quotes_url(:atom)
+          - if user_signed_in?
+            %li= link_to_unless_current "Admin", admin_url
+        .cleardiv
+      #page-body
+        - if flash[:notice]
+          #flash= flash[:notice]
+        = yield
+      %footer
+        #footer-left= raw "The Four Island Quotes DB is a #{link_to "Four Island", root_url} project and is &copy;&nbsp;hatkirby&nbsp;2008-#{Time.now.year}"
+        #footer-right #{Quote.published.count} approved quotes; #{Quote.pending.count} pending quotes
+        .cleardiv
@@ -1,7 +1,7 @@
 !!! 5
 %html
   %head
-    %title Thoughts
+    %title Four Island
     = csrf_meta_tags
     = stylesheet_link_tag    'userdata', media: 'all', 'data-turbolinks-track': 'reload'
     = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'