Merge pull request #4 from QU-UP/v0.2.0

V0.2.0
QU-UP · Aug 2, 2021 · 6b63e38 · 6b63e38
2 parents ccfee9a + 267d27d
commit 6b63e38
Show file tree

Hide file tree

Showing 237 changed files with 54,368 additions and 195 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,6 +21,8 @@ jobs:
         for theme in */ ; do
             if [ -d "$theme" ]; then
                 echo "${theme%/}"
+                echo "Copying resume.jinja to $theme"
+                cp resume.jinja $theme/resume.jinja
                 FILENAME="${theme%/}_${{ github.event.inputs.version_number }}.zip"
                 echo "$FILENAME $theme"
                 zip -r $FILENAME $theme

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,10 @@
+## V 0.2.0
+
+**All Themes**
+- Added support for google analytics
+- Added support for custom favicons
+
+
+**Freelancer**
+- Fixed bug where remote images (images served over http/https requests from other servers) would not load
+
diff --git a/aerial/images/favicon.png b/aerial/images/favicon.png
diff --git a/aerial/index.jinja b/aerial/index.jinja
@@ -11,6 +11,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
 		<link rel="stylesheet" href="css/main.css" />
 		<noscript><link rel="stylesheet" href="css/noscript.css" /></noscript>
+		<link rel="icon" type="image/png" href="images/favicon.png"/>
 		{% if config["background"] %}
 		<style>
 			{% if config['background'].startswith('http') or config['background'].startswith('images') %}
@@ -21,6 +22,17 @@
 		</style>
 		{% else %}
 		{% endif %}
+
+		{% if config["ua_code"] %}
+		<!-- Global site tag (gtag.js) - Google Analytics -->
+		<script async src="https://www.googletagmanager.com/gtag/js?id={{config['ua_code']}}"></script>
+		<script>
+		window.dataLayer = window.dataLayer || [];
+		function gtag(){dataLayer.push(arguments);}
+		gtag('js', new Date());
+		gtag('config', '{{config["ua_code"]}}');
+		</script>
+		{% endif %}
 	</head>
 
 	<body class="is-preload">
@@ -66,6 +78,9 @@
 								{% if config['phone'] %} 
 								<li><a href="tel:{{config['phone']}}" class="icon solid fa-phone" target="_blank"><span class="label">phone</span></a></li>
 								{% endif %}
+								{% if config["resume"] %}
+								<li><a href="/resume.html" class="icon solid fa-address-card" target="_blank"><span class="label">resume</span></a></li>
+								{%endif%}
 							</ul>
 						</nav>
 					</header>

diff --git a/base/index.jinja b/base/index.jinja
diff --git a/base/sections/education.jinja b/base/sections/education.jinja
diff --git a/base/sections/projects.jinja b/base/sections/projects.jinja
diff --git a/base/sections/volunteering_experience.jinja b/base/sections/volunteering_experience.jinja
diff --git a/base/sections/work_experience.jinja b/base/sections/work_experience.jinja
diff --git a/creative/css/styles.css b/creative/css/styles.css
@@ -10142,4 +10142,41 @@ header.masthead h1 {
 
 .text-white-75 {
   color: rgba(255, 255, 255, 0.75);
+}
+
+
+#gallery .container-fluid, #gallery .container-sm, #gallery .container-md, #gallery .container-lg, #gallery .container-xl {
+  max-width: 1920px;
+}
+#gallery .container-fluid .gallery-box, #gallery .container-sm .gallery-box, #gallery .container-md .gallery-box, #gallery .container-lg .gallery-box, #gallery .container-xl .gallery-box {
+  position: relative;
+  display: block;
+}
+#gallery .container-fluid .gallery-box .gallery-box-caption, #gallery .container-sm .gallery-box .gallery-box-caption, #gallery .container-md .gallery-box .gallery-box-caption, #gallery .container-lg .gallery-box .gallery-box-caption, #gallery .container-xl .gallery-box .gallery-box-caption {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  bottom: 0;
+  text-align: center;
+  opacity: 0;
+  color: #fff;
+  background: rgba(244, 98, 58, 0.9);
+  transition: opacity 0.25s ease;
+  text-align: center;
+}
+#gallery .container-fluid .gallery-box .gallery-box-caption .project-category, #gallery .container-sm .gallery-box .gallery-box-caption .project-category, #gallery .container-md .gallery-box .gallery-box-caption .project-category, #gallery .container-lg .gallery-box .gallery-box-caption .project-category, #gallery .container-xl .gallery-box .gallery-box-caption .project-category {
+  font-family: "Merriweather Sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-size: 0.85rem;
+  font-weight: 600;
+  text-transform: uppercase;
+}
+#gallery .container-fluid .gallery-box .gallery-box-caption .project-name, #gallery .container-sm .gallery-box .gallery-box-caption .project-name, #gallery .container-md .gallery-box .gallery-box-caption .project-name, #gallery .container-lg .gallery-box .gallery-box-caption .project-name, #gallery .container-xl .gallery-box .gallery-box-caption .project-name {
+  font-size: 1.2rem;
+}
+#gallery .container-fluid .gallery-box:hover .gallery-box-caption, #gallery .container-sm .gallery-box:hover .gallery-box-caption, #gallery .container-md .gallery-box:hover .gallery-box-caption, #gallery .container-lg .gallery-box:hover .gallery-box-caption, #gallery .container-xl .gallery-box:hover .gallery-box-caption {
+  opacity: 1;
 }
