Compare commits

...

75 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
Th3NiKo
c120a9d1d1 Merge branch 'master' of https://git.wmi.amu.edu.pl/s452101/BestNotes 2019-12-06 12:30:24 +01:00
Dawid Majsnerowski
d2de735937 BES-26 | adding new test 2019-11-30 11:47:49 +01:00
Dawid Majsnerowski
4a63d7df46 BES-26 | adding new test 2019-11-30 11:47:16 +01:00
Dawid Majsnerowski
e43b6d9709 Fix for Jenkins 2019-11-29 23:28:18 +01:00
Dawid Majsnerowski
d0940dbbc6 Fix for Jenkins 2019-11-29 23:27:57 +01:00
Dawid Majsnerowski
10db28eccf Fix for Jenkins 2019-11-29 23:25:57 +01:00
Dawid Majsnerowski
04e0b933cf Fix for Jenkins 2019-11-29 23:25:48 +01:00
Dawid Majsnerowski
af936b727b Fix for Jenkins 2019-11-29 23:22:08 +01:00
Dawid Majsnerowski
c15c1eb22f BES-26 | Test for incorrect login 2019-11-29 22:51:45 +01:00
Dawid Majsnerowski
672caa2392 BES-26 | Merge 2019-11-29 22:18:40 +01:00
Dawid Majsnerowski
b80756b687 BES-26 | First test for BestNotes 2019-11-29 22:16:18 +01:00
Th3NiKo
cb3440b52f BES-27 Basic files merge, login works 2019-11-28 11:27:08 +01:00
Th3NiKo
eff2492c4c Merge remote-tracking branch 'origin/BES-16' 2019-11-28 10:43:37 +01:00
Th3NiKo
d9f2a9408a Merge remote-tracking branch 'origin/BES-15' 2019-11-28 10:42:49 +01:00
Th3NiKo
0085bb8c22 Merge models 2019-11-27 23:08:32 +01:00
Th3NiKo
042dd8d463 Merge branch 'BES-23' 2019-11-27 23:08:10 +01:00
Th3NiKo
93115c22fa Merge branch 'BES-22' 2019-11-27 23:08:03 +01:00
Th3NiKo
d933f403bb Merge branch 'BES-19' 2019-11-27 23:04:56 +01:00
Th3NiKo
c258e00b0d Merge branch 'BES-18' 2019-11-27 23:04:24 +01:00
ksanu
04585ba7e1 BES-16 Added methods for adding, updating, deleting students + unittests for adding and updating 2019-11-25 15:22:36 +01:00
ksanu
a4979c1223 Added how_to_run.txt file with simple instructions. 2019-11-25 00:19:13 +01:00
ksanu
9ae175554c BES-15 Created django project with new db table StudentProfile which extends User Model using a One-To-One link. 2019-11-25 00:10:39 +01:00
Th3NiKo
0316a32496 BES-23 Add topic front 2019-11-24 20:53:53 +01:00
Th3NiKo
39818b3aee BES-22 Add subject front 2019-11-24 20:51:17 +01:00
Th3NiKo
4c7649c77c BES-14 Add base, login and navbar front 2019-11-24 20:44:53 +01:00
Th3NiKo
b3d2cf3a9a BES-19 Add comment + date field 2019-11-24 20:34:09 +01:00
Th3NiKo
3f49f3bd55 Add topic without subject 2019-11-24 14:36:55 +01:00
3367 changed files with 3261 additions and 36 deletions

93
.gitignore vendored
View File

@ -1,7 +1,100 @@
/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
### 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

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>

7
.idea/misc.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8" project-jdk-type="Python SDK" />
<component name="PyCharmProfessionalAdvertiser">
<option name="shown" value="true" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/BestNotesProject.iml" filepath="$PROJECT_DIR$/.idea/BestNotesProject.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

96
.idea/workspace.xml Normal file
View File

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
<option value="HTML File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>bestnotes.apps.BestnotesConfigdjango</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<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$/../../../TAU/TAU_34/wmt_2017_git_master" />
<property name="settings.editor.selected.configurable" value="preferences.general" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<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" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/bestnotes/bestnotesunittests.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method v="2" />
</configuration>
<recent_temporary>
<list>
<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>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="" />
<created>1574623676973</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1574623676973</updated>
</task>
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
</component>
</project>

View File

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,144 @@
"""
Django settings for BestNotesProject project.
Generated by 'django-admin startproject' using Django 2.2.7.
For more information on this file, see
https://docs.djangoproject.com/en/2.2/topics/settings/
For the full list of settings and their values, see
https://docs.djangoproject.com/en/2.2/ref/settings/
"""
import os
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = '!_d^j-tap#j_d+hqaz^g8*n4l-p=uop+5s-jbiykp2_6ik-xwa'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []
STATIC_URL = '/static/'
#
LOGIN_REDIRECT_URL = '/bestnotes/'
LOGOUT_REDIRECT_URL = '/bestnotes/accounts/login/'
# Application definition
INSTALLED_APPS = [
'bestnotes.apps.BestnotesConfig',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'widget_tweaks',
'tinymce',
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'BestNotesProject.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]
WSGI_APPLICATION = 'BestNotesProject.wsgi.application'
# Database
# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
}
}
# Password validation
# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/2.2/topics/i18n/
LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC'
USE_I18N = True
USE_L10N = True
USE_TZ = True
# Static files (CSS, JavaScript, Images)
# 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
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

25
BestNotesProject/urls.py Normal file
View File

@ -0,0 +1,25 @@
"""BestNotesProject URL Configuration
The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/2.2/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.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),
]

16
BestNotesProject/wsgi.py Normal file
View File

@ -0,0 +1,16 @@
"""
WSGI config for BestNotesProject project.
It exposes the WSGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/
"""
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'BestNotesProject.settings')
application = get_wsgi_application()

View File

@ -1,5 +0,0 @@
from django.db import models
class Przedmiot(models.Model):
nazwa = models.CharField(max_length=30)
#uzytkownik_id = models.ForeignKey(User, on_delete=models.CASCADE)

10
Front/urls.py Normal file
View File

@ -0,0 +1,10 @@
from django.urls import path, include
from . import views
urlpatterns = [
path('/', views.login),
path('accounts/', include("django.contrib.auth.urls")),
path('profesor/', views.profesor, name="profesor"),
path('profesor/<id>', views.profesor_id),
]

11
Front/views.py Normal file
View File

@ -0,0 +1,11 @@
from django.shortcuts import render
# Create your views here.
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})

View File

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

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