stc

commit f4a847bb3485d676f22daa790b7c971960023a8b
parent 67adb0b33f9bac1ef059a622a7c424034ffe1ceb
Author: Brennen T. Mazur <brennen@madis.cool>
Date:   Wed, 18 Jan 2023 20:17:08 -0700

Merge branch 'backend' of git.brennen.work:stc into backend

Diffstat:
M
app.py
 | 
21
++++-----------------
M
models.py
 | 
25
++++++++-----------------

2 files changed, 12 insertions(+), 34 deletions(-)
diff --git a/app.py b/app.py
@@ -1,5 +1,4 @@
 import datetime
-import urllib.parse
 import json
 from flask import Flask, render_template, abort, redirect, url_for, request, session, jsonify;
 from flask_login import UserMixin, login_user, LoginManager, login_required, logout_user, current_user;
@@ -12,19 +11,7 @@ OrganizationName = "Youth Employment Program"
 
 app = Flask(__name__)
 
-# urllib.parse
-username = urllib.parse.quote_plus('user')
-password = urllib.parse.quote_plus('pass/word')
-MongoClient('mongodb://%s:%s@127.0.0.1' % (username, password))
-# urllib.parse
-
 # Mongo setup
-client = MongoClient('simple-time-card.com',
-                    username='user',
-                    password='password',
-                    authSource='users-collection',
-                    authMechanism='SCRAM-SHA-256')
-
 client = MongoClient('localhost', 27017)
 bcrypt = Bcrypt(app)
 db = client['simple_timecard_database']
@@ -42,13 +29,13 @@ app.config['SECRET_KEY'] = 'secretkey'
 # Login manager
 
 # Database collections/documents
-collection = db['users-collection'] # Make aditional user info single document/array
+users_col = db.users_collection # Make aditional user info single document/array
 
-collection = db['time-data-collection']
+time_col = db.time_data_collection
 
-collection = db['fleet-collection']
+fleet_col = db.fleet_collection
 
-collection = db['agreement-collection']
+agreement_col = db.agreement_collection
 # Database collections/documents
 
 # Routes
diff --git a/models.py b/models.py
@@ -4,7 +4,7 @@
 #                 fixed datetime
 
 import datetime
-from flask import Flask, jsonify
+from flask import Flask, jsonify, request
 
 from fastapi.encoders import jsonable_encoder
 from typing import List, Optional
@@ -13,11 +13,11 @@ from pydantic import BaseModel, Field, ValidationError, validator
 class Users:
 
     def signup(self):
+        print(request.form)
         users = {
             '_id': '',
             'username': '',
             'password': '',
-            'confirm_password': '',
             'role': '',
             'location': '',
             'phone': '',
@@ -29,27 +29,18 @@ class Users:
     
         return jsonify(users), 200
 
-    def to_json(self):
-        return jsonable_encoder(self, exclude_none=True)
-
-    def to_bson(self):
-        data = self.dict(by_alias=True, exclude_none=True)
-
-        if data["_id"] is None:
-            data.pop("_id")
-        return data
+    def login(self):
+        user = {
+            'username': '',
+            'password': '',
+            'confirm_password': '',
+        }
 
     @validator('username')
     def username_alphanumeric(cls, v):
         assert v.isalnum(), 'Username must be alphanumeric'
         return v
 
-    @validator('confirm_password')
-    def password_confirmed(cls, v, values, **kwargs):
-        if 'password' in values and v != values['password']:
-            raise ValueError('Passwords do not match')
-        return v
-
 class Time:
 
     def clockin(self):