Merge branch 'master' into cv

# Conflicts: # src/js/main.js
2021-08-21 12:31:26 +01:00 · 2021-08-21 12:31:26 +01:00 · 60927cf6b6
commit 60927cf6b6
parent 5e2d42b409 fba01f1d98
10 changed files with 1256 additions and 112 deletions
--- a/.gitignore
+++ b/.gitignore
@ -70,3 +70,6 @@ fabric.properties

 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+
+# Custom ignores
+.env
--- a/dist/css/main.css
+++ b/dist/css/main.css
--- a/dist/index.html
+++ b/dist/index.html
--- a/dist/js/main.js
+++ b/dist/js/main.js
@ -1 +1 @@
-const scrollLimit=150;window.onscroll=()=>{document.body.scrollTop>=150||document.documentElement.scrollTop>=150?document.querySelector("nav").classList.add("scrolled"):document.querySelector("nav").classList.remove("scrolled");let e="";document.querySelectorAll("section").forEach((t=>{const o=t.offsetTop;window.pageYOffset>=o-60&&(e=t.getAttribute("id"))})),document.querySelectorAll("nav ul li a").forEach((t=>{t.classList.remove("active"),t.href.includes(e)&&""!==e?t.classList.add("active"):""===e&&document.querySelector("nav ul li a").classList.add("active")}))},document.addEventListener("DOMContentLoaded",(()=>{var e=["full stack developer","web designer","student","gamer","drummer"];function t(e,o,n){o<e.length?(document.querySelector("header div h1").innerHTML=e.substring(0,o+1)+'<span aria-hidden="true">_</span>',setTimeout((function(){t(e,o+1,n)}),100)):"function"==typeof n&&setTimeout(n,700)}!function o(n){void 0===e[n]?setTimeout((function(){o(0)}),1500):n<e[n].length&&t(e[n],0,(function(){setTimeout(o,1500,n+1)}))}(0)}));
+const scrollLimit=150;var dataText=["full stack developer","web designer","student","gamer","drummer"];function typeWriter(e,t,n){t<e.length?(document.querySelector("header div h1").innerHTML=e.substring(0,t+1)+'<span aria-hidden="true">_</span>',setTimeout((function(){typeWriter(e,t+1,n)}),100)):"function"==typeof n&&setTimeout(n,700)}function StartTextAnimation(e){void 0===dataText[e]?setTimeout((function(){StartTextAnimation(0)}),1500):e<dataText[e].length&&typeWriter(dataText[e],0,(function(){setTimeout(StartTextAnimation,1500,e+1)}))}function getTimelineData(){fetch("/api/timelineData").then((e=>{e.json().then((e=>{}))}))}window.onscroll=()=>{document.body.scrollTop>=150||document.documentElement.scrollTop>=150?document.querySelector("nav").classList.add("scrolled"):document.querySelector("nav").classList.remove("scrolled");let e="";document.querySelectorAll("section").forEach((t=>{const n=t.offsetTop;window.pageYOffset>=n-60&&(e=t.getAttribute("id"))})),document.querySelectorAll("nav ul li a").forEach((t=>{t.classList.remove("active"),t.href.includes(e)&&""!==e?t.classList.add("active"):""===e&&document.querySelector("nav ul li a").classList.add("active")}))},document.addEventListener("DOMContentLoaded",(()=>{StartTextAnimation(0)}));
--- a/gulpfile.js
+++ b/gulpfile.js
@ -1,8 +1,14 @@
-const gulp = require("gulp");
+const gulp = require("gulp")
 const browserSync = require("browser-sync").create();
 const htmlMin = require("gulp-htmlmin");
 const cssMin = require("gulp-clean-css")
 const terser = require("gulp-terser");
