Replace o holy makefile and bower with yarn

itdagene-ntnu · Jan 8, 2018 · df508ae · df508ae
1 parent 0102f2e
commit df508ae
Show file tree

Hide file tree

Showing 11 changed files with 2,718 additions and 104 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/assets.js b/assets.js
@@ -0,0 +1,18 @@
+const assets = [
+  "animate.css",
+  "bootstrap/dist",
+  "chosen-js",
+  "lightbox2",
+  "bootstrap-datepicker",
+  "font-awesome",
+  "eonasdan-bootstrap-datetimepicker/build",
+  "bootstrap-chosen",
+  "bootstrap-table/dist",
+  "tablesorter",
+  "ionicons",
+  "hover.css",
+  "jquery/dist",
+  "moment/min/"
+];
+
+module.exports = assets;
diff --git a/bower.json b/bower.json
diff --git a/itdagene/app/feedback/templates/feedback/evaluations/handle_evaluate.html b/itdagene/app/feedback/templates/feedback/evaluations/handle_evaluate.html
@@ -19,7 +19,7 @@
         <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
         <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
         <link href="//code.ionicframework.com/ionicons/1.5.2/css/ionicons.min.css" rel="stylesheet" type="text/css" />
-        <link rel="stylesheet" href="{{ STATIC_URL }}lib/bootstrap-datepicker/css/datepicker3.css">
+        <link rel="stylesheet" href="{{ STATIC_URL }}lib/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css">
         <link rel="stylesheet" href="{% static "lib/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" %}">
         <!--[if lt IE 9]>
           <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -54,7 +54,7 @@
 
         <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
         {% analytics %}
-        <script type="text/javascript" src="{{ STATIC_URL }}lib/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
+        <script type="text/javascript" src="{{ STATIC_URL }}lib/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"></script>
         <script type="text/javascript" src="{% static "lib/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js" %}"></script>
         <script>$(function(){ $("#id_date").datepicker({format: 'yyyy-mm-dd'}); });</script>
         <script>$(function(){ $("#id_deadline").datetimepicker({ format:'YYYY-MM-DD HH:mm' });});</script>

diff --git a/itdagene/assets/frontend/styl/style.styl b/itdagene/assets/frontend/styl/style.styl
@@ -1,7 +1,7 @@
 @import 'nib'
 @import "/static/lib/animate.css/animate.min.css"
-@import "/static/lib/font-awsome/css/font-awesome.min.css"
-@import "/static/lib/ionicons/css/ionicons.min.css"
+@import "/static/lib/font-awesome/css/font-awesome.min.css"
+@import "/static/lib/ionicons/dist/css/ionicons.min.css"
 
 @import url("https://fonts.googleapis.com/css?family=Open+Sans")
 @import url("https://fonts.googleapis.com/css?family=Slabo+27px")

diff --git a/itdagene/templates/base_admin.html b/itdagene/templates/base_admin.html
@@ -241,7 +241,7 @@ <h1>
 
 {% block scripts %}
     <script src="{% static "lib/bootstrap-table/dist/bootstrap-table.min.js" %}" type="text/javascript"></script>
-    <script src="{% static "lib/chosen/chosen.jquery.min.js" %}" type="text/javascript"></script>
+    <script src="{% static "lib/chosen-js/chosen.jquery.min.js" %}" type="text/javascript"></script>
     {% chosen ".select" %}
     {% chosen ".selectmultiple" %}
     {% block inline-scripts %}{% endblock %}

diff --git a/itdagene/templates/form.html b/itdagene/templates/form.html
@@ -2,11 +2,11 @@
 {% load crispy_forms_tags static %}
 
 {% block styles %}
-    <link rel="stylesheet" href="{{ STATIC_URL }}lib/bootstrap-datepicker/css/datepicker3.css">
+    <link rel="stylesheet" href="{{ STATIC_URL }}lib/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css">
     <link rel="stylesheet" href="{% static "lib/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" %}">
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="{{ STATIC_URL }}lib/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}lib/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"></script>
     <script type="text/javascript" src="{% static "lib/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js" %}"></script>
     <script>$(function(){ $("#id_date").datepicker({format: 'yyyy-mm-dd'}); });</script>
     <script>$(function(){ $("#id_deadline").datetimepicker({ format:'YYYY-MM-DD HH:mm' });});</script>

