From 72b25c958f6446dc04a20cacc9453d76089eeb81 Mon Sep 17 00:00:00 2001
From: DeMineArchiver <minearchiver@gmail.com>
Date: Sat, 23 Nov 2024 20:54:44 +0300
Subject: [PATCH] Backend refactorings

---
 .gitignore                        |   2 ++
 apps/backend/db.db                | Bin 8192 -> 0 bytes
 apps/backend/package.json         |   6 +++++-
 apps/backend/{ => src}/app.py     |   2 +-
 apps/backend/{ => src}/classes.py |   0
 apps/backend/{ => src}/db.py      |   0
 apps/backend/src/dev.py           |   5 +++++
 apps/backend/{ => src}/events.py  |   0
 apps/backend/src/prod.py          |   5 +++++
 apps/backend/{ => src}/util.py    |   4 ++--
 requirements.txt                  | Bin 910 -> 888 bytes
 11 files changed, 20 insertions(+), 4 deletions(-)
 delete mode 100644 apps/backend/db.db
 rename apps/backend/{ => src}/app.py (99%)
 rename apps/backend/{ => src}/classes.py (100%)
 rename apps/backend/{ => src}/db.py (100%)
 create mode 100644 apps/backend/src/dev.py
 rename apps/backend/{ => src}/events.py (100%)
 create mode 100644 apps/backend/src/prod.py
 rename apps/backend/{ => src}/util.py (64%)

diff --git a/.gitignore b/.gitignore
index f1a5a53..df5e222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,9 @@
 
 node_modules/
 .venv
+__pycache__
 package-lock.json
+*.db
 
 dist
 dist-ssr
diff --git a/apps/backend/db.db b/apps/backend/db.db
deleted file mode 100644
index fbd43e806951aa6b9fda25a2e4ba6f84badeaf59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8192
zcmeI#&q~8E90%~U&TS~8g2Jx3sbi6(`Lo8;rW6&1=&ay1SsNUvgKZuJFW&YD;uH7?
z`W`-z>0}2%5U=w4k~ICLzm)R1_2RrgnibfMC%0yXIod!$fVvnXgzA2Vel8REo655A
zYgzx6I@-H?Z}_etdO?0bKmY_l00ck)1V8`;KmY_l00ck)1ilI6L9N+r22a~FV{eN4
zX)&2DF5%%I?PV#>dI$X!FSge357`;zI7_dxHohI-6%Y92G)s@tK^tF>rnB+nVexRc
z{5P*fTPXU7UZcn8EIN+5zJ!1P2!H?xfB*=900@8p2!H?xfWW^OXw@p0VIvW_O*HS2
z*lI~c92;UBbwqNiazm9hHr{`(Rx2oMY|g8zUu&yUo@Irmys(rQ6*D4oHY8dlf+U<J
z&RW(HMy<cKR{qc%mc5-^i$o12Q3<C+aLfHG<CqjwJEpCWE~lIGR#5f|MxByO6RM5#
U-yj9iG2=u~Rmh<<GIzfB6OeaY?f?J)

diff --git a/apps/backend/package.json b/apps/backend/package.json
index 9636c68..3800f81 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -2,5 +2,9 @@
   "private": true,
   "name": "@cgs/backend",
   "type": "module",
-  "packageManager": "yarn@4.5.2"
+  "packageManager": "yarn@4.5.2",
+  "scripts": {
+    "dev": "py src/dev.py",
+    "start": "py src/prod.py"
+  }
 }
diff --git a/apps/backend/app.py b/apps/backend/src/app.py
similarity index 99%
rename from apps/backend/app.py
rename to apps/backend/src/app.py
index 71fe581..a0eff95 100644
--- a/apps/backend/app.py
+++ b/apps/backend/src/app.py
@@ -4,7 +4,7 @@
 from flask import Flask, request, make_response
 from flask_cors import CORS, cross_origin
 
-from apps.backend import util
+import util
 from db import DB
 from events import events
 
diff --git a/apps/backend/classes.py b/apps/backend/src/classes.py
similarity index 100%
rename from apps/backend/classes.py
rename to apps/backend/src/classes.py
diff --git a/apps/backend/db.py b/apps/backend/src/db.py
similarity index 100%
rename from apps/backend/db.py
rename to apps/backend/src/db.py
diff --git a/apps/backend/src/dev.py b/apps/backend/src/dev.py
new file mode 100644
index 0000000..6d51287
--- /dev/null
+++ b/apps/backend/src/dev.py
@@ -0,0 +1,5 @@
+from app import app
+
+if __name__ == '__main__':
+    app.run(debug=True, host='127.0.0.1', port=5000)
+
diff --git a/apps/backend/events.py b/apps/backend/src/events.py
similarity index 100%
rename from apps/backend/events.py
rename to apps/backend/src/events.py
diff --git a/apps/backend/src/prod.py b/apps/backend/src/prod.py
new file mode 100644
index 0000000..7c586d0
--- /dev/null
+++ b/apps/backend/src/prod.py
@@ -0,0 +1,5 @@
+from app import app
+
+if __name__ == '__main__':
+    from waitress import serve
+    serve(app, host='0.0.0.0', port=8080)
diff --git a/apps/backend/util.py b/apps/backend/src/util.py
similarity index 64%
rename from apps/backend/util.py
rename to apps/backend/src/util.py
index 28e0d74..da3a036 100644
--- a/apps/backend/util.py
+++ b/apps/backend/src/util.py
@@ -1,5 +1,5 @@
-from apps.backend.classes import Event
-from apps.backend.db import HISTORY_EVENT_SEP, HISTORY_ANSWER_SEP
+from classes import Event
+from db import HISTORY_EVENT_SEP, HISTORY_ANSWER_SEP
 from events import events
 
 
diff --git a/requirements.txt b/requirements.txt
index 2f38abcadbbadfe65543d10c004f22f59b7289c5..9f07547bb4833b2bd83e05a1ba6e16299511efe9 100644
GIT binary patch
delta 174
zcmeBU|G_pvZlZ$JL>q;PaZ(ejG^Dv0ycjYW@))uh5*dsbY=O|2L65-@h)pIQRGpl~
btT3625us&r3!@6{w0Qt+1K9|qnYb7L?vp0&

delta 153
zcmeyt*2g|Uj*)kwtTZF<WJ5+pAQ{LAWKS&A1QIi4f&7n5szByVpwz^l@<0Mz>Evui
VkOE3IOcrGZS#eX5g_nVg0RZuLBQyX2