s452101/BestNotes
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BES-28 Added simple homepage.

Browse Source
This commit is contained in:
ksanu 2019-12-02 00:14:10 +01:00
parent 57d469611d
commit 605648b6dc
29 changed files with 174 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.idea/workspace.xml
View File

@ -2,14 +2,25 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/bestnotes/templates/base.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/homepage.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/navbar.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/profesor.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/przedmiot.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/templates/registration/login.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/BestNotesProject/static/images/bg_notes.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/migrations/0002_subject_topic.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/bg_notes.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/homepage.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/laptop.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/laptop.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/login.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/navbar.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/bestnotes/static/subject.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/images/bg_notes.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BestNotesProject/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/BestNotesProject/settings.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BestNotesProject/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/BestNotesProject/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/admin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/templates/homepage.html" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/templates/homepage.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/templates/navbar.html" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/templates/navbar.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/templates/profesor.html" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/templates/subjects.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/templates/przedmiot.html" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/templates/subject.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/urls.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bestnotes/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
@ -20,6 +31,9 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FavoritesManager">
<favorites_list name="BestNotes" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
@ -39,6 +53,7 @@
<component name="ProjectId" id="1U5Jq3TEUnuX8tmyYK4OsXqAEBc" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/bestnotes" />
@ -62,7 +77,7 @@
</option>
</component>
<component name="RunManager">
<configuration name="Unittests in bestnotesunittests.py" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<configuration name="Unittests in E:/MojeDane/StudiaWMI/Semestr_2_Zimowy_2019-20/Systemy_informatyczne/merged_master/BestNotes/bestnotes/bestnotesunittests.py" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="BestNotesProject" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
@ -78,7 +93,7 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python tests.Unittests in bestnotesunittests.py" />
<item itemvalue="Python tests.Unittests in E:/MojeDane/StudiaWMI/Semestr_2_Zimowy_2019-20/Systemy_informatyczne/merged_master/BestNotes/bestnotes/bestnotesunittests.py" />
</list>
</recent_temporary>
</component>

BIN
BestNotesProject/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

BIN
BestNotesProject/__pycache__/urls.cpython-38.pyc
View File

Binary file not shown.

7
BestNotesProject/settings.py
View File

