Skip to content

Commit 62dc543

Browse files
committed
Added status message and some styling changes
1 parent 776eb59 commit 62dc543

File tree

6 files changed

+33
-10
lines changed

6 files changed

+33
-10
lines changed

app/scripts/controllers/main.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ angular.module('codeSearchApp')
1515
$scope.loading=false
1616
});
1717

18+
$rootScope.statusMsg = {msg: ""};
19+
1820
$scope.page = {
1921
currPage: 0,
2022
resultsPerPage: 10
@@ -39,10 +41,9 @@ angular.module('codeSearchApp')
3941
}
4042

4143
$scope.findCode = function () {
42-
43-
$scope.$emit('LOAD');
44-
apiRequest.findCode($scope.findLibrary.library, $scope.findFunction.libFunction).then(function(data) {
45-
44+
$rootScope.statusMsg.msg = "Fetching code from database..."
45+
$scope.$emit('LOAD');
46+
apiRequest.findCode($scope.findLibrary.library, $scope.findFunction.libFunction).then(function(data) {
4647
$scope.loading = false;
4748
$scope.codeSnippits = data.codeSnippits;
4849
$scope.pageArray = data.pageArray;

app/scripts/services/apirequest.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
'use strict';
22

33
angular.module('codeSearchApp')
4-
.factory('apiRequest', function ($http, $timeout, codeParser) {
4+
.factory('apiRequest', function ($http, $rootScope, $timeout, codeParser) {
55
var apiRequest = {};
66

77
var searchOptions;
88
var searchQuery;
99
var library = "";
1010
var libFunction = "";
1111

12+
var maxFiles = 500;
13+
1214
var getDepVar = function(lib, file) {
1315
var parsedData = esprima.tokenize(file);
1416

@@ -66,6 +68,10 @@ angular.module('codeSearchApp')
6668
};
6769

6870
apiRequest.findCode = function (lib, func) {
71+
$timeout(function() {
72+
$rootScope.statusMsg.msg = "Parsing through files for example snippets...";
73+
}, 3000);
74+
6975
return $http({
7076
method:'GET',
7177
url:'/api/findFile',
@@ -75,6 +81,7 @@ angular.module('codeSearchApp')
7581
}
7682
})
7783
.then(function(data) {
84+
7885
searchOptions = data.data.searchOptions;
7986
searchQuery = data.data.searchQuery;
8087
library = lib;
@@ -85,6 +92,7 @@ angular.module('codeSearchApp')
8592
console.log('files', allFiles[0].score);
8693
console.log('sOpts', searchOptions);
8794
console.log('sQuer', searchQuery);
95+
// console.log($rootScope.statusMsg.msg);
8896

8997
allFiles.sort(function(a, b) {
9098
if (a.score < b.score) {
@@ -98,7 +106,7 @@ angular.module('codeSearchApp')
98106

99107
console.log('files', allFiles[0].score);
100108

101-
var end = allFiles.length <= 1800 ? allFiles.length : 1800;
109+
var end = allFiles.length <= maxFiles ? allFiles.length : maxFiles;
102110

103111
var files = allFiles.slice(0, end);
104112

@@ -121,6 +129,7 @@ angular.module('codeSearchApp')
121129
return [snippitsArray, snippitPaths];
122130
})
123131
.then(function(results) {
132+
124133
return $http.post('/api/popSnips',
125134
{data: results[1]})
126135
.then(function(data) {

app/styles/main.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,16 @@ span > pre {
359359
height:5px;
360360
}
361361

362+
#status-msg {
363+
margin-top: 10px;
364+
text-align: center;
365+
color: #3498DB;
366+
}
367+
368+
#status-msg > p {
369+
font-size: 1.3em;
370+
}
371+
362372
/*a.loginlink{
363373
height:0;
364374
padding:0;

app/views/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<!-- build:css({.tmp,app}) styles/main.css -->
2020
<link rel="stylesheet" href="styles/main.css">
2121
<link href='http://fonts.googleapis.com/css?family=Lato:300,400,900' rel='stylesheet' type='text/css'>
22-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/styles/rainbow.min.css
22+
<link rel="stylesheet" href="cdnjs.cloudflare.com/ajax/libs/highlight.js/8.0/styles/atelier-forest.light.min.css
2323
">
2424

2525
<!-- endbuild -->

app/views/partials/codesnippetmodal.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11

22
<div class="modal-header">
33
<div class="row">
4-
<div class="col-lg-4">
4+
<div class="col-lg-8">
55
<a ng-href="{{snippitObj.repoUrl}}" target="_blank">{{snippitObj.repoUrl}}</a>
6+
<p>{{snippitObj.filePath}}</p>
67
</div>
7-
<div class="col-lg-4 col-lg-offset-4">
8+
<div class="col-lg-4">
89
<div class="pull-right">
910
<button ng-click="goToSnippit()">Go To Snippit</button>
1011
<button class="btn btn-small" ng-click="dismissModal()">X</button>
@@ -16,5 +17,4 @@
1617
<span hljs source="preSnippitBody"></span><span id="snip-highlight" hljs source="snippitSubStr"></span><span hljs source="postSnippitBody">{{postSnippitBody}}</span>
1718
</div>
1819
<div class="modal-footer">
19-
<button class="btn btn-small pull-right" ng-click="dismissModal()">X</button>
2020
</div>

app/views/partials/main.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ <h4 class='col-lg-offset-1'> Search for JavaScript code examples by selecting No
5151
<div></div>
5252
<div></div>
5353
</div>
54+
<div id="status-msg" ng-show="loading">
55+
<p><strong>{{statusMsg.msg}}</strong></p>
56+
</div>
5457
<div ng-show="codeSnippits.length">
5558
<h3>Results:</h3>
5659
<div>

0 commit comments

Comments
 (0)