Compare commits

...

48 Commits

Author SHA1 Message Date
ksanu
4793046962 new readme 2020-04-02 09:53:32 +02:00
ksanu
269cda217d BES-65 Usunięcie mozliwosci logowania ze strony logowania 2020-01-19 23:55:40 +01:00
Th3NiKo
d123241d1c Merge branches, update sql 2020-01-19 19:03:19 +01:00
Th3NiKo
fd3812b24b Merge branch 'BES-6' 2020-01-19 19:01:20 +01:00
Th3NiKo
b43d9650bd Settings update 2020-01-19 18:54:43 +01:00
Dawid Majsnerowski
8dadec66b2 BES-66 | formatting tests 2020-01-19 16:51:29 +01:00
Dawid Majsnerowski
e31dd0d04d BES-66 | Add tests for formatting 2020-01-19 14:41:43 +01:00
Dawid Majsnerowski
c82fcfd552 BES-66 | Add tests for formatting 2020-01-19 14:40:45 +01:00
Th3NiKo
19274c4f3f BES-6 Remove Powered by Tiny, add word count instead 2020-01-19 11:10:45 +01:00
Th3NiKo
7b218b744d BES-6 Add new features, font color, font style, context menu. Fixed showing code sample properly 2020-01-19 11:02:52 +01:00
Th3NiKo
25b74a61d3 BES-6 Fix bug with adding notes and bug connected with showing wrong title 2020-01-18 19:02:58 +01:00
Dawid Majsnerowski
7fb58d3202 BES-66 | Add test for adding notes 2020-01-18 18:39:00 +01:00
Dawid Majsnerowski
38b56d55ec BES-66 | Add test for adding notes 2020-01-18 18:33:14 +01:00
Dawid Majsnerowski
cce93b2549 BES-66 | Add test for adding notes 2020-01-18 18:30:46 +01:00
Dawid Majsnerowski
81d1b731e4 BES-66 | fixing test 2020-01-18 14:08:53 +01:00
Dawid Majsnerowski
96e911283b BES-66 | fixing test 2020-01-18 14:07:04 +01:00
Th3NiKo
1553d6be08 BES-6 Updating note, no protections 2020-01-16 11:16:59 +01:00
Th3NiKo
54c5370b5d BES-6 Delete note 2020-01-15 16:47:34 +01:00
Th3NiKo
e78332631c Merge branch 'master' of https://git.wmi.amu.edu.pl/s452101/BestNotes 2020-01-15 16:15:27 +01:00
Th3NiKo
12db061392 BES-55 Fix error 2020-01-15 16:14:42 +01:00
Th3NiKo
48c4109964 BES-55 Show notes with tinymce plugin 2020-01-11 13:17:12 +01:00
Th3NiKo
be72c875c3 BES-55 Adding notes with tinymce, fix showing too many subjects 2020-01-11 12:45:47 +01:00
Dawid Majsnerowski
76d0e7ab4b Merge branch 'master' of https://git.wmi.amu.edu.pl/s452101/BestNotes 2020-01-01 20:18:40 +01:00
Dawid Majsnerowski
0d39d411f7 Fixing test - added cookies 2020-01-01 20:18:23 +01:00
Th3NiKo
032b4c34c2 Merge branch 'BES-52' 2019-12-22 12:44:20 +01:00
Dawid Majsnerowski
345100f5ca BES-53 | Added tests for User Notes and Topic Page 2019-12-15 21:18:58 +01:00
Th3NiKo
f9965d82e0 Merge branch 'BES-52' of https://git.wmi.amu.edu.pl/s452101/BestNotes into BES-52 2019-12-15 19:35:42 +01:00
Th3NiKo
6f518fe300 BES-52 Merge version 3 2019-12-15 19:34:49 +01:00
Th3NiKo
0e47b590a3 Merge version 3 2019-12-15 19:08:00 +01:00
ksanu
6e010e9bcf BES-45 BES-50 BES-51 Added topics.html template, added method to use template notes.html to generate notes_by_topic_id, modified backend to work with the mentioned addtions. 2019-12-15 17:49:20 +01:00
Th3NiKo
1b7dcdaf5f BES-49 Change subjects website look, add IDs for testing, add buttons in note by id 2019-12-13 12:20:20 +01:00
Th3NiKo
348fd7b790 Homepage change 2019-12-12 15:43:34 +01:00
Th3NiKo
02860e1f39 BES-44 Basic homepage change 2019-12-12 13:29:42 +01:00
Th3NiKo
83a612f934 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452101/BestNotes into BES-34 2019-12-12 12:08:23 +01:00
Dawid Majsnerowski
471d53dc29 BES-39 | Fixed tests on prod 2019-12-08 22:55:50 +01:00
Dawid Majsnerowski
7c1656f5ae BES-35 | Fixed tests on prod 2019-12-08 22:54:37 +01:00
Dawid Majsnerowski
767f19679f BES 35 | Fixed tests on prod 2019-12-08 22:51:49 +01:00
Dawid Majsnerowski
4d39a5e431 BES 35 | Add tests for display notes 2019-12-08 22:46:26 +01:00
Dawid Majsnerowski
f38e565e57 BES 39 | Fixed tests 2019-12-08 13:16:12 +01:00
Th3NiKo
0bac11d36a Merge icons 2019-12-08 10:40:52 +01:00
Th3NiKo
77971cce4d BES-34
Merging new colors
2019-12-08 10:29:08 +01:00
Th3NiKo
00fb4b61d9 Merge branch 'BES-34' of https://git.wmi.amu.edu.pl/s452101/BestNotes into BES-34 2019-12-08 01:12:22 +01:00
Th3NiKo
05ffefb104 BES-34 Add notes listing html connected with backend 2019-12-08 01:06:08 +01:00
Th3NiKo
587aec09bc Add notes listing html connected with backend 2019-12-08 01:05:41 +01:00
ksanu
cfb9840d1a BES-32 Added single note view by id 2019-12-07 19:24:05 +01:00
ksanu
16f0e52ff9 BES-38 Merged Homepage(BES-28_29) with master 2019-12-07 17:00:49 +01:00
Th3NiKo
aeb5637b7a BES-40 Change primary and background color to dark 2019-12-06 14:31:03 +01:00
Th3NiKo
b2d34f5ed0 BES-41 Add new icons + id for login form 2019-12-06 13:33:10 +01:00
3345 changed files with 2124 additions and 130 deletions

3
.gitignore vendored
View File

@ -1,10 +1,13 @@
/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/
/_results_/
# Created by https://www.gitignore.io

View File

@ -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>

View File

@ -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,7 +43,8 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'widget_tweaks'
'widget_tweaks',
'tinymce',
]
MIDDLEWARE = [
@ -121,5 +127,18 @@ USE_TZ = True
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
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -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),
]

View File

@ -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:

Some files were not shown because too many files have changed in this diff Show More