update 1.1.0

Author: brucewzj99

.env

@@ -1,2 +1,3 @@
 TRACKER_TELEGRAM_TOKEN=sometoken
 DATABASE_URL=someurl
+GOOGLE_API_EMAIL=apiemail

.gitignore

@@ -0,0 +1,6 @@
+__pycache__
+/.env
+/app.yaml
+/accounts
+/.gcloudignore
+/app.log

README.md

@@ -28,23 +28,29 @@ python3 main.py
 ```
 
 ## Usage
-/start - Start bot and configure your google sheet
+/start - Start the bot and configure your Google Sheet for tracking expenses and other entries.
 
-/config - To update your google sheet, or configure quick settings for /addtransports and /addothers
+/config - Update your Google Sheet settings or configure quick settings for adding transport and other entries.
 
-/addentry - To add new entry
+/addentry - Add a new entry to your expense tracking system.
 
-/addtranports - To quickly add new transport entry
+/addtransports - Quickly add a new transport entry to your expense tracker.
 
-/addothers - To quickly add others entry
+/addothers - Quickly add another type of entry to your expense tracker.
 
-/cancel - To cancel previous conversation with bot
+/cancel - Cancel the previous conversation with the bot and start fresh.
+
+/help - Show help message
 
 ## Planned Features
 1. More options for /addothers
 2. Retrieve your last few transaction
-4. Use webhook instead of polling
-5. Host onto serverless function
+3. /addincome
+4. Recurring transaction
+5. Budgeting notification
+6. Reminders
+7. Use webhook instead of polling
+8. Host onto serverless function
 
 ## Contributing
 

logfile.txt renamed to bot/__init__.py

@@ -2,6 +2,4 @@
 
 class EntryType(Enum):
     TRANSPORT = "Transport"
-    OTHERS = "Others"
-
-
+    OTHERS = "Others"

common.py renamed to bot/common.py

@@ -1,6 +1,4 @@
-from firebase_config import db
-import datetime as dt
-from common import EntryType
+from bot.firebase_config import db
 
 # new user setup
 def new_user_setup(telegram_id, sheet_id):

firebase.py renamed to bot/firebase.py

@@ -3,9 +3,9 @@
 from firebase_admin import db
 import os
 
-databaseURL = os.getenv("DATABASE_URL")
+DATABASE_URL = os.getenv("DATABASE_URL")
 
 cred = credentials.Certificate("accounts/firebase_account.json")
 firebase_admin.initialize_app(cred, {
-    'databaseURL': databaseURL
-})
+    'databaseURL': DATABASE_URL
+})

firebase_config.py renamed to bot/firebase_config.py

@@ -1,7 +1,6 @@
 from google.oauth2 import service_account
 from googleapiclient.discovery import build
-from common import EntryType
-import datetime as dt
+from bot.common import EntryType
 
 # Path to the downloaded JSON key file
 SERVICE_ACCOUNT_FILE = 'accounts/service_account.json'
@@ -12,7 +11,7 @@
 # Dropdown range
 transport_range = ["Dropdown!A3:A9"]
 others_sub_range = [f"Dropdown!{chr(i)}2:{chr(i)}9" for i in range(ord('B'), ord('K'))]
-others_main_range = ["Dropdown!A2:J2"]
+others_main_range = ["Dropdown!B2:J2"]
 payment_sub_range = [f"Dropdown!{chr(i)}12:{chr(i)}19" for i in range(ord('A'), ord('K'))]
 payment_main_range = ["Dropdown!A12:J12"]
 

google_sheet.py renamed to bot/google_sheet.py

@@ -0,0 +1,20 @@
+import logging
+
+def setup_logger():
+    # Create a logger instance
+    logger = logging.getLogger(__name__)
+    logger.setLevel(logging.WARNING)
+
+    # Create a file handler
+    file_handler = logging.FileHandler('app.log', mode='a')
+    file_handler.setLevel(logging.WARNING)
+
+    # Create a formatter
+    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+
+    # Set the formatter for the handlers
+    file_handler.setFormatter(formatter)
+
+    # Add the handlers to the logger
+    logger.addHandler(file_handler)
+    return logger