added new portfolio items and added portfolio details page

agarwali · Nov 9, 2016 · 85b8747 · 85b8747
1 parent 001d8b8
commit 85b8747
Show file tree

Hide file tree

Showing 23 changed files with 212 additions and 582 deletions.
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'jekyll', '3.1.6'
+
+group :jekyll_plugins do
+  gem 'jekyll-feed'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    colorator (0.1)
+    ffi (1.9.14)
+    jekyll (3.1.6)
+      colorator (~> 0.1)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-feed (0.7.2)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.12.0)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    rb-fsevent (0.9.8)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (= 3.1.6)
+  jekyll-feed
+
+BUNDLED WITH
+   1.13.6
diff --git a/_config.yml b/_config.yml
@@ -1,7 +1,11 @@
-url: www.ishwaragarwal.com
+url: http://ishwaragarwal.com
 baseurl: ""
 exclude: ['README.md']
 permalink: pretty
+title: Ishwar Agarwal
+description: This is a personal website of Ishwar Agarwal, where he provides brief information about him, and his portfolio. He also has a blog
+gem:
+  - jekyll-feed
 sass:
   sass_dir: _scss
   style: compressed
diff --git a/_includes/contact.html b/_includes/contact.html
@@ -8,21 +8,22 @@
             <div class="clearfix section-head contact-text">
               <div class="col-sm-12">
                 <h2 class="title">Contact</h2>
-                <p class="regular-text">101 Chestnut Street Berea KY 40404</p>
-                <ul class="clearfix contact-info">
-                  <li><a href="">+1 859 248 4851</a>
-                  </li>
-                  <li><a href="mailto:aisshwar@gmail.com" target="_top">aisshwar@gmail.com</a>
-                  </li>
-                  <li><a href="">www.ishwaragarwal.com</a>
-                  </li>
-                </ul>
+                <p class="regular-text">Let's get in touch</p>
+                <br>
+                <div class="row clearfix">
+                  <a href="mailto:a.isshwar@gmail.com" class="waves-effect btn btn-large white brand-text">Message Me
+                      <i class="material-icons left">email</i>
+                  </a>
+                  <a target="_blank" href="https://agarwali.youcanbook.me/">
+                    <button class="waves-effect btn btn-large white brand-text"> Book an appointment
+                      <i class="fa fa-calendar-check-o left" aria-hidden="true"></i>
+                    </button>
+                  </a>
+                </div>
               </div>
             </div> <!-- contact text end -->
 
-            <div class="clearfix contact-form">
-
-            </div>
+            <div class="clearfix contact-form"></div>
           </div>
         </div>
       </div>

diff --git a/_includes/map&contactForm.html → _includes/contactForm.html b/_includes/map&contactForm.html → _includes/contactForm.html
@@ -1,10 +1,11 @@
 
             <!-- Map Start -->
-              <div class="col-sm-7">
+              <!-- <div class="col-sm-7">
                 <div class="map-wrapper">
                   <div id="map"></div>
                 </div>
-              </div> <!-- Map end -->
+              </div>  -->
+              <!-- Map end -->
 
             <!-- Contact Form start -->
               <div class="col-sm-5">

diff --git a/_includes/navbar.html b/_includes/navbar.html
@@ -2,7 +2,7 @@
   <nav>
     <div class="nav-wrapper">
       <a href="#" data-activates="slide-out" class="button-collapse"><i class="material-icons">menu</i></a>
-      <a href="#!" class="brand-logo">I A</a>
+      <a href="{{site.baseurl}}/#" class="brand-logo">I A</a>
       <ul class="right hide-on-med-and-down">
         {% for item in include.nav %}
           {% assign current = nil %}
@@ -21,7 +21,7 @@
   <li class="mobile-profile">
    <div class="profile-inner">
       <div class="pp-container">
-          <img src="images/person.jpg" alt="">
+          <img src="{{site.baseurl}}/images/person.jpg" alt="">
       </div>
       <h3>Ishwar Agarwal</h3>
     </div>

diff --git a/_includes/portfolio.html b/_includes/portfolio.html
@@ -38,8 +38,8 @@ <h2 class="title">Lorem ipsum dolor sit fugit dolore.</h2>
     </div>
 
     <div class="modal-footer">
