Skip to content

Commit

Permalink
Webpage up~~~
Browse files Browse the repository at this point in the history
  • Loading branch information
adl13006 committed Nov 19, 2015
1 parent e2a6190 commit 0f924d8
Show file tree
Hide file tree
Showing 33 changed files with 14,929 additions and 116 deletions.
Binary file modified TeamDBAwesome/TeamDBAwesome/Scripts/_references.js
Binary file not shown.
1,746 changes: 1,746 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/Scripts/select.js

Large diffs are not rendered by default.

4,840 changes: 4,840 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/Scripts/ui-bootstrap-tpls-0.13.0.js

Large diffs are not rendered by default.

33 changes: 30 additions & 3 deletions TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@
<Compile Include="Controllers\NewCustomerController.cs" />
<Compile Include="Controllers\SearchController.cs" />
<Compile Include="Controllers\TestController.cs" />
<Compile Include="Controllers\UpdateUserController.cs" />
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
Expand All @@ -184,15 +183,41 @@
<Compile Include="SqlService\MySqlService.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="app.js" />
<Content Include="Areas\HelpPage\HelpPage.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="css\main.css" />
<Content Include="css\bootstrap.css" />
<Content Include="css\location.css" />
<Content Include="css\resultstyle.css" />
<Content Include="css\rotating-card.css" />
<Content Include="css\select.css" />
<Content Include="css\style.css" />
<Content Include="favicon.ico" />
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="index.html" />
<Content Include="js\adminController.js" />
<Content Include="js\HolderService.js" />
<Content Include="js\homeController.js" />
<Content Include="js\services\factories.js" />
<Content Include="js\services\httpRequestInjector.js" />
<Content Include="js\userController.js" />
<Content Include="pages\admin-customerinfo.html" />
<Content Include="pages\admin-home.html" />
<Content Include="pages\admin-mediacenter.html" />
<Content Include="pages\admin-view.html" />
<Content Include="index.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\templates\admin-header.html" />
<Content Include="pages\templates\footer.html" />
<Content Include="pages\templates\home-header.html" />
<Content Include="pages\templates\user-header.html" />
<Content Include="pages\user-account.html" />
<Content Include="pages\user-home.html" />
<Content Include="pages\user-playlists.html" />
<Content Include="Scripts\angular.min.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
Expand Down Expand Up @@ -221,6 +246,8 @@
<Content Include="Scripts\modernizr-2.6.2.js" />
<Content Include="Scripts\respond.js" />
<Content Include="Scripts\respond.min.js" />
<Content Include="Scripts\select.js" />
<Content Include="Scripts\ui-bootstrap-tpls-0.13.0.js" />
<Content Include="Web.config" />
<Content Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
Expand Down
105 changes: 105 additions & 0 deletions TeamDBAwesome/TeamDBAwesome/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
var app = angular.module('routerApp', ['ui.router','ngCookies','ui.select', 'ngTouch', 'ui.grid', 'ui.grid.resizeColumns','ui.grid.autoResize','ui.bootstrap','ui.select', 'ngSanitize','factories']);
app.config(function ($stateProvider, $urlRouterProvider, $httpProvider) {

$httpProvider.interceptors.push('httpRequestInterceptor');

$urlRouterProvider.otherwise('/home');

$stateProvider
// HOME STATES AND NESTED VIEWS =====C:\Users\Ania\git\TeamDbAwesome\TeamDBAwesome\TeamDBAwesome\app.js===================================
.state('home', {
url: '/home',
views: {
'header': {templateUrl: 'pages/templates/home-header.html'},
'content': {templateUrl: 'pages/partial-home.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('register',{
url: '/register',
views: {
'header': {templateUrl: 'pages/templates/home-header.html'},
'content':{templateUrl: 'pages/partial-register.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
},
})
.state('login', {
url: '/login',
views: {
'header': {templateUrl: 'pages/templates/home-header.html'},
'content': { templateUrl: 'pages/partial-login.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('admin-login',{
url:'/adminlogin',
views: {
'header': {templateUrl: 'pages/templates/home-header.html'},
'content': {templateUrl:'pages/partial-adminlogin.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('user-home', {
url: '/userhome',
views: {
'header': {templateUrl: 'pages/templates/user-header.html'},
'content' : {templateUrl: 'pages/user-home.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('user-account', {
url: '/manageaccount',
views: {
'header': {templateUrl: 'pages/templates/user-header.html'},
'content' : {templateUrl: 'pages/user-account.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('user-playlists', {
url: '/manageplaylists',
views: {
'header': {templateUrl: 'pages/templates/user-header.html'},
'content' : {templateUrl: 'pages/user-playlists.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('admin-home',{
url:'/adminHome',
views: {
'header': {templateUrl: 'pages/templates/admin-header.html'},
'content': {templateUrl: 'pages/admin-home.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('admin-mediacenter',{
url: '/mediacenter',
views: {
'header': {templateUrl: 'pages/templates/admin-header.html'},
'content': {templateUrl: 'pages/admin-mediacenter.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('admin-customerinfo',{
url: '/customerinfo',
views: {
'header': {templateUrl: 'pages/templates/admin-header.html'},
'content': {templateUrl: 'pages/admin-customerinfo.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
.state('admin-view',{
url: '/view',
views: {
'header': {templateUrl: 'pages/templates/admin-header.html'},
'content': {templateUrl: 'pages/admin-view.html'},
'footer': {templateUrl: 'pages/templates/footer.html'}
}
})
});

app.run(['$rootScope', '$state', '$stateParams','$http',
function ($rootScope, $state, $stateParams,$http) {
$rootScope.$state = $state;
$rootScope.$stateParams = $stateParams;
$http.defaults.headers.common.Authentication = 'Basic Token';
}]);
Loading

0 comments on commit 0f924d8

Please sign in to comment.