Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Sandra/Sandra.Snow
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pxtl
Pxtl committed Dec 4, 2023
2 parents eaa9bbd + 72b097d commit 10e2df4
Show file tree
Hide file tree
Showing 6 changed files with 220 additions and 47 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-snow.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Build Snow
# compile Sandra.Snow binary in release mode and publish as artifact "Snow"

on:
push:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/publish-website.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Publish Website

Check warning on line 1 in .github/workflows/publish-website.yml

View workflow job for this annotation

GitHub Actions / publish 

Mandatory repo variable WEBSITE_REPO is not set.
# publish SnowSite to the repo set in vars.WEBSITE_REPO, using the pat defined in secrets.WEBSITE_PAT
# note that this action overrides the output paths set in the snow config file

on:
push:
Expand Down
84 changes: 42 additions & 42 deletions SnowSite/Snow/snow.config.json
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
{
"blogTitle" : "Pxtl.ca",
"siteUrl": "http://pxtl.ca",
"author": "Martin Zarate",
"email": "pxtl@hotmail.com",
"posts": "_posts",
"pages": "_pages",
"layouts": "_layouts",
"theme": "pxtlca",
"postsOutput": "../../../Pxtl.github.io",
"pagesOutput": "../../../Pxtl.github.io",
"urlFormat": "yyyy/MM/slug",
"copyDirectories": [
"images",
"javascripts",
"stylesheets"
],
"defaultPostLayout": "post",
"processFiles": [{
"file": "index.cshtml",
"loop": "Posts"
},{
"file": "category.cshtml",
"loop": "Categories"
},{
"file": "categories.cshtml => category",
"title": "Categories"
"blogTitle" : "Pxtl.ca",
"siteUrl": "http://pxtl.ca",
"author": "Martin Zarate",
"email": "pxtl@hotmail.com",
"posts": "_posts",
"pages": "_pages",
"layouts": "_layouts",
"theme": "pxtlca",
"postsOutput": "../../../Pxtl.github.io",
"pagesOutput": "../../../Pxtl.github.io",
"urlFormat": "yyyy/MM/slug",
"copyDirectories": [
"images",
"javascripts",
"stylesheets"
],
"defaultPostLayout": "post",
"processFiles": [{
"file": "index.cshtml",
"loop": "Posts"
},{
"file": "archive.cshtml",
"title": "Archive"
"file": "category.cshtml",
"loop": "Categories"
},{
"file": "about.cshtml"
},{
"file": "drafts.cshtml",
"loop": "Drafts"
"file": "categories.cshtml => category",
"title": "Categories"
},{
"file": "archive.cshtml",
"title": "Archive"
},{
"file": "about.cshtml"
},{
"file": "feed.xml",
"loop": "atom"
},{
"file": "rss.xml",
"loop": "rss"
},{
"file": "sitemap.xml",
"loop": "sitemap"
}]
}
"file": "drafts.cshtml",
"loop": "Drafts"
},{
"file": "feed.xml",
"loop": "atom"
},{
"file": "rss.xml",
"loop": "rss"
},{
"file": "sitemap.xml",
"loop": "sitemap"
}]
}
133 changes: 133 additions & 0 deletions SnowSite/Snow/themes/default/_layouts/default.cshtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase<Snow.ViewModels.BaseViewModel>
@using System.Collections.Generic
@{
var keywords = String.Join(",", Model.Keywords);
var title = String.Join(" • ", Model.HeaderTitleChain);
}
<!DOCTYPE html>
<html dir="ltr" lang="en-US">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width" />
<meta http-equiv="last-modified" content="@Model.GeneratedDate" />
<meta name="keywords" content="@keywords" />
<title>@title</title>
<link rel="stylesheet" type="text/css" href="/stylesheets/style.css" />
@Html.CanonicalUrl()
</head>
<body class="home blog">
<div id="page" class="hfeed site">
<header id="masthead" class="site-header fancy-container lightgreen" role="banner">
<hgroup>
<h1 class="site-title"><a href="/" title="philliphaydon.com" rel="home">philliphaydon.com</a></h1>
<h2><small>Works on my PC...</small></h2>
<p class="site-description">Pleb from New Zealand who was banished overseas and currently resides in Singapore.</p>
</hgroup>
<nav role="navigation" class="site-navigation main-navigation">
<h1 class="assistive-text">Menu</h1>
<div class="assistive-text skip-link"><a href="#content" title="Skip to content">Skip to content</a></div>
<div class="menu">
<ul>
<li><a href="/about">About</a></li>
<li><a href="/category">Categories</a></li>
<li><a href="/archive">Archive</a></li>
<li><a href="/rss.xml">RSS</a> / <a href="/feed.xml">Atom</a></li>
</ul>
</div>
</nav>
</header>
<div id="main">
<div id="primary" class="site-content">
<div id="content" role="main">
@RenderBody()
</div>
<!-- #content -->
</div>
<!-- #primary .site-content -->

