Merge branch 'dev'

tbaltrushaitis · May 6, 2019 · 448b1ab · 448b1ab
2 parents 16703da + 7d75daa
commit 448b1ab
Show file tree

Hide file tree

Showing 52 changed files with 1,623 additions and 1,582 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 <p align="center">
-  <a href="https://github.com/tbaltrushaitis/cv/releases"><img src="https://img.shields.io/github/release/tbaltrushaitis/cv.svg?style=flat" alt="GitHub release"></a>
-  <a href="https://github.com/tbaltrushaitis/cv/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-green.svg?style=flat" alt="License"></a>
-  <img src="https://img.shields.io/david/tbaltrushaitis/cv.svg" alt="Dependencies">
-  <img src="https://img.shields.io/david/dev/tbaltrushaitis/cv.svg" alt="Dev Dependencies">
+  <a href="https://github.com/tbaltrushaitis/cv/releases"><img src="https://img.shields.io/github/release/tbaltrushaitis/cv.svg?style=flat" alt="GitHub release" /></a>
+  <a href="https://github.com/tbaltrushaitis/cv/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-green.svg?style=flat" alt="License" /></a>
+  <img src="https://img.shields.io/david/tbaltrushaitis/cv.svg" alt="Dependencies" />
+  <img src="https://img.shields.io/david/dev/tbaltrushaitis/cv.svg" alt="Dev Dependencies" />
 </p>
 
 <p align="center">
@@ -19,12 +19,30 @@
 
 :mortar_board: Best-in-Class modern CV, Resume and Portfolio website template. All-in-One-Page site with fully customizable builder.
 
-`modern` `cv` `resume` `template` `portfolio` `portfolio-website` `cv-template` `IT` `curriculum-vitae` `cv-summary` `resume-template` `resume-website` `cv-website` `animated` `template-project`
+`modern` `cv` `resume` `template` `portfolio` `portfolio-website` `cv-template` `IT` `curriculum-vitae` `cv-summary` `resume-template` `resume-website` `cv-website` `template-project`
 
 ---
 
 ## :memo: Change history ##
 
