diff --git a/.gitignore b/.gitignore index 0738c53..e7756f5 100644 --- a/.gitignore +++ b/.gitignore @@ -144,4 +144,5 @@ dmypy.json # pytype static type analyzer .pytype/ -# End of https://www.toptal.com/developers/gitignore/api/python +# Added +data_export.json diff --git a/app/routes.py b/app/routes.py index eca1917..64d66b4 100644 --- a/app/routes.py +++ b/app/routes.py @@ -37,6 +37,11 @@ ALLOWED_EXTENSIONS = {'json'} @app.route('/index') @login_required def index(): + return render_template('home.html') + +@app.route('/twitter') +@login_required +def twitter(): start_time = time.time() followingList = current_user.twitter_following_list() followCount = len(followingList) @@ -50,7 +55,7 @@ def index(): else: profilePic = posts[0].userProfilePic print("--- {} seconds fetching twitter feed---".format(time.time() - start_time)) - return render_template('index.html', title='Home', posts=posts, avatar=avatarPath, profilePic = profilePic, followedCount=followCount, form=form) + return render_template('twitter.html', title='Home', posts=posts, avatar=avatarPath, profilePic = profilePic, followedCount=followCount, form=form) @app.route('/savePost/', methods=['POST']) @login_required @@ -300,7 +305,7 @@ def channel(id): def watch(): id = request.args.get('v', None) ydl = YoutubeDL() - data = ydl.extract_info("{id}".format(id=id), download=False) + data = ydl.extract_info(id, False) if data['formats'][-1]['url'].find("manifest.googlevideo") > 0: flash("Livestreams are not yet supported!") return redirect(url_for('youtube')) diff --git a/app/templates/base.html b/app/templates/base.html index 528c7f9..2bd2150 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -13,13 +13,13 @@
-
- -
+
+ +
{% if current_user.is_anonymous %} Login {% else %} - + Youtube diff --git a/app/templates/home.html b/app/templates/home.html new file mode 100644 index 0000000..9b395ba --- /dev/null +++ b/app/templates/home.html @@ -0,0 +1,19 @@ +{% extends "base.html" %} +{% block content %} + +
+
+
+

+ Welcome back, {{current_user.username}}! +
Choose a platform
+

+
+
+ +
+ + +
+
+{% endblock %} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/twitter.html similarity index 100% rename from app/templates/index.html rename to app/templates/twitter.html