diff --git a/creative/images/bg-masthead.jpg b/creative/images/bg-masthead.jpg
diff --git a/creative/images/favicon.ico b/creative/images/favicon.ico
diff --git a/creative/images/favicon.png b/creative/images/favicon.png
diff --git a/creative/images/portfolio/fullsize/1.jpg b/creative/images/portfolio/fullsize/1.jpg
diff --git a/creative/images/portfolio/fullsize/2.jpg b/creative/images/portfolio/fullsize/2.jpg
diff --git a/creative/images/portfolio/fullsize/3.jpg b/creative/images/portfolio/fullsize/3.jpg
diff --git a/creative/images/portfolio/fullsize/4.jpg b/creative/images/portfolio/fullsize/4.jpg
diff --git a/creative/images/portfolio/fullsize/5.jpg b/creative/images/portfolio/fullsize/5.jpg
diff --git a/creative/images/portfolio/fullsize/6.jpg b/creative/images/portfolio/fullsize/6.jpg
diff --git a/creative/images/portfolio/thumbnails/1.jpg b/creative/images/portfolio/thumbnails/1.jpg
diff --git a/creative/images/portfolio/thumbnails/2.jpg b/creative/images/portfolio/thumbnails/2.jpg
diff --git a/creative/images/portfolio/thumbnails/3.jpg b/creative/images/portfolio/thumbnails/3.jpg
diff --git a/creative/images/portfolio/thumbnails/4.jpg b/creative/images/portfolio/thumbnails/4.jpg
diff --git a/creative/images/portfolio/thumbnails/5.jpg b/creative/images/portfolio/thumbnails/5.jpg
diff --git a/creative/images/portfolio/thumbnails/6.jpg b/creative/images/portfolio/thumbnails/6.jpg
diff --git a/creative/index.jinja b/creative/index.jinja
@@ -4,10 +4,11 @@
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
         <meta name="description" content="" />
-        <meta name="author" content="" />
+        <meta name="author" content="{{config['name']}}" />
+        <link rel="icon" type="image/png" href="images/favicon.png"/>
         <title>{{ config['name'] }}</title>
         <!-- Favicon-->
-        <link rel="icon" type="image/x-icon" href="images/favicon.ico" />
+        <link rel="icon" type="image/x-icon" href="images/favicon.png" />
         <!-- Font Awesome icons (free version)-->
         <script src="https://use.fontawesome.com/releases/v5.15.1/js/all.js" crossorigin="anonymous"></script>
         <!-- Google fonts-->
@@ -17,6 +18,17 @@
         <link href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.min.css" rel="stylesheet" />
         <!-- Core theme CSS (includes Bootstrap)-->
         <link href="css/styles.css" rel="stylesheet" />
+
+    {% if config["ua_code"] %}
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{config['ua_code']}}"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    gtag('config', '{{config["ua_code"]}}');
+    </script>
+    {% endif %}
 
     {% if config["background"] %}
     <style>