+const ftp = require("vinyl-ftp");
+const env = require("gulp-env");
+env({
+	file: ".env",
+	type: ".ini"
+});

 gulp.task("minifyHTML", () =>
 {
@ -20,8 +26,10 @@ gulp.task("minifyCSS", () =>

 gulp.task("minifyJS", () =>
 {
-	function createErrorHandler(name) {
-		return function (err) {
+	function createErrorHandler(name)
+	{
+		return function (err)
+		{
 			console.error("Error from " + name + " in compress task", err.toString());
 		};
 	}
@ -34,6 +42,32 @@ gulp.task("minifyJS", () =>
 	.on("error", createErrorHandler("gulp.dest"));
 });

+gulp.task("watch files", () =>
+{
+	gulp.watch("src/*.html", gulp.task("minifyHTML"));
+	gulp.watch("src/css/*.css", gulp.task("minifyCSS"));
+	gulp.watch("src/js/*.js", gulp.task("minifyJS"));
+});
+
+gulp.task("ftp", () =>
+{
+	let conn = ftp.create(
+	{
+		host: process.env.host,
+		user: process.env.user,
+		pass: process.env.pass,
+		parallel: 1,
+	});
+	return gulp.src("dist/**", {base: "dist", dot: true})
+		.pipe(conn.newer("/"))
+		.pipe(conn.dest("/"));
+});
+
+gulp.task("deploy", () =>
+{
+	gulp.watch("dist", gulp.task("ftp"));
+});
+
 gulp.task("browserSync", () =>
 {
 	browserSync.init({
@ -41,11 +75,7 @@ gulp.task("browserSync", () =>
 			baseDir: "dist"
 		}
 	});
-	
-	gulp.watch("src/*.html", gulp.task("minifyHTML"));
-	gulp.watch("src/css/*.css", gulp.task("minifyCSS"));
-	gulp.watch("src/js/*.js", gulp.task("minifyJS"));
 	gulp.watch("dist").on("change", browserSync.reload)
 });

-gulp.task("default", gulp.series("browserSync"));
+gulp.task("default", gulp.series(gulp.parallel("watch files", "deploy")));
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -15,10 +15,13 @@
    "browser-sync": "^2.26.14",
    "gulp": "^4.0.2",
    "gulp-clean-css": "^4.3.0",
-    "gulp-uglify": "^3.0.2",
+    "gulp-deploy-ftp": "^1.0.1",
+    "gulp-env": "^0.4.0",
    "gulp-htmlmin": "^5.0.1",
    "gulp-terser": "^2.0.1",
+    "gulp-uglify": "^3.0.2",
    "normalize.css": "^8.0.1",
-    "require": "^0.4.4"
+    "require": "^0.4.4",
+    "vinyl-ftp": "^0.6.1"
  }
 }
--- a/src/css/main.css
+++ b/src/css/main.css
@ -5,13 +5,17 @@
 /****** Root Style ******/
 :root {
    /* Colours */
-    --primaryDefault: hsla(79, 62%, 51%, 1);
-    --primaryHover: hsla(79, 75%, 41%, 1);
-    --errorDefault: hsla(0, 62%, 51%, 1);
+    --mainHue: 79;
+    --mainSat: 62%;
+    --mainLight: 51%;
+    --primaryDefault: hsla(var(--mainHue), var(--mainSat), var(--mainLight), 1);
+    --primaryHover: hsla(var(--mainHue), var(--mainSat), calc(var(--mainLight) - 10%), 1);
+    --timelineItemBrdr: hsla(var(--mainHue), var(--mainSat), calc(var(--mainLight) - 20%), 1);
+    --errorDefault: hsla(0, var(--mainSat), var(--mainLight), 1);
    --grey: hsla(0, 0%, 39%, 1);
    --mutedGrey: hsla(0, 0%, 67%, 0.58);
    --mutedBlack: hsla(0, 0%, 0%, 0.25);
-    --navBack: hsl(0, 0%, 30%);
+    --navBack: hsla(0, 0%, 30%, 1);

    /* Font Sizes */
    --titleFS: 2.25rem;
@ -79,7 +83,6 @@ a.btnOutline {

 a.btnPrimary:hover, form input[type="submit"]:hover {
    background: var(--primaryHover);
-
 }

 a.btn:active, form input[type="submit"]:active {
@ -98,6 +101,10 @@ a.btn:active, form input[type="submit"]:active {
    text-shadow: 0 6px 4px var(--mutedBlack);
 }

+section#about, section#curriculumvitae h1 {
+    padding: 0 5rem;
+}
+
 /*** Navigation Styles **/

 header {
@ -122,6 +129,7 @@ nav {

 nav.scrolled {
    background-color: var(--navBack);
+    z-index: 1;
 }

 nav #nav-check {
@ -203,20 +211,149 @@ div h1 span {

 /***** About Styles *****/

-section#about {
-    padding: 0 5em;
-}
-
 section#about div {
    padding: 0.1em 5em;
 }

+/****** CV Styles *******/
+
+section#curriculumvitae{
+    background-color: var(--primaryDefault);
+    color: #FFFFFF;
+    padding: 2em 0;
+}
+
+section#curriculumvitae .cvGrid {
+    display: flex;
+    flex-direction: row;
+    padding: 0 1.5rem;
+    flex-wrap: wrap;
+}
+
+section#curriculumvitae .cvGrid > div {
+    width: 45%;
+    display: flex;
+    flex-direction: column;
+    min-height: 100%;
+
+}
+
+#curriculumvitae .cvGrid h2 {
+    text-align: center;
+}
+
+#curriculumvitae .timeline {
+    position: relative;
+    max-width: 30em;
+    gap: 1em;
+    display: flex;
+    flex-direction: column;
+    margin: 0 auto;
+    height: 100%;
+}
+
+#curriculumvitae .timeline:before {
+    content: "";
+    position: absolute;
+    height: 100%;
+    border: 4px var(--timelineItemBrdr) solid;
+    /*border-bottom: 4;*/
+    right: 194px;
+    top: 0;
+}
+
+#curriculumvitae .timeline:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+#curriculumvitae .timelineItem {
+    border: 2px solid var(--timelineItemBrdr);
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    padding: 0 1rem;
+    width: 50%;
+    position: relative;
+    background-color: var(--primaryHover);
+}
+
+#curriculumvitae .timelineItem:before, .timelineItem:after {
+    content: '';
+    position: absolute;
+}
+
+#curriculumvitae .timelineItem:before{
+    content: '';
+    right: -20px;
+    top: calc(50% - 5px);
+    border-style: solid;
+    border-color: var(--timelineItemBrdr) var(--timelineItemBrdr) transparent transparent;
+    border-width: 20px;
+    transform: rotate(45deg);
+}
+#curriculumvitae .timelineItem:nth-child(2n) {
+    margin-left: 21em;
+}
+
+#curriculumvitae .timelineItem:nth-child(2n):before {
+    right: auto;
+    left: -20px;
+    border-color: transparent transparent var(--timelineItemBrdr) var(--timelineItemBrdr);
+}
+
+#curriculumvitae .timelineItem h3 {
+    font-weight: normal;
+}
+
+#curriculumvitae .timelineItem span {
+    color: hsl(0, 0%, 90%);
+}
 /**** Media Queries *****/

