Skip to content

Commit b3aaf89

Browse files
committed
update to Python 3, django 1.11.4
Update all node_modules, eslint (airbnb-base), gulp tasks
1 parent 93e8304 commit b3aaf89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+620
-843
lines changed

.eslintrc

Lines changed: 0 additions & 192 deletions
This file was deleted.

.eslintrc.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
module.exports = {
2+
"parser": "babel-eslint",
3+
"extends": "airbnb-base",
4+
"rules": {
5+
"indent": ["error", "tab"],
6+
"no-tabs": 0
7+
},
8+
"env": {
9+
"browser": true,
10+
"jquery": true
11+
},
12+
"globals": {
13+
"flexibility": true
14+
}
15+
};

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
It's very simple start point for django project.
44

5-
For `Django == 1.10.6` compatible with Python 2.7 & 3.6
5+
For `Django == 1.11.4` compatible with Python >= 3.4
66

77
## Install
88

@@ -16,13 +16,8 @@ For `Django == 1.10.6` compatible with Python 2.7 & 3.6
1616
python manage.py runserver
1717

1818
### Frontend (other terminal tab)
19-
20-
#### For development
2119
npm start
2220

23-
#### For production
24-
npm run build
25-
2621

2722
## Structure
2823

@@ -32,7 +27,6 @@ Recommend installation virtualenv in `.env` folder in project folder.
3227
/.env - virtualenv
3328
/.git
3429
/applications - folder for django applications
35-
---/frontend – app for fast layout pages (Ex. http://localhost:8000/template/template_file_name.html)
3630
---/main - start app point that I offer for you
3731
/frontend - folder for source "frontend" files
3832
---/images - gulp tasks look at this folder, files get->optimize->put to `/static/images/`

applications/main/admin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
from django.contrib import admin
32
from . import models
43

applications/main/apps.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# coding: utf-8
21
from django.apps import AppConfig
32

43

applications/main/forms.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
# -*- coding: utf-8 -*-
21
from django import forms
32
from . import models

applications/main/models.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
import os
32
import uuid
43
from django.db import models
@@ -22,22 +21,22 @@ class Common(models.Model):
2221
PUBLISHED = 'published'
2322

2423
CHOICES_STATUS = (
25-
(DRAFT, u'Черновик'),
26-
(PUBLISHED, u'Опубликовано'),
24+
(DRAFT, 'Черновик'),
25+
(PUBLISHED, 'Опубликовано'),
2726
)
2827

2928
status = models.CharField(
30-
u'Статус',
29+
'Статус',
3130
choices=CHOICES_STATUS,
3231
default=PUBLISHED,
3332
max_length=50)
3433

3534
created = models.DateTimeField(
36-
u'Дата создания',
35+
'Дата создания',
3736
auto_now_add=True)
3837

3938
modified = models.DateTimeField(
40-
u'Дата изменения',
39+
'Дата изменения',
4140
auto_now=True)
4241

4342
objects = models.Manager()
@@ -51,16 +50,16 @@ class Meta:
5150
class MetaFields(models.Model):
5251

5352
meta_description = models.CharField(
54-
u'META описание',
53+
'META описание',
5554
max_length=200,
56-
help_text=u'Рекомендуемая длина мета описания = 160 символов.',
55+
help_text='Рекомендуемая длина мета описания = 160 символов.',
5756
blank=True,
5857
null=True)
5958

6059
meta_keywords = models.CharField(
61-
u'META ключевые слова',
60+
'META ключевые слова',
6261
max_length=2500,
63-
help_text=u'Укажите ключевые слова через запятую.',
62+
help_text='Укажите ключевые слова через запятую.',
6463
blank=True,
6564
null=True)
6665

applications/main/sitemap.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
# from django.contrib.sitemaps import Sitemap
32
# from itertools import chain
43
# from django.core.urlresolvers import reverse

applications/main/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
from django.conf.urls import url
32
from . import views
43

applications/main/views.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
from django.views.generic import TemplateView
32

43

0 commit comments

Comments
 (0)