Skip to content

Commit 785a0c9

Browse files
committedSep 3, 2019
add color picker
1 parent b539ac7 commit 785a0c9

File tree

6 files changed

+30
-1
lines changed

6 files changed

+30
-1
lines changed
 

‎public/html/views/main.html

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
id="colorField"
1010
required>
1111
<input type="submit" class="btn btn-default" value="Let's rock!">
12+
<label for="colorPicker">Pick color</label>
13+
<color-picker ng-model="selectedColor" options="options"></color-picker>
1214
</div>
1315
</form>
1416

‎public/index.html

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<title>colorReader challenge</title>
1111

1212
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
13+
<link rel="stylesheet" href="node_modules/angularjs-color-picker/dist/angularjs-color-picker.min.css" />
14+
<link rel="stylesheet" href="node_modules/angularjs-color-picker/dist/themes/angularjs-color-picker-bootstrap.min.css" />
15+
1316
<link href="css/css/bs3-custom.css" rel="stylesheet">
1417
<link href="css/css/output.css" rel="stylesheet">
1518

@@ -30,6 +33,8 @@
3033
<script src="node_modules/angular-route/angular-route.js"></script>
3134
<script src="node_modules/localforage/dist/localforage.js"></script>
3235
<script src="node_modules/angular-localforage/dist/angular-localForage.js"></script>
36+
<script src="node_modules/tinycolor2/dist/tinycolor-min.js"></script>
37+
<script src="node_modules/angularjs-color-picker/dist/angularjs-color-picker.min.js"></script>
3338
<!-- main app file -->
3439
<script src="js/app.js"></script>
3540
<!-- constance -->

‎public/js/app.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
angular
55
.module('app', [
66
'ngRoute',
7-
'LocalForageModule'
7+
'LocalForageModule',
8+
'color.picker'
89
])
910
.config(config);
1011

‎public/js/controllers/mainCtrl.js

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
function Controller($scope, $rootScope, $localForage, colorCheckerService) {
1212
var vm = $scope;
1313

14+
vm.selectedColor = '#1E00FF';
15+
vm.options = {
16+
preserveInputFormat: true,
17+
format: 'hex',
18+
id: 'colorPicker'
19+
};
1420
vm.convertedColors = [ {} ];
1521

1622
vm.fireColorReader = function() {

‎public/package-lock.json

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"angular": "^1.6.5",
1919
"angular-localforage": "^1.3.7",
2020
"angular-route": "^1.6.5",
21+
"angularjs-color-picker": "^3.4.8",
2122
"bootstrap": "^3.4.1",
2223
"localforage": "^1.5.6"
2324
},

0 commit comments

Comments
 (0)