skrd/musiclist-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Solucionado #2

Browse Source
This commit is contained in:
Daniel Cortes
2020-06-23 19:40:50 -04:00
parent f592ed082d
commit ea75dfb1b7
9 changed files with 31 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.flake8
View File

@@ -1,3 +1,3 @@
[flake8]
max-line-length = 120
exclude = __pycache__,.git,.idea,static,venv,users/migrations/
exclude = __pycache__,.git,.idea,static,.venv,users/migrations/

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
__pycache__
/venv
/.venv
/.idea
/db.sqlite3
/static

2
pre-commit.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh
set -eu
. venv/bin/activate
. .venv/bin/activate
STASH_NAME=pre-commit-$(date +%s)
git stash save -q --keep-index $STASH_NAME

1
requirements-dev.txt
View File

@@ -1 +1,2 @@
flake8 # Obligar a usar pep8
coverage # Para ver cual es el estado de coverage y ejecutar los test con el

32
users/migrations/0001_initial.py
View File

@@ -1,7 +1,9 @@
# Generated by Django 3.0.6 on 2020-05-16 02:58
# Generated by Django 3.0.7 on 2020-06-23 23:23
from django.conf import settings
import django.contrib.auth.validators
from django.db import migrations, models
import django.db.models.deletion
import django.db.models.manager
@@ -17,18 +19,34 @@ class Migration(migrations.Migration):
name='User',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('password', models.CharField(max_length=128, verbose_name='password')),
('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
('username', models.CharField(max_length=40, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()])),
('email', models.EmailField(max_length=254)),
('is_active', models.BooleanField(default=True)),
('is_admin', models.BooleanField(default=False)),
('username', models.CharField(max_length=40, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='nombre de usuario')),
('email', models.EmailField(max_length=254, verbose_name='correo')),
('is_active', models.BooleanField(default=True, verbose_name='esta activo')),
('is_admin', models.BooleanField(default=False, verbose_name='es administrador')),
('password', models.CharField(max_length=128, verbose_name='contraseña')),
],
options={
'abstract': False,
'verbose_name': 'usuario',
'verbose_name_plural': 'usuarios',
},
managers=[
('object', django.db.models.manager.Manager()),
],
),
migrations.CreateModel(
name='SocialNetworks',
fields=[
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
('twitter', models.CharField(blank=True, max_length=255, verbose_name='twitter')),
('facebook', models.CharField(blank=True, max_length=255, verbose_name='facebook')),
('instagram', models.CharField(blank=True, max_length=255, verbose_name='instagram')),
('youtube', models.CharField(blank=True, max_length=255, verbose_name='youtube')),
('twitch', models.CharField(blank=True, max_length=255, verbose_name='twitch')),
],
options={
'verbose_name': 'Redes Sociales',
'verbose_name_plural': 'Redes Sociales',
},
),
]

56
users/migrations/0002_auto_20200516_0201.py
View File

@@ -1,56 +0,0 @@
# Generated by Django 3.0.6 on 2020-05-16 06:01
from django.conf import settings
import django.contrib.auth.validators
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('users', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='SocialNetworks',
fields=[
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
('twitter', models.CharField(max_length=255, verbose_name='twitter')),
('facebook', models.CharField(max_length=255, verbose_name='facebook')),
('instagram', models.CharField(max_length=255, verbose_name='instagram')),
('youtube', models.CharField(max_length=255, verbose_name='youtube')),
('twitch', models.CharField(max_length=255, verbose_name='twitch')),
],
),
migrations.AlterModelOptions(
name='user',
options={'verbose_name': 'usuario', 'verbose_name_plural': 'usuarios'},
),
migrations.AlterField(
model_name='user',
name='email',
field=models.EmailField(max_length=254, verbose_name='correo'),
),
migrations.AlterField(
model_name='user',
name='is_active',
field=models.BooleanField(default=True, verbose_name='esta activo'),
),
migrations.AlterField(
model_name='user',
name='is_admin',
field=models.BooleanField(default=False, verbose_name='es administrador'),
),
migrations.AlterField(
model_name='user',
name='password',
field=models.CharField(max_length=128, verbose_name='contraseña'),
),
migrations.AlterField(
model_name='user',
name='username',
field=models.CharField(max_length=40, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='nombre de usuario'),
),
]

42
users/migrations/0003_auto_20200516_0225.py
View File

@@ -1,42 +0,0 @@
# Generated by Django 3.0.6 on 2020-05-16 06:25
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0002_auto_20200516_0201'),
]
operations = [
migrations.AlterModelOptions(
name='socialnetworks',
options={'verbose_name': 'Redes Sociales', 'verbose_name_plural': 'Redes Sociales'},
),
migrations.AlterField(
model_name='socialnetworks',
name='facebook',
field=models.CharField(blank=True, max_length=255, verbose_name='facebook'),
),
migrations.AlterField(
model_name='socialnetworks',
name='instagram',
field=models.CharField(blank=True, max_length=255, verbose_name='instagram'),
),
migrations.AlterField(
model_name='socialnetworks',
name='twitch',
field=models.CharField(blank=True, max_length=255, verbose_name='twitch'),
),
migrations.AlterField(
model_name='socialnetworks',
name='twitter',
field=models.CharField(blank=True, max_length=255, verbose_name='twitter'),
),
migrations.AlterField(
model_name='socialnetworks',
name='youtube',
field=models.CharField(blank=True, max_length=255, verbose_name='youtube'),
),
]

0
users/migrations/__init__.py Normal file
View File

4
users/models.py
View File

@@ -60,12 +60,12 @@ class User(AbstractBaseUser):
REQUIRED_FIELDS = ['email']
@staticmethod
def has_perm():
def has_perm(*args, **kwargs):
"""Los usuarios siempre tienen permiso"""
return True
@staticmethod
def has_module_perms():
def has_module_perms(*args, **kwargs):
"""Los usuarios siempre tienen permiso"""
return True