<div id="secondary" class="widget-area fancy-container lightred" role="complementary">
<aside id="text-5" class="widget widget_text">
<h1 class="widget-title">Follow</h1>
<div class="textwidget logos">
<a href="https://twitter.com/philliphaydon" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://twitter.com']);"><img src="/stylesheets/images/twitter.png"></a>
<a href="http://stackoverflow.com/users/456813/phill" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://stackoverflow.com']);"><img src="/stylesheets/images/stackoverflow.png"></a>
<a href="http://www.linkedin.com/in/philliphaydon" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://www.linkedin.com']);"><img src="/stylesheets/images/linkedin.png"></a>
<a href="https://plus.google.com/u/0/111751877537461442095" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://plus.google.com']);"><img src="/stylesheets/images/googleplus.png"></a>
<a href="https://coderbits.com/philliphaydon" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','https://coderbits.com/philliphaydon']);"><img src="/stylesheets/images/codebits.png"></a>
<a href="https://github.com/phillip-haydon" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://github.com']);"><img src="/stylesheets/images/github.png"></a>
<a href="http://www.codeschool.com/users/philliphaydon" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://codeschool.com']);"><img src="/stylesheets/images/codeschool.png"></a>
<a href="http://www.kickstarter.com/profile/phillip-haydon" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://kickstarter.com']);"><img src="/stylesheets/images/kickstarter.png"></a>
</div>
<a href="http://stackoverflow.com/users/456813/phill">
<img src="http://stackoverflow.com/users/flair/456813.png" width="208" height="58" alt="profile for Phill at Stack Overflow, Q&amp;A for professional and enthusiast programmers" title="profile for Phill at Stack Overflow, Q&amp;A for professional and enthusiast programmers">
</a>

<a href="http://nancyfx.org/mvm.html"><img src="/stylesheets/images/mvm.png"></a>

<div id = "clustrback" style="width:162px; height:133px; background:#f7f7f7 url(http://clustrmaps.com/admin/3d/images/st4_grey.png) center no-repeat; text-align:center;">
<a href="http://www2.clustrmaps.com/counter/maps.php?url=http://www.philliphaydon.com/" style="width:160px; display:block; margin:0 auto;" id="clustrMapsLink">
<img src="http://www2.clustrmaps.com/counter/index2.php?url=http://www.philliphaydon.com/" style="border:0px; margin:15px auto;margin:15px auto;" alt="Locations of visitors to this page" title="Locations of visitors to this page" id="clustrMapsImg" />
</a>
</div>
</aside>
<!--aside id="text-8" class="widget widget_text">
<h1 class="widget-title">Other sites</h1>
<div class="textwidget">
<a href="http://csharptube.com/" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://csharptube.com']);">csharptube.com</a><br />
<a href="http://thisisparrot.com/" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://thisisparrot.com']);">Parrot</a><br />
<a href="http://shitprogrammerswrite.com/" onclick="javascript:_gaq.push(['_trackEvent','outbound-widget','http://shitprogrammerswrite.com']);">Shit programmers write</a><br />
</div>
</aside-->
<aside id="linkcat-6" class="widget widget_links">
<h1 class="widget-title">Other Blogs</h1>
<ul class='xoxo blogroll'>
<li><a href="http://www.nickharris.net/" target="_top" onclick="javascript:_gaq.push(['_trackEvent','outbound-blogroll','http://nickharris.net/']);">Nick Harris</a></li>
<li><a href="http://www.mindscapehq.com/blog/" target="_top" onclick="javascript:_gaq.push(['_trackEvent','outbound-blogroll','http://www.mindscapehq.com/blog/']);">Mindscape</a></li>
<li><a href="http://blog.orangelightning.co.uk/" target="" onclick="javascript:_gaq.push(['_trackEvent','outbound-blogroll','http://blog.orangelightning.co.uk/']);">Phil Jones</a></li>
<li><a href="http://buildstarted.com/" target="" onclick="javascript:_gaq.push(['_trackEvent','outbound-blogroll','http://buildstarted.com']);">Ben Dornis</a></li>
<li><a href="http://jflood.net/" target="" onclick="javascript:_gaq.push(['_trackEvent','outbound-blogroll','http://jflood.net/']);">Jospeh Flood</a></li>
</ul>

</aside>
<aside id="archives-4" class="widget widget_archive">
<h1 class="widget-title">Archive</h1>
<ul class="posts">
@foreach(var item in Model.MonthYearList)
{
<li><a href="@item.Url">@item.Title</a></li>
}
</ul>
</aside>
</div>
<!-- #secondary .widget-area -->


</div>
<!-- #main -->

<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">
Powered by <a href="https://github.com/Sandra/Sandra.Snow" rel="generator">Sandra.Snow</a>.
</div>
<!-- .site-info -->
</footer>
<!-- #colophon .site-footer -->
</div>
<!-- #page .hfeed .site -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script src='/javascripts/prettify.js' type='text/javascript'></script>
@Html.RenderGoogleAnalytics("UA-000000-00")
<script type='text/javascript'>
$(function () {
$("pre code").parent().each(function () {
if (!$(this).hasClass("prettyprint")) {
$(this).addClass("prettyprint");
a = true
}
});
prettyPrint();
});
</script>
</body>
</html>
44 changes: 40 additions & 4 deletions publish.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,50 @@
param(
[Parameter(Position=0,mandatory=$true)][string]$message
#.SYNOPSIS
# Simple 1-step publish script, but has many assumptions. See description.

#.DESCRIPTION
# This publish is a simple local convenience measure for publishing SnowSite
# from localhost to your gitrepo, assuming you've customized SnowSite to become
# your site.
#
# It also assumes you've already compiled Sandra.snow in "debug" mode.
#
# It also assumes that your "config" is set to output directly into your target
# static site repo.
#
# If any of these assumptions are false, you may need to use a different publish
# script, or customize this one.

param (
# git commit message for both Sandra.Snow repo and output repo.
[Parameter(mandatory)]
[string] $commitMessage,

# path to the config file. Must be in the site directory. Defaults to SnowSite\Snow\Snow.config
[Parameter()]
[IO.FileInfo] $configPath = $null
)

& src\Snow\bin\Debug\Snow config=.\SnowSite\Snow\Snow.config.json
Push-Location $PSScriptRoot

# defaulting.
if (-not $configPath) {
$configPath = [IO.FileInfo](Resolve-Path ".\SnowSite\Snow\Snow.config.json").Path
}
$configDirPath = Split-Path $configPath -Parent
$outputPath = Resolve-Path (Join-Path $configDirPath $config.postsOutput)

& src\Snow\bin\Debug\Snow config=$configPath

#region commits
git add .
git commit -m $message
git push

Push-Location ..\Pxtl.github.io\
Push-Location $outputPath
git add .
git commit -m $message
git push
Pop-Location
#endregion commits

Pop-Location
4 changes: 3 additions & 1 deletion src/Snow/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,9 @@ private static void Main(string[] args)
SnowServer.Start(settings);
}

if (commands.ContainsKey("debug"))
if (commands.ContainsKey("debug")
&& !commands.ContainsKey("server") //server already has press-any-key-to-stop so waitforcontinue is redundant.
)
{
DebugHelperExtensions.WaitForContinue();
}
Expand Down

0 comments on commit 10e2df4

Please sign in to comment.