+### v0.2.2: ###
+- [x] Several tweaks for apache server caching and compressing added in `.htaccess` file
+- [x] Bower packages updated to latest versions: `modernizr`, `smoothscroll`, `font-awesome` and `jquery`
+- [x] NPM packages updated to latest versions: `jimp`, `jshint` and `yargs`
+- [x] Added colors for several skills icons
+- [x] Implemented Gulp and Make tasks for preparation of archive with project distro
+- [x] Fixed bug with responsive styling
+- [x] Added tooltips for skill icons in employment history cards
+- [x] Improved styles building gulp task
+- [x] Implemented FOUC (flash of unstyled content) workaround
+- [x] Added category keys for npm scripts in package.json - from [Jason Yu](https://dev.to/ycmjason/how-to-organise-npm-scripts-4d2m)
+- [x] Shorter color names for console logs
+- [x] One global function to show date and time in console logs
+
+### v0.2.1: ###
+- [x] For each item in the portfolio section buttons with links to live demos now goes before "zoom" and "github repo" buttons
+- [x] Added tooltips for links to profiles in social media at "home" section
+
 ### v0.2.0: ###
 - [x] For several links attribute `rel="noopener"` added for higher security
 - [x] Many major improvements for gulp tasks

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-nowdays The CV Authors (https://github.com/tbaltrushaitis/cv/graphs/contributors)
+Copyright (c) 2016-nowdays The CV Authors (https://github.com/tbaltrushaitis/cv/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/Makefile b/Makefile
@@ -8,6 +8,8 @@
 .ONESHELL:
 
 SHELL = /bin/sh
+THIS_FILE := $(lastword $(MAKEFILE_LIST))
+TO_NULL = 2>&1 >/dev/null
 
 ##  ------------------------------------------------------------------------  ##
 $(shell [ -f NODE_ENV ] || cp -prfu config/.NODE_ENV ./NODE_ENV);
@@ -23,12 +25,11 @@ APP_REPO := $(shell git ls-remote --get-url)
 CODE_VERSION := $(shell cat ./VERSION)
 GIT_COMMIT := $(shell git rev-list --remove-empty --remotes --max-count=1 --date-order --reverse)
 WD := $(shell pwd -P)
-DT = $(shell date +'%Y%m%d%H%M%S')
+DT = $(shell date +'%Y-%m-%dT%H:%M:%S %Z')
 
 APP_ENV := $(strip $(shell [ -f NODE_ENV ] && cat NODE_ENV || cat config/.NODE_ENV))
 ifeq ($(APP_ENV),)
 $(info [$(White)$(DT)$(NC)] APP_ENV is NOT DETECTED!)
-APP_ENV := $(strip $(shell echo $([ -f NODE_ENV ] && cat NODE_ENV || cat config/.NODE_ENV)))
 endif
 
 BUILD_FILE = BUILD-$(CODE_VERSION)
@@ -66,19 +67,35 @@ BUILD_CONTENT := $(subst BUILD_HASH,$(BUILD_HASH),$(BUILD_CONTENT))
 BUILD_CONTENT := $(subst GIT_COMMIT,$(GIT_COMMIT),$(BUILD_CONTENT))
 BUILD_CONTENT := $(subst CODE_VERSION,$(CODE_VERSION),$(BUILD_CONTENT))
 
-# $(info [$(White)$(DT)$(NC)] BUILD_CONTENT [$(Yellow)$(BUILD_CONTENT)$(NC)])
 $(file > config/build.json,$(BUILD_CONTENT))
 $(info [$(White)$(DT)$(NC)] Created file [$(Yellow)BUILD_CONTENT$(NC):$(BPurple)$(WD)/config/build.json$(NC)])
 
 ##  ------------------------------------------------------------------------  ##
-
+##  COMMIT information
+##  ------------------------------------------------------------------------  ##
 $(file > COMMIT,$(GIT_COMMIT));
 $(info [$(White)$(DT)$(NC)] Created file [$(BYellow)COMMIT$(NC):$(BPurple)$(GIT_COMMIT)$(NC)]);
 
-DIR_SRC := ${WD}/src
-DIR_BUILD := ${WD}/build-${CODE_VERSION}
-DIR_DIST := ${WD}/dist-${CODE_VERSION}
-DIR_WEB := ${WD}/webroot
+##  ------------------------------------------------------------------------  ##
+##                               DIRECTORIES                                  ##
+##  ------------------------------------------------------------------------  ##
+
+ARC := arch
+SRC := src
+BLD := build-${CODE_VERSION}
+DST := dist-${CODE_VERSION}
+WEB := webroot
+
+$(shell [ -d $(ARC) ] || mkdir $(ARC))
+
+##  ------------------------------------------------------------------------  ##
+##                                 PATHS                                      ##
+##  ------------------------------------------------------------------------  ##
+
+DIR_SRC := $(WD)/$(SRC)
+DIR_BUILD := $(WD)/$(BLD)
+DIR_DIST := $(WD)/$(DST)
+DIR_WEB := $(WD)/$(WEB)
 
 ##  ------------------------------------------------------------------------  ##
 ##  Query default goal.
@@ -134,7 +151,9 @@ build:
 	@ export NODE_ENV="${APP_ENV}"; npm run build
 
 dist:
-	@ export NODE_ENV="${APP_ENV}"; gulp dist
+	@ export NODE_ENV="production"; npm run build
+	@ export NODE_ENV="${APP_ENV}"; npm run dist
+	@ tar -c "${DST}" | gzip -9 > "${ARC}/${APP_NAME}-v${CODE_VERSION}-b${BUILD_CNTR}.tar.gz"
 
 deploy:
 	@ export NODE_ENV="${APP_ENV}"; npm run deploy
@@ -146,11 +165,14 @@ update: pre-update setup ;
 
 ##  ------------------------------------------------------------------------  ##
 
-.PHONY: rebuild redeploy
+.PHONY: rebuild redeploy rb rd
 
 rebuild: build ;
 redeploy: rebuild deploy banner ;
 
+rb: rebuild;
+rd: redeploy;
+
 ##  ------------------------------------------------------------------------  ##
 
 .PHONY: all full cycle cycle-dev dev run watch
@@ -161,14 +183,13 @@ all: clean cycle banner ;
 
 full: clean-all all banner ;
 
-cycle: rights setup build deploy ;
+cycle: setup build deploy ;
 cycle-dev: build deploy ;
 
 dev: clean-build cycle-dev banner ;
 	@ export NODE_ENV="${APP_ENV}"; npm run dev ;
 
-run: banner help ;
-	@ export NODE_ENV="${APP_ENV}"; npm run all
+run: banner help cycle dist banner ;
 
 watch:
 	@ export NODE_ENV="${APP_ENV}"; npm run watch

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 
 :mortar_board: Best-in-Class modern CV, Resume and Portfolio website template. All-in-One-Page site with fully customizable builder.
 
-`modern` `cv` `resume` `template` `portfolio` `portfolio-website` `cv-template` `IT` `curriculum-vitae` `cv-summary` `resume-template` `resume-website` `cv-website` `animated` `template-project`
+`modern` `cv` `resume` `portfolio` `template` `portfolio-website` `cv-template` `IT` `cv-summary` `resume-template` `resume-website` `cv-website` `animated` `template-project`
 
 ---
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.2
diff --git a/bin/Help.mk b/bin/Help.mk
@@ -8,14 +8,14 @@ help: banner
 	@ echo ${BCyan}---------------------------------------------------------${NC};
 	@ echo ${BBlue}DEVELOPMENT${NC} ${White}Commands${NC}:;
 	@ echo "\t" make ${Purple}help${NC} "\t" - show usage info;
-	@ echo "\t" make ${Purple}clean${NC} "\t" - CLEAR directories and delete files;
-	@ echo "\t" make ${Purple}setup${NC} "\t" - Check for installations of php, node, bower and other dependencies;
-	@ echo "\t" make ${Purple}build${NC} "\t" - BUILD project from sources;
-	@ echo "\t" make ${Purple}release${NC} "\t" - COMPILE project distro;
-	@ echo "\t" make ${BPurple}deploy${NC} "\t" - sync public dir [${Yellow}${DIR_WEB}${NC}] with compiled project distro [${Cyan}$(DIR_DIST)${NC}];
-	@ echo "\t" make ${BRed}rebuild${NC} "\t" - Run [${Yellow}build, release, deploy${NC}] tasks;
-	@ echo "\t" make ${BRed}redeploy${NC} " " - Run [${Yellow}rebuild, deploy${NC}] tasks;
-	@ echo "\t" make ${BRed}all${NC} "\t" - Run ${Yellow}all${NC} defined tasks for current stage [${Red}$(APP_ENV)${NC}] read from ${Cyan}NODE_ENV${NC};
+	@ echo "\t" make ${Yellow}clean${NC} "\t" - CLEAR directories and delete files;
+	@ echo "\t" make ${Yellow}setup${NC} "\t" - Check for installations of node, bower and other dependencies;
+	@ echo "\t" make ${Yellow}build${NC} "\t" - BUILD project from sources into [${Cyan}$(DIR_BUILD)${NC}];
+	@ echo "\t" make ${Yellow}dist${NC} "\t" - COMPILE project distro to [${Cyan}$(DIR_DIST)${NC}];
+	@ echo "\t" make ${BYellow}deploy${NC} "\t" - SYNC public dir [${Purple}${DIR_WEB}${NC}] with compiled project distro;
+	@ echo "\t" make ${BRed}rebuild${NC} "\t" - Run [${White}build${NC}, ${White}release${NC}, ${White}deploy${NC}] tasks;
+	@ echo "\t" make ${BRed}redeploy${NC} " " - Run [${White}rebuild${NC}, ${White}deploy${NC}] tasks;
+	@ echo "\t" make ${BRed}all${NC} "\t" - Run ${White}all${NC} defined tasks for current stage [${Red}$(APP_ENV)${NC}] which is read from [${Cyan}NODE_ENV${NC}];
 	@ echo ${BCyan}---------------------------------------------------------${NC};
 
 ##  ------------------------------------------------------------------------  ##
diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {   "name": "cv"
-  , "version": "0.2.0"
+  , "version": "0.2.2"
   , "title": "Modern CV, Resume and Portfolio website"
   , "description": "Best-in-Class website template for modern CV, Resume and Portfolio. Easy customizable static website with simple smart easy-to-use builder."
   , "homepage": "https://github.com/tbaltrushaitis/cv"
@@ -27,21 +27,21 @@
         "animate.css":    "^3.7.0"
       , "bootstrap":      "~3.3.7"
       , "bower-jquery-easyPieChart": "^0.0.1"
-      , "font-awesome":   "#5.7.2"
+      , "font-awesome":   "#5.8.1"
       , "fitvids":        "jquery.fitvids#^1.2.0"
       , "html5shiv":      "~3.7.3"
-      , "jquery":         "~3.3.1"
+      , "jquery":         "~3.4.0"
       , "jquery-countTo": "countto#^1.2.0"
       , "jquery.inview":  "jquery.inview#^1.1.2"
       , "jquery.stellar": "^0.6.2"
       , "jquery-sticky":  "sticky#1.0.4"
       , "jquery-throttle-debounce": "*"
       , "magnific-popup": "^1.1.0"
-      , "modernizr":      "^3.6.0"
+      , "modernizr":      "^3.7.1"
       , "noty":           "~2.4.1"
       , "requirejs":      "~2.3.6"
       , "respond":        "~1.4.2"
-      , "smoothscroll":   "^0.4.2"
+      , "smoothscroll":   "^0.4.4"
       , "shufflejs":      "^5.2.0"
       , "waypoints":      "^4.0.1"
       , "wow":            "wow-mit#~1.3.0"

diff --git a/config/.bowerrc b/config/.bowerrc
@@ -1,4 +1,4 @@
 {
-    "directory": "bower_modules"
-  , "color":     true
+  "color": true
+, "directory": "bower_modules"
 }
diff --git a/config/.jscsrc b/config/.jscsrc
@@ -4,73 +4,73 @@
  * NO License required
  */
 {
-    /*"disallowSpacesInNamedFunctionExpression": {
-      "beforeOpeningCurlyBrace": true
-    }
-  , "disallowSpacesInFunctionExpression": {
+  /*"disallowSpacesInNamedFunctionExpression": {
     "beforeOpeningCurlyBrace": true
-    }
-  , "disallowSpacesInAnonymousFunctionExpression": {
+  }
+, "disallowSpacesInFunctionExpression": {
     "beforeOpeningCurlyBrace": true
-    }
-  , "disallowSpacesInFunctionDeclaration": {
+  }
+, "disallowSpacesInAnonymousFunctionExpression": {
     "beforeOpeningCurlyBrace": true
-    }
-  , */
-    "disallowEmptyBlocks":                      false
-  , "disallowSpacesInsideArrayBrackets":        true
-  , "disallowSpacesInsideParentheses":          true
-  , "disallowQuotedKeysInObjects":              true
-  , "disallowSpaceAfterObjectKeys":             true
-  , "disallowSpaceAfterPrefixUnaryOperators":   true
-  , "disallowSpaceBeforePostfixUnaryOperators": true
-  , "disallowSpaceBeforeBinaryOperators": [
-      ","
-    ]
-  , "disallowMixedSpacesAndTabs":               true
-  , "disallowTrailingWhitespace":               true
-  , "disallowTrailingComma":                    true
-  , "disallowYodaConditions":                   false
-  , "disallowKeywords": [
-      "with"
-    ]
-  , "disallowMultipleLineBreaks":               true
-  , "disallowMultipleVarDecl":                  false
-  , "requireBlocksOnNewline":                   1
-  , "requireCamelCaseOrUpperCaseIdentifiers":   true
-  , "requireCapitalizedConstructors":           true
-  , "requireCommaBeforeLineBreak":              false
-  , "requireCurlyBraces": [
-      "do"
-    ]
-  , "requireDotNotation":                       true
-  , "requireLineFeedAtFileEnd":                 true
-  , "requireParenthesesAroundIIFE":             true
-  , "requirePaddingNewLinesAfterBlocks":        false
-  , "requireSpaceBeforeBlockStatements":        true
-  , "requireSpacesInConditionalExpression":     true
-  , "requireSpaceBeforeBinaryOperators":        true
-  , "requireSpaceAfterBinaryOperators":         true
-  , "requireSpacesInForStatement":              true
-  , "requireSpaceBetweenArguments":             true
-  , "requireSpaceAfterKeywords": [
-        "if"
-      , "else"
-      , "for"
-      , "while"
-      , "do"
-      , "switch"
-      , "case"
-      , "return"
-      , "try"
-      , "catch"
-      , "typeof"
-    ]
-  , "requirePaddingNewLinesBeforeLineComments": {
-        "allExcept": "firstAfterCurly"
-    }
-  , "safeContextKeyword":  "self"
-  , "validateLineBreaks":  "LF"
-  , "validateQuoteMarks":  "'"
-  , "validateIndentation": 2
+  }
+, "disallowSpacesInFunctionDeclaration": {
+    "beforeOpeningCurlyBrace": true
+  }
+, */
+  "disallowEmptyBlocks":                      false
+, "disallowSpacesInsideArrayBrackets":        true
+, "disallowSpacesInsideParentheses":          true
+, "disallowQuotedKeysInObjects":              true
+, "disallowSpaceAfterObjectKeys":             true
+, "disallowSpaceAfterPrefixUnaryOperators":   true
+, "disallowSpaceBeforePostfixUnaryOperators": true
+, "disallowSpaceBeforeBinaryOperators": [
+    ","
+  ]
+, "disallowMixedSpacesAndTabs":               true
+, "disallowTrailingWhitespace":               true
+, "disallowTrailingComma":                    true
+, "disallowYodaConditions":                   false
+, "disallowKeywords": [
+    "with"
+  ]
+, "disallowMultipleLineBreaks":               true
+, "disallowMultipleVarDecl":                  false
+, "requireBlocksOnNewline":                   1
+, "requireCamelCaseOrUpperCaseIdentifiers":   true
+, "requireCapitalizedConstructors":           true
+, "requireCommaBeforeLineBreak":              false
+, "requireCurlyBraces": [
+    "do"
+  ]
+, "requireDotNotation":                       true
+, "requireLineFeedAtFileEnd":                 true
+, "requireParenthesesAroundIIFE":             true
+, "requirePaddingNewLinesAfterBlocks":        false
+, "requireSpaceBeforeBlockStatements":        true
+, "requireSpacesInConditionalExpression":     true
+, "requireSpaceBeforeBinaryOperators":        true
+, "requireSpaceAfterBinaryOperators":         true
+, "requireSpacesInForStatement":              true
+, "requireSpaceBetweenArguments":             true
+, "requireSpaceAfterKeywords": [
+    "if"
+  , "else"
+  , "for"
+  , "while"
+  , "do"
+  , "switch"
+  , "case"
+  , "return"
+  , "try"
+  , "catch"
+  , "typeof"
+  ]
+, "requirePaddingNewLinesBeforeLineComments": {
+    "allExcept": "firstAfterCurly"
+  }
+, "safeContextKeyword":  "self"
+, "validateLineBreaks":  "LF"
+, "validateQuoteMarks":  "'"
+, "validateIndentation": 2
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
     :mortar_board: Best-in-Class modern CV, Resume and Portfolio website template. All-in-One-Page site with fully customizable builder.
-    `modern` `cv` `resume` `template` `portfolio` `portfolio-website` `cv-template` `IT` `curriculum-vitae` `cv-summary` `resume-template` `resume-website` `cv-website` `animated` `template-project`
+    `modern` `cv` `resume` `portfolio` `template` `portfolio-website` `cv-template` `IT` `cv-summary` `resume-template` `resume-website` `cv-website` `animated` `template-project`
     ---
@@ Expand Down @@