Commit eda77b8c by Simon

Mise à jour de l'organisation des fichiers

parent 46c8aeb8
...@@ -52,6 +52,7 @@ crashlytics-build.properties ...@@ -52,6 +52,7 @@ crashlytics-build.properties
fabric.properties fabric.properties
.idea .idea
/.idea
node_modules node_modules
{ {
"name": "Doodle", "name": "doodle",
"version": "0.0.1",
"main": "app.js",
"repository": "git@gitlab.appolo.fr:jquery-plugin/doodle.git",
"author": "Simon <simon@appolo.fr>", "author": "Simon <simon@appolo.fr>",
"version": "1.0.4",
"main": "dist/js/doodle.js",
"repository": {
"type": "git",
"url": "https://gitlab.appolo.fr/jquery-plugin/doodle.git"
},
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {},
"devDependencies": {
"tether": "^1.4.3",
"bootstrap": "4.0.0-alpha.6", "bootstrap": "4.0.0-alpha.6",
"bootstrap-datepicker": "^1.7.1", "bootstrap-datepicker": "^1.7.1",
"bootstrap-timepicker": "^0.5.2", "bootstrap-timepicker": "^0.5.2",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"moment": "^2.20.1" "moment": "^2.20.1"
},
"devDependencies": {
"tether": "^1.4.3"
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="css/starter-template.css" rel="stylesheet"> <link href="css/starter-template.css" rel="stylesheet">
<link href="assets/lib/doodle/css/doodle.css" rel="stylesheet"> <link href="../dist/css/doodle.css" rel="stylesheet">
<!-- Pages css --> <!-- Pages css -->
<link rel="stylesheet" href="/node_modules/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/node_modules/font-awesome/css/font-awesome.min.css">
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<!--<div class="doodle table-responsive"></div> <div class="doodle table-responsive"></div>
<input type="hidden" id="inputVal" value='{"19/01/2018":["10","11","12"],"20/01/2018":["10","11","12"],"21/01/2018":["10","11","12"],"22/01/2018":["10","11","12"],"23/01/2018":["10","11","12"],"24/01/2018":["10","11:15","12"]}'>--> <input type="hidden" id="inputVal" value='{}'>
<div class="doodle table-responsive" data-json="json/data.json"></div> <!--<div class="doodle table-responsive" data-json="json/data.json"></div>
<input type="hidden" id="inputVal" value='' /> <input type="hidden" id="inputVal" value='' />-->
</div> </div>
</div> </div>
...@@ -52,6 +52,6 @@ ...@@ -52,6 +52,6 @@
<script src="/node_modules/moment/min/moment.min.js"></script> <script src="/node_modules/moment/min/moment.min.js"></script>
<script src="/node_modules/moment/locale/fr.js"></script> <script src="/node_modules/moment/locale/fr.js"></script>
<script src="assets/lib/doodle/js/doodle.js" type="text/javascript"></script> <script src="../dist/js/doodle.js" type="text/javascript"></script>
<script src="js/app.js" type="text/javascript"></script> <script src="js/app.js" type="text/javascript"></script>
</body></html> </body></html>
$( document ).ready(function() { $( document ).ready(function() {
$('.doodle').Doodle({ $('.doodle').Doodle({
editMode: false, editMode: true,
output: '#inputVal', output: '#inputVal',
input: '#inputVal' input: '#inputVal'
}); });
......
...@@ -28,8 +28,8 @@ font-awesome@^4.7.0: ...@@ -28,8 +28,8 @@ font-awesome@^4.7.0:
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
moment@^2.20.1: moment@^2.20.1:
version "2.20.1" version "2.21.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
tether@^1.4.0, tether@^1.4.3: tether@^1.4.0, tether@^1.4.3:
version "1.4.3" version "1.4.3"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment