Merge remote-tracking branch 'refs/remotes/origin/master' into EventRegistration

Author: Clement-Roque

Zenergy/Zenergy/Pages/home.html

@@ -1,7 +1,5 @@
 <div class="jumbotron">
-    <h1>ASP.NET</h1>
-    <p class="lead">ASP.NET is a free web framework for building great Web sites and Web applications using HTML, CSS and JavaScript.</p>
-    <p><a href="http://asp.net" class="btn btn-primary btn-lg">Learn more &raquo;</a></p>
-    <p ng-cloak ng-show="isConnected">Connected AS : {{name}}</p>
-    {{users}}
+    <h1>Zenergy</h1>
+    <p class="lead">Welcome on our website. Here you can manage your account, subscribe to the club and to events. You can also visit our shop to buy some items </p>
+    <p><a ng-hide="isAuthanticated()" href="#Register" class="btn btn-primary btn-lg">Try it</a></p>
 </div>

Zenergy/Zenergy/Scripts/Controllers/shopPageController.js

@@ -32,7 +32,13 @@
             newCC.userId = tokenService.getUserId();
             newCC.productId = p.productId;
             newCC.productQuantity = 1;
-            newCC.$save({ userId: tokenService.getUserId() });
+            newCC.$save({ userId: tokenService.getUserId() }, 
+            function(response){
+                bootbox.alert("Item added in your cart");
+            }, function (response) {
+                bootbox.alert("Item already in your cart");
+            }
+            );
         }
 
     }

Zenergy/Zenergy/Web.config

@@ -11,10 +11,10 @@
   <connectionStrings>
     <add name="DefaultConnection" connectionString="Data Source=(LocalDb)\MSSQLLocalDB;AttachDbFilename=|DataDirectory|\aspnet-Zenergy-20151109023115.mdf;Initial Catalog=aspnet-Zenergy-20151109023115;Integrated Security=True" providerName="System.Data.SqlClient" />
    <!-- prod-->
-    <!--<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergy;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
+    <add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergy;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
 
     <!-- test-->
-    <add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergyTest2;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <!--<add name="ZenergyContext" connectionString="metadata=res://*/Models.ZenergyModel.csdl|res://*/Models.ZenergyModel.ssdl|res://*/Models.ZenergyModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=zenergy.cb9xv2w6phgt.us-west-2.rds.amazonaws.com;initial catalog=zenergyTest2;persist security info=True;user id=admin;password=zenergy1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
 
   </connectionStrings>
   <appSettings></appSettings>