diff --git a/itdagene/templates/form_clean.html b/itdagene/templates/form_clean.html
@@ -2,11 +2,11 @@
 {% load crispy_forms_tags static %}
 
 {% block styles %}
-    <link rel="stylesheet" href="{{ STATIC_URL }}lib/bootstrap-datepicker/css/datepicker3.css">
+    <link rel="stylesheet" href="{{ STATIC_URL }}lib/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css">
     <link rel="stylesheet" href="{% static "lib/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css" %}">
 {% endblock %}
 {% block scripts %}
-    <script type="text/javascript" src="{{ STATIC_URL }}lib/bootstrap-datepicker/js/bootstrap-datepicker.js"></script>
+    <script type="text/javascript" src="{{ STATIC_URL }}lib/bootstrap-datepicker/dist/js/bootstrap-datepicker.js"></script>
     <script type="text/javascript" src="{% static "lib/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js" %}"></script>
     <script>$(function(){ $("#id_date").datepicker({format: 'yyyy-mm-dd'}); });</script>
     <script>$(function(){ $("#id_deadline").datetimepicker({ format:'YYYY-MM-DD HH:mm' });});</script>
@@ -57,4 +57,4 @@ <h4 class="modal-title">{{ form.form_title }}</h4>
             </div>
         </div>
     </div>
-{% endif %}
+{% endif %}
diff --git a/package.json b/package.json
@@ -15,21 +15,42 @@
     "students"
   ],
   "author": "Eirik Martiniussen Sylliaas",
-  "license": "Proprietary",
+  "license": "UNLICENSED",
   "bugs": {
     "url": "https://github.com/itdagene-ntnu/itdagene/issues"
   },
   "homepage": "https://github.com/itdagene-ntnu/itdagene",
   "dependencies": {
+    "animate.css": "^3.5.2",
+    "bootstrap": "3",
+    "bootstrap-chosen": "^1.4.2",
+    "bootstrap-datepicker": "^1.7.1",
+    "bootstrap-table": "^1.11.2",
     "browserify": "^7.0.0",
+    "chosen-js": "^1.8.2",
+    "eonasdan-bootstrap-datetimepicker": "^4.17.47",
+    "file-loader": "^1.1.6",
+    "font-awesome": "^4.7.0",
+    "hover.css": "^2.2.1",
+    "ionicons": "^3.0.0",
+    "jquery": "^3.2.1",
+    "lightbox2": "^2.10.0",
     "moment": "^2.8.4",
+    "moment-timezone": "^0.5.14",
     "nib": "^1.0.4",
     "react": "^0.12.1",
     "react-bootstrap": "^0.13.0",
     "reactify": "^0.17.1",
-    "stylus": "^0.49.3",
+    "stylus": "^0.54.5",
     "superagent": "^0.21.0",
+    "tablesorter": "^2.29.2",
     "uglify-js": "^2.4.15",
     "watchify": "^2.1.1"
+  },
+  "devDependencies": {
+    "copy-webpack-plugin": "^4.3.1",
+    "css-loader": "^0.28.8",
+    "stylus-loader": "^3.0.1",
+    "webpack": "^3.10.0"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,44 @@
+const path = require("path");
+const webpack = require("webpack");
+const CopyWebpackPlugin = require("copy-webpack-plugin");
+
+const Assets = require("./assets");
+
+module.exports = {
+  entry: {
+    app: "./itdagene/assets/frontend/js/index.js"
+  },
+  output: {
+    path: __dirname + "/itdagene/assets/frontend/",
+    filename: "itdagene.js"
+  },
+  module: {
+    loaders: [
+      {
+        test: /\.styl$/,
+        loader:
+          "file-loader?name=itdagene.css!stylus-loader?paths=node_modules/bootstrap-stylus/stylus/"
+      }
+    ]
+  },
+  plugins: [
+    new webpack.LoaderOptionsPlugin({
+      options: {
+        stylus: {
+          use: [require("nib")()],
+          import: ["~nib/lib/nib/index.styl"]
+        }
+      }
+    }),
+
+    new CopyWebpackPlugin(
+      Assets.map(asset => {
+        return {
+          from: path.resolve(__dirname, `./node_modules/${asset}/`),
+          toType: "dir",
+          to: path.resolve(__dirname, `./itdagene/assets/lib/${asset}/`)
+        };
+      })
+    )
+  ]
+};