Skip to content

Commit

Permalink
more data models, started HTML/CSS/Angular
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Mill committed Nov 2, 2015
1 parent 373ba24 commit eeb7b99
Show file tree
Hide file tree
Showing 8 changed files with 481 additions and 0 deletions.
17 changes: 17 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/Models/Album.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace TeamDBAwesome.Models
{
public class Album
{
public int AlbumID;

public string Title;

//this one might need to change
public int ArtistID;
}
}
14 changes: 14 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/Models/Artist.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace TeamDBAwesome.Models
{
public class Artist
{
public int ArtistID;

public string Name;
}
}
31 changes: 31 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/Models/Track.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.ComponentModel.DataAnnotations;

namespace TeamDBAwesome.Models
{
public class Track
{
public int trackID;

[RegularExpression(@"^([A-Za-z\s\.-]{1,200})$")]
public string TrackName;

public string AlbumName;

public string MediaType;

public string Genre;

public string Composer;

public int Milliseconds;

public int Bytes;

public float UnitPrice;

}
}
Binary file modified TeamDBAwesome/TeamDBAwesome/Scripts/_references.js
Binary file not shown.
294 changes: 294 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/Scripts/angular.min.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,23 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Models\Album.cs" />
<Compile Include="Models\Artist.cs" />
<Compile Include="Models\Customer.cs" />
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Track.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Areas\HelpPage\HelpPage.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="css\main.css" />
<Content Include="favicon.ico" />
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="index.html" />
<Content Include="Scripts\angular.min.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" />
Expand Down
82 changes: 82 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/css/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
*{
margin:0;
padding:0;
}

body{
font:15px/1.3 'Open Sans', sans-serif;
color: #5e5b64;
text-align:center;
}

a, a:visited {
outline:none;
color:#389dc1;
}

a:hover{
text-decoration:none;
}

section, footer, header, aside, nav{
display: block;
}

/*-------------------------
The menu
--------------------------*/

nav{
display:inline-block;
margin:60px auto 45px;
background-color:#5597b4;
box-shadow:0 1px 1px #ccc;
border-radius:2px;
}

nav a{
display:inline-block;
padding: 18px 30px;
color:#fff !important;
font-weight:bold;
font-size:16px;
text-decoration:none !important;
line-height:1;
text-transform: uppercase;
background-color:transparent;

-webkit-transition:background-color 0.25s;
-moz-transition:background-color 0.25s;
transition:background-color 0.25s;
}

nav a:first-child{
border-radius:2px 0 0 2px;
}

nav a:last-child{
border-radius:0 2px 2px 0;
}

nav.home .home,
nav.projects .projects,
nav.services .services,
nav.contact .contact{
background-color:#e35885;
}

p{
font-size:22px;
font-weight:bold;
color:#7d9098;
}

p b{
color:#ffffff;
display:inline-block;
padding:5px 10px;
background-color:#c4d7e0;
border-radius:2px;
text-transform:uppercase;
font-size:18px;
}
37 changes: 37 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!DOCTYPE html>
<html>
<head>
<title></title>
<meta charset="utf-8" />
<!--CSS IMPORT-->
<link rel="stylesheet" type="text/css" href="css/main.css">
<!--SCRIPT IMPORTS-->
<!--JQuery-->
<script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
<!--AngularJS-->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular.min.js"></script>
</head>
<body ng-app>
<<div id="main" ng-app>
<!-- The navigation menu will get the value of the "active" variable as a class.
The $event.preventDefault() stops the page from jumping when a link is clicked. -->

<nav class="{{active}}" ng-click="$event.preventDefault()">

<!-- When a link in the menu is clicked, we set the active variable -->

<a href="#" class="home" ng-click="active='home'">Home</a>
<a href="#" class="projects" ng-click="active='projects'">Projects</a>
<a href="#" class="services" ng-click="active='services'">Services</a>
<a href="#" class="contact" ng-click="active='contact'">Contact</a>
</nav>

<!-- ng-show will show an element if the value in the quotes is truthful,
while ng-hide does the opposite. Because the active variable is not set
initially, this will cause the first paragraph to be visible. -->

<p ng-hide="active">Please click a menu item</p>
<p ng-show="active">You chose <b>{{active}}</b></p>
</div>
</body>
</html>

0 comments on commit eeb7b99

Please sign in to comment.