diff --git a/makefile b/makefile index fd636f5..7b46426 100644 --- a/makefile +++ b/makefile @@ -1,12 +1,15 @@ -VENV=source ./.venv/bin/activate; -ALEMBIC=alembic -c ./server/backend/database/alembic/alembic.ini +#VENV=source ./.venv/bin/activate; +#ALEMBIC=alembic -c ./server/backend/database/alembic/alembic.ini +VENV= .venv\Scripts\activate #Windows +ALEMBIC=alembic -c server\backend\database\alembic\alembic.ini .PHONY: run run_debug migrate_head migrate_down migrate_history migrate_current migrate_heads migrate_stamp migrate run: $(VENV) python run.py --user_name admin run_debug: $(VENV) python run.py --mode debug --user_name admin migrate_head: - $(VENV) $(ALEMBIC) upgrade head + $(VENV) $(ALEMBIC) + migrate_down: $(VENV) $(ALEMBIC) downgrade -1 migrate_history: diff --git a/server/frontend/auth/fonts/MurreyC/COPYRIGHT.txt b/server/frontend/auth/fonts/MurreyC/COPYRIGHT.txt new file mode 100644 index 0000000..89086ce --- /dev/null +++ b/server/frontend/auth/fonts/MurreyC/COPYRIGHT.txt @@ -0,0 +1 @@ +DoubleRus encoding by Diai; unfinished \ No newline at end of file diff --git a/server/frontend/auth/fonts/MurreyC/murreyc.eot b/server/frontend/auth/fonts/MurreyC/murreyc.eot new file mode 100644 index 0000000..d34d0a5 Binary files /dev/null and b/server/frontend/auth/fonts/MurreyC/murreyc.eot differ diff --git a/server/frontend/auth/fonts/MurreyC/murreyc.ttf b/server/frontend/auth/fonts/MurreyC/murreyc.ttf new file mode 100644 index 0000000..df4cd69 Binary files /dev/null and b/server/frontend/auth/fonts/MurreyC/murreyc.ttf differ diff --git a/server/frontend/auth/fonts/MurreyC/murreyc.woff b/server/frontend/auth/fonts/MurreyC/murreyc.woff new file mode 100644 index 0000000..3709e66 Binary files /dev/null and b/server/frontend/auth/fonts/MurreyC/murreyc.woff differ diff --git a/server/frontend/auth/fonts/MurreyC/murreyc.woff2 b/server/frontend/auth/fonts/MurreyC/murreyc.woff2 new file mode 100644 index 0000000..d76f1b2 Binary files /dev/null and b/server/frontend/auth/fonts/MurreyC/murreyc.woff2 differ diff --git a/server/frontend/auth/image/bg.png b/server/frontend/auth/image/bg.png new file mode 100644 index 0000000..9a91822 Binary files /dev/null and b/server/frontend/auth/image/bg.png differ diff --git a/server/frontend/auth/image/hamster.png b/server/frontend/auth/image/hamster.png new file mode 100644 index 0000000..dc6d5da Binary files /dev/null and b/server/frontend/auth/image/hamster.png differ diff --git a/server/frontend/auth/login.css b/server/frontend/auth/login.css index e69de29..ee3c82c 100644 --- a/server/frontend/auth/login.css +++ b/server/frontend/auth/login.css @@ -0,0 +1,81 @@ +@font-face { + font-family: "MurreyC"; + src: url("fonts/MurreyC/murreyc.woff2") format("woff2"); + font-weight: 400; + font-style: normal; + font-display: swap; +} +@font-face { + font-family: "MurreyC"; + src: url("fonts/MurreyC/murreyc.woff") format("woff"); + font-weight: 400; + font-style: normal; + font-display: swap; +} +@font-face { + font-family: "MurreyC"; + src: url("fonts/MurreyC/murreyc.eot") format("eot"); + font-weight: 400; + font-style: normal; + font-display: swap; +} +body { + font-family: "MurreyC"; + background: url('./image/bg.png') no-repeat 100% 100% fixed; + background-size: cover; + margin: 0; + padding: 0; +} +.glass-container { + position: fixed; + inset: 0; + backdrop-filter: blur(16px); + background: rgba(255,255,255,0.1); /* обязательно */ +} +.login-box { + height: 100%; + width: 100%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + background: url('./image/hamster.png') no-repeat 50% 50%; + padding-top: 50px; +} +form { + display: flex; + flex-direction: column; +} +h2 { + font-weight: 900; + font-size: 50px; + text-decoration: underline; + margin: 0; + padding: 0; +} +input { + width: 320px; + height: 50px; + padding: 0 20px; + border-radius: 25px; + border: 1px solid #000; + background-color: #ffffff; + outline: none; + font-size: 30px; +} +button { + margin-top: 10px; + font-size: 30px; + background-color: #3a1f09; + padding: 10px 15px; + border-radius: 33px; + transition: all .1s; + color: #e5b97e; + box-shadow: #3a1f09 2px 4px 10px 2px; + cursor: pointer; +} +button:hover { + background-color: #f0c590; + color: #b06029; + transform: scale(1.015); +} \ No newline at end of file diff --git a/server/frontend/auth/login.html b/server/frontend/auth/login.html index 33bdf92..974db91 100644 --- a/server/frontend/auth/login.html +++ b/server/frontend/auth/login.html @@ -9,10 +9,10 @@