-      <a href="#" class="waves-effect btn-flat brand-text modal-action"><i class="fa fa-github right"></i>View Source</a>
-      <!-- <a href="#" target="_blank" class="waves-effect btn-flat brand-text">Details</a> -->
+      <a href="#" target="_blank" class="waves-effect btn-flat brand-text source-link left"><i class="fa fa-github right"></i>View Source</a>
+      <a href="#" target="_blank" class="waves-effect btn-flat brand-text modal-action">Details</a>
       <a class="waves-effect btn-flat brand-text modal-close">cancel</a>
     </div>
   </div>
@@ -53,9 +53,16 @@ <h2 class="title">Lorem ipsum dolor sit fugit dolore.</h2>
             {% if project.type == "project" %}
             <!-- Single Portfolio-->
             <li class="single-port-item {{project.category}}">
-              <a href="#portfolioModal" class="waves-effect waves-block waves-light modal-trigger" data-image-source="{{project.photo}}" data-title="{{project.title}}" data-content="{{project.description}}" data-demo-link="{{project.github-url}}"> <!-- Portfolio pop-up content-->
+              <a href="#portfolioModal" class="waves-effect waves-block waves-light modal-trigger" data-image-source="{{project.photo}}" data-title="{{project.title}}" data-content="{{project.description}}" data-details-link="{{project.url | prepend: site.baseurl }}" data-source-link="{{project.github-url}}"> <!-- Portfolio pop-up content-->
                 <div class="protfolio-image">
-                  <img src="images/portfolio/pf1.jpg" alt="portfolio"> <!-- portfolio thumbnail-->
+                  <img
+                  src= "{% if project.thumbnail %}
+                        {{site.baseurl}}/images/portfolio/{{project.thumbnail}}
+                        {% elsif project.media_source %}
+                        {{site.baseurl}}/images/portfolio/{{project.media_source}}
+                        {% else %}
+                        {{site.baseurl}}/images/portfolio/pf1.jpg
+                        {% endif %}" alt="portfolio"> <!-- portfolio thumbnail-->
                   <div class="protfolio-content waves-effect waves-block waves-light">
                     <div class="protfolio-content__inner">
                       <h2 class="p-title">{{project.title}}</h2>

diff --git a/_layouts/base.html b/_layouts/base.html
@@ -9,11 +9,11 @@
 <head>
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>{{ page.title }} - Ishwar Agarwal </title>
+  <title>{{ page.title }} - {{site.title}} </title>
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=no">
   {% include cssLinks.html %}
-
+  {% feed_meta %}
   <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),

diff --git a/_layouts/portfolio.html b/_layouts/portfolio.html
@@ -0,0 +1,62 @@
+---
+layout: base
+---
+<!-- Banner start -->
+ <section id="banner" class="root-sec brand-bg padd-tb-55 single-banner blogpage-banner-wrap">
+   <div class="container">
+     <div class="row">
+       <div class="clearfix blog-banner-text blog-single-banner">
+         <div class="col-md-12">
+           <h2 class="title">{{ page.title }}</h2>
+         </div>
+       </div>
+     </div>
+   </div>
+ </section> <!-- ./Banner end -->
+
+  <!-- Portfolio Container-->
+ <section id="all-posts" class="root-sec grey lighten-5 blogpage-posts-wrap">
+   <div class="container">
+     <div class="row">
+       <div class="clearfix all-blog-post blog-inner with-sidebar">
+
+       <!-- post container start-->
+         <div class="col-sm-8">
+           <article class="single-post-page">
+             <div class="thumb-wrap">
+               <img src="{% if page.media_source %}{{site.baseurl}}/images/portfolio/{{page.media_source}}{% endif %}" alt="">
+             </div>
+             <div class="single-post-content">{{content}}</div>
+            {% include socialShare.html %}
+           </article>
+         </div> <!-- ./post container end-->
+
+         <!-- Sidebar start-->
+         <div class="col-sm-4">
+           <div class="primary-sidebar">
+             <aside class="single-widget">
+               <h2 class="widget-title">RECENT POSTS</h2>
+               <ul>
+                 {% for post in site.posts limit:5 %}
+                 <li>
+                   <a href="{{ post.url | prepend: site.baseurl}}">{{ post.title }}</a>
+                   <span>{{ post.date | date: "%b %-d, %Y" }}</span>
+                 </li>
+                 {% endfor %}
+               </ul>
+             </aside>
+             <aside class="single-widget">
+               <h2 class="widget-title">CATEGORIES</h2>
+               <ul>
+                 {% for category in site.data.blogCategories %}
+                 <li><a href="{{site.baseurl}}/category/{{category.key}}">{{category.name}}</a>
+                 </li>
+                 {% endfor %}
+               </ul>
+             </aside>
+           </div>
+         </div> <!-- ./sidebar end-->
+       </div>
+     </div>
+   </div> <!-- ./container end-->
+ </section>  <!-- ./Portfolio Container end-->
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -14,7 +14,7 @@ <h2 class="title">{{ page.title }}</h2>
              <li>{{ page.date | date: "%b %-d, %Y" }}</li>
              <!-- <li><a href="#">5 Comments</a> -->
              </li>
