Permalink
Browse files

removed mvccontrib stuff and updated admin stuff to show users

  • Loading branch information...
devinrader committed Dec 28, 2011
1 parent 42a3dcc commit 989bc5196cdc856661b2ea505b19263ddfe6b64f
@@ -1,25 +0,0 @@
-using System.Web.Mvc;
-using MvcContrib.PortableAreas;
-
-namespace Website.Areas.Admin
-{
-public class AdminAreaRegistration : PortableAreaRegistration
-{
- public override string AreaName
- {
- get
- {
- return "Admin";
- }
- }
-
- public override void RegisterArea(AreaRegistrationContext context, IApplicationBus bus)
- {
- context.MapRoute(
- "Admin_default",
- "Admin/{controller}/{action}/{id}",
- new { action = "Index", id = UrlParameter.Optional }
- );
- }
-}
-}
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Web.Mvc;
-
-namespace AdminPortableArea.Admin.Controllers
-{
- public class UserController : Controller
- {
- //
- // GET: /Admin/User/
-
- public ActionResult List()
- {
- return View();
- }
-
- }
-}
@@ -1,7 +0,0 @@
-@{
- ViewBag.Title = "List";
-}
-
-<h2>List</h2>
-
-Portable Area
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.30703</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{5E370DB6-4A18-4731-BA6D-B3E9411EBECA}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>AdminPortableArea</RootNamespace>
- <AssemblyName>AdminPortableArea</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Microsoft.Web.Mvc">
- <HintPath>..\packages\Mvc2Futures.2.0.50217.0\lib\Microsoft.Web.Mvc.dll</HintPath>
- </Reference>
- <Reference Include="MvcContrib">
- <HintPath>..\packages\MvcContrib.2.0.95.0\lib\MvcContrib.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Web" />
- <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Admin\AdminAreaRegistration.cs" />
- <Compile Include="Admin\Controllers\UserController.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <Content Include="Admin\Views\User\List.cshtml" />
- <None Include="packages.config" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Admin\Models\" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("AdminPortableArea")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("AdminPortableArea")]
-[assembly: AssemblyCopyright("Copyright © 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("fa578d6d-13af-4974-bab5-3f05987a94ed")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="MicrosoftWebMvc" version="2.0" />
- <package id="Mvc2Futures" version="2.0.50217.0" />
- <package id="MvcContrib" version="2.0.95.0" />
-</packages>
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 11
+# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5130C754-BB27-4018-98FE-2E966267118F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{C0A18BF4-B56B-4E32-B1CD-2FF9EA43526F}"
@@ -19,26 +19,26 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Release|Any CPU.Build.0 = Release|Any CPU
{C0A18BF4-B56B-4E32-B1CD-2FF9EA43526F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0A18BF4-B56B-4E32-B1CD-2FF9EA43526F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0A18BF4-B56B-4E32-B1CD-2FF9EA43526F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C0A18BF4-B56B-4E32-B1CD-2FF9EA43526F}.Release|Any CPU.Build.0 = Release|Any CPU
- {D739D3C5-5C15-4D36-B177-818DC676D57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D739D3C5-5C15-4D36-B177-818DC676D57A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D739D3C5-5C15-4D36-B177-818DC676D57A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D739D3C5-5C15-4D36-B177-818DC676D57A}.Release|Any CPU.Build.0 = Release|Any CPU
{EFD6F198-A4E8-419E-ABBC-8573B29ACC42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFD6F198-A4E8-419E-ABBC-8573B29ACC42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFD6F198-A4E8-419E-ABBC-8573B29ACC42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFD6F198-A4E8-419E-ABBC-8573B29ACC42}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6F8D99D7-A303-4BA7-9E29-7CCCD510FE78}.Release|Any CPU.Build.0 = Release|Any CPU
{FD52AD83-2185-4093-94C3-D97D38D30110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD52AD83-2185-4093-94C3-D97D38D30110}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD52AD83-2185-4093-94C3-D97D38D30110}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD52AD83-2185-4093-94C3-D97D38D30110}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D739D3C5-5C15-4D36-B177-818DC676D57A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D739D3C5-5C15-4D36-B177-818DC676D57A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D739D3C5-5C15-4D36-B177-818DC676D57A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D739D3C5-5C15-4D36-B177-818DC676D57A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -17,7 +17,7 @@ public override void RegisterArea(AreaRegistrationContext context)
context.MapRoute(
"Admin_default",
"Admin/{controller}/{action}/{id}",
- new { action = "Index", id = UrlParameter.Optional }
+ new { controller = "Users", action = "Index", id = UrlParameter.Optional }
);
}
}
@@ -7,5 +7,25 @@ namespace Ebuy.Website.Areas.Admin.Models
{
public class UserViewModel
{
+ public virtual ICollection<Auction> Selling { get; private set; }
+
+ // public virtual ICollection<Bid> Bids { get; private set; }
+
+ public virtual string DisplayName
+ {
+ get { return _displayName ?? FullName; }
+ set { _displayName = value; }
+ }
+ private string _displayName;
+
+ public string EmailAddress { get; set; }
+
+ public virtual string FullName { get; set; }
+
+ public virtual ICollection<Payment> Payments { get; private set; }
+
+ public virtual ICollection<Review> Reviews { get; private set; }
+
+ public virtual ICollection<Auction> WatchedAuctions { get; private set; }
}
}
@@ -15,6 +15,7 @@
@foreach (var user in Model)
{
<li class="listitem">
+ @user.DisplayName
@*@Html.Partial("_AuctionTile", user)*@
</li>
}
@@ -236,7 +236,9 @@
<Content Include="Scripts\knockout-1.3.0beta.debug.js" />
<Content Include="Scripts\knockout-1.3.0beta.js" />
<Content Include="Scripts\modernizr-2.0.6-development-only.js" />
- <Content Include="Web.config" />
+ <Content Include="Web.config">
+ <SubType>Designer</SubType>
+ </Content>
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</Content>
View
@@ -52,9 +52,6 @@
<Reference Include="Microsoft.Web.Optimization">
<HintPath>..\packages\Microsoft.Web.Optimization.0.1\lib\net40\Microsoft.Web.Optimization.dll</HintPath>
</Reference>
- <Reference Include="MvcContrib, Version=2.0.95.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\MvcContrib.2.0.95.0\lib\MvcContrib.dll</HintPath>
- </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity" />

0 comments on commit 989bc51

Please sign in to comment.