diff --git a/.gitignore b/.gitignore index 03fff394..f29e68d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .idea/ __pycache__/ -static/ \ No newline at end of file +db.sqlite3 +front_end/static/front_end/ \ No newline at end of file diff --git a/HackTJ2020/urls.py b/HackTJ2020/urls.py index 53b48a42..3e158560 100644 --- a/HackTJ2020/urls.py +++ b/HackTJ2020/urls.py @@ -16,8 +16,10 @@ Including another URLconf from django.contrib import admin from django.urls import path, include from api import urls as api_urls +from front_end import urls as front_end_urls urlpatterns = [ path('admin/', admin.site.urls), path('api', include(api_urls)), + path('', include(front_end_urls)) ] diff --git a/front_end/static/css/index.css b/front_end/static/css/index.css new file mode 100644 index 00000000..c6f197ab --- /dev/null +++ b/front_end/static/css/index.css @@ -0,0 +1,19 @@ +html, body { + height: 100%; + margin: 0; + padding: 0; +} + +#main { + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; +} + +#app { + width: 100%; + height: 100%; + display: flex; +} \ No newline at end of file diff --git a/front_end/urls.py b/front_end/urls.py new file mode 100644 index 00000000..b93d926c --- /dev/null +++ b/front_end/urls.py @@ -0,0 +1,21 @@ +"""djangoProject URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/3.1/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.urls import path +from .views import * + +urlpatterns = [ + path('', index), +] diff --git a/front_end/views.py b/front_end/views.py index 91ea44a2..5be90aa8 100644 --- a/front_end/views.py +++ b/front_end/views.py @@ -1,3 +1,6 @@ from django.shortcuts import render + # Create your views here. +def index(request, *args, **kwargs): + return render(request, 'front_end/index.html') diff --git a/templates/front_end/index.html b/templates/front_end/index.html index 566549bd..a22cdab3 100644 --- a/templates/front_end/index.html +++ b/templates/front_end/index.html @@ -1,10 +1,23 @@ - - - - Title - - + + + + + Hack TJ 2020 + {% load static %} + + + + + +
+
+
- + + \ No newline at end of file