Merge branch 'master' of github.com:TelerikAcademy/ShowcaseSystem

TelerikAcademy · Aug 15, 2015 · c4f9a17 · c4f9a17
2 parents 4601532 + 47a93a2
commit c4f9a17
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 12 deletions.
diff --git a/Source/Client/Showcase.Client.App/Scripts/_references.js b/Source/Client/Showcase.Client.App/Scripts/_references.js
@@ -150,6 +150,6 @@
 /// <reference path="../app/not-found-page/not-found-controller.js" />
 /// <reference path="../app/project-details-page/project-tags-directive.js" />
 /// <reference path="../app/user-profile-page/user-profile-collaborators-directive.js" />
-/// <reference path="../app/build/vendorjs2015081446.min.js" />
-/// <reference path="../app/build/alljs2015081430.min.js" />
+/// <reference path="../app/build/vendorjs2015081417.min.js" />
+/// <reference path="../app/build/alljs2015081417.min.js" />
 
diff --git a/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj b/Source/Client/Showcase.Client.App/Showcase.Client.App.csproj
@@ -127,9 +127,9 @@
     <Content Include="app\add-project-page\add-project-controller.js" />
     <Content Include="app\add-project-page\add-project-data.js" />
     <Content Include="app\add-project-page\add-project-view.html" />
-    <Content Include="app\build\allcss2015081430.min.css" />
-    <Content Include="app\build\alljs2015081430.min.js" />
-    <Content Include="app\build\vendorjs2015081446.min.js" />
+    <Content Include="app\build\allcss2015081417.min.css" />
+    <Content Include="app\build\alljs2015081417.min.js" />
+    <Content Include="app\build\vendorjs2015081417.min.js" />
     <Content Include="app\common\comments-data.js" />
     <Content Include="app\add-project-page\file-upload-directive.js" />
     <Content Include="app\add-project-page\token-input-directive.js" />

diff --git a/Source/Client/Showcase.Client.App/crawlers.cshtml b/Source/Client/Showcase.Client.App/crawlers.cshtml
@@ -13,8 +13,14 @@
 
     <meta name="title" content="@Model.Title" />
     <meta name="description" content="@Model.Description" />
-    <meta property="og:image" content="/Images/@(Model.MainImageUrl)_high.jpg" />
+    <meta property="og:title" content="@Model.Title" />
+    <meta property="og:description" content="@Model.Description" />
+    <meta property="og:type" content="website" />
+    <meta property="og:site_name" content="Telerik Academy Showcase System" />
+    <meta property="og:image:url" content="http://@Model.HostUrl/Images/@(Model.MainImageUrl)_high.jpg" />
     <meta property="og:image:type" content="image/jpeg" />
+    <meta property="og:image:width" content="1360" />
+    <meta property="og:image:height" content="780" />
 </head>
 <body>
 </body>

diff --git a/Source/Client/Showcase.Client.App/index-template.html b/Source/Client/Showcase.Client.App/index-template.html
@@ -10,10 +10,16 @@
     <meta name="keywords" content="Telerik Academy Showcase System" />
     <meta name="Author" content="Telerik Academy" />
 
-    <meta name="title" content="Telerik Showcase System" />
-    <meta name="description" content="Showcase system for students\' projects in Telerik Academy" />
-    <meta property="og:image" content="/content/images/telerik-logo.png" />
+    <meta name="title" content="Telerik Academy Showcase System" />
+    <meta name="description" content="Showcase system for students' projects in Telerik Academy" />
+    <meta property="og:title" content="Telerik Academy Showcase System" />
+    <meta property="og:description" content="Showcase system for students' projects in Telerik Academy" />
+    <meta property="og:type" content="website" />
+    <meta property="og:site_name" content="Telerik Academy Showcase System" />
+    <meta property="og:image:url" content="http://best.telerikacademy.com/content/images/telerik-logo.png" />
     <meta property="og:image:type" content="image/png" />
+    <meta property="og:image:width" content="371" />
+    <meta property="og:image:height" content="373" />
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, maximum-scale=1, initial-scale=1, user-scalable=0" />
@@ -34,8 +40,8 @@
         <script src="/scripts/epona/plugins/respond.js"></script>
     <![endif]-->
 </head>
-<body class="smoothscroll">
-    <div id="wrapper" ng-app="showcaseSystem" ng-cloak ng-controller="MainController as vm">
+<body class="smoothscroll" ng-app="showcaseSystem" ng-cloak ng-controller="MainController as vm">
+    <div id="wrapper">
         <div id="header" showcase-header animate="fadeIn"></div>
 
         <div id="content" ng-view></div>

diff --git a/Source/Data/Showcase.Data.Common/ValidationConstants.cs b/Source/Data/Showcase.Data.Common/ValidationConstants.cs
@@ -9,7 +9,7 @@ public class ValidationConstants
         public const int MinProjectTitleLength = 2;
         public const int MaxProjectTitleLength = 70;
         public const int MinProjectDescriptionLength = 70;
-        public const int MaxProjectDescriptionLength = 700;
+        public const int MaxProjectDescriptionLength = 2500;
         public const int MaxProjectUrlLength = 200;
         public const int MinProjectCollaboratorsLength = 0;
         public const int MinProjectTagsLength = 4;

diff --git a/Source/Server/Showcase.Server.Api/Controllers/CrawlersController.cs b/Source/Server/Showcase.Server.Api/Controllers/CrawlersController.cs
@@ -28,6 +28,8 @@ public async Task<IHttpActionResult> Get(int id)
                 .To<ProjectCrawlerResponseModel>()
                 .FirstOrDefaultAsync();
 
+            model.HostUrl = this.Request.RequestUri.Authority;
+
             return this.Ok(model);
         }
     }

diff --git a/Source/Server/Showcase.Server.DataTransferModels/Project/ProjectCrawlerResponseModel.cs b/Source/Server/Showcase.Server.DataTransferModels/Project/ProjectCrawlerResponseModel.cs
@@ -11,6 +11,8 @@ public class ProjectCrawlerResponseModel : IMapFrom<Project>, IHaveCustomMapping
 
         public string Description { get; set; }
 
+        public string HostUrl { get; set; }
+
         public string MainImageUrl { get; set; }
 
         public void CreateMappings(IConfiguration configuration)