Merge pull request #1 from ashutosh2k12/master

Added projects as custom collection

README.md

@@ -15,6 +15,10 @@
 * Highlight pre
 * Next & Previous Post
 * Disqus comment
+* Projects
+* Project page
+* Share on social media
+* Google analytics
 
 #### Screenshot
 

_config.yml

@@ -3,16 +3,49 @@ description: My Personal Stack Problems
 author: Agus Makmun
 github: https://github.com/agusmakmun
 about: I am freelance developer. Currently doing more in backend, actually in Python and Django.
+disqus_shortname: aboutashu
+google_analytics: UA-XXXXXXXX-Y
+
+enableTags: true
+tagarray: []
+
+collections:
+  project:
+    output: true
+    permalink: /project/:path/
+
+social:
+    - icon: fa-facebook
+      link: "#"
+    - icon: fa-skype
+      link: "#"
+    - icon: fa-twitter
+      link: "#"
+    - icon: fa-linkedin
+      link: "#"
+    - icon: fa-stack-exchange
+      link: "#"
+
+share:
+  twitter_username: 216ashutosh
+  fb_appid: 0000000000000
+
 urls:
     - text: About Me
       url: /about/
+    - text: Projects
+      url: /projects/
     - text: Github
       url: https://github.com/agusmakmun
     - text: XML Feed
       url: /feed.xml
+
 url: "https://agusmakmun.github.io"
 baseurl: ""
 paginate: 20
 per_page: 20
 paginate_path: "/page:num/"
 markdown: kramdown
+gems:
+  - jekyll-paginate
+  - jekyll-gist

_data/projects.json

@@ -0,0 +1,31 @@
+[
+	{
+		"slug": "cool-project",
+		"name": "Cool project 1",
+		"image": "placeholder.jpg",
+		"url": "#",
+		"date": "Jan 2014",
+		"tags": ["Angular JS","API"]
+	},
+	{
+		"name": "Cool project 2",
+		"image": "placeholder.jpg",
+		"url": "#",
+		"date": "May 2014",
+		"tags": ["Android","PHP"]
+	},
+	{
+		"name": "Cool project 3",
+		"image": "placeholder.jpg",
+		"url": "#",
+		"date": "June 2014",
+		"tags": ["HTML","JQuery","PHP"]
+	},
+	{
+		"name": "Cool project 4",
+		"image": "placeholder.jpg",
+		"date": "Oct 2016",
+		"tags": ["Android","nodejs"]
+	}
+
+]

_includes/analytics.html

@@ -0,0 +1,10 @@
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '{{ site.google_analytics }}', 'auto');
+  ga('send', 'pageview');
+
+</script>

_includes/project_tags.html

@@ -0,0 +1,25 @@
+{% if site.enableTags ==  true %} 
+	<div id="tag-filter" class="tag-group">
+		<span class="tag-filter tag-cloud all active">All</span>
+        {% assign tagarray = site.tagarray %}
+        {% for project in site.data.projects %}
+            {% for tag in project.tags %}
+                {% assign tagarray = tagarray | push: tag %}
+            {% endfor %}
+        {% endfor %}
+
+        {% assign tags = tagarray[1] %}
+        {% for item in tagarray %}
+            {% assign tagDown = item | downcase %}
+            {% assign tagComp = tags | downcase %}
+            {% unless tagComp contains tagDown %}
+                {% capture tags %}{{ tags }}|{{ item }}{% endcapture %}
+            {% endunless %}
+        {% endfor %}
+
+        {% assign taglist = tags | split: '|' | sort %}
+        {% for tag in taglist %}
+            <span class="tag-filter tag-cloud" data-tag="{{ tag | downcase }}">{{ tag }}</span>
+        {% endfor %}
+	</div>
+{% endif %}

_includes/share-page.html

