Your branch is up to date with 'origin/main'.

Changes to be committed:
	modified:   app.py

app.py

@@ -1,15 +1,151 @@
 import json
 import os
+#     def __init__(self, github_access_token):
+#         self.github_access_token = github_access_token
+import sqlite3
 
 import requests
 from flask import (Flask, g, jsonify, redirect, render_template,
                    render_template_string, request, session, url_for)
 from flask_github import GitHub
-from sqlalchemy import Column, Integer, String, create_engine
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import scoped_session, sessionmaker
 
-DATABASE_URI = 'sqlite:////tmp/github-flask.db'
+# # from sqlalchemy import Column, Integer, String, create_engine
+# # from sqlalchemy.ext.declarative import declarative_base
+# # from sqlalchemy.orm import scoped_session, sessionmaker
+
+# # DATABASE_URI = 'sqlite:////tmp/github-flask.db'
+# # SECRET_KEY = 'development key'
+# # DEBUG = True
+
+# # # Set these values
+# # GITHUB_CLIENT_ID = '7cffdeaec480efaae537'
+# # GITHUB_CLIENT_SECRET = "2127ca287f178e7b7b4f2d96eea0e55470dda5f8"
+
+# # # setup flask
+# # app = Flask(__name__)
+# # app.config.from_object(__name__)
+
+# # # setup github-flask
+# # github = GitHub(app)
+
+# # # setup sqlalchemy
+# # engine = create_engine(app.config['DATABASE_URI'])
+# # db_session = scoped_session(sessionmaker(autocommit=False,
+# #                                          autoflush=False,
+# #                                          bind=engine))
+# # Base = declarative_base()
+# # Base.query = db_session.query_property()
+
+
+# # def init_db():
+# #     Base.metadata.create_all(bind=engine)
+
+
+# # class User(Base):
+# #     __tablename__ = 'users'
+
+# #     id = Column(Integer, primary_key=True)
+# #     github_access_token = Column(String(255))
+# #     github_id = Column(Integer)
+# #     github_login = Column(String(255))
+
+
+# DATABASE_URI = '/tmp/github-flask.db'
+# SECRET_KEY = 'development key'
+# DEBUG = True
+
+# # Set these values
+# GITHUB_CLIENT_ID = '7cffdeaec480efaae537'
+# GITHUB_CLIENT_SECRET = "2127ca287f178e7b7b4f2d96eea0e55470dda5f8"
+
+# # setup flask
+# app = Flask(__name__)
+# app.config.from_object(__name__)
+
+# # setup github-flask
+# github = GitHub(app)
+
+# # # setup sqlalchemy
+# # engine = create_engine(app.config['DATABASE_URI'])
+
+# # Create users table
+# def create_users_table():
+#     conn = sqlite3.connect(app.config['DATABASE_URI'])
+#     cursor = conn.cursor()
+#     cursor.execute('''
+#         CREATE TABLE IF NOT EXISTS users (
+#             id INTEGER PRIMARY KEY,
+#             github_access_token TEXT,
+#             github_id INTEGER,
+#             github_login TEXT
+#         )
+#     ''')
+#     conn.commit()
+#     conn.close()
+
+# create_users_table()
+
+# class User:
+#     def __init__(self, github_access_token):
+#         self.github_access_token = github_access_token
+
+# # Your routes and other Flask code...
+
+
+
+# @app.before_request
+# def before_request():
+#     g.user = None
+#     if 'user_id' in session:
+#         g.user = User.query.get(session['user_id'])
+
+
+# @app.after_request
+# def after_request(response):
+#     db_session.remove()
+#     return response
+
+
+
+
+
+# @github.access_token_getter
+# def token_getter():
+#     user = g.user
+#     if user is not None:
+#         return user.github_access_token
+
+
+# @app.route('/github-callback')
+# @github.authorized_handler
+# def authorized(access_token):
+#     next_url = request.args.get('next') or url_for('index')
+#     if access_token is None:
+#         return redirect(next_url)
+
+#     user = User.query.filter_by(github_access_token=access_token).first()
+#     if user is None:
+#         user = User(access_token)
+#         db_session.add(user)
+
+#     user.github_access_token = access_token
+
+#     # Not necessary to get these details here
+#     # but it helps humans to identify users easily.
+#     g.user = user
+#     github_user = github.get('/user')
+#     user.github_id = github_user['id']
+#     user.github_login = github_user['login']
+
+#     db_session.commit()
+
+#     session['user_id'] = user.id
+#     return redirect(next_url)
+
+
+
+
+DATABASE_URI = '/tmp/github-flask.db'
 SECRET_KEY = 'development key'
 DEBUG = True
 
@@ -24,111 +160,116 @@
 # setup github-flask
 github = GitHub(app)
 