+@media screen and (max-width: 90em) {
+
+    /****** CV Styles *******/
+
+    section#curriculumvitae .cvGrid {
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+    }
+
+    section#curriculumvitae .cvGrid > div {
+        width: 100%;
+    }
+
+    section#curriculumvitae .cvGrid > div:first-child {
+        padding-bottom: 2.5em;
+        margin-bottom: 2.5em;
+        border-bottom: 5px #FFFFFF solid;
+    }
+
+    section#curriculumvitae .cvGrid h2 {
+        margin-left: 5em;
+    }
+
+    section#curriculumvitae .cvGrid .timeline {
+        margin: 0 auto;
+    }
+
+}
+
@media screen and (max-width: 75em) {

+    /*** Template Styles ****/
+
+    section#about, section#curriculumvitae h1  {
+        padding: 0 1em;
+    }
+
    /*** Navigation Styles **/

+    /** Default Nav Styles **/
+
    nav {
        display: block;
        height: 50px;
@ -380,16 +517,20 @@ section#about div {

    /***** About Styles *****/

-    section#about {
-        padding: 0 1em;
-    }
-
    section#about div {
        padding: 0.1em 2.5em;
    }
+
 }

@media screen and (max-width: 31em) {
+
+    /*** Template Styles ****/
+
+    section#about, section#curriculumvitae h1 {
+        padding: 0 1em;
+    }
+
    /*** Navigation Styles **/

    header div h1 {
@ -399,10 +540,6 @@ section#about div {

    /***** About Styles *****/

-    section#about {
-        padding: 0 0.5em;
-    }
-
    section#about div {
        padding: 0.1em 1em;
    }
--- a/src/index.html
+++ b/src/index.html
@ -5,7 +5,7 @@
    <meta name="viewport"
          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Document</title>
+    <title>Rohit Pai - Portfolio</title>
    <link rel="stylesheet" href="css/main.css">
    <script src="https://kit.fontawesome.com/ed3c25598e.js" crossorigin="anonymous"></script>
    <script src="js/main.js"></script>
@ -26,7 +26,7 @@
            </div>
            <ul>
                <li><a href="#about" class="textShadow active"><span>&lt;</span>about<span>&gt;</span></a></li>
-                <li><a href="#curiculumvitae" class="textShadow"><span>&lt;</span>cv<span>&gt;</span></a></li>
+                <li><a href="#curriculumvitae" class="textShadow"><span>&lt;</span>cv<span>&gt;</span></a></li>
                <li><a href="#projects" class="textShadow"><span>&lt;</span>projects<span>&gt;</span></a></li>
                <li><a href="#contact" class="textShadow"><span>&lt;</span>contact<span>&gt;</span></a></li>
                <li><a href="#" class="textShadow"><span>&lt;</span>blog<span>&gt;</span></a></li>
@ -52,16 +52,59 @@
                <a href="other/rohitpaicv.pdf" class="btn btnOutline boxShadowIn boxShadowOut" download>Download CV</a>
            </div>
        </section>
-        <section id="curiculumvitae">
+        <section id="curriculumvitae">
            <h1>curriculum vitae</h1>
            <div class="cvGrid">
+                <!-- https://codepen.io/keithwyland/pen/wqNqvy -->
                <div>
                    <h2>Education</h2>
-                    <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem ipsum nobis officia sequi. Beatae hic molestiae quibusdam repellendus vero voluptatem!</div>
+                    <div class="timeline">
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                    </div>
                </div>
                <div>
                    <h2>Work</h2>
-                    <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aliquid aperiam atque blanditiis doloribus labore minima odio recusandae tempore. Totam, ut!</div>
+                    <div class="timeline">
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                        <div class="timelineItem">
+                            <h3 class="timelineHeader">Sep 2016 - July 2018</h3>
+                            <span>Grade: D*D*D*</span>
+                            <p class="timelineText">Chelmsford College - BTEC Level 3 in IT</p>
+                        </div>
+                    </div>
                </div>
            </div>
        </section>
--- a/src/js/main.js
+++ b/src/js/main.js
@ -1,95 +1,123 @@
 // scrolling effect
 const scrollLimit = 150;
+
+// array with texts to type in typewriter
+var dataText = ["full stack developer", "web designer", "student", "gamer", "drummer"];
+
 window.onscroll = () =>
 {
-    // check if scrolled past limit if so add scrolled class to change background of nav
-    if (document.body.scrollTop >= scrollLimit || document.documentElement.scrollTop >= scrollLimit)
-    {
-        document.querySelector("nav").classList.add("scrolled");
-    }
-    else
-    {
-        document.querySelector("nav").classList.remove("scrolled");
-    }
+	// check if scrolled past limit if so add scrolled class to change background of nav
+	if (document.body.scrollTop >= scrollLimit || document.documentElement.scrollTop >= scrollLimit)
+	{
+		document.querySelector("nav").classList.add("scrolled");
+	}
+	else
+	{
+		document.querySelector("nav").classList.remove("scrolled");
+	}

-    let current = ""; //id of current section scrolled to, set to "" if at top
-    // go through all sections and find current section id scrolled to
-    document.querySelectorAll("section").forEach((section) =>
-    {
-        const sectionTop = section.offsetTop;
-        if (window.pageYOffset >= sectionTop - 60)
-        {
-            current = section.getAttribute("id");
-        }
-    });
+	let current = ""; //id of current section scrolled to, set to "" if at top
+	// go through all sections and find current section id scrolled to
+	document.querySelectorAll("section").forEach((section) =>
+	{
+		const sectionTop = section.offsetTop;
+		if (window.pageYOffset >= sectionTop - 60)
+		{
+			current = section.getAttribute("id");
+		}
+	});

-    // go through all nav links, remove active class and add it to the link whose href matches the current id scrolled
-    // to
-    document.querySelectorAll("nav ul li a").forEach((a) =>
-    {
-        a.classList.remove("active");
-        if (a.href.includes(current) && current !== "")
-        {
-            a.classList.add("active");
-        }
-        else if (current === "")
-        {
-            document.querySelector("nav ul li a").classList.add("active"); // at the top
-        }
-    });
+	// go through all nav links, remove active class and add it to the link whose href matches the current id scrolled
+	// to
+	document.querySelectorAll("nav ul li a").forEach((a) =>
+	{
+		a.classList.remove("active");
+		if (a.href.includes(current) && current !== "")
+		{
+			a.classList.add("active");
+		}
+		else if (current === "")
+		{
+			document.querySelector("nav ul li a").classList.add("active"); // at the top
+		}
+	});
 };

