new readme

Merging new colors

.gitignore

@@ -1,7 +1,100 @@
 /node_modules/
+/test/allure-results/
 /test/allure-results/*.xml
 /test/allure-results/*.png
 /test/allure-results/*.log
 /test/allure-results/*.json
+/test/allure-results/*.mp4
 /test/screenshots/*.png
-/allure-report/
+/allure-report/
+/_results_/
+ 
+# Created by https://www.gitignore.io
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+
+### Django ###
+*.log
+*.pot
+*.pyc
+__pycache__/
+local_settings.py
+
+.env
+db.sqlite3

.idea/workspace.xml

@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/bestnotes/dbAPI.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bestnotes/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/models.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bestnotes/tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/bestnotes/tests.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/db.sqlite3" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,6 +14,7 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Python Script" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -32,8 +29,9 @@
   <component name="ProjectId" id="1U5Jq3TEUnuX8tmyYK4OsXqAEBc" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="PropertiesComponent">
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../TAU/TAU_34/wmt_2017_git_master" />
     <property name="settings.editor.selected.configurable" value="preferences.general" />
   </component>
   <component name="RunDashboard">
@@ -49,7 +47,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/BES-32/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" />
@@ -65,7 +63,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/BES-32/BestNotes/bestnotes/bestnotesunittests.py" />
       </list>
     </recent_temporary>
   </component>

BestNotesProject/settings.py

@@ -28,6 +28,11 @@ DEBUG = True
 ALLOWED_HOSTS = []
 
 
+STATIC_URL = '/static/'
+#
+LOGIN_REDIRECT_URL = '/bestnotes/'
+LOGOUT_REDIRECT_URL = '/bestnotes/accounts/login/'
+
 # Application definition
 
 INSTALLED_APPS = [
@@ -38,6 +43,8 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'widget_tweaks',
+    'tinymce',
 ]
 
 MIDDLEWARE = [
@@ -119,3 +126,19 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/2.2/howto/static-files/
 
 STATIC_URL = '/static/'
+
+
+TINYMCE_JS_URL = "https://cdn.tiny.cloud/1/r9o35nobg5gdj46hhxw3ohwbjh4yct23kx405ozckt8fj2k2/tinymce/5.1.4-66/tinymce.min.js"
+
+TINYMCE_DEFAULT_CONFIG = {
+    'height' : 500,
+    'skin': 'oxide-dark',
+    'branding': False,
+    'content_css': 'dark',
+    'plugins': "image,imagetools,media,codesample,link,code,wordcount",
+    'menubar': False,
+    'contextmenu': "cut, copy, link, media ",
+    'toolbar': "styleselect | undo redo | bold italic underline superscript subscript| fontselect fontsizeselect forecolor backcolor | alignleft aligncenter alignright | link image media codesample code",
+    'image_caption': True,
+    'image_advtab': True
+}

BestNotesProject/urls.py

@@ -15,8 +15,11 @@ 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(r'^tinymce/', include('tinymce.urls')),
     path('admin/', admin.site.urls),
 ]

Front/models.py

@@ -1,11 +0,0 @@
-from django.db import models
-
-#Klasa opisująca zagadnienie dla danego przedmiotu
-class Zagadnienie(models.Model):
-    nazwa = models.CharField(max_length=30)
-    przedmiot = models.ForeignKey(Przedmiot, on_delete=models.CASCADE)
-    data_dodania = models.DateField()
-
-class Przedmiot(models.Model):
-    nazwa = models.CharField(max_length=30)
-    #uzytkownik_id = models.ForeignKey(User, on_delete=models.CASCADE)

Front/templates/navbar.html

@@ -1,16 +0,0 @@
-<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-    <a class="navbar-brand" href="#">
-        <i class="fa fa-sticky-note logo"></i>
-        <strong>Best Notes</strong>
-    </a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-    </button>
-        <ul class="navbar-nav collapse navbar-collapse"  id="navbarNav">
-            <li class="nav-item nav-link" href="#">Strona główna <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"><a class="nolink" href="{% url 'logout' %}">Wyloguj się</a></li>
-            {% endif %}
-        </ul>
-</nav>

Front/templates/profesor.html

@@ -1,50 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% block css %}
-    <link rel="stylesheet" type="text/css" href="{% static 'profesor.css' %}">
-{% endblock %}
-
-{% block content %}
-
-{% if user.is_authenticated %}
-
-{% include 'navbar.html' %}
-
-<div class="container">
-        <div class="d-flex justify-content-center mt-5">
-            <h3>Dodaj nowy przedmiot</h3>
-        </div>
-    <div class="d-flex justify-content-center mt-3">
-        <form role="form">
-            <input type="text" class="form-control" placeholder="Nowy przedmiot" name="przedmiot">
-        </form>
-        <button type="button" class="btn btn btn-primary ml-1">Dodaj</button>
-    </div>
-    <div class="d-flex justify-content-center mt-5">
-            <h3>Lista przedmiotów</h3>
-    </div>
-    <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-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-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-success mr-1">Edytuj</button>
-                <button class="btn-danger">Usuń</button>
-             </li> 
-    </ul>
-</div>
-
-{% else %}
-<a href="{% url 'login' %}">Zaloguj sie</a>
-{% endif %}
-
-{% endblock %}

README.md

@@ -1,6 +1,7 @@
-Testowe Readme do projektu BestNotes
-
-Testowa zmiana
+Demo dostępne pod adresem: http://bestnotes.pythonanywhere.com/
+Dane do logowanie:
+Email: admin
+Hasło: admin
 
 # Run Webdriver.IO tests locally
 To run WebdriverIO tests locally, just execute: