Skip to content

Commit

Permalink
Setup vue project
Browse files Browse the repository at this point in the history
  • Loading branch information
eheinrich committed Apr 11, 2019
1 parent 6902faf commit 89c807b
Show file tree
Hide file tree
Showing 58 changed files with 2,703 additions and 9,187 deletions.
3 changes: 3 additions & 0 deletions .browserslistrc
@@ -0,0 +1,3 @@
> 1%
last 2 versions
not ie <= 8
48 changes: 16 additions & 32 deletions .eslintrc.js
@@ -1,33 +1,17 @@
module.exports = {
"env": {
"browser": true,
},
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"plugins": ["html"],
"settings": {
"html/html-extensions": [".html", ".vue"]
},
"rules": {
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
],
"no-console": 'off'
}
};
root: true,
env: {
node: true
},
'extends': [
'plugin:vue/essential',
'eslint:recommended'
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
},
parserOptions: {
parser: 'babel-eslint'
}
}
25 changes: 25 additions & 0 deletions .gitignore
Expand Up @@ -102,3 +102,28 @@ venv.bak/

# mypy
.mypy_cache/

.DS_Store
node_modules
/dist

/tests/e2e/videos/
/tests/e2e/screenshots/

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw*
5 changes: 5 additions & 0 deletions babel.config.js
@@ -0,0 +1,5 @@
module.exports = {
presets: [
'@vue/app'
]
}
3 changes: 3 additions & 0 deletions cypress.json
@@ -0,0 +1,3 @@
{
"pluginsFile": "tests/e2e/plugins/index.js"
}
Expand Up @@ -6,4 +6,5 @@
{% endblock %}
{% block extra_javascript %}
<script type="text/javascript" src="{% static 'bundles/compose.js' %}"></script>
<script type="text/javascript" src="{% static 'bundles/vendors~compose.js' %}"></script>
{% endblock %}
Expand Up @@ -17,5 +17,6 @@
</div>
{% endblock %}
{% block extra_javascript %}
<script type="text/javascript" src="{% static 'bundles/vendors~request_detail.js' %}"></script>
<script type="text/javascript" src="{% static 'bundles/request_detail.js' %}"></script>
{% endblock %}
Expand Up @@ -21,4 +21,5 @@
{% endblock %}
{% block extra_javascript %}
<script type="text/javascript" src="{% static 'bundles/requestgroup_detail.js' %}"></script>
<script type="text/javascript" src="{% static 'bundles/vendors~requestgroup_detail.js' %}"></script>
{% endblock %}
8 changes: 5 additions & 3 deletions observation_portal/requestgroups/viewsets.py
@@ -1,11 +1,12 @@
import logging

from rest_framework import viewsets, filters
from rest_framework.decorators import action
from rest_framework.decorators import action, list_route
from rest_framework.response import Response
from rest_framework.permissions import IsAuthenticatedOrReadOnly, IsAdminUser
from django.utils import timezone
from django_filters.rest_framework import DjangoFilterBackend
from dateutil.parser import parse
import logging

from observation_portal.proposals.models import Proposal, Semester, TimeAllocation
from observation_portal.requestgroups.models import RequestGroup, Request, DraftRequestGroup
Expand Down Expand Up @@ -139,7 +140,8 @@ def cancel(self, request, pk=None):
return Response({'errors': [str(exc)]}, status=400)
return Response(RequestGroupSerializer(request_group).data)

@action(detail=False, methods=['post'])
#@action(detail=False, methods=['post'])
@list_route(methods=['post'])
def validate(self, request):
serializer = RequestGroupSerializer(data=request.data, context={'request': request})
req_durations = {}
Expand Down
1 change: 1 addition & 0 deletions observation_portal/urls.py
Expand Up @@ -81,6 +81,7 @@
url(r'^', include(requestgroup_urls)),
url(r'^accounts/', include(accounts_urls)),
url(r'^api/', include(api_urlpatterns)),
url(r'^tools/', TemplateView.as_view(template_name='tools.html'), name='tools'),
url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
url(r'^proposals/', include(proposals_urls)),
url(r'^observations/', include(observations_urls)),
Expand Down

0 comments on commit 89c807b

Please sign in to comment.