diff --git a/Dockerfile b/Dockerfile index d2dc01a..423c036 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,11 +6,14 @@ RUN mkdir /code WORKDIR /code RUN mkdir requirements ADD bikeshop_project /code -COPY requirements /code/requirements +ADD requirements /code/requirements/base.txt +ADD requirements /code/requirements/production.txt RUN pip install -r requirements/production.txt RUN npm cache clean +ADD ./bikeshop_project/bower.json bower.json RUN npm install --unsafe-perm -g bower RUN bower install --allow-root +ADD ./bikeshop_project/package.json package.json RUN npm install --unsafe-perm RUN npm run build-production RUN DJANGO_SETTINGS_MODULE=bikeshop.settings.production python manage.py collectstatic --no-input diff --git a/bikeshop_project/bower.json b/bikeshop_project/bower.json index 5163b81..65f36e9 100644 --- a/bikeshop_project/bower.json +++ b/bikeshop_project/bower.json @@ -18,7 +18,6 @@ ], "dependencies": { "material-design-lite": "^1.3.0", - "md-date-time-picker": "https://github.com/puranjayjain/md-date-time-picker.git#master", "normalize-css": "normalize.css#^4.1.1" } } diff --git a/bikeshop_project/core/templates/membership_form.html b/bikeshop_project/core/templates/membership_form.html index 506206a..eb496f2 100644 --- a/bikeshop_project/core/templates/membership_form.html +++ b/bikeshop_project/core/templates/membership_form.html @@ -1,10 +1,6 @@ {% extends 'dashboard.html' %} {% load staticfiles %} -{% block styles %} - -{% endblock %} - {% block content %}

New Membership

@@ -150,26 +146,7 @@ {% endblock %} {% block scripts %} - - - - - - - - - - -