diff --git a/app/api/__init__.py b/app/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/api/admin.py b/app/api/admin.py new file mode 100644 index 0000000..92b9b1c --- /dev/null +++ b/app/api/admin.py @@ -0,0 +1,9 @@ +from django.contrib import admin +from app.api.models import News + + +@admin.register(News) +class NewsAdmin(admin.ModelAdmin): + readonly_fields = ('votes',) + list_display = ('title', 'url') + diff --git a/app/api/apps.py b/app/api/apps.py new file mode 100644 index 0000000..24cf026 --- /dev/null +++ b/app/api/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ApiConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'app.api' diff --git a/app/api/migrations/0001_initial.py b/app/api/migrations/0001_initial.py new file mode 100644 index 0000000..6ea824e --- /dev/null +++ b/app/api/migrations/0001_initial.py @@ -0,0 +1,24 @@ +# Generated by Django 3.2.4 on 2021-06-22 10:46 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='News', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=50)), + ('url', models.CharField(max_length=500)), + ('votes', models.IntegerField()), + ('created', models.DateTimeField(auto_now_add=True)), + ], + ), + ] diff --git a/app/api/migrations/__init__.py b/app/api/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/api/models.py b/app/api/models.py new file mode 100644 index 0000000..6364146 --- /dev/null +++ b/app/api/models.py @@ -0,0 +1,15 @@ +from django.db import models + + +class News(models.Model): + title = models.CharField(max_length=50) + url = models.CharField(max_length=500) + votes = models.IntegerField(default=0) + created = models.DateTimeField(auto_now_add=True) + + class Meta: + verbose_name = "News" + verbose_name_plural = "News" + + def __str__(self): + return self.title diff --git a/app/api/serializers.py b/app/api/serializers.py new file mode 100644 index 0000000..f34eb50 --- /dev/null +++ b/app/api/serializers.py @@ -0,0 +1,9 @@ +from app.api.models import News +from rest_framework import serializers + + +class NewsSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = News + fields = ['title', 'url', 'created'] + diff --git a/app/api/tests.py b/app/api/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/app/api/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/api/views.py b/app/api/views.py new file mode 100644 index 0000000..6b774d4 --- /dev/null +++ b/app/api/views.py @@ -0,0 +1,11 @@ +from app.api.models import News +from rest_framework import viewsets +from app.api.serializers import NewsSerializer + + +class NewsViewSet(viewsets.ModelViewSet): + """ + API endpoint that allows News to be viewed or edited. + """ + queryset = News.objects.all() + serializer_class = NewsSerializer \ No newline at end of file diff --git a/app/web/__init__.py b/app/web/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/web/admin.py b/app/web/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/app/web/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/app/web/apps.py b/app/web/apps.py new file mode 100644 index 0000000..4473a6c --- /dev/null +++ b/app/web/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class WebConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'app.web' diff --git a/app/web/migrations/__init__.py b/app/web/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/web/templates/layouts/base.html b/app/web/templates/layouts/base.html new file mode 100644 index 0000000..4a84b1e --- /dev/null +++ b/app/web/templates/layouts/base.html @@ -0,0 +1,26 @@ + + + + + {% block title %}{% endblock %} | Djanker News + + +
+ +
+
+

Djanker News

+ {% block main %}{% endblock %} +
+ + + \ No newline at end of file diff --git a/app/web/templates/pages/add-news.html b/app/web/templates/pages/add-news.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/app/web/templates/pages/add-news.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/app/web/templates/pages/list.html b/app/web/templates/pages/list.html new file mode 100644 index 0000000..ce60807 --- /dev/null +++ b/app/web/templates/pages/list.html @@ -0,0 +1,12 @@ +{% extends 'layouts/base.html' %} +{% block title %}Welcome{% endblock %} +{% block main %} + {% for item in news %} +
+

{{ item.title }}

+

+ Ver completo +

+
+ {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/app/web/tests.py b/app/web/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/app/web/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/web/views.py b/app/web/views.py new file mode 100644 index 0000000..21daad2 --- /dev/null +++ b/app/web/views.py @@ -0,0 +1,12 @@ +from django.shortcuts import render +from app.api.models import News + + +def home(request): + return render(request, 'pages/list.html', { + 'news': News.objects.all() + }) + + +def add_news(request): + return render(request, 'pages/add-news.html', {}) \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000..9198ecd Binary files /dev/null and b/db.sqlite3 differ diff --git a/hackernews/__init__.py b/hackernews/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hackernews/asgi.py b/hackernews/asgi.py new file mode 100644 index 0000000..5a7937c --- /dev/null +++ b/hackernews/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for hackernews project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'hackernews.settings') + +application = get_asgi_application() diff --git a/hackernews/settings.py b/hackernews/settings.py new file mode 100644 index 0000000..08597f5 --- /dev/null +++ b/hackernews/settings.py @@ -0,0 +1,128 @@ +""" +Django settings for hackernews project. + +Generated by 'django-admin startproject' using Django 3.2.4. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/3.2/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure--l@xj@*d=v!20+)(7^m70&hguvmb#57)c+%-+$0i0i^eb2-goy' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'rest_framework', + 'app.web', + 'app.api', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'hackernews.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'hackernews.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/3.2/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/3.2/topics/i18n/ + +LANGUAGE_CODE = 'es-es' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.2/howto/static-files/ + +STATIC_URL = '/static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/hackernews/urls.py b/hackernews/urls.py new file mode 100644 index 0000000..6856d1d --- /dev/null +++ b/hackernews/urls.py @@ -0,0 +1,31 @@ +"""hackernews URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/3.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path, include +from rest_framework import routers +from app.web.views import home, add_news +from app.api.views import NewsViewSet + +router = routers.DefaultRouter() +# Abrir esto -> http://127.0.0.1:8000/api/v1/news/ +router.register(r'v1/news', NewsViewSet) + +urlpatterns = [ + path('', home, name='list'), + path('add-news/', add_news, name='add-news'), + path('api/', include(router.urls)), + path('admin/', admin.site.urls), +] diff --git a/hackernews/wsgi.py b/hackernews/wsgi.py new file mode 100644 index 0000000..ec1285b --- /dev/null +++ b/hackernews/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for hackernews project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'hackernews.settings') + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..86cfe72 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'hackernews.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..4affdbe --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +# Django +django +# Django Rest Framework +djangorestframework +markdown +django-filter \ No newline at end of file