Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Started working on the media center
  • Loading branch information
sec11008 committed Nov 26, 2015
1 parent 1a55fda commit fa73a90
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 4 deletions.
2 changes: 1 addition & 1 deletion TeamDBAwesome/TeamDBAwesome/Models/Track.cs
Expand Up @@ -9,7 +9,7 @@ namespace TeamDBAwesome.Models
{
public int TrackId { get; set; }
public string TrackName { get; set; }
public string AlbumTitle { get; set; }
public string AlbumTitle { get; set; } //Should this be album id to match the sql?
public string MediaType { get; set; }
public string Genre { get; set; }
public string Composer { get; set; }
Expand Down
2 changes: 2 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
Expand Up @@ -208,10 +208,12 @@
<Content Include="pages\admin-mediacenter.html" />
<Content Include="pages\admin-view.html" />
<Content Include="index.html" />
<Content Include="pages\new-media.html" />
<Content Include="pages\partial-adminlogin.html" />
<Content Include="pages\partial-home.html" />
<Content Include="pages\partial-login.html" />
<Content Include="pages\partial-register.html" />
<Content Include="pages\playlist-editor.html" />
<Content Include="pages\templates\admin-header.html" />
<Content Include="pages\templates\footer.html" />
<Content Include="pages\templates\home-header.html" />
Expand Down
16 changes: 16 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/app.js
Expand Up @@ -103,6 +103,22 @@ app.config(function ($stateProvider, $urlRouterProvider, $httpProvider) {
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('new-media', {
url: '/newmedia',
views: {
'header': { templateUrl: 'pages/templates/admin-header.html' },
'content': { templateUrl: 'pages/new-media.html' },
'footer': { templateUrl: 'pages/templates/footer.html' }
}
})
.state('playlist-editor', {
url: '/playlisteditor',
views: {
'header': { templateUrl: 'pages/templates/admin-header.html' },
'content': { templateUrl: 'pages/playlist-editor.html' },
'footer': { templateUrl: 'pages/templates/footer.html' }
}
})
});

app.run(['$rootScope', '$state', '$stateParams','$http',
Expand Down
50 changes: 50 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/js/adminController.js
Expand Up @@ -36,6 +36,8 @@ angular.module('routerApp').controller('adminController', function($scope, $http
$state.go('home');
}




/* BEGIN LOGIC */
var promise = $scope.authenticateAdmin($cookies.get('ADMIN'),$cookies.get('PWD'));
Expand All @@ -46,4 +48,52 @@ promise.then(function(){
else if ($scope.authenticated == false)$scope.logoutAdmin();
});

$scope.showMediaOptions = true;
$scope.showTrackFields = false;
$scope.showAlbumFields = false;
$scope.showArtistFields = false;
$scope.showGenreFields = false;
$scope.showMediaTypeFields = false;


$scope.back = function () {
$scope.showMediaOptions = true;
$scope.showTrackFields = false;
$scope.showAlbumFields = false;
$scope.showArtistFields = false;
$scope.showGenreFields = false;
$scope.showMediaTypeFields = false;
}
$scope.toCreateTrack = function () {
$scope.showMediaOptions = false;
$scope.showTrackFields = true;
};
$scope.toCreateAlbum = function () {
$scope.showMediaOptions = false;
};
$scope.toCreateArtist = function () {
$scope.showMediaOptions = false;
};
$scope.toCreateGenre = function () {
$scope.showMediaOptions = false;
};
$scope.toCreateMediaType = function () {
$scope.showMediaOptions = false;
};

$scope.playlists = [
{
"playlistId": "1",
"name":"test1"
},
{
"playlistId": "2",
"name":"test2"
},
{
"playlistId": "3",
"name":"test3"
}
];

});
9 changes: 6 additions & 3 deletions TeamDBAwesome/TeamDBAwesome/pages/admin-mediacenter.html
@@ -1,7 +1,7 @@
<div ng-controller='adminController'>
<div class="text-center">
<h1 class=''>Media Center Here</h1><br /><br />
Enter/Edit New Media Screen – as shown in Figure 4 for the UConnJobSearch app, there
<h1 class=''>Media Center</h1><br /><br />
<!--Enter/Edit New Media Screen – as shown in Figure 4 for the UConnJobSearch app, there
needs to a screen to enter all of the information on a new media item including: track name,
album name, artist name, composer name, genre name, and/or media name; this means
entering new artists, albums, genres, media types, and tracks. You may also need to add
Expand All @@ -16,6 +16,9 @@
the upper left should have a set of options to search media by track name, album name, artist
name, composer name, genre name, and/or media name, return the results. You will need to
support multiple pages for the result sets since there can be many results based on the search
criteria. <br /><br />
criteria. <br /><br />-->

<a ui-sref="new-media" class="btn btn-lg btn-primary center-block">Create New Media</a><br/>
<a ui-sref="playlist-editor" class="btn btn-lg btn-primary center-block">Playlist Editor</a>
</div>
</div>
25 changes: 25 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/pages/new-media.html
@@ -0,0 +1,25 @@

<head>
<title>New Media</title>
<meta charset="utf-8" />
</head>
<div ng-controller="adminController">
<a ng-hide="showMediaOptions" class="btn btn-sm btn-primary center-block" ng-click="back();">Back</a>
<a class="btn btn-sm btn-primary center-block" ng-show="showMediaOptions" ng-click="toCreateTrack();">Create a New Track</a><br />
<a class="btn btn-sm btn-primary center-block" ng-show="showMediaOptions" ng-click="toCreateAlbum();">Create a New Album</a><br />
<a class="btn btn-sm btn-primary center-block" ng-show="showMediaOptions" ng-click="toCreateArtist();">Create a New Artist</a><br />
<a class="btn btn-sm btn-primary center-block" ng-show="showMediaOptions" ng-click="toCreateGenre();">Create a New Genre</a><br />
<a class="btn btn-sm btn-primary center-block" ng-show="showMediaOptions" ng-click="toCreateMediaType();">Create a New Media Type</a><br />
<form ng-show="showTrackFields">
<div class="form-group" ng-class="{ 'has-error': form.trackName.$dirty && form.trackName.$error.required }">
<label for="trackName">Track name</label>
<input type="text" name="trackName" id="trackName" class="form-control" ng-model="track.trackName" required />
<span ng-show="form.trackName.$dirty && form.trackName.$error.required" class="help-block">Track name is required</span>
</div>

</form>




</div>
7 changes: 7 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/pages/playlist-editor.html
@@ -0,0 +1,7 @@
<head>
<title>Playlist Editor</title>
<meta charset="utf-8" />
</head>
<div ng-controller="adminController" ng-init="getPlaylists()">

</div>

0 comments on commit fa73a90

Please sign in to comment.