Compare commits
107 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 | ||
|
aeb5637b7a | ||
|
b2d34f5ed0 | ||
|
c120a9d1d1 | ||
|
d2de735937 | ||
|
4a63d7df46 | ||
|
e43b6d9709 | ||
|
d0940dbbc6 | ||
|
10db28eccf | ||
|
04e0b933cf | ||
|
af936b727b | ||
|
c15c1eb22f | ||
|
672caa2392 | ||
|
b80756b687 | ||
|
cb3440b52f | ||
|
eff2492c4c | ||
|
d9f2a9408a | ||
|
0085bb8c22 | ||
|
042dd8d463 | ||
|
93115c22fa | ||
|
d933f403bb | ||
|
c258e00b0d | ||
|
0316a32496 | ||
|
39818b3aee | ||
|
f99126a698 | ||
|
4c7649c77c | ||
|
b3d2cf3a9a | ||
|
3f49f3bd55 | ||
|
538db4195b | ||
|
6d132f8037 | ||
|
6797b32eea | ||
|
defdca17bd | ||
|
5535019136 | ||
|
ade5149032 | ||
|
c41905d7ed | ||
|
1c23493a33 | ||
|
bc86021126 | ||
|
fd797a2d8a | ||
|
9bc3d6a7f5 | ||
|
cd545a397c | ||
|
156ddc6736 | ||
|
c091964d03 | ||
|
a4de64ee15 | ||
|
f24d824c2c | ||
|
82c7e4e5d9 | ||
|
58c96f3d11 | ||
|
1c9e261972 | ||
|
aeb396af57 | ||
|
ace21a22d3 | ||
|
518d533632 | ||
|
0697a04d63 | ||
|
16e239d5e2 | ||
|
5398481652 | ||
|
39d0ff82c9 | ||
|
146b23990e | ||
|
7c656e934b | ||
|
25bdf24217 | ||
|
bedc5b039b | ||
|
76d7ec97d5 | ||
|
276747169d | ||
|
d0d6365e22 | ||
02a29aec04 |
100
.gitignore
vendored
Normal file
100
.gitignore
vendored
Normal file
@ -0,0 +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/
|
||||
/_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
|
@ -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>
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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
|
||||
}
|
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.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),
|
||||
]
|
||||
|
5
Dockerfile
Normal file
5
Dockerfile
Normal file
@ -0,0 +1,5 @@
|
||||
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
|
10
Front/urls.py
Normal file
10
Front/urls.py
Normal 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
11
Front/views.py
Normal 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})
|
25
Jenkinsfile
vendored
Normal file
25
Jenkinsfile
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
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....'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
8
README.md
Normal file
8
README.md
Normal file
@ -0,0 +1,8 @@
|
||||
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```
|
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