Changes to move the html files into the solution so that it deploys e…

…asier to AppHarbor.
7digital · Apr 25, 2011 · 687b223 · 687b223
1 parent 010cba0
commit 687b223
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 23 deletions.
diff --git a/....Xml2Json/Controllers/ImagesController.cs → Controllers/ImagesController.cs b/....Xml2Json/Controllers/ImagesController.cs → Controllers/ImagesController.cs
@@ -4,13 +4,13 @@
 using System.Web;
 using System.Web.Mvc;
 using System.Net;
-using SevenDigital.Api.Xml2Json.Models;
+using SevenDigital.WebGl.Models;
 using System.IO;
 using System.Collections.Specialized;
 using System.Configuration;
-using SevenDigital.Api.Xml2Json.Services;
+using SevenDigital.WebGl.Services;
 
-namespace SevenDigital.Api.Xml2Json.Controllers
+namespace SevenDigital.WebGl.Controllers
 {
 	[HandleError]
 	public class ImagesController : Controller

diff --git a/SevenDigital.Api.Xml2Json/Global.asax → Global.asax b/SevenDigital.Api.Xml2Json/Global.asax → Global.asax
@@ -1 +1 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="SevenDigital.Api.Xml2Json.MvcApplication" Language="C#" %>
+<%@ Application Codebehind="Global.asax.cs" Inherits="SevenDigital.WebGl.MvcApplication" Language="C#" %>
diff --git a/SevenDigital.Api.Xml2Json/Global.asax.cs → Global.asax.cs b/SevenDigital.Api.Xml2Json/Global.asax.cs → Global.asax.cs
@@ -5,7 +5,7 @@
 using System.Web.Mvc;
 using System.Web.Routing;
 
-namespace SevenDigital.Api.Xml2Json
+namespace SevenDigital.WebGl
 {
 	// Note: For instructions on enabling IIS6 or IIS7 classic mode, 
 	// visit http://go.microsoft.com/?LinkId=9394801
@@ -15,6 +15,8 @@ public class MvcApplication : System.Web.HttpApplication
 		public static void RegisterRoutes(RouteCollection routes)
 		{
 			routes.IgnoreRoute("{resource}.axd/{*pathInfo}");
+			routes.IgnoreRoute("static/");
+			routes.IgnoreRoute("{file}.html");
 
 			routes.MapRoute(
 				"Default", // Route name

diff --git a/...igital.Api.Xml2Json/Models/ApiResponse.cs → Models/ApiResponse.cs b/...igital.Api.Xml2Json/Models/ApiResponse.cs → Models/ApiResponse.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Xml.Linq;
 
-namespace SevenDigital.Api.Xml2Json.Models
+namespace SevenDigital.WebGl.Models
 {
 	public class ApiResponse
 	{

diff --git a/...l.Api.Xml2Json/Properties/AssemblyInfo.cs → Properties/AssemblyInfo.cs b/...l.Api.Xml2Json/Properties/AssemblyInfo.cs → Properties/AssemblyInfo.cs
diff --git a/...gital.Api.Xml2Json/Services/ApiWrapper.cs → Services/ApiWrapper.cs b/...gital.Api.Xml2Json/Services/ApiWrapper.cs → Services/ApiWrapper.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using SevenDigital.Api.Xml2Json.Models;
+using SevenDigital.WebGl.Models;
 using System.Net;
 using System.IO;
 using System.Configuration;
 
-namespace SevenDigital.Api.Xml2Json.Services
+namespace SevenDigital.WebGl.Services
 {
 	public class ApiWrapper
 	{

diff --git a/...Xml2Json/SevenDigital.Api.Xml2Json.csproj → SevenDigital.WebGl.csproj b/...Xml2Json/SevenDigital.Api.Xml2Json.csproj → SevenDigital.WebGl.csproj
@@ -10,8 +10,8 @@
     <ProjectTypeGuids>{F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SevenDigital.Api.Xml2Json</RootNamespace>
-    <AssemblyName>SevenDigital.Api.Xml2Json</AssemblyName>
+    <RootNamespace>SevenDigital.WebGl</RootNamespace>
+    <AssemblyName>SevenDigital.WebGl</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
   </PropertyGroup>
@@ -74,8 +74,18 @@
     <Compile Include="Services\ApiWrapper.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="coverFlow.html" />
     <Content Include="Global.asax" />
-    <Content Include="Web.config" />
+    <Content Include="index.html" />
+    <Content Include="Static\glMatrix-0.9.5.min.js" />
+    <Content Include="Static\glUtils.js" />
+    <Content Include="Static\jquery-1.5.js" />
+    <Content Include="Static\sylvester.js" />
+    <Content Include="Static\webgl-debug.js" />
+    <Content Include="Static\webgl-utils.js" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -91,12 +101,11 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
+          <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>51541</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl>http://localhost/SevenDigital.WebGl</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/...pi.Xml2Json/SevenDigital.Api.Xml2Json.sln → SevenDigital.WebGl.sln b/...pi.Xml2Json/SevenDigital.Api.Xml2Json.sln → SevenDigital.WebGl.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SevenDigital.Api.Xml2Json", "SevenDigital.Api.Xml2Json.csproj", "{F2FDA9DC-5931-4314-80CF-482A51C3FB68}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SevenDigital.WebGl", "SevenDigital.WebGl.csproj", "{F2FDA9DC-5931-4314-80CF-482A51C3FB68}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/glMatrix-0.9.5.min.js → Static/glMatrix-0.9.5.min.js b/glMatrix-0.9.5.min.js → Static/glMatrix-0.9.5.min.js
diff --git a/glUtils.js → Static/glUtils.js b/glUtils.js → Static/glUtils.js
diff --git a/jquery-1.5.js → Static/jquery-1.5.js b/jquery-1.5.js → Static/jquery-1.5.js
diff --git a/sylvester.js → Static/sylvester.js b/sylvester.js → Static/sylvester.js
diff --git a/webgl-debug.js → Static/webgl-debug.js b/webgl-debug.js → Static/webgl-debug.js
diff --git a/webgl-utils.js → Static/webgl-utils.js b/webgl-utils.js → Static/webgl-utils.js
diff --git a/SevenDigital.Api.Xml2Json/Web.config → Web.config b/SevenDigital.Api.Xml2Json/Web.config → Web.config
diff --git a/coverFlow.html b/coverFlow.html
@@ -4,10 +4,10 @@
 <title>7digital WebGl Cover Flow</title>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 
-<script type="text/javascript" src="webgl-debug.js"></script>
-<script type="text/javascript" src="sylvester.js"></script>
-<script type="text/javascript" src="glUtils.js"></script>
-<script type="text/javascript" src="jquery-1.5.js"></script>
+<script type="text/javascript" src="./static/webgl-debug.js"></script>
+<script type="text/javascript" src="./static/sylvester.js"></script>
+<script type="text/javascript" src="./static/glUtils.js"></script>
+<script type="text/javascript" src="./static/jquery-1.5.js"></script>
 
 <script id="shader-fs" type="x-shader/x-fragment">
   #ifdef GL_ES
@@ -67,7 +67,7 @@
 	]
 
 	function initApiImages() {
-		var apiUrl = './Xml2Json/images/' 
+		var apiUrl = './images/' 
 						+ getQuerystring("searchType", "artist") 
 						+ "/" + getQuerystring("search");
 

diff --git a/index.html b/index.html
@@ -3,8 +3,8 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 
-<script type="text/javascript" src="glMatrix-0.9.5.min.js"></script>
-<script type="text/javascript" src="webgl-utils.js"></script>
+<script type="text/javascript" src="./static/glMatrix-0.9.5.min.js"></script>
+<script type="text/javascript" src="./static/webgl-utils.js"></script>
 <script type="text/javascript" src="http://code.jquery.com/jquery-1.5.min.js"></script>
 
 <script id="shader-fs" type="x-shader/x-fragment">
@@ -51,7 +51,7 @@
     return qs[1];
 }
 
-var apiUrl = './Xml2Json/images/' 
+var apiUrl = './images/' 
 				+ getQuerystring("searchType", "artist") 
 				+ "/" + getQuerystring("search");