-document.addEventListener("DOMContentLoaded", () =>
+// typewriter effect
+
+/**
+ * typeWriter function
+ * type one character at a time in the typewriter
+ * keeps calling itself until the text is finished
+ * @param {string} text text to type
+ * @param {number} i current index at which the next character should be typed
+ * @param {function} fnCallback function to call back in this case the StartTextAnimation function
+ */
+function typeWriter(text, i, fnCallback)
 {
-    // array with texts to type in typewriter
-    var dataText = ["full stack developer", "web designer", "student", "gamer", "drummer"];
-
-    // type one text in the typwriter
-    // keeps calling itself until the text is finished
-    function typeWriter(text, i, fnCallback)
+    // check if text isn't finished yet
+    if (i < (text.length))
    {
-        // chekc if text isn't finished yet
-        if (i < (text.length))
-        {
-            // add next character to h1
-            document.querySelector("header div h1").innerHTML = text.substring(0, i + 1) + "<span aria-hidden=\"true\">_</span>";
+        // add next character to h1
+        document.querySelector("header div h1").innerHTML = text.substring(0, i + 1) + "<span aria-hidden=\"true\">_</span>";

-            // wait for a while and call this function again for next character
-            setTimeout(function ()
-            {
-                typeWriter(text, i + 1, fnCallback)
-            }, 100);
-        }
-        // text finished, call callback if there is a callback function
-        else if (typeof fnCallback == "function")
+        // wait for a while and call this function again for next character
+        setTimeout(function ()
        {
-            // call callback after timeout
-            setTimeout(fnCallback, 700);
-        }
+            typeWriter(text, i + 1, fnCallback)
+        }, 100);
    }
-
-    // start a typewriter animation for a text in the dataText array
-    function StartTextAnimation(i)
+    // text finished, call callback if there is a callback function
+    else if (typeof fnCallback == "function")
    {
-        if (typeof dataText[i] === "undefined")
-        {
-            setTimeout(function ()
-            {
-                StartTextAnimation(0);
-            }, 1500);
-        }
-        else if (i < dataText[i].length)
-        {
-            // text exists! start typewriter animation
-            typeWriter(dataText[i], 0, function ()
-            {
-                // after callback (and whole text has been animated), start next text
-                setTimeout(StartTextAnimation, 1500, i + 1);
-            });
-        }
+        // call callback after timeout
+        setTimeout(fnCallback, 700);
    }
+}

+/**
+ * StartTextAnimation function
+ * start a typewriter animation for a text in the dataText array
+ * @param {number} i current index at which text should be typed next
+ */
+function StartTextAnimation(i)
+{
+    if (typeof dataText[i] === "undefined")
+    {
+        setTimeout(function ()
+        {
+            StartTextAnimation(0);
+        }, 1500);
+    }
+    else if (i < dataText[i].length)
+    {
+        // text exists! start typewriter animation
+        typeWriter(dataText[i], 0, function ()
+        {
+            // after callback (and whole text has been animated), start next text
+            setTimeout(StartTextAnimation, 1500, i + 1);
+        });
+    }
+}
+
+// cv timeline data
+
+function getTimelineData()
+{
+	fetch("/api/timelineData").then(res =>
+	{
+		res.json().then(json =>
+		{
+			console.log(JSON.parse(json));
+		})
+	});
+}
+
+document.addEventListener('DOMContentLoaded', () =>
+{
    // start the text animation
    StartTextAnimation(0);
-});

+    // get timeline data and add it to the timeline
+	//getTimelineData();
+});