@@ -0,0 +1,20 @@
+<div class="share-page">
+    Share this on &rarr;
+ <a href="https://twitter.com/share" class="twitter-share-button" data-via="{{ site.share.twitter_username }}">Tweet</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+
+<!-- Google + -->
+<div class="g-plus" data-action="share" data-annotation="bubble"></div>
+<script src="https://apis.google.com/js/platform.js" async defer></script>
+
+<!-- Facebook -->
+<div class="fb-share-button" data-href="{{site.url}}{{page.url}}" data-layout="button_count" style="position: relative; top: -8px; left: 3px;"></div>
+</div>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.6&appId={{ site.share.fb_appid }}";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>

_includes/social_links.html

@@ -0,0 +1,7 @@
+<div class="social">
+	<ul>
+		{% for link in site.social %}
+			<li><a href="{{ link.link }}" target="_blank"><i class="fa {{ link.icon }}"></i></a></li>
+		{% endfor %}
+	</ul>
+</div>

_layouts/default.html

@@ -12,6 +12,69 @@
         <meta name="keywords" content="{% if page.title %}{{ page.title }}, {{ site.title }}, {% for categ in page.categories %}{{ categ }}{% if forloop.last == false %}, {% endif %}{% endfor %}{% else %}{{ site.title }}, {% for category in site.categories %}{% capture categories_slug %}{{ category | first }}{% endcapture %}{% for categ in categories_slug %}{{ categ }}{% endfor %}{% if forloop.last == false %}, {% endif %}{% endfor %}{% endif %}" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="/feed.xml">
 
+        <meta content="{{ site.share.fb_appid }}" property="fb:app_id">
+        <meta content="{{ site.title }}" property="og:site_name">
+        {% if page.title %}
+          <meta content="{{ page.title }}" property="og:title">
+        {% else %}
+          <meta content="{{ site.title }}" property="og:title">
+        {% endif %}
+        {% if page.title %}
+          <meta content="article" property="og:type">
+        {% else %}
+          <meta content="website" property="og:type">
+        {% endif %}
+        {% if page.description %}
+          <meta content="{{ page.description }}" property="og:description">
+        {% else %}
+          <meta content="{{ site.description }}" property="og:description">
+        {% endif %}
+        {% if page.url %}
+          <meta content="{{ site.url }}{{ page.url }}" property="og:url">
+        {% endif %}
+        {% if page.date %}
+          <meta content="{{ page.date | date_to_xmlschema }}" property="article:published_time">
+          <meta content="{{ site.url }}/about/" property="article:author">
+        {% endif %}
+        {% if page.image %}
+          <meta content="{{ site.url }}/static/img/posts/{{ page.image }}" property="og:image">
+        {% else %}
+          <meta content="{{ site.url }}/static/img/logo-high-resolution.png" property="og:image">
+        {% endif %}
+        {% if page.categories %}
+          {% for category in page.categories limit:1 %}
+          <meta content="{{ category }}" property="article:section">
+          {% endfor %}
+        {% endif %}
+        {% if page.tags %}
+          {% for tag in page.tags %}
+          <meta content="{{ tag }}" property="article:tag">
+          {% endfor %}
+        {% endif %}
+
+        <meta name="twitter:card" content="summary">
+        <meta name="twitter:site" content="@{{ site.share.twitter_username }}">
+        <meta name="twitter:creator" content="@{{ site.share.twitter_username }}">
+        {% if page.title %}
+          <meta name="twitter:title" content="{{ page.title }}">
+        {% else %}
+          <meta name="twitter:title" content="{{ site.title }}">
+        {% endif %}
+        {% if page.url %}
+          <meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
+        {% endif %}
+        {% if page.description %}
+          <meta name="twitter:description" content="{{ page.description }}">
+        {% else %}
+          <meta name="twitter:description" content="{{ site.description }}">
+        {% endif %}
+        {% if page.header-img %}
+          <meta name="twitter:image:src" content="{{ site.url }}/{{ page.header-img }}">
+        {% endif %}
+
+        <!-- Font awesome icons -->
+        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
+
         <!-- syntax highlighting CSS -->
         <link rel="stylesheet" href="/static/css/syntax.css">
 
