take arguments, move components to header (generic meta) & post (specific meta)

.meteor/versions

@@ -112,11 +112,6 @@ oauth2@1.1.7-rc.2
 observe-sequence@1.0.9-rc.2
 ongoworks:speakingurl@9.0.0
 ordered-dict@1.0.5-rc.2
-peerlibrary:assert@0.2.5
-peerlibrary:fiber-utils@0.6.0
-peerlibrary:reactive-mongo@0.1.1
-peerlibrary:reactive-publish@0.2.0
-peerlibrary:server-autorun@0.5.2
 percolatestudio:synced-cron@1.1.0
 promise@0.6.4-rc.2
 raix:eventemitter@0.1.3
@@ -148,8 +143,8 @@ url@1.0.7-rc.2
 utilities:avatar@0.9.2
 utilities:react-form-containers@0.1.5
 utilities:react-list-container@0.1.5
-utilities:smart-methods@0.1.2
-utilities:smart-publications@0.1.3
+utilities:smart-methods@0.1.0
+utilities:smart-publications@0.1.2
 webapp@1.2.6-rc.2
 webapp-hashing@1.0.7-rc.2
 zimme:active-route@2.3.2

packages/base-components/lib/common/HeadTags.jsx

@@ -1,38 +1,32 @@
 import Helmet from 'react-helmet';
 
-const HeadTags = () => {
-
-	const	logoUrl = Telescope.get("logoUrl", "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a2/SN1994D.jpg/800px-SN1994D.jpg"); // supernova picture
-	const siteTitle = Telescope.get("title", "Telescope");
-	const	tagline = Telescope.get("tagline");
-	const favicon = Telescope.get("favicon", "/img/favicon.ico");
-
+const HeadTags = ({url, title, description, image}) => {
+	debugger
 	return (
 		<Helmet
-			title={siteTitle}
-			base={{href: Meteor.absoluteUrl()}}
+			title={title}
+			base={{href: Telescope.utils.getSiteUrl()}}
 			meta={[
 				{charset: "utf-8"},
-				{name: "description", content: tagline},
+				{name: "description", content: description},
 				// facebook
 				{property: "og:type", content: "article"},
-				{property: "og:url", content: Telescope.utils.getSiteUrl()},
-				{property: "og:image", content: logoUrl},
-				{property: "og:title", content: siteTitle},
-				{property: "og:description", content: tagline},
+				{property: "og:url", content: url},
+				{property: "og:image", content: image},
+				{property: "og:title", content: title},
+				{property: "og:description", content: description},
 				//twitter
 				{name: "twitter:card", content: "summary"},
-				{name: "twitter:image:src", content: logoUrl},
-				{name: "twitter:title", content: siteTitle},
-				{name: "twitter:description", content: tagline}
+				{name: "twitter:image:src", content: image},
+				{name: "twitter:title", content: title},
+				{name: "twitter:description", content: description}
 			]}
 			link={[
 				{rel: "canonical", href: Telescope.utils.getSiteUrl()},
-				{rel: "shortcut icon", href: favicon}
+				{rel: "shortcut icon", href: Telescope.settings.get("favicon", "/img/favicon.ico")}
 			]}
 		/>
 	);
-	
 };
 
 module.exports = HeadTags;

packages/base-components/lib/common/Header.jsx

@@ -5,7 +5,7 @@ const Messages = Core.Messages;
 
 const Header = ({currentUser}) => {
   
-  ({Logo, ListContainer, CategoriesList, FlashContainer, FlashMessages, ModalButton, NewDocContainer, CanCreatePost, CurrentUserContainer, NewsletterForm} = Telescope.components);
+  ({Logo, ListContainer, CategoriesList, FlashContainer, FlashMessages, ModalButton, NewDocContainer, CanCreatePost, CurrentUserContainer, NewsletterForm, HeadTags} = Telescope.components);
 
   const logoUrl = Telescope.settings.get("logoUrl");
   const siteTitle = Telescope.settings.get("title", "Telescope");
@@ -13,7 +13,8 @@ const Header = ({currentUser}) => {
 
   return (
     <header className="header">
-     <div className="logo">
+      <HeadTags url={Telescope.utils.getSiteUrl()} title={siteTitle} description={tagline} image={logoUrl} />
+      <div className="logo">
         <Logo logoUrl={logoUrl} siteTitle={siteTitle} />
         {tagline ? <h2 className="tagline">{tagline}</h2> : "" }
       </div>

packages/base-components/lib/common/Layout.jsx

@@ -1,9 +1,8 @@
 const Layout = props => {
 
-  ({HeadTags, Header, Footer} = Telescope.components);
+  ({Header, Footer} = Telescope.components);
   return (
     <div className="wrapper" id="wrapper">
-      <HeadTags/>
       <Header {...props}/>
       <div className="main">
         {props.children}

packages/base-components/lib/posts/Post.jsx

@@ -4,11 +4,12 @@ const Post = ({document}) => {
 
   const post = document;
   const htmlBody = {__html: post.htmlBody};
-
+  debugger
   return (
     <div className="post">
 
       <h3>{post.title}</h3>
+      <HeadTags url={Posts.getLink(post)} title={post.title}/>
       <SocialShare url={ Posts.getLink(post) } title={ post.title }/>
       <p>{post.commentCount} comments</p>
       <p>{moment(post.postedAt).fromNow()}</p>