-             <li><a href="{{ page.category | prepend:'category' | prepend:site.baseurl }}">
+             <li><a href="{{site.baseurl}}/category/{{page.category}}">
                {% for cat in site.data.blogCategories %}
                 {% if cat.key == page.category %}
                 {{cat.name}}
@@ -39,7 +39,7 @@ <h2 class="title">{{ page.title }}</h2>
          <div class="col-sm-8">
            <article class="single-post-page">
              <div class="thumb-wrap">
-               <img src="{{site.baseurl}}/images/blog/{{page.media_source}}" alt="">
+               <img src="{{page.media_source}}" alt="">
              </div>
              <div class="single-post-content">{{content}}</div>
             {% include socialShare.html %}
@@ -64,7 +64,7 @@ <h2 class="widget-title">RECENT POSTS</h2>
                <h2 class="widget-title">CATEGORIES</h2>
                <ul>
                  {% for category in site.data.blogCategories %}
-                 <li><a href="#">{{category.name}}</a>
+                 <li><a href="{{site.baseurl}}/category/{{category.key}}">{{category.name}}</a>
                  </li>
                  {% endfor %}
                </ul>

diff --git a/assets/js/main.js b/assets/js/main.js
@@ -673,7 +673,8 @@ $(window).load(function(){
 			portImgArea = portfolioModal.find('.model-img'),
 			portTitle = portfolioModal.find('.modal-content .title'),
 			portContent = portfolioModal.find('.modal-content .m-content'),
-			portLink = portfolioModal.find('.modal-footer .modal-action');
+			portLink = portfolioModal.find('.modal-footer .modal-action'),
+			portSourceLink = portfolioModal.find('.modal-footer .source-link');
 
 		$('#protfolio-msnry').delegate('a.modal-trigger', 'click', function(e){
 			e.preventDefault();
@@ -687,8 +688,8 @@ $(window).load(function(){
 					var imgSrc = $this.data('image-source'),
 					title = $this.data('title'),
 					content = $this.data('content'),
-					demoLink = $this.data('demo-link');
-
+					detailsLink = $this.data('details-link'),
+					sourceLink = $this.data('source-link');
 
 					if ( imgSrc ) {
 						portImgArea.html('<img src="'+imgSrc+'" alt="Portfolio Image" />');
@@ -697,7 +698,8 @@ $(window).load(function(){
 
 					portTitle.text(title);
 					portContent.text(content);
-					portLink.attr('href', demoLink);
+					portLink.attr('href', detailsLink);
+					portSourceLink.attr('href', sourceLink);
 				}
 			});
 		});

diff --git a/images/portfolio/campus-tour-guide.png b/images/portfolio/campus-tour-guide.png
diff --git a/images/portfolio/elementary-thumb.png b/images/portfolio/elementary-thumb.png
diff --git a/images/portfolio/elementary.jpg b/images/portfolio/elementary.jpg
diff --git a/images/portfolio/tic-tac-toe.png b/images/portfolio/tic-tac-toe.png
diff --git a/images/portfolio/universify.png b/images/portfolio/universify.png