@@ -44,11 +56,19 @@
                         <li class="nav-item"><a class="nav-link js-scroll-trigger" href="#about">About</a></li>
                     {% endif %}
 
-
                     {% if projects_html %}
-                        <li class="nav-item"><a class="nav-link js-scroll-trigger" href="#portfolio">Projects</a></li>
+                        <li class="nav-item"><a class="nav-link js-scroll-trigger" href="#services">Projects</a></li>
                     {% endif %}
+
+                    {% if gallery_html %}
+                        <li class="nav-item"><a class="nav-link js-scroll-trigger" href="#Gallery">Gallery</a></li>
+                    {% endif %}
+
                         <li class="nav-item"><a class="nav-link js-scroll-trigger" href="#contact">Contact</a></li>
+
+                    {% if config["resume"] %}
+                        <li class="nav-item"><a class="nav-link js-scroll-trigger" href="/resume.html">Resume</a></li>
+                    {%endif%}
                     </ul>
                 </div>
             </div>
@@ -79,16 +99,16 @@
         </section>
         {% endif %}
 
-
-        <!-- Services-->
+{% if projects_html %}
+        <!-- Projects-->
         <section class="page-section" id="services">
             <div class="container">
                 <h2 class="text-center mt-0">Projects</h2>
                 <hr class="divider my-4" />
                 <div class="row">
                     <div class="col-md-12 text-center">
                         <div class="mt-5">
-                            <i class="fas fa-4x fa-gem text-primary mb-4"></i>
+                            <i class="fas fa-4x fa-tools text-primary mb-4"></i>
                             <h3 class="h4 mb-2">Check out my projects below</h3>
                         </div>
                     </div>
@@ -97,6 +117,27 @@
         </section>
 
         {{ projects_html | safe }}
+{%endif%}
+
+{% if gallery_html %}
+        <!-- Gallery-->
+        <section class="page-section" id="Gallery">
+            <div class="container">
+                <h2 class="text-center mt-0">Gallery</h2>
+                <hr class="divider my-4" />
+                <div class="row">
+                    <div class="col-md-12 text-center">
+                        <div class="mt-5">
+                            <i class="fas fa-4x fa-camera text-primary mb-4"></i>
+                            <h3 class="h4 mb-2">Check out some of my images below</h3>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
+
+        {{ gallery_html | safe}}
+{% endif %}
 
 {% if config['phone'] or config['email'] %}
         <!-- Contact-->
@@ -150,4 +191,5 @@
         <!-- Core theme JS-->
         <script src="js/scripts.js"></script>
     </body>
+    <script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-MML-AM_CHTML"></script>
 </html>
diff --git a/creative/js/scripts.js b/creative/js/scripts.js
@@ -60,4 +60,21 @@
     }
   });
 
+
+    // Magnific popup calls
+    $('#gallery').magnificPopup({
+      delegate: 'a',
+      type: 'image',
+      tLoading: 'Loading image #%curr%...',
+      mainClass: 'mfp-img-mobile',
+      gallery: {
+        enabled: true,
+        navigateByImgClick: true,
+        preload: [0, 1]
+      },
+      image: {
+        tError: '<a href="%url%">The image #%curr%</a> could not be loaded.'
+      }
+    });
+
 })(jQuery); // End of use strict
diff --git a/creative/sections/gallery.jinja b/creative/sections/gallery.jinja
@@ -0,0 +1,19 @@
+<!-- Projects -->
+<div id="gallery">
+    <div class="container-fluid p-0">
+        <div class="row no-gutters">
+        {% for image in gallery %}
+            <div class="col-lg-4 col-sm-6">
+                <a class="gallery-box" href="{{ image[0]['file_path'] }}">
+                    <img class="img-fluid" src="{{ image[0]['file_path'] }}" alt="{{ image[0]['file_path'] | get_filename_without_extension }}" style="width:100%;height:500px;"/>
+
+                    <div class="gallery-box-caption">
+
+                        <div class="project-name">{{ image[0]['file_path'] | get_filename_without_extension }}</div>
+                    </div>
+                </a>
+            </div>
+        {% endfor %}
+        </div>
+    </div>
+</div>