Merge branch 'master' of https://github.com/Dr-N0/Jumpstart into develop

Author: Dr-N0

README.md

@@ -11,9 +11,14 @@ This project uses [Python](http://nodejs.org), [Flask](https://npmjs.com), SQL,
 
 1. Download the zip file and open the code.
 2. Navigate into the folder.
-3. Run `flask install -r requirements.txt`
+3. Run `pip install -r requirements.txt`
 4. Run `flask run`
-5. Results
+5. DM @drno in CSH slack, or email for secrets package
+    - The secrets package follows the directory structure:
+    src/
+      secrets/
+        client_secrets.json
+6. Results
 
 ## Usage
 

jumpstart/__init__.py

@@ -54,7 +54,7 @@
     db.create_all()
 
 # Initializes the database for Files
-file = File(title="Jumpstart.exe")
+file = File(title="drno")
 db.session.query(File).delete()
 db.session.commit()
 db.session.add(file)
@@ -183,7 +183,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)

jumpstart/static/css/jumpstartbang.png

@@ -3,6 +3,7 @@ body{
 }
 
 .panel-primary{
+    background: #34495e;
     border: 8px #34495e solid ;
     border-radius: 10px;
 }
@@ -34,7 +35,7 @@ body{
 }
 
 .timewidget{
-    width: 400px;
+    width: 800px;
     height: 53px;
 }
 
@@ -286,4 +287,4 @@ body{
     .announcements{
         padding-top: 77%;
     }
-}
+}

jumpstart/static/css/style.css

@@ -19,11 +19,11 @@
         <div class="row d-flex" id="top-bar">
             <iframe class="timewidget" id="timewidget-fake" style="padding: 17px 10px 0; float: left;" src="https://freesecure.timeanddate.com/clock/i6zogrqs/n179/fn8/fs20/fcfcf6fa/tct/pct/ahl/ftb/tt0/tm3/th2/ts1/tb1" frameborder="0" width="447" height="25" allowTransparency="true"></iframe>
             <div class="mr-auto">
-                <iframe class="timewidget" id="timewidget-real" style="padding: 17px 10px 0; float: left;" src="https://freesecure.timeanddate.com/clock/i6zogrqs/n179/fn8/fs20/fcfcf6fa/tct/pct/ahl/ftb/tt0/tm3/th2/ts1/tb1" frameborder="0"  allowTransparency="true"></iframe>
+                <iframe class="timewidget" id="timewidget-real" style="padding: 8px 10px 0; float: left;" src="https://free.timeanddate.com/clock/i7yyk735/n421/fn8/fs32/fcfff/tct/pct/ahl/ftb/pl10/pr0/pt0/pb0/tt0/tm3/ts1" frameborder="0" width="985" height="50" allowTransparency="true"></iframe>
             </div>
-            <!-- <div class="file-title" style="padding: 6px 10px 0 10px;">
+            <div class="file-title" style="padding: 6px 10px 0 10px;">
                 <b>Harold: <span id="harold-file-name"></span></b>
-            </div> -->
+            </div>
             <div class="js-title" style="padding: 6px 10px 0 10px;">
                 <b>jumpstart.csh.rit.edu</b>
             </div>
@@ -80,9 +80,11 @@
 
     if (date.getMonth()+1 == 2 && (date.getDate() == 12 || date.getDate() == 13 || date.getDate() == 14) ){
         $("body").css("background-image", "url(../static/css/valentinemode.png)");
+    }else if (date.getMonth()+1 == 3 && (date.getDate() == 13) ){
+        $("body").css("background-image", "url(../static/css/jumpstartbang.png)");
     }else if (date.getMonth()+1 == 10 && (date.getDate() == 29 || date.getDate() == 30 || date.getDate() == 31) ){
         $("body").css("background-image", "url(../static/css/spookymode.png)");
-    }else if(date.getMonth()+1 == 11 && (date.getDate() == 2)){
+    }else if(date.getMonth()+1 == 11 && date.getDate() == 2){
         $("body").css("background-image", "url(../static/css/duckymode2.png)");
     }else if(date.getMonth()+1 == 11 || date.getMonth()+1 == 12){
         $("body").css("background-image", "url(../static/css/wintermode.png)");
@@ -188,4 +190,4 @@
 setInterval('__weatherwidget_init()', 1800000)
 </script>
 </body>
-</html>
+</html>