Skip to content

Commit 2b36343

Browse files
hunkimhunkim
committed
Auto indentation
1 parent ef3ddfc commit 2b36343

File tree

15 files changed

+628
-697
lines changed

15 files changed

+628
-697
lines changed

‎Gruntfile.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ grunt.initConfig({
2626
},
2727

2828

29+
uglify: {
30+
my_target: {
31+
files: {
32+
'dist/handsup.min.js': ['js/*.js', 'js/conrollers/*.js', 'js/filters/*.js']
33+
}
34+
}
35+
},
36+
2937
// Test settings
3038
karma: {
3139
unit: {
@@ -64,4 +72,8 @@ grunt.loadNpmTasks('grunt-karma');
6472

6573
// npm install grunt-protractor-runner --save-dev
6674
grunt.loadNpmTasks('grunt-protractor-runner');
75+
76+
// npm install grunt-contrib-uglify --save-dev
77+
grunt.loadNpmTasks('grunt-contrib-uglify');
78+
6779
};

‎index.html‎

Lines changed: 98 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,100 @@
11
<!DOCTYPE html>
22
<html lang="en" ng-app="app">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
8-
<meta name="description" content="">
9-
<meta name="author" content="">
10-
<link rel="icon" href="../../favicon.ico">
11-
12-
<title>Question Room</title>
13-
14-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
15-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
16-
17-
<!-- Custom styles for this template -->
18-
<link href="node_modules/todomvc-common/cover.css" rel="stylesheet">
19-
20-
21-
</head>
22-
23-
<body ng-controller="controller">
24-
25-
<div class="site-wrapper">
26-
27-
<div class="site-wrapper-inner">
28-
29-
<div class="cover-container">
30-
31-
<div class="masthead clearfix">
32-
<div class="inner">
33-
<h3 class="masthead-brand">Question Room</h3>
34-
<nav>
35-
<ul class="nav masthead-nav">
36-
<li class="active"><a href="#">Home</a></li>
37-
<li><a href="#">Features</a></li>
38-
<li><a href="#">Contact</a></li>
39-
</ul>
40-
</nav>
41-
</div>
42-
</div>
43-
44-
<div class="inner cover">
45-
<h1 class="cover-heading">Ask More Questions!</h1>
46-
<p class="lead">This totally anonymous and realtime updating question moderate system permits students ask more questions in a typical class setting.
47-
Simply join a question room using a simple name (such as comp3111).</p>
48-
<p class="lead" class="col-md-2 col-md-offset-5">
49-
<form name="form" ng-submit="join()" class="navbar-form navbar-left" role="search">
50-
<input type="text" name = "input" class="form-control large"
51-
ng-model="example.text"
52-
ng-pattern="example.word" required
53-
ng-trim="false"
54-
autofocus
55-
aria-describedby="sizing-addon1"
56-
placeholder="Room name">
57-
<a href="#" class="btn btn-lg btn-default"
58-
ng-hide="form.input.$error.required || form.input.$error.pattern"
59-
ng-click="join()"
60-
>Join</a>
61-
</form>
62-
</p>
63-
64-
<div class="alert alert-warning" role="alert" ng-show="form.input.$error.required">
65-
Room name is required!</div>
66-
<div class="alert alert-warning" role="alert" ng-show="form.input.$error.pattern">
67-
Room name must be a single English word!
68-
</div>
69-
70-
</div>
71-
72-
<div class="mastfoot">
73-
<div class="inner">
74-
<p>Cover template for <a href="http://getbootstrap.com">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
75-
</div>
76-
</div>
77-
78-
</div>
79-
80-
</div>
81-
82-
</div>
83-
84-
<!-- Bootstrap core JavaScript
85-
================================================== -->
86-
<!-- Placed at the end of the document so the pages load faster -->
87-
<script src="js/lib/jquery.min.js"></script>
88-
<script src="js/lib/bootstrap.min.js"></script>
89-
90-
<!-- 1.4.2 -->
91-
<script src="js/lib/angular.min.js"></script>
92-
93-
<script>
94-
angular.module('app', [])
95-
.controller('controller', ['$scope', '$location', '$window', function($scope, $location, $window) {
96-
$scope.example = {
97-
text: '',
98-
word: /^\s*\w*\s*$/
99-
};
100-
101-
$scope.join = function () {
102-
$window.location.href = '/question.html#/' + $scope.example.text;
103-
}
104-
}]);
105-
</script>
106-
107-
</body>
108-
</html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
8+
<meta name="description" content="">
9+
<meta name="author" content="">
10+
<link rel="icon" href="../../favicon.ico">
11+
12+
<title>Question Room</title>
13+
14+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
15+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css">
16+
17+
<!-- Custom styles for this template -->
18+
<link href="node_modules/todomvc-common/cover.css" rel="stylesheet">
19+
</head>
20+
<body ng-controller="controller">
21+
<div class="site-wrapper">
22+
<div class="site-wrapper-inner">
23+
<div class="cover-container">
24+
<div class="masthead clearfix">
25+
<div class="inner">
26+
<h3 class="masthead-brand">Question Room</h3>
27+
<nav>
28+
<ul class="nav masthead-nav">
29+
<li class="active"><a href="#">Home</a></li>
30+
<li><a href="#">Features</a></li>
31+
<li><a href="#">Contact</a></li>
32+
</ul>
33+
</nav>
34+
</div>
35+
</div>
36+
37+
<div class="inner cover">
38+
<h1 class="cover-heading">Ask More Questions!</h1>
39+
<p class="lead">This totally anonymous and realtime updating question moderate system permits students ask more questions in a typical class setting.
40+
Simply join a question room using a simple name (such as comp3111).</p>
41+
<p class="lead" class="col-md-2 col-md-offset-5">
42+
<form name="form" ng-submit="join()" class="navbar-form navbar-left" role="search">
43+
<input type="text" name = "input" class="form-control large"
44+
ng-model="example.text"
45+
ng-pattern="example.word" required
46+
ng-trim="false"
47+
autofocus
48+
aria-describedby="sizing-addon1"
49+
placeholder="Room name">
50+
<a href="#" class="btn btn-lg btn-default"
51+
ng-hide="form.input.$error.required || form.input.$error.pattern"
52+
ng-click="join()"
53+
>Join</a>
54+
</form>
55+
</p>
56+
57+
<div class="alert alert-warning" role="alert" ng-show="form.input.$error.required">
58+
Room name is required!</div>
59+
<div class="alert alert-warning" role="alert" ng-show="form.input.$error.pattern">
60+
Room name must be a single English word!
61+
</div>
62+
63+
</div>
64+
65+
<div class="mastfoot">
66+
<div class="inner">
67+
<p>Cover template for <a href="http://getbootstrap.com">Bootstrap</a>, by <a href="https://twitter.com/mdo">@mdo</a>.</p>
68+
</div>
69+
</div>
70+
71+
</div>
72+
73+
</div>
74+
75+
</div>
76+
77+
<!-- Bootstrap core JavaScript
78+
================================================== -->
79+
<!-- Placed at the end of the document so the pages load faster -->
80+
<script src="js/lib/jquery.min.js"></script>
81+
<script src="js/lib/bootstrap.min.js"></script>
82+
83+
<!-- 1.4.2 -->
84+
<script src="js/lib/angular.min.js"></script>
85+
86+
<script>
87+
angular.module('app', [])
88+
.controller('controller', ['$scope', '$location', '$window', function($scope, $location, $window) {
89+
$scope.example = {
90+
text: '',
91+
word: /^\s*\w*\s*$/
92+
};
93+
94+
$scope.join = function () {
95+
$window.location.href = '/question.html#/' + $scope.example.text;
96+
}
97+
}]);
98+
</script>
99+
</body>
100+
</html>

‎index.html.org‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎js/app.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict';
44

55
/**
6-
* The main TodoMVC app module
7-
*
8-
* @type {angular.Module}
9-
*/
6+
* The main TodoMVC app module
7+
*
8+
* @type {angular.Module}
9+
*/
1010
var todomvc = angular.module('todomvc', ['firebase', 'ngStorage']);

0 commit comments

Comments
 (0)