Compare commits

..

No commits in common. "master" and "BES-15" have entirely different histories.

3354 changed files with 242 additions and 7970 deletions

100
.gitignore vendored
View File

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

@ -1,20 +1,90 @@
<?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>
<list default="true" id="b23c009e-2f8a-48f7-8b29-023f93596932" name="Default Changelist" comment="" />
<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="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/BestNotesProject/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="e#640#672#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bestnotes/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bestnotes/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="7" column="55" selection-start-line="7" selection-start-column="55" selection-end-line="7" selection-end-column="55" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/bestnotes/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="15" column="86" selection-start-line="15" selection-start-column="86" selection-end-line="15" selection-end-column="86" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bestnotes/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/BestNotesProject/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="33" column="37" selection-start-line="33" selection-start-column="37" selection-end-line="33" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
<option value="HTML File" />
</list>
</option>
</component>
@ -23,15 +93,62 @@
<find>bestnotes.apps.BestnotesConfigdjango</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/BestNotesProject/urls.py" />
<option value="$PROJECT_DIR$/bestnotes/urls.py" />
<option value="$PROJECT_DIR$/bestnotes/views.py" />
<option value="$PROJECT_DIR$/BestNotesProject/settings.py" />
<option value="$PROJECT_DIR$/bestnotes/admin.py" />
<option value="$PROJECT_DIR$/bestnotes/models.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="377" />
<option name="y" value="92" />
<option name="width" value="1324" />
<option name="height" value="1000" />
</component>
<component name="ProjectId" id="1U5Jq3TEUnuX8tmyYK4OsXqAEBc" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="BestNotesProject" type="b2602c69:ProjectViewProjectNode" />
<item name="BestNotesProject" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BestNotesProject" type="b2602c69:ProjectViewProjectNode" />
<item name="BestNotesProject" type="462c0819:PsiDirectoryNode" />
<item name="bestnotes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BestNotesProject" type="b2602c69:ProjectViewProjectNode" />
<item name="BestNotesProject" type="462c0819:PsiDirectoryNode" />
<item name="bestnotes" type="462c0819:PsiDirectoryNode" />
<item name="migrations" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="BestNotesProject" type="b2602c69:ProjectViewProjectNode" />
<item name="BestNotesProject" type="462c0819:PsiDirectoryNode" />
<item name="BestNotesProject" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<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="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="preferences.general" />
</component>
<component name="RunDashboard">
@ -46,27 +163,6 @@
</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>
@ -80,17 +176,109 @@
</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 name="ToolWindowManager">
<frame x="302" y="74" width="1059" height="800" extended-state="0" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20136853" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.32884902" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="10" weight="0.32884902" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/BestNotesProject/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="e#640#672#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bestnotes/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bestnotes/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="7" column="55" selection-start-line="7" selection-start-column="55" selection-end-line="7" selection-end-column="55" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://D:/Programming/Python/Python_3.8/Lib/site-packages/django/apps/config.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="115" selection-start-line="115" selection-end-line="115" />
</state>
</provider>
</entry>
<entry file="file://D:/Programming/Python/Python_3.8/Lib/importlib/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="126" selection-start-line="126" selection-end-line="126" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bestnotes/apps.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/BestNotesProject/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="33" column="37" selection-start-line="33" selection-start-column="37" selection-end-line="33" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bestnotes/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
<folding>
<element signature="e#0#32#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bn_migrate_log.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/bestnotes/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="15" column="86" selection-start-line="15" selection-start-column="86" selection-end-line="15" selection-end-column="86" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

View File

@ -28,11 +28,6 @@ DEBUG = True
ALLOWED_HOSTS = []
STATIC_URL = '/static/'
#
LOGIN_REDIRECT_URL = '/bestnotes/'
LOGOUT_REDIRECT_URL = '/bestnotes/accounts/login/'
# Application definition
INSTALLED_APPS = [
@ -43,8 +38,6 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'widget_tweaks',
'tinymce',
]
MIDDLEWARE = [
@ -126,19 +119,3 @@ 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
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -15,11 +15,8 @@ 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,5 +0,0 @@
FROM circleci/node:10
RUN sudo apt-get update
RUN sudo apt-get install libnss3-dev
RUN sudo wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
RUN sudo apt-get install ./google-chrome-stable_current_amd64.deb

View File

@ -1,10 +0,0 @@
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),
]

View File

@ -1,11 +0,0 @@
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})

25
Jenkinsfile vendored
View File

@ -1,25 +0,0 @@
pipeline {
agent {dockerfile true}
environment {
HOME = '.'
}
stages {
stage('Build') {
steps {
sh "npm install"
sh "npm install webdriverio"
}
}
stage('Test') {
steps {
sh "npm test"
}
}
stage('Deploy') {
steps {
echo 'Deploying....'
}
}
}
}

View File

@ -1,8 +0,0 @@
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:
```./node_modules/.bin/wdio run ./test/config/base.conf.js```

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