resolve merge conficts

appbaseio · Apr 19, 2017 · 4432af0 · 4432af0
2 parents 210c89e + 489c767
commit 4432af0
Show file tree

Hide file tree

Showing 15 changed files with 775 additions and 28 deletions.
diff --git a/index.html b/index.html
@@ -19,6 +19,10 @@
 </head>
 
 <body id="home">
+	<a href="https://medium.appbase.io/reactivesearch-ui-components-for-building-amazon-yelp-like-search-29a170dfa843" target="_blank" class="medium-post-link">
+		📰 <span>Read All About It!</span>
+	</a>
+
 	<!-- top section START -->
 	<section id="top" class="container-fluid">
 		<!-- Navigation START -->
@@ -282,9 +286,9 @@ <h2>Who's In Town</h2>
 			a.appendChild(r);
 		})(window,document,'//static.hotjar.com/c/hotjar-','.js?sv=');
 	</script>
-	<script src="https://unpkg.com/jquery@3.2.1"></script>
-	<script src="https://unpkg.com/packery@2/dist/packery.pkgd.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="website/dist/js/vendor/jquery-3.2.1.min.js"></script>
+	<script src="website/dist/js/vendor/packery.pkgd.min.js"></script>
+	<script src="website/dist/js/vendor/bootstrap.min.js"></script>
 	<script src="website/assets/js/app.js"></script>
 	<script>
 		setInterval(() => {

diff --git a/website/README.md b/website/README.md
@@ -41,3 +41,4 @@ gulp
 ### Misc Tasks
 
 - `yarn run imagemin` minifies all images from `assets/images` to `dist/images`. Add raw images to `assets/images` and run this command.
+- `yarn run migrate-vendor-js` copies JS from `assets/js/vendor` to `dist/js/vendor`. Use this anytime you add a third party script to `assets/js/vendor`. Setting it up like this opens it up for other operations (e.g. minification, concat, browserify, etc.).
diff --git a/website/assets/css/style.css b/website/assets/css/style.css
@@ -547,6 +547,42 @@ ul > li {
     position: relative;
     z-index: 9999; } }
 
+@keyframes slideLeft {
+  0% {
+    transform: translateX(0); }
+  100% {
+    transform: translateX(-100%); } }
+
+.medium-post-link {
+  position: fixed;
+  bottom: 15px;
+  left: 0;
+  padding-left: 15px;
+  background: #173baa;
+  font-family: source sans pro, sans-serif;
+  font-weight: bold;
+  font-size: 13px;
+  padding: 15px 30px;
+  border-radius: 0 5px 5px 0;
+  color: white;
+  z-index: 99999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: all 0.4s cubic-bezier(1, 0.48, 0.89, 1.33);
+  transform: translateX(-100%);
+  animation: 800ms slideRight forwards; }
+  .medium-post-link:not(.js-active) {
+    animation-delay: 1200ms; }
+  .medium-post-link.js-active {
+    animation: 800ms slideLeft forwards; }
+  .medium-post-link span {
+    margin-left: 10px; }
+  .medium-post-link:hover, .medium-post-link:active, .medium-post-link:focus {
+    color: white;
+    background: #1a42c1;
+    text-decoration: none; }
+
 #home .navbar {
   position: absolute;
   top: 0;

diff --git a/website/assets/js/app.js b/website/assets/js/app.js
@@ -13,13 +13,34 @@ $(document).ready(function() {
 	}
 
 	// Stars
-	$.ajax({
-		url: 'https://api.github.com/repos/appbaseio/reactivesearch',
-	}).done(function(data) {
-		if (data.stargazers_count > 1) {
-			$('.js-stars').text(data.stargazers_count);
-		} else {
-			$('.js-stars').hide();
+	function x() {
+		$.ajax({
+			url: 'https://api.github.com/repos/appbaseio/reactivesearch',
+		}).done(function(data) {
+			if (data.stargazers_count > 1 && data.forks > 6) {
+				$('.js-stars').text(data.stargazers_count);
+			} else {
+				$('.js-stars').hide();
+			}
+		})
+	}
+	x()
+	// Slide Out Blog post tab after some scrolling
+	// with throttle
+	var didScroll = false;
+	$(window).scroll(function() {
+		didScroll = true;
+	});
+	setInterval(function() {
+		if (didScroll) {
+			// If they scrolled 100vh
+			if ($('html').scrollTop() > $(window).height()) {
+				$('.medium-post-link').addClass('js-active');
+			} else {
+				$('.medium-post-link').removeClass('js-active');
+			}
+
+			didScroll = false;
 		}
-	})
+	}, 250);
 });
diff --git a/website/assets/js/vendor/bootstrap.min.js b/website/assets/js/vendor/bootstrap.min.js
diff --git a/website/assets/js/vendor/jquery-3.2.1.min.js b/website/assets/js/vendor/jquery-3.2.1.min.js
diff --git a/website/assets/js/vendor/packery.pkgd.min.js b/website/assets/js/vendor/packery.pkgd.min.js
diff --git a/website/assets/styles/partials/components/_home.scss b/website/assets/styles/partials/components/_home.scss
@@ -602,3 +602,53 @@ ul > li {
 		z-index: 9999;
 	}
 }
