diff --git a/README.md b/README.md index 9b67fed..38ce298 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Wulkanowy-web -🌋 Unofficial browser VULCAN UONET+ register client for both students and their parents +🌋 Unofficial browser VULCAN UONET+ client for both students and their parents ![GitHub Workflow Status](https://github.com/wulkanowy/wulkanowy-web/workflows/Python%20application/badge.svg) [![Discord](https://img.shields.io/discord/390889354199040011.svg?color=#33CD56)](https://discord.gg/vccAQBr) diff --git a/app/views.py b/app/views.py index b00a057..f7fecbc 100644 --- a/app/views.py +++ b/app/views.py @@ -21,16 +21,6 @@ from .API.school_data import get_school_data from .API.dashboard import get_dashboard from .decrypt import decrypt_cookies -#views -def default_view(request, *args, **kwargs): - return render(request, 'index.html') - -def content_view(request, *args, **kwargs): - if request.session.has_key('is_logged'): - return render(request, 'content.html') - else: - return redirect('../') - #API def login(request, *args, **kwargs): data = json.loads(request.body) diff --git a/frontend/__init__.py b/frontend/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/frontend/admin.py b/frontend/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/frontend/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/frontend/apps.py b/frontend/apps.py new file mode 100644 index 0000000..33ae5ca --- /dev/null +++ b/frontend/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class FrontendConfig(AppConfig): + name = 'frontend' diff --git a/frontend/migrations/__init__.py b/frontend/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/frontend/models.py b/frontend/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/frontend/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/package-lock.json b/frontend/package-lock.json similarity index 99% rename from package-lock.json rename to frontend/package-lock.json index a7bc067..d6e2c95 100644 --- a/package-lock.json +++ b/frontend/package-lock.json @@ -1040,9 +1040,9 @@ } }, "@types/estree": { - "version": "0.0.45", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz", - "integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g==", + "version": "0.0.46", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", + "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==", "dev": true }, "@types/json-schema": { @@ -1052,9 +1052,9 @@ "dev": true }, "@types/node": { - "version": "14.14.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz", - "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==", + "version": "14.14.22", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz", + "integrity": "sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw==", "dev": true }, "@webassemblyjs/ast": { @@ -1491,9 +1491,9 @@ "dev": true }, "enhanced-resolve": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.6.0.tgz", - "integrity": "sha512-C3GGDfFZmqUa21o10YRKbZN60DPl0HyXKXxoEnQMWso9u7KMU23L7CBHfr/rVxORddY/8YQZaU2MZ1ewTS8Pcw==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz", + "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -1515,6 +1515,12 @@ "integrity": "sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==", "dev": true }, + "es-module-lexer": { + "version": "0.3.26", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.3.26.tgz", + "integrity": "sha512-Va0Q/xqtrss45hWzP8CZJwzGSZJjDM5/MJRE3IXXnUCcVLElR9BRaE9F62BopysASyc4nM3uwhSW7FFB9nlWAA==", + "dev": true + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -2407,20 +2413,21 @@ } }, "webpack": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.13.0.tgz", - "integrity": "sha512-NPhMEtfhSVegp1FNPkCM1MPygDm0GHwpreG10dh//0Gr0epfB0br9nlgEfxSghxJqrQ7j9XzgO91CGGLWZiHeA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.17.0.tgz", + "integrity": "sha512-R+IdNEaYcYaACpXZOt7reyc8txBK7J06lOPkX1SbgmeoAnUbyBZivJIksrDBnmMA3wlTWvPcX7DubxELyPB8rA==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.45", + "@types/estree": "^0.0.46", "@webassemblyjs/ast": "1.11.0", "@webassemblyjs/wasm-edit": "1.11.0", "@webassemblyjs/wasm-parser": "1.11.0", "acorn": "^8.0.4", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.6.0", + "enhanced-resolve": "^5.7.0", + "es-module-lexer": "^0.3.26", "eslint-scope": "^5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", diff --git a/package.json b/frontend/package.json similarity index 97% rename from package.json rename to frontend/package.json index b4ac24d..fb6955d 100644 --- a/package.json +++ b/frontend/package.json @@ -33,7 +33,7 @@ "@babel/core": "^7.12.10", "@babel/preset-env": "^7.12.11", "babel-loader": "^8.2.2", - "webpack": "^5.13.0", + "webpack": "^5.17.0", "webpack-cli": "^4.3.1" } } diff --git a/files/css/materialize.css b/frontend/static/frontend/css/materialize.css similarity index 100% rename from files/css/materialize.css rename to frontend/static/frontend/css/materialize.css diff --git a/files/css/materialize.min.css b/frontend/static/frontend/css/materialize.min.css similarity index 100% rename from files/css/materialize.min.css rename to frontend/static/frontend/css/materialize.min.css diff --git a/files/css/start.css b/frontend/static/frontend/css/start.css similarity index 100% rename from files/css/start.css rename to frontend/static/frontend/css/start.css diff --git a/files/css/style.css b/frontend/static/frontend/css/style.css similarity index 100% rename from files/css/style.css rename to frontend/static/frontend/css/style.css diff --git a/files/images/27146352.png b/frontend/static/frontend/images/27146352.png similarity index 100% rename from files/images/27146352.png rename to frontend/static/frontend/images/27146352.png diff --git a/files/images/book-outline.png b/frontend/static/frontend/images/book-outline.png similarity index 100% rename from files/images/book-outline.png rename to frontend/static/frontend/images/book-outline.png diff --git a/files/images/discord.e9241a54.svg b/frontend/static/frontend/images/discord.e9241a54.svg similarity index 100% rename from files/images/discord.e9241a54.svg rename to frontend/static/frontend/images/discord.e9241a54.svg diff --git a/files/images/email.ce588d18.svg b/frontend/static/frontend/images/email.ce588d18.svg similarity index 100% rename from files/images/email.ce588d18.svg rename to frontend/static/frontend/images/email.ce588d18.svg diff --git a/files/images/github.9c30fa5a.svg b/frontend/static/frontend/images/github.9c30fa5a.svg similarity index 100% rename from files/images/github.9c30fa5a.svg rename to frontend/static/frontend/images/github.9c30fa5a.svg diff --git a/files/images/paypal.9fd1b9bc.svg b/frontend/static/frontend/images/paypal.9fd1b9bc.svg similarity index 100% rename from files/images/paypal.9fd1b9bc.svg rename to frontend/static/frontend/images/paypal.9fd1b9bc.svg diff --git a/files/images/wallpaper.jpg b/frontend/static/frontend/images/wallpaper.jpg similarity index 100% rename from files/images/wallpaper.jpg rename to frontend/static/frontend/images/wallpaper.jpg diff --git a/files/images/wulkanowy-full-flat.4ff8222a.svg b/frontend/static/frontend/images/wulkanowy-full-flat.4ff8222a.svg similarity index 100% rename from files/images/wulkanowy-full-flat.4ff8222a.svg rename to frontend/static/frontend/images/wulkanowy-full-flat.4ff8222a.svg diff --git a/files/images/wulkanowy_only_logo.svg b/frontend/static/frontend/images/wulkanowy_only_logo.svg similarity index 100% rename from files/images/wulkanowy_only_logo.svg rename to frontend/static/frontend/images/wulkanowy_only_logo.svg diff --git a/files/js/attendance.js b/frontend/static/frontend/js/attendance.js similarity index 100% rename from files/js/attendance.js rename to frontend/static/frontend/js/attendance.js diff --git a/files/js/dashboard.js b/frontend/static/frontend/js/dashboard.js similarity index 100% rename from files/js/dashboard.js rename to frontend/static/frontend/js/dashboard.js diff --git a/files/js/exams.js b/frontend/static/frontend/js/exams.js similarity index 100% rename from files/js/exams.js rename to frontend/static/frontend/js/exams.js diff --git a/files/js/grades.js b/frontend/static/frontend/js/grades.js similarity index 100% rename from files/js/grades.js rename to frontend/static/frontend/js/grades.js diff --git a/files/js/homeworks.js b/frontend/static/frontend/js/homeworks.js similarity index 100% rename from files/js/homeworks.js rename to frontend/static/frontend/js/homeworks.js diff --git a/files/js/login.js b/frontend/static/frontend/js/login.js similarity index 100% rename from files/js/login.js rename to frontend/static/frontend/js/login.js diff --git a/files/js/materializecss/materialize.js b/frontend/static/frontend/js/materializecss/materialize.js similarity index 100% rename from files/js/materializecss/materialize.js rename to frontend/static/frontend/js/materializecss/materialize.js diff --git a/files/js/materializecss/materialize.min.js b/frontend/static/frontend/js/materializecss/materialize.min.js similarity index 100% rename from files/js/materializecss/materialize.min.js rename to frontend/static/frontend/js/materializecss/materialize.min.js diff --git a/files/js/messages.js b/frontend/static/frontend/js/messages.js similarity index 100% rename from files/js/messages.js rename to frontend/static/frontend/js/messages.js diff --git a/files/js/mobile_access.js b/frontend/static/frontend/js/mobile_access.js similarity index 100% rename from files/js/mobile_access.js rename to frontend/static/frontend/js/mobile_access.js diff --git a/files/js/notes.js b/frontend/static/frontend/js/notes.js similarity index 100% rename from files/js/notes.js rename to frontend/static/frontend/js/notes.js diff --git a/files/js/school_data.js b/frontend/static/frontend/js/school_data.js similarity index 100% rename from files/js/school_data.js rename to frontend/static/frontend/js/school_data.js diff --git a/files/js/start.js b/frontend/static/frontend/js/start.js similarity index 100% rename from files/js/start.js rename to frontend/static/frontend/js/start.js diff --git a/files/js/timetable.js b/frontend/static/frontend/js/timetable.js similarity index 100% rename from files/js/timetable.js rename to frontend/static/frontend/js/timetable.js diff --git a/templates/content.html b/frontend/templates/frontend/content.html similarity index 69% rename from templates/content.html rename to frontend/templates/frontend/content.html index d3a09b8..94b9428 100644 --- a/templates/content.html +++ b/frontend/templates/frontend/content.html @@ -5,19 +5,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -26,8 +26,8 @@ - - + + Wulkanowy | Aplikacja ucznia i rodzica @@ -40,9 +40,9 @@