-# setup sqlalchemy
-engine = create_engine(app.config['DATABASE_URI'])
-db_session = scoped_session(sessionmaker(autocommit=False,
-                                         autoflush=False,
-                                         bind=engine))
-Base = declarative_base()
-Base.query = db_session.query_property()
-
-
-def init_db():
-    Base.metadata.create_all(bind=engine)
-
-
-class User(Base):
-    __tablename__ = 'users'
-
-    id = Column(Integer, primary_key=True)
-    github_access_token = Column(String(255))
-    github_id = Column(Integer)
-    github_login = Column(String(255))
-
+# Create users table
+def create_users_table():
+    conn = sqlite3.connect(app.config['DATABASE_URI'])
+    cursor = conn.cursor()
+    cursor.execute('''
+        CREATE TABLE IF NOT EXISTS users (
+            id INTEGER PRIMARY KEY,
+            github_access_token TEXT,
+            github_id INTEGER,
+            github_login TEXT
+        )
+    ''')
+    conn.commit()
+    conn.close()
+
+create_users_table()
+
+class User:
     def __init__(self, github_access_token):
         self.github_access_token = github_access_token
 
-
 @app.before_request
 def before_request():
     g.user = None
     if 'user_id' in session:
-        g.user = User.query.get(session['user_id'])
-
-
-@app.after_request
-def after_request(response):
-    db_session.remove()
-    return response
-
-
-@app.route('/')
-def index():
-    if g.user:
-        userss =(github.get('/user'))
-        avatar = userss["avatar_url"]
-        name = userss["name"]
-        #homepage can be inserted here
-        t = 'homepagee.html'
-        render_template('homepagee.html',avatar=avatar,name=name)
-
-    else:
-        #login page can be inserted here
-        #t = 'Hello! <a href="{{ url_for("login") }}">Login with github</a>'
-        return render_template('index.html')
-
-    return render_template(t,avatar=avatar,name=name)
-
+        g.user = User(session['user_id'])
+
+# @app.route('/')
+# def index():
+#     if g.user:
+#         userss = github.get('/user')
+#         avatar = userss["avatar_url"]
+#         name = userss["name"]
+#         return render_template('homepagee.html', avatar=avatar, name=name)
+#     else:
+#         return render_template('index.html')
 
 @github.access_token_getter
 def token_getter():
     user = g.user
     if user is not None:
         return user.github_access_token
 
-
 @app.route('/github-callback')
 @github.authorized_handler
 def authorized(access_token):
     next_url = request.args.get('next') or url_for('index')
     if access_token is None:
         return redirect(next_url)
 
-    user = User.query.filter_by(github_access_token=access_token).first()
-    if user is None:
-        user = User(access_token)
-        db_session.add(user)
-
-    user.github_access_token = access_token
+    conn = sqlite3.connect(app.config['DATABASE_URI'])
+    cursor = conn.cursor()
+    cursor.execute("SELECT * FROM users WHERE github_access_token = ?", (access_token,))
+    user_data = cursor.fetchone()
 
-    # Not necessary to get these details here
-    # but it helps humans to identify users easily.
-    g.user = user
-    github_user = github.get('/user')
-    user.github_id = github_user['id']
-    user.github_login = github_user['login']
+    if user_data is None:
+        cursor.execute("INSERT INTO users (github_access_token) VALUES (?)", (access_token,))
+        conn.commit()
 
-    db_session.commit()
+    conn.close()
 
-    session['user_id'] = user.id
+    session['user_id'] = access_token
     return redirect(next_url)
 
-
 @app.route('/login')
 def login():
     if session.get('user_id', None) is None:
-        #login form can be inserted here
         return github.authorize()
     else:
         return 'Already logged in'
 
-
 @app.route('/logout')
 def logout():
     session.pop('user_id', None)
     return redirect(url_for('index'))
 
 
+
+# @app.route('/login')
+# def login():
+#     if session.get('user_id', None) is None:
+#         #login form can be inserted here
+#         return github.authorize()
+#     else:
+#         return 'Already logged in'
+
+
+# @app.route('/logout')
+# def logout():
+#     session.pop('user_id', None)
+#     return redirect(url_for('index'))
+
+
+@app.route('/')
+def index():
+    if g.user:
+        userss =(github.get('/user'))
+        avatar = userss["avatar_url"]
+        name = userss["name"]
+        #homepage can be inserted here
+        t = 'homepagee.html'
+        render_template('homepagee.html',avatar=avatar,name=name)
+
+    else:
+        #login page can be inserted here
+        #t = 'Hello! <a href="{{ url_for("login") }}">Login with github</a>'
+        return render_template('index.html')
+
+    return render_template(t,avatar=avatar,name=name)
+
 @app.route('/user')
 def user(): #this function is used to get user's details
     #we can put th profile section here
@@ -222,6 +363,6 @@ def repo():
 
 
 if __name__ == '__main__':
-    init_db()
+    # init_db()
     app.run(debug=True)
     # app.run(host="0.0.0.0",port=8000)