@ -27,9 +27,12 @@ DEBUG = True
ALLOWED_HOSTS = []
STATIC_URL = '/static/'
#
LOGIN_REDIRECT_URL = '/bestnotes/profesor/'
LOGOUT_REDIRECT_URL = '/bestnotes/'
LOGIN_REDIRECT_URL = '/bestnotes/'
LOGOUT_REDIRECT_URL = '/bestnotes/accounts/login/'
# Application definition
INSTALLED_APPS = [

BIN
BestNotesProject/static/images/bg_notes.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

2
BestNotesProject/urls.py
View File

@ -15,8 +15,10 @@ Including another URLconf
"""
from django.contrib import admin
from django.urls import path, include
from bestnotes.views import homepage
urlpatterns = [
path('bestnotes/', include('bestnotes.urls')),
path('', homepage, name='homepage'),
path('admin/', admin.site.urls),
]

BIN
bestnotes/__pycache__/admin.cpython-38.pyc
View File

Binary file not shown.

BIN
bestnotes/__pycache__/models.cpython-38.pyc
View File

Binary file not shown.

BIN
bestnotes/__pycache__/urls.cpython-38.pyc
View File

Binary file not shown.

BIN
bestnotes/__pycache__/views.cpython-38.pyc
View File

Binary file not shown.

6
bestnotes/admin.py
View File

@ -2,6 +2,8 @@ from django.contrib import admin
# Register your models here.
from django.contrib import admin
from .models import StudentProfile
from .models import StudentProfile, Subject, Topic
admin.site.register(StudentProfile)
admin.site.register(StudentProfile)
admin.site.register(Subject)
admin.site.register(Topic)

31
bestnotes/migrations/0002_subject_topic.py Normal file
View File

@ -0,0 +1,31 @@
# Generated by Django 2.2.7 on 2019-12-01 22:21
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('bestnotes', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='Subject',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30)),
('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bestnotes.StudentProfile')),
],
),
migrations.CreateModel(
name='Topic',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30)),
('add_date', models.DateField()),
('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bestnotes.Subject')),
],
),
]

BIN
bestnotes/migrations/__pycache__/0002_subject_topic.cpython-38.pyc Normal file
View File

Binary file not shown.

14
bestnotes/models.py
View File

@ -33,4 +33,16 @@ def create_studentprofile(sender, instance, created, **kwargs):
@receiver(post_save, sender=User)
def save_studentprofile(sender, instance, **kwargs):
instance.studentprofile.save()
instance.studentprofile.save()
class Subject(models.Model):
name = models.CharField(max_length=30)
student = models.ForeignKey(StudentProfile, on_delete=models.CASCADE)
class Topic(models.Model):
name = models.CharField(max_length=30)
subject = models.ForeignKey(Subject, on_delete=models.CASCADE)
add_date = models.DateField()

BIN
bestnotes/static/bg_notes.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 MiB

0
bestnotes/static/homepage.css Normal file
View File

BIN
bestnotes/static/laptop.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

BIN
bestnotes/static/laptop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

47
bestnotes/static/login.css Normal file
View File

@ -0,0 +1,47 @@
.login-container{
margin-top: 5%;
text-align: center;
}
.logo{
color:white;
margin-bottom: 5%;
}
.login-form-2{
border-radius: 5%;
padding: 5%;
background: #0062cc;
box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.2), 0 9px 26px 0 rgba(0, 0, 0, 0.19);
}
.input-group-text{
font-size: 1.5rem;
min-width: 50px;
}
.icon{
text-align: center;
}
.login-form-2 h1{
text-align: center;
color: #fff;
}
.login-container form{
padding: 8%;
}
.btnSubmit
{
width: 50%;
border-radius: 1rem;
padding: 1.5%;
border: none;
cursor: pointer;
}
.login-form-2 .btnSubmit{
font-weight: 600;
color: #0062cc;
background-color: #fff;
}

9
bestnotes/static/navbar.css Normal file
View File

@ -0,0 +1,9 @@
.nolink{
text-decoration: none;
color:white;
}
.nolink:hover{
text-decoration: none;
color:white;
}

0
bestnotes/static/subject.css Normal file
View File

23
bestnotes/templates/homepage.html
View File

@ -10,7 +10,28 @@
{% include 'navbar.html' %}
<div class="container">
<div class="bg-secondary">
<div class="w-100 p-3 mb-2 text-white">
<div >
<img src="{% static 'bg_notes.jpg' %}" class="w-100 img-fluid"/>
</div>
</div>
<div>
<div class="w-25 d-flex justify-content-center">
<img src="{% static 'laptop.png' %}" class="img-fluid "/>
</div>
<div class="d-flex justify-content-center">
<h2>Stwórz najlepszą wersję mobilnych notatek</h2>
</div>
</div>
<div class="w-50 d-flex justify-content-center">
<div >
<h3>Dziel się notatkami ze znajomymi</h3>
</div>
</div>
</div>

9
bestnotes/templates/navbar.html
View File

@ -7,12 +7,13 @@
<span class="navbar-toggler-icon"></span>
</button>
<ul class="navbar-nav collapse navbar-collapse" id="navbarNav">
<li class="nav-item nav-link" href="{% url 'homepage' %}"><a class="nolink" href="{% url 'homepage' %}">Strona główna</a><span class="sr-only">(current)</span></li>
<li class="nav-item nav-link active" ><a class="nolink" href="{% url 'homepage' %}">Strona główna</a> <span class="sr-only">(current)</span></li>
{% if user.is_authenticated %}
<li class="nav-item nav-link active"><a class="nolink" href="{% url 'profesor' %}">Przedmioty</a></li>
<li class="nav-item nav-link active"><a class="nolink" href="{% url 'logout' %}">Wyloguj się</a></li>
<li class="nav-item nav-link active"><a class="nolink" href="{% url 'subject' %}">Przedmioty</a></li>
<li class="nav-item nav-link"><a class="nolink" href="{% url 'logout' %}">Wyloguj się</a></li>
{% else %}
<li class="nav-item nav-link active"><a class="nolink" href="{% url 'login' %}">Zaloguj się</a></li>
<li class="nav-item nav-link"><a class="nolink" href="{% url 'login' %}">Zaloguj się</a></li>
{% endif %}
</ul>
</nav>

4
bestnotes/templates/przedmiot.html → bestnotes/templates/subject.html
View File

@ -1,6 +1,8 @@
{% extends 'base.html' %}
{% load static %}
{% block css %}
<link rel="stylesheet" type="text/css" href="{% static 'subject.css' %}">
{% endblock %}
{% block content %}
{% include 'navbar.html' %}
<div class="container d-flex justify-content-center">

6
bestnotes/templates/profesor.html → bestnotes/templates/subjects.html
View File

@ -26,17 +26,17 @@
<a class="row justify-content-center">Liczba dostępnych przedmiotów: 3/5</a>
<ul class="list-group cProductsList mt-3">
<li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Sztuczna inteligencja</p>
<button class="btn-primary mr-1" ><a class="nolink" href="/profesor/Sztuczna inteligencja">Zarządzaj</a></button>
<button class="btn-primary mr-1" ><a class="nolink" href="/bestnotes/subject/Sztuczna inteligencja">Zarządzaj</a></button>
<button class="btn-success mr-1">Edytuj</button>
<button class="btn-danger">Usuń</button>
</li>
<li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Systemy informatyczne</p>
<button class="btn-primary mr-1"><a class="nolink" href="/profesor/Systemy informatyczne">Zarządzaj</a></button>
<button class="btn-primary mr-1"><a class="nolink" href="/bestnotes/subject/Systemy informatyczne">Zarządzaj</a></button>
<button class="btn-success mr-1">Edytuj</button>
<button class="btn-danger">Usuń</button>
</li>
<li class="list-group-item d-sm-flex justify-content-between"><p class="p-0 m-0 flex-grow-1">Programowanie</p>
<button class="btn-primary mr-1"><a class="nolink" href="/profesor/Programowanie">Zarządzaj</a></button>
<button class="btn-primary mr-1"><a class="nolink" href="/bestnotes/subject/Programowanie">Zarządzaj</a></button>
<button class="btn-success mr-1">Edytuj</button>
<button class="btn-danger">Usuń</button>
</li>

4
bestnotes/urls.py
View File

@ -6,6 +6,6 @@ urlpatterns = [
path('', views.homepage, name='homepage'),
#path('/', views.login),
path('accounts/', include("django.contrib.auth.urls")),
path('profesor/', views.profesor, name="profesor"),
path('profesor/<id>', views.profesor_id),
path('subject/', views.subject, name="subject"),
path('subject/<id>', views.subject_id, name="subjectid"),
]

11
bestnotes/views.py
View File

@ -7,11 +7,10 @@ from django.http import HttpResponse
def homepage(request):
#return HttpResponse("BestNotes' index will be here.")
return render(request, "homepage.html", {})
def login(request):
return render(request, "login.html", {})
def profesor(request):
return render(request, "profesor.html", {})
def profesor_id(request,id):
return render(request, "przedmiot.html", {'id': id})
def subject(request):
return render(request, "subjects.html", {})
def subject_id(request,id):
return render(request, "subject.html", {'id': id})

BIN
db.sqlite3
View File

Binary file not shown.

BIN
images/bg_notes.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB