Skip to content
This repository has been archived by the owner on Aug 9, 2018. It is now read-only.

Commit

Permalink
Fixed drop down box
Browse files Browse the repository at this point in the history
  • Loading branch information
ljzca committed Apr 4, 2017
1 parent 91a9dec commit fb91e93
Show file tree
Hide file tree
Showing 7 changed files with 379 additions and 318 deletions.
73 changes: 73 additions & 0 deletions dev_test.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,78 @@ insert into stars_record_data(owner, time, title, c_acc, gps_fix, h_acc, h_m_s_l
insert into stars_record_data(owner, time, title, c_acc, gps_fix, h_acc, h_m_s_l, heading, lat, lon, num_s_v, s_acc, v_acc, vel_d, vel_e, vel_n) values ('will',STR_TO_DATE('2016-09-10 17:35:33.80','%Y-%m-%d %H:%i:%s.%f'),'TEST2',52.0812735,-114.0160906,921.162,-0.09,-0.05,-0.09,2.610,2.729,0.29,0.00000,114.84650,3,6);
insert into stars_record_data(owner, time, title, c_acc, gps_fix, h_acc, h_m_s_l, heading, lat, lon, num_s_v, s_acc, v_acc, vel_d, vel_e, vel_n) values ('will',STR_TO_DATE('2016-09-10 17:35:34.00','%Y-%m-%d %H:%i:%s.%f'),'TEST2',52.0812733,-114.0160910,921.094,0.12,0.01,0.02,2.533,2.682,0.26,0.00000,114.84652,3,6);

INSERT INTO `stars_brand`
(`name`,
`description`,
`version`)
VALUES
('Squirrel','Test',0),
('Phoenix Fly','Test',0),
('Tony Suit','Test',0),
('S-Fly','Test',0);

INSERT INTO `stars_model`
(`name`,
`type`,
`description`,
`version`)
VALUES
('Squirrel',
'Jackson5',
'Test',
0),
('Phoenix Fly',
'Phoenix Fly Test Model',
'test',
0),
('Tony Suit',
'Tony Suit Test Model',
'test',
0),
('S-Fly',
'S-Fly Test Model',
'Test',
0);

INSERT INTO `stars_model`
(`name`,
`type`,
`description`,
`version`)
VALUES
('Squirrel',
'Modular6',
'Test',
0);


INSERT INTO `stars_gear`
(`id`,
`name`,
`owner`,
`type`,
`description`,
`version`)
VALUES
(1,
'Squirrel',
'admin',
'Jackson5',
'Test',
0);

INSERT INTO `stars_gear`
(`id`,
`name`,
`owner`,
`type`,
`description`,
`version`)
VALUES
(2,
'Squirrel',
'admin',
'Modular6',
'Test',
0);

24 changes: 12 additions & 12 deletions src/main/resources/application.properties
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
spring.profiles.active=production

spring.data.rest.basePath=/rest
spring.jackson.serialization.fail-on-empty-beans=false

# following values can be changed, but can not be removed. To not create an admin automatically, simply make init.admin.create=false
init.admin.create=true
init.admin.username=admin
init.admin.firstname=William
init.admin.lastname=Li
init.admin.email=lijianzhao@lijianzhao.com
init.admin.password=password
spring.profiles.active=development

spring.data.rest.basePath=/rest
spring.jackson.serialization.fail-on-empty-beans=false

# following values can be changed, but can not be removed. To not create an admin automatically, simply make init.admin.create=false
init.admin.create=true
init.admin.username=admin
init.admin.firstname=William
init.admin.lastname=Li
init.admin.email=lijianzhao@lijianzhao.com
init.admin.password=password
init.admin.sex=male
195 changes: 96 additions & 99 deletions src/main/resources/static/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,100 +1,97 @@
<!DOCTYPE html>
<html ng-app="stars">

<head>
<meta charset="UTF-8">
<title>S.T.A.R.S</title>

<!-- Setting the favicon -->
<link rel="icon" type="image/png" href="images/favicon.ico">

<!-- Custom CSS -->
<link rel="stylesheet" href="genericStyle.css">

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
crossorigin="anonymous">

<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp"
crossorigin="anonymous">

<!-- Latest compiled and minified JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script>


<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-route.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-cookies.min.js"></script>

<script src="angular-base64.min.js"></script>

<script src="js/app.js"></script>

<script src="js/configs/route.js"></script>

<script src="js/directive/fileModel.js"></script>

<script src="js/services/rest-service.js"></script>
<script src="js/services/file-upload-service.js"></script>
<<<<<<< HEAD
<script src="js/services/parse-service.js"></script>
<script src="js/services/login-service.js"></script>
=======
<script src="js/services/login-service.js"></script>
<script src="js/services/logout-service.js"></script>
<script src="js/services/parse-service.js"></script>
>>>>>>> branch 'master' of https://github.com/ljzca/capstone

<script src="js/controllers/gear.js"></script>
<script src="js/controllers/nav.js"></script>
<script src="js/controllers/login.js"></script>
<script src="js/controllers/admin.js"></script>
<script src="js/controllers/profile.js"></script>
<script src="js/controllers/records.js"></script>
<script src="js/controllers/signup.js"></script>
<script src="js/controllers/password.js"></script>
<script src="js/controllers/forgot.js"></script>
<script src="js/controllers/upload.js"></script>

<script src="js/factory/globalVariables.js"></script>

<script src="js/factory/Chart.min.js"></script>

</head>

<body>
<nav class="navbar navbar-inverse" ng-controller="navCtrl">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-menu" aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span
class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#/"> <span class="glyphicon glyphicon-star"></span> <span>S.T.A.R.S</span>
</a>
</div>
<div class="collapse navbar-collapse" id="main-menu">
<ul class="nav navbar-nav" ng-repeat="item in navbar">
<li><a href="{{item.url}}">{{item.display}}</a></li>
</ul>

<ul class="nav navbar-nav navbar-right">
<li><a href="#/profile" ng-if="username != null">Hello,
{{username}}</a></li>
<li><a href="#/" ng-if="username == null">Login</a></li>
<li><a href="#/" ng-click="logout()" ng-if="username != null">Logout</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>

<div class="container-fluid" ng-view></div>
</body>

<!DOCTYPE html>
<html ng-app="stars">

<head>
<meta charset="UTF-8">
<title>S.T.A.R.S</title>

<!-- Setting the favicon -->
<link rel="icon" type="image/png" href="images/favicon.ico">

<!-- Custom CSS -->
<link rel="stylesheet" href="genericStyle.css">

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
crossorigin="anonymous">

<!-- Optional theme -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp"
crossorigin="anonymous">

<!-- Latest compiled and minified JavaScript -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
crossorigin="anonymous"></script>


<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-route.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-cookies.min.js"></script>

<script src="angular-base64.min.js"></script>

<script src="js/app.js"></script>

<script src="js/configs/route.js"></script>

<script src="js/directive/fileModel.js"></script>

<script src="js/services/rest-service.js"></script>
<script src="js/services/file-upload-service.js"></script>
<script src="js/services/parse-service.js"></script>
<script src="js/services/login-service.js"></script>
<script src="js/services/login-service.js"></script>
<script src="js/services/logout-service.js"></script>
<script src="js/services/parse-service.js"></script>

<script src="js/controllers/gear.js"></script>
<script src="js/controllers/nav.js"></script>
<script src="js/controllers/login.js"></script>
<script src="js/controllers/admin.js"></script>
<script src="js/controllers/profile.js"></script>
<script src="js/controllers/records.js"></script>
<script src="js/controllers/signup.js"></script>
<script src="js/controllers/password.js"></script>
<script src="js/controllers/forgot.js"></script>
<script src="js/controllers/upload.js"></script>

<script src="js/factory/globalVariables.js"></script>

<script src="js/factory/Chart.min.js"></script>

</head>

<body>
<nav class="navbar navbar-inverse" ng-controller="navCtrl">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-menu" aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span
class="icon-bar"></span> <span class="icon-bar"></span> <span
class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#/"> <span class="glyphicon glyphicon-star"></span> <span>S.T.A.R.S</span>
</a>
</div>
<div class="collapse navbar-collapse" id="main-menu">
<ul class="nav navbar-nav" ng-repeat="item in navbar">
<li><a href="{{item.url}}">{{item.display}}</a></li>
</ul>

<ul class="nav navbar-nav navbar-right">
<li><a href="#/profile" ng-if="username != null">Hello,
{{username}}</a></li>
<li><a href="#/" ng-if="username == null">Login</a></li>
<li><a href="#/" ng-click="logout()" ng-if="username != null">Logout</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>

<div class="container-fluid" ng-view></div>
</body>

</html>
Loading

0 comments on commit fb91e93

Please sign in to comment.