diff --git a/jumpstart/__init__.py b/jumpstart/__init__.py index abc3a50..e5315ba 100644 --- a/jumpstart/__init__.py +++ b/jumpstart/__init__.py @@ -10,6 +10,7 @@ import random import textwrap from datetime import datetime, timedelta, timezone, tzinfo +import pytz from sentry_sdk.integrations.flask import FlaskIntegration import sentry_sdk import requests @@ -54,7 +55,7 @@ db.create_all() # Initializes the database for Files -file = File(title="drno") +file = File(title="Jumpstart.exe") db.session.query(File).delete() db.session.commit() db.session.add(file) @@ -94,7 +95,7 @@ def index(): def calendar(): # Call the Calendar API - now = datetime.now(timezone.utc) + now = datetime.now(timezone.utc or pytz.utc) events_result = calendar_service.events().list( calendarId='rti648k5hv7j3ae3a3rum8potk@group.calendar.google.com', timeMin=now.isoformat(), @@ -183,7 +184,7 @@ def showerthoughts(): randompost = random.randint(1, 20) url = requests.get( 'https://www.reddit.com/r/showerthoughts/top.json', - headers={'User-agent':'Showerthoughtbot 0.1'}, + headers={'User-agent':'Showerthoughtbot 0.1'}, ) reddit = json.loads(url.text) shower_thoughts = textwrap.fill((reddit['data']['children'][randompost]['data']['title']), 50) diff --git a/jumpstart/static/css/style.css b/jumpstart/static/css/style.css index a751119..a018f8d 100644 --- a/jumpstart/static/css/style.css +++ b/jumpstart/static/css/style.css @@ -54,7 +54,7 @@ body{ width: 760px; height: 580px; float: right; - margin-bottom: 4%; + margin-bottom: 3%; } .announcements{ diff --git a/jumpstart/templates/index.html b/jumpstart/templates/index.html index 7ffbc95..122b726 100644 --- a/jumpstart/templates/index.html +++ b/jumpstart/templates/index.html @@ -1,193 +1,196 @@ - - Jumpstart - - - - - - - - - - - - - -
-
- -
- -
-
- Harold: -
-
- jumpstart.csh.rit.edu + + Jumpstart + + + + + + + + + + + + + +
+
+ +
+ +
+
+ Harold: +
+
+ jumpstart.csh.rit.edu +
-
- -
-
- - - -
-
-
- Announcements -
-
-
- + +
+
+ + + + +
+
+
+ Announcements +
+
+
+ +
-
-
- ROCHESTER WEATHER -
- -
-
-
- Shower Thoughts - /r/showerthoughts -
-
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +
+ +

Visit USADebtClock.com to learn more!

+
+ +
+
+
+ Shower Thoughts - /r/showerthoughts +
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. +
-
- -
-
- -
+ +
+
+ +
+
-
- - + // Weather Widget refresh + setInterval('__weatherwidget_init()', 1800000) + +