Merge branch 'dev'

tbaltrushaitis · Oct 10, 2018 · c36f9f1 · c36f9f1
2 parents 48684be + 4aa8503
commit c36f9f1
Show file tree

Hide file tree

Showing 58 changed files with 668 additions and 451 deletions.
diff --git a/.jshintrc b/.jshintrc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,15 @@
-# CV, Resume, Portfolio, Skills, Career, Bio, All-In-One Web Site #
-
-![CV Logo](assets/img/cv-01.png)
-
-`cv` `resume` `portfolio` `skillset` `professional` `specialist` `IT` `curriculum` `vitae` `site`
-
----
-
-## Badges
-
 [![Standard Version](https://img.shields.io/badge/release-standard%20version-brightgreen.svg?style=plastic)](https://github.com/conventional-changelog/standard-version)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/tbaltrushaitis/cv/blob/master/LICENSE)
 [![dependencies Status](https://david-dm.org/tbaltrushaitis/cv/status.svg)](https://david-dm.org/tbaltrushaitis/cv)
 [![devDependencies Status](https://david-dm.org/tbaltrushaitis/cv/dev-status.svg)](https://david-dm.org/tbaltrushaitis/cv?type=dev)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/tbaltrushaitis/cv/blob/master/LICENSE)
 [![Contributors](https://img.shields.io/github/contributors/tbaltrushaitis/cv.svg)](https://github.com/tbaltrushaitis/cv/graphs/contributors)
 
+# CV, Resume and Portfolio - All-in-One-Page site template with builder #
+
+![CV Logo](assets/img/cv-01.png)
+
+`cv` `resume` `portfolio` `skillset` `professional` `specialist` `IT` `curriculum` `vitae` `site`
+
 ---
 
 ## :memo: Changelog ##
@@ -22,8 +18,10 @@
 - [x] Animations settings moved from javascript code to JSON config
 - [x] Company logo in employment history
 - [x] Icons in skillset list
-- [x] Fontawesome colors tweaks
+- [x] FontAwesome icons color tweaks
 - [x] Dependencies version upgrade
+- [x] Reduced page load time by implementing image compression for portfolio items
+- [x] Moved rc-files to `config/` directory
 
 ### v0.1.4: ###
 - [x] Upgrade Font-Awesome to v5.0.13 and correct html code accordingly
@@ -48,7 +46,7 @@
 - [x] Improved frontend javascripts
 - [x] Dependencies update
 
-### v0.0.0: ###
+### v0.0.0: May 2016 ###
 - [x] Initial release
 
 ---

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 ##                                Build Project                               ##
 ##  ------------------------------------------------------------------------  ##
 
-# .SILENT:
+.SILENT:
 .EXPORT_ALL_VARIABLES:
 .IGNORE:
 .ONESHELL:
@@ -14,7 +14,7 @@ APP_SLOG := "CV+PORTFOLIO"
 APP_LOGO := ./assets/BANNER
 APP_REPO := $(shell git ls-remote --get-url)
 
-APP_ENV := $(shell cat ./NODE_ENV)
+APP_ENV := $(shell cat config/.NODE_ENV)
 CODE_VERSION := $(shell cat ./VERSION)
 
 GIT_COMMIT := $(shell git rev-list --remove-empty --remotes --max-count=1 --date-order --reverse)
@@ -25,11 +25,8 @@ include ./bin/Colors.mk
 
 ##  ------------------------------------------------------------------------  ##
 
-# COMMIT_EXISTS := $(shell [ -e COMMIT ] && echo 1 || echo 0)
-# ifeq ($(COMMIT_EXISTS), 0)
 $(file > COMMIT,${GIT_COMMIT})
-$(warning ${BYellow}[${DT}] Created file [COMMIT]${NC})
-# endif
+$(info [${Cyan}${DT}${NC}] Created file [${BYellow}COMMIT${NC}:${BPurple}${GIT_COMMIT}${NC}])
 
 DIR_SRC := ${WD}/src
 DIR_BUILD := ${WD}/build-${CODE_VERSION}
@@ -63,31 +60,33 @@ default: all;
 .PHONY: test
 
 test: banner state help;
-	@ NODE_ENV=${APP_ENV}; gulp test
+	@ NODE_ENV=${APP_ENV}; gulp --color test
 
 ##  ------------------------------------------------------------------------  ##
 
-.PHONY: setup build deploy dev
+.PHONY: setup build release deploy dev
 
 setup:
 	@ npm i -g npm
 	@ npm i -g bower
 	@ npm i
 	@ bower i
 
+dev: build deploy;
+
 build:
-	@ NODE_ENV=${APP_ENV}; gulp build
+	@ NODE_ENV=${APP_ENV}; gulp --color build
+
+release:
+	@ NODE_ENV=${APP_ENV}; gulp --color dist
 
 deploy:
-	@ NODE_ENV=${APP_ENV}; gulp deploy
+	@ NODE_ENV=${APP_ENV}; gulp --color deploy
 
 # deploy:
 # 	@  cp -prv ${DIR_SRC}/* ./ 		 \
 # 	&& sudo chmod a+x app/bin/*.sh ;
 
-dev: rights build deploy;
-	# @ NODE_ENV=development; gulp build
-
 ##  ------------------------------------------------------------------------  ##
 
 .PHONY: rebuild redeploy
@@ -105,6 +104,6 @@ all: banner clean cycle;
 
 full: clean-all all;
 
-cycle: rights setup build deploy;
+cycle: rights setup build deploy banner;
 
 ##  ------------------------------------------------------------------------  ##
diff --git a/README.md b/README.md
@@ -1,19 +1,15 @@
-# CV, Resume, Portfolio, Skills, Career, Bio, All-In-One Web Site #
-
-![CV Logo](assets/img/cv-01.png)
-
-`cv` `resume` `portfolio` `skillset` `professional` `specialist` `IT` `curriculum` `vitae` `site`
-
----
-
-## Badges
-
 [![Standard Version](https://img.shields.io/badge/release-standard%20version-brightgreen.svg?style=plastic)](https://github.com/conventional-changelog/standard-version)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/tbaltrushaitis/cv/blob/master/LICENSE)
 [![dependencies Status](https://david-dm.org/tbaltrushaitis/cv/status.svg)](https://david-dm.org/tbaltrushaitis/cv)
 [![devDependencies Status](https://david-dm.org/tbaltrushaitis/cv/dev-status.svg)](https://david-dm.org/tbaltrushaitis/cv?type=dev)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/tbaltrushaitis/cv/blob/master/LICENSE)
 [![Contributors](https://img.shields.io/github/contributors/tbaltrushaitis/cv.svg)](https://github.com/tbaltrushaitis/cv/graphs/contributors)
 
+# CV, Resume and Portfolio - All-in-One-Page site template with builder #
+
+![CV Logo](assets/img/cv-01.png)
+
+`cv` `resume` `portfolio` `skillset` `professional` `specialist` `IT` `curriculum` `vitae` `site`
+
 ---
 
 ## :computer: Live Demo ##
@@ -27,7 +23,7 @@
 
 CVs include information on one’s academic background, including teaching experience, degrees, research, awards, publications, presentations, and other achievements. CVs are thus much longer than resumes, and include more information, particularly related to academic background.
 
-A curriculum vitae summary is a one-to-two-page, condensed version of a full curriculum vitae. A CV summary is a way to quickly and concisely convey one’s skills and qualifications. Sometimes large organizations will ask for a one-page CV summary when they expect a large pool of applicants.
+A curriculum vitae summary is a one-to-two-page, condensed version of a full curriculum vitae. A CV summary is a way to quickly and concisely convey one’s skills and qualifications. Sometimes large organizations will ask for a `one-page CV` summary when they expect a large pool of applicants.
 
 [Source](https://www.thebalance.com/cv-vs-resume-2058495)
 

diff --git a/bin/Clean.mk b/bin/Clean.mk
@@ -3,35 +3,30 @@
 ##  ------------------------------------------------------------------------  ##
 
 .PHONY: clean clean-all
-.PHONY: clean-repo clean-src clean-deps
-.PHONY: clean-build clean-dist clean-web clean-files
+.PHONY: clean-repo clean-deps
+.PHONY: clean-build clean-dist clean-files
 
-clean-all: clean clean-web clean-files
+clean-all: clean clean-dist
 
-clean: clean-build clean-dist
+clean: clean-build clean-files
 
 clean-repo:
-	@ ${RM} -rvf ${APP_NAME}
-
-clean-src:
-	@ rm -rvf ${DIR_SRC}
+	@ ${RM} -rf ${APP_NAME}
 
 clean-build:
-	@ rm -rvf ${DIR_BUILD}
+	@ rm -rf ${DIR_BUILD}
 
 clean-dist:
-	@ rm -rvf ${DIR_DIST}
-
-clean-web:
-	@ rm -rvf ${DIR_WEB}
+	@ rm -rf ${DIR_DIST}
 
 clean-deps:
-	@ rm -rvf \
+	@ rm -rf \
 		bower_modules/ \
 		node_modules/ ;
 
 clean-files:
-	@ rm -rvf ${APP_DIRS} \
+	@ rm -rf COMMIT \
+		package-lock.json \
 		bitbucket-pipelines.yml \
 		codeclimate-config.patch \
 		_config.yml ;

diff --git a/bin/Utils.mk b/bin/Utils.mk
@@ -9,7 +9,7 @@ include ./bin/.bash_colors
 .PHONY: state
 
 state:
-	@ echo ${BCyan}---------------------------------------------------------${NC};
+	@ echo "${BCyan}-------------------------------------------------------${NC}";
 	@ echo ${BYellow}ENVIRONMENT VARS:${NC};
 	@ echo ${BCyan}APPLICATION:${NC};
 	@ echo "\t DT \t\t = ${DT}";
@@ -29,7 +29,7 @@ state:
 	@ echo "\t DIR_BUILD \t = ${DIR_BUILD}";
 	@ echo "\t DIR_DIST \t = ${DIR_DIST}";
 	@ echo "\t DIR_WEB \t = ${DIR_WEB}";
-	@ echo ${BCyan}---------------------------------------------------------${NC};
+	@ echo "${BCyan}-------------------------------------------------------${NC}";
 
 ##  ------------------------------------------------------------------------  ##
 ##                 Lists all targets defined in this makefile                 ##
@@ -70,4 +70,4 @@ clone:
 	&& cd ${APP_NAME} \
 	&& git pull;
 
-	##  ------------------------------------------------------------------------  ##
+##  ------------------------------------------------------------------------  ##
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {   "name":        "cv"
-  , "title":       "CV, Resume, Portfolio, Skills Site"
-  , "description": "CV, Resume, Portfolio, Skills, Bio, All-In-One Page Site"
-  , "version":     "0.1.4"
+  , "title":       "CV, Resume and Portfolio site"
+  , "description": "CV, Resume and Portfolio - All-in-One-Page site template with builder"
+  , "version":     "0.1.5"
   , "authors": [
       "tbaltrushaitis@gmail.com"
     ]
@@ -87,6 +87,11 @@
           "src/smoothscroll.js"
         ]
       }
+    , "shufflejs": {
+        "main": [
+          "dist/shuffle.js"
+        ]
+      }
     , "waypoints": {
         "main": [
             "lib/jquery.waypoints.js"

diff --git a/NODE_ENV → config/.NODE_ENV b/NODE_ENV → config/.NODE_ENV
diff --git a/.bowerrc → config/.bowerrc b/.bowerrc → config/.bowerrc
diff --git a/.jscsrc → config/.jscsrc b/.jscsrc → config/.jscsrc
diff --git a/config/.jshintrc b/config/.jshintrc
@@ -0,0 +1,29 @@
+{
+  "browser": true,
+  "jquery": false,
+  "node": true,
+  "esversion": 6,
+  "camelcase":    true,
+  "curly":        true,
+  "eqeqeq":       true,
+  "eqnull":       true,
+  "funcscope":    true,
+  "indent":       2,
+  "latedef":      true,
+  "laxcomma":     true,
+  "maxerr":       50,
+  "newcap":       true,
+  "nonbsp":       true,
+  "notypeof":     true,
+  "shadow":       "inner",
+  "quotmark":     "single",
+  "trailing":     true,
+  "undef":        true,
+  "unused":       true,
+  "strict":       true,
+  "predef": [
+      "APP"
+    , "Modernizr"
+    , "MobileDetect"
+  ]
+}