+
+@keyframes slideLeft {
+	0% {
+		transform: translateX(0);
+	}
+	100% {
+		transform: translateX(-100%);
+	}
+}
+
+.medium-post-link {
+	position: fixed;
+	bottom: 15px;
+	left: 0;
+	padding-left: 15px;
+	background: lighten(#143394, 5%);
+	font-family: source sans pro, sans-serif;
+	font-weight: bold;
+	font-size: 13px;
+	padding: 15px 30px;
+	border-radius: 0 5px 5px 0;
+	color: white;
+	z-index: 99999;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	transition: all .4s cubic-bezier(1, 0.48, 0.89, 1.33);
+	transform: translateX(-100%);
+	animation: 800ms slideRight forwards;
+
+	&:not(.js-active) {
+		animation-delay: 1200ms;
+	}
+
+	&.js-active {
+		animation: 800ms slideLeft forwards;
+	}
+
+	span {
+		margin-left: 10px;
+	}
+
+	&:hover,
+	&:active,
+	&:focus {
+		color: white;
+		background: lighten(#143394, 10%);
+		text-decoration: none;
+	}
+}
diff --git a/website/dist/css/style.min.css b/website/dist/css/style.min.css
diff --git a/website/dist/js/vendor/bootstrap.min.js b/website/dist/js/vendor/bootstrap.min.js
diff --git a/website/dist/js/vendor/jquery-3.2.1.min.js b/website/dist/js/vendor/jquery-3.2.1.min.js
diff --git a/website/dist/js/vendor/packery.pkgd.min.js b/website/dist/js/vendor/packery.pkgd.min.js
diff --git a/website/package.json b/website/package.json
@@ -1,8 +1,10 @@
 {
   "scripts": {
-    "imagemin": "imagemin-dir assets/images dist/images"
+    "imagemin": "imagemin-dir assets/images dist/images",
+    "migrate-vendor-js": "cpx assets/js/vendor/**/*.js dist/js/vendor --verbose"
   },
   "devDependencies": {
+    "cpx": "^1.5.0",
     "imagemin": "^5.2.2",
     "imagemin-cli": "^3.0.0",
     "imagemin-cli-preserve-dir-structure": "^0.0.2"

diff --git a/website/pages/index.html b/website/pages/index.html
@@ -19,6 +19,10 @@
 </head>
 
 <body id="home">
+	<a href="https://medium.appbase.io/reactivesearch-ui-components-for-building-amazon-yelp-like-search-29a170dfa843" target="_blank" class="medium-post-link">
+		📰 <span>Read All About It!</span>
+	</a>
+
 	<!-- top section START -->
 	<section id="top" class="container-fluid">
 		<!-- Navigation START -->
@@ -245,9 +249,9 @@ <h2>Who's In Town</h2>
 			a.appendChild(r);
 		})(window,document,'//static.hotjar.com/c/hotjar-','.js?sv=');
 	</script>
-	<script src="https://unpkg.com/jquery@3.2.1"></script>
-	<script src="https://unpkg.com/packery@2/dist/packery.pkgd.min.js"></script>
-	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+	<script src="website/dist/js/vendor/jquery-3.2.1.min.js"></script>
+	<script src="website/dist/js/vendor/packery.pkgd.min.js"></script>
+	<script src="website/dist/js/vendor/bootstrap.min.js"></script>
 	<script src="website/assets/js/app.js"></script>
 	<script>
 		setInterval(() => {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,4 @@ gulp
		### Misc Tasks

		- `yarn run imagemin` minifies all images from `assets/images` to `dist/images`. Add raw images to `assets/images` and run this command.
		- `yarn run migrate-vendor-js` copies JS from `assets/js/vendor` to `dist/js/vendor`. Use this anytime you add a third party script to `assets/js/vendor`. Setting it up like this opens it up for other operations (e.g. minification, concat, browserify, etc.).