Skip to content

Commit

Permalink
Update django version, migrations and some changes
Browse files Browse the repository at this point in the history
  • Loading branch information
tdelatorre committed Sep 7, 2020
1 parent d671fb8 commit c0ca07c
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 19 deletions.
1 change: 0 additions & 1 deletion src/mister_cobol_web/admin.py
@@ -1,5 +1,4 @@
from django.contrib import admin
from django.contrib.contenttypes import generic
from solo.admin import SingletonModelAdmin
from .models import *

Expand Down
6 changes: 3 additions & 3 deletions src/mister_cobol_web/migrations/0001_initial.py
Expand Up @@ -85,7 +85,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='aboutus',
name='image',
field=models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image'),
field=models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image', on_delete = models.CASCADE),
preserve_default=True,
),
migrations.CreateModel(
Expand All @@ -94,7 +94,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, serialize=False, verbose_name='ID', primary_key=True)),
('name', models.CharField(max_length=100, verbose_name='Name')),
('description', models.TextField(verbose_name='Description')),
('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image')),
('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image', on_delete = models.CASCADE)),
],
options={
'verbose_name_plural': 'Members',
Expand All @@ -117,7 +117,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='home',
name='main_video',
field=models.ForeignKey(to='mister_cobol_web.Video', verbose_name='Main video'),
field=models.ForeignKey(to='mister_cobol_web.Video', verbose_name='Main video', on_delete = models.CASCADE),
preserve_default=True,
),
]
2 changes: 1 addition & 1 deletion src/mister_cobol_web/migrations/0003_auto_20140715_1532.py
Expand Up @@ -14,7 +14,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='event',
name='image',
field=models.ForeignKey(verbose_name='Image', to='mister_cobol_web.Image', default=''),
field=models.ForeignKey(verbose_name='Image', to='mister_cobol_web.Image', default='', on_delete = models.CASCADE),
preserve_default=False,
),
migrations.RemoveField(
Expand Down
2 changes: 1 addition & 1 deletion src/mister_cobol_web/migrations/0006_tour.py
Expand Up @@ -17,7 +17,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(primary_key=True, serialize=False, auto_created=True, verbose_name='ID')),
('title', models.CharField(max_length=50, verbose_name='Title')),
('description', models.TextField(verbose_name='Description')),
('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image')),
('image', models.ForeignKey(to='mister_cobol_web.Image', verbose_name='Image', on_delete = models.CASCADE)),
],
options={
'verbose_name_plural': 'Tours',
Expand Down
2 changes: 1 addition & 1 deletion src/mister_cobol_web/migrations/0011_auto_20140717_1235.py
Expand Up @@ -14,6 +14,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='tour',
name='image',
field=models.ForeignKey(blank=True, verbose_name='Image', to='mister_cobol_web.Image', null=True),
field=models.ForeignKey(blank=True, verbose_name='Image', to='mister_cobol_web.Image', null=True, on_delete = models.CASCADE),
),
]
2 changes: 2 additions & 0 deletions src/mister_cobol_web/models.py
Expand Up @@ -51,6 +51,7 @@ class Member(models.Model):
)
image = models.ForeignKey('Image',
blank=False, null=False,
on_delete = models.CASCADE,
verbose_name=_(u'Image')
)
order = models.SmallIntegerField(
Expand All @@ -77,6 +78,7 @@ class Tour(SingletonModel):
)
image = models.ForeignKey('Image',
blank=True, null=True,
on_delete = models.CASCADE,
verbose_name=_(u'Image')
)

Expand Down
27 changes: 25 additions & 2 deletions src/mister_cobol_web/settings/common.py
Expand Up @@ -49,12 +49,12 @@

INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS

MIDDLEWARE_CLASSES = (
MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
#'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
Expand Down Expand Up @@ -115,6 +115,29 @@
# Example: "http://example.com/static/", "http://static.example.com/"
STATIC_URL = '/static/'

# Django-pug
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'templates')],
'APP_DIRS': True,
'OPTIONS': {
'debug': DEBUG,
'context_processors': [
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.request',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.contrib.messages.context_processors.messages',
]
},
},
]


EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
CONTACT_EMAILS_DESTINATION = 'dummy@dummy.com'

Expand Down
2 changes: 1 addition & 1 deletion src/mister_cobol_web/static/css/style.css
Expand Up @@ -563,7 +563,7 @@ body {
font-family: 'Gotham', sans-serif;
color: #efefef;
line-height: 1.5;
background: url("../images/bg-res.jpg") 50% 0 fixed;
background-color: black;
background-position: center top;
background-repeat: repeat;
}
Expand Down
Binary file removed src/mister_cobol_web/static/images/bg-drops1.png
Binary file not shown.
Binary file removed src/mister_cobol_web/static/images/bg-drops2.png
Binary file not shown.
Binary file removed src/mister_cobol_web/static/images/bg-res.jpg
Binary file not shown.
Binary file removed src/mister_cobol_web/static/images/foto_i_pad.jpg
Binary file not shown.
Binary file modified src/mister_cobol_web/static/images/main-logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/mister_cobol_web/templates/index.html
Expand Up @@ -13,7 +13,6 @@
<meta property="og:title" content="Mister Cobol">
<meta property="og:description" content="Mister Cobol rock band">
<meta property="og:url" content="https://mrcobol.com">
<meta property="og:image" content="/static/images/bg-res.jpg">
<meta property="og:type" content="website">
<meta property="og:site_name" content="Mister Cobol">

Expand Down
12 changes: 4 additions & 8 deletions src/mister_cobol_web/urls.py
@@ -1,18 +1,14 @@
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib import admin
from django.conf import settings
from .views import LandingView, ContactView
from django.contrib.staticfiles.urls import staticfiles_urlpatterns

urlpatterns = patterns('',
# Examples:
# url(r'^$', 'mister_cobol_web.views.home', name='home'),
# url(r'^blog/', include('blog.urls')),

url(r'^admin/', include(admin.site.urls)),
urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^$', LandingView.as_view(), name='landing'),
url(r'^contact/$', ContactView.as_view(), name='contact'),
)
]



Expand Down

0 comments on commit c0ca07c

Please sign in to comment.