Compare commits
47 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
4793046962 | ||
|
269cda217d | ||
|
d123241d1c | ||
|
fd3812b24b | ||
|
b43d9650bd | ||
|
8dadec66b2 | ||
|
e31dd0d04d | ||
|
c82fcfd552 | ||
|
19274c4f3f | ||
|
7b218b744d | ||
|
25b74a61d3 | ||
|
7fb58d3202 | ||
|
38b56d55ec | ||
|
cce93b2549 | ||
|
81d1b731e4 | ||
|
96e911283b | ||
|
1553d6be08 | ||
|
54c5370b5d | ||
|
e78332631c | ||
|
12db061392 | ||
|
48c4109964 | ||
|
be72c875c3 | ||
|
76d0e7ab4b | ||
|
0d39d411f7 | ||
|
032b4c34c2 | ||
|
345100f5ca | ||
|
f9965d82e0 | ||
|
6f518fe300 | ||
|
0e47b590a3 | ||
|
6e010e9bcf | ||
|
1b7dcdaf5f | ||
|
348fd7b790 | ||
|
02860e1f39 | ||
|
83a612f934 | ||
|
471d53dc29 | ||
|
7c1656f5ae | ||
|
767f19679f | ||
|
4d39a5e431 | ||
|
f38e565e57 | ||
|
0bac11d36a | ||
|
77971cce4d | ||
|
00fb4b61d9 | ||
|
05ffefb104 | ||
|
587aec09bc | ||
|
cfb9840d1a | ||
|
16f0e52ff9 | ||
|
b2d34f5ed0 |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,10 +1,13 @@
|
|||||||
/node_modules/
|
/node_modules/
|
||||||
|
/test/allure-results/
|
||||||
/test/allure-results/*.xml
|
/test/allure-results/*.xml
|
||||||
/test/allure-results/*.png
|
/test/allure-results/*.png
|
||||||
/test/allure-results/*.log
|
/test/allure-results/*.log
|
||||||
/test/allure-results/*.json
|
/test/allure-results/*.json
|
||||||
|
/test/allure-results/*.mp4
|
||||||
/test/screenshots/*.png
|
/test/screenshots/*.png
|
||||||
/allure-report/
|
/allure-report/
|
||||||
|
/_results_/
|
||||||
|
|
||||||
# Created by https://www.gitignore.io
|
# Created by https://www.gitignore.io
|
||||||
|
|
||||||
|
@ -2,11 +2,7 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="">
|
<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$/.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>
|
</list>
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
@ -18,6 +14,7 @@
|
|||||||
<option name="RECENT_TEMPLATES">
|
<option name="RECENT_TEMPLATES">
|
||||||
<list>
|
<list>
|
||||||
<option value="Python Script" />
|
<option value="Python Script" />
|
||||||
|
<option value="HTML File" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
@ -32,8 +29,9 @@
|
|||||||
<component name="ProjectId" id="1U5Jq3TEUnuX8tmyYK4OsXqAEBc" />
|
<component name="ProjectId" id="1U5Jq3TEUnuX8tmyYK4OsXqAEBc" />
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
||||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
<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" />
|
<property name="settings.editor.selected.configurable" value="preferences.general" />
|
||||||
</component>
|
</component>
|
||||||
<component name="RunDashboard">
|
<component name="RunDashboard">
|
||||||
@ -49,7 +47,7 @@
|
|||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager">
|
<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" />
|
<module name="BestNotesProject" />
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true" />
|
||||||
@ -65,7 +63,7 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list>
|
<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>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
</component>
|
</component>
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -28,6 +28,11 @@ DEBUG = True
|
|||||||
ALLOWED_HOSTS = []
|
ALLOWED_HOSTS = []
|
||||||
|
|
||||||
|
|
||||||
|
STATIC_URL = '/static/'
|
||||||
|
#
|
||||||
|
LOGIN_REDIRECT_URL = '/bestnotes/'
|
||||||
|
LOGOUT_REDIRECT_URL = '/bestnotes/accounts/login/'
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
@ -38,7 +43,8 @@ INSTALLED_APPS = [
|
|||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'widget_tweaks'
|
'widget_tweaks',
|
||||||
|
'tinymce',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
@ -121,5 +127,18 @@ USE_TZ = True
|
|||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
|
|
||||||
LOGIN_REDIRECT_URL = '/bestnotes/subject/' #To change, at this moment we have no home site
|
|
||||||
LOGOUT_REDIRECT_URL = '/bestnotes/accounts/login'
|
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
|
||||||
|
}
|
BIN
BestNotesProject/static/images/bg_notes.jpg
Normal file
BIN
BestNotesProject/static/images/bg_notes.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.3 KiB |
@ -15,8 +15,11 @@ Including another URLconf
|
|||||||
"""
|
"""
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.urls import path, include
|
from django.urls import path, include
|
||||||
|
from bestnotes.views import homepage
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('bestnotes/', include('bestnotes.urls')),
|
path('bestnotes/', include('bestnotes.urls')),
|
||||||
|
path('', homepage, name='homepage'),
|
||||||
|
path(r'^tinymce/', include('tinymce.urls')),
|
||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
]
|
]
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
Testowe Readme do projektu BestNotes
|
Demo dostępne pod adresem: http://bestnotes.pythonanywhere.com/
|
||||||
|
Dane do logowanie:
|
||||||
Testowa zmiana
|
Email: admin
|
||||||
|
Hasło: admin
|
||||||
|
|
||||||
# Run Webdriver.IO tests locally
|
# Run Webdriver.IO tests locally
|
||||||
To run WebdriverIO tests locally, just execute:
|
To run WebdriverIO tests locally, just execute:
|
||||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user