@@ -23,7 +86,12 @@
 
         <!-- Custom CSS -->        
         <link rel="stylesheet" href="/static/css/super-search.css">
+        <link rel="stylesheet" href="/static/css/thickbox.css">
+        <link rel="stylesheet" href="/static/css/projects.css">
         <link rel="stylesheet" href="/static/css/main.css">
+
+        <!-- Google Analytics -->
+        {% include analytics.html %}
     </head>
 
     <body>
@@ -37,7 +105,8 @@
                 </div>
                 {% endif %}
 
-                <hr />                
+                {% include social_links.html %}
+
                 <div class="search" id="js-search">
                   <input type="text" placeholder="(sitemap)~$ type to search" class="search__input form-control" id="js-search__input">
                   <ul class="search__results" id="js-search__results"></ul>
@@ -72,7 +141,10 @@
         ================================================== -->
         <!-- Placed at the end of the document so the pages load faster -->
         <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+        <script src="//code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
         <script src="/static/js/bootstrap.min.js"></script>
         <script src="/static/js/super-search.js"></script>
+        <script src="/static/js/thickbox-compressed.js"></script>
+        <script src="/static/js/projects.js"></script>
     </body>
 </html>

_layouts/post.html

@@ -11,6 +11,7 @@ layout: default
 
 <div class="content">
     <div class="post">{{ content }}</div>
+    {% include share-page.html %}
 </div>
 
 {% assign hasSimilar = '' %}
@@ -56,7 +57,7 @@ layout: default
     <script type="text/javascript">
         /* <![CDATA[ */
 
-        var disqus_shortname = 'stackproblems';
+        var disqus_shortname = "{{ site.disqus_shortname }}";
         var disqus_identifier = "{{ site.url }}_{{ page.title }}";
         var disqus_title = "{{ page.title }}";
 

_layouts/project.html

@@ -0,0 +1,63 @@
+---
+layout: default
+---
+<article class="post">
+
+  <header class="post-header">
+    <h1 class="post-title">{{ page.title }}</h1>
+    <hr />
+  </header>
+
+  <div class="post-content">
+    {{ content }}
+
+    {% assign p_array = "" | split:"|"  %}
+    {% for project in site.project %}
+    {% capture p_slug %}{{ project.url | split:"/" | last }},{{ project.url }}{% endcapture %}
+    {% assign p_slug_arr = p_slug | split:"," %}
+    {% assign p_array = p_array | push: p_slug_arr  %}
+    {% endfor %}
+
+    <div class="projects">
+    {% include project_tags.html %}
+    {% for i in site.data.projects %}
+    	<div class="project-item project-outer" data-tags='{{ i.tags | jsonify | downcase }}'>
+    		<div class="project-inner">
+    			<a href="/static/projects/{{ i.image }}" class="thickbox">
+    			<div class="project-img bordered" style="background-image: url('/static/projects/{{ i.image }}');"></div>
+                </a>
+                {% assign p_url = nil %}
+                {% for pr in p_array %}
+                    {% if pr contains i.slug %}
+                        {% assign p_url = pr[1] %}
+                    {% endif %}
+                {% endfor %}
+                {% if p_url == nil %}{% assign p_url = i.url %}{% endif %}
+                {% if p_url %}<a href="{{ p_url }}">{% endif %}
+    			<h3 class="project-headlines">{{ i.name }}</h3>
+    			{% if p_url %} </a> {% endif %}
+    			<div class="project-content">
+    				<div class="tag-holder">
+    				{% if i.tags %} 
+    					{% for j in i.tags %}
+    					<span class="tags tag-filter" data-tag="{{ j | downcase }}"><a href="#">{{ j }}</a></span>
+    					{% endfor %}
+    				{% endif %}
+    				</div>
+    				
+    			</div>
+    			<div class="project-footer"> 
+    				{% if i.url %} 
+    				<a href="{{ i.url }}" class="project-link">View</a>
+    				{% endif %}
+    				<span class="project-timeline">{{ i.date }}</span>
+    			</div>
+    		</div>
+    		<hr>
+    	</div>
+
+    {% endfor %}
+    </div>
+  </div>
+
+</article>

_layouts/project_single.html

@@ -0,0 +1,15 @@
+---
+layout: default
+---
+<article class="post">
+
+  <header class="post-header">
+    <h1 class="post-title">{{ page.title }}</h1>
+    <hr />
+  </header>
+
+  <div class="post-content">
+    {{ content }}
+  </div>
+
+</article>

_project/cool-project.md

@@ -0,0 +1,5 @@
+---
+layout: project_single
+title:  "Cool Project"
+---
+Just a demo text for now, which signifies there is lot of scope for improvement.

projects.md

@@ -0,0 +1,7 @@
+---
+layout: project
+title: Projects
+permalink: /projects/
+---
+
+Few of my projects. Currently doing more in Android, NodeJS.

static/css/main.css

@@ -193,3 +193,20 @@ div.col-sm-3 img#about {
 .PageNavigation .prev {
     text-align: left;
 }
+
+.social{
+    display: block;
+    margin: 10px 0;
+}
+.social ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+.social ul li {
+    display: inline-block;
+    margin: 0 5px;
+}
+.social li a {
+    font-size: 16px;
+}

static/css/projects.css

@@ -0,0 +1,71 @@
+/**
+ * //////////////////////////////////
+ * Project Elements
+ * //////////////////////////////////
+ */
+.project-outer {
+    display: inline-block;
+    width: 30%;
+    vertical-align: top;
+    margin: 0 10px;
+}
+.project-img img {
+    width: 100%;
+}
+h3.project-headlines {
+    margin: 5px 0;
+    font-size: 20px;
+    border-bottom: 1px #EEE solid;
+}
+span.tags {
+    font-size: 10px;
+    border-bottom: 1px #888 dotted;
+    margin: 0 5px;
+}
+span.tags:first-child{ margin-left: 0; }
+span.tags:last-child{ margin-right: 0; }
+
+.project-footer {
+    clear: both;
+    display: inline-block;
+    width: 100%;
+}
+.project-footer .project-link {
+    display: inline-block;
+    position: relative;
+    float: left;
+}
+.project-footer .project-timeline {
+    display: inline-block;
+    position: relative;
+    float: right;
+    font-size: 13px;
+    font-style: italic;
+}
+.project-inner > a {
+    display: block;
+}
+.project-img {
+    width: 230px;
+    height: 200px;
+    display: block;
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center center;
+}
+/** Project Tag Filters **/
+.tag-group{
+    margin: 0 0 25px 0;
+}
+span.tag-cloud {
+    margin: 0 2px;
+    cursor: pointer;
+    font-size: 75%;
+    padding: .2em .6em .3em;
+    font-weight: 700;
+    display: inline;
+}
+.tag-cloud.active{
+    background: #ccc;
+}
+.project-item.not-show{ display: none; }

static/css/thickbox.css

@@ -0,0 +1,163 @@
+/* ----------------------------------------------------------------------------------------------------------------*/
+/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
+/* ----------------------------------------------------------------------------------------------------------------*/
+*{padding: 0; margin: 0;}
+
+/* ----------------------------------------------------------------------------------------------------------------*/
+/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
+/* ----------------------------------------------------------------------------------------------------------------*/
+#TB_window {
+	font: 12px Arial, Helvetica, sans-serif;
+	color: #333333;
+}
+
+#TB_secondLine {
+	font: 10px Arial, Helvetica, sans-serif;
+	color:#666666;
+}
+
+#TB_window a:link {color: #666666;}
+#TB_window a:visited {color: #666666;}
+#TB_window a:hover {color: #000;}
+#TB_window a:active {color: #666666;}
+#TB_window a:focus{color: #666666;}
+
+/* ----------------------------------------------------------------------------------------------------------------*/
+/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
+/* ----------------------------------------------------------------------------------------------------------------*/
+#TB_overlay {
+	position: fixed;
+	z-index:100;
+	top: 0px;
+	left: 0px;
+	height:100%;
+	width:100%;
+}
+
+.TB_overlayMacFFBGHack {background: url(/static/img/macFFBgHack.png) repeat;}
+.TB_overlayBG {
+	background-color:#000;
+	filter:alpha(opacity=75);
+	-moz-opacity: 0.75;
+	opacity: 0.75;
+}
+
+* html #TB_overlay { /* ie6 hack */
+     position: absolute;
+     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_window {
+	position: fixed;
+	background: #ffffff;
+	z-index: 102;
+	color:#000000;
+	display:none;
+	border: 4px solid #525252;
+	text-align:left;
+	top:50%;
+	left:50%;
+}
+
+* html #TB_window { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_window img#TB_Image {
+	display:block;
+	margin: 15px 0 0 15px;
+	border-right: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #666;
+	border-left: 1px solid #666;
+}
+
+#TB_caption{
+	height:25px;
+	padding:7px 30px 10px 25px;
+	float:left;
+}
+
+#TB_closeWindow{
+	height:25px;
+	padding:11px 25px 10px 0;
+	float:right;
+}
+
+#TB_closeAjaxWindow{
+	padding:7px 10px 5px 0;
+	margin-bottom:1px;
+	text-align:right;
+	float:right;
+}
+
+#TB_ajaxWindowTitle{
+	float:left;
+	padding:7px 0 5px 10px;
+	margin-bottom:1px;
+}
+
+#TB_title{
+	background-color:#e8e8e8;
+	height:27px;
+}
+
+#TB_ajaxContent{
+	clear:both;
+	padding:2px 15px 15px 15px;
+	overflow:auto;
+	text-align:left;
+	line-height:1.4em;
+}
+
+#TB_ajaxContent.TB_modal{
+	padding:15px;
+}
+
+#TB_ajaxContent p{
+	padding:5px 0px 5px 0px;
+}
+
+#TB_load{
+	position: fixed;
+	display:none;
+	height:13px;
+	width:208px;
+	z-index:103;
+	top: 50%;
+	left: 50%;
+	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
+}
+
+* html #TB_load { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_HideSelect{
+	z-index:99;
+	position:fixed;
+	top: 0;
+	left: 0;
+	background-color:#fff;
+	border:none;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+	height:100%;
+	width:100%;
+}
+
+* html #TB_HideSelect { /* ie6 hack */
+     position: absolute;
+     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_iframeContent{
+	clear:both;
+	border:none;
+	margin-bottom:-1px;
+	margin-top:1px;
+	_margin-bottom:1px;
+}

static/js/projects.js

@@ -0,0 +1,41 @@
+(function($){
+	$(document).ready(function(){
+		$(document).on('click','.tag-filter',function(){
+			var $this = $(this);
+			
+			$('span.tag-filter').removeClass("active");
+			$this.addClass("active");
+
+
+			$('.tag-group').children().each(function(){
+				if( $(this).data('tag') ==  $this.data('tag')){
+					$(this).addClass("active");
+				}
+			});
+
+			if( $(this).hasClass('all'))
+				$('.project-item').showAll();
+			else
+				$('.project-item').filterTags( $(this).data('tag') );
+		});
+	});
+
+	$.fn.extend({
+	  filterTags: function(tagName) {
+	  	this.removeClass('not-show');
+	    return this.each(function() {
+	    	var itemTagArray = JSON.parse( $(this).attr('data-tags') );
+			if($.inArray(tagName, itemTagArray) === -1){
+				$(this).addClass('not-show');
+			}
+	    });
+	  },
+	  showAll: function(){
+	  	return this.each(function() {
+			if($(this).hasClass('not-show')){
+				$(this).removeClass('not-show');
+			}
+	    });
+	  }
+	});
+})(jQuery)