diff --git a/server.py b/server.py index 9af371c..1596fd9 100644 --- a/server.py +++ b/server.py @@ -39,10 +39,8 @@ if __name__ == "__main__": async def mta_callback(routes): global subway_data - print("We are inside of the call back now") - print(len(routes)) + # TODO: Do away with this and throw it into websockets subway_data = mtaController.convert_routes_to_station_first(routes) - pprint(subway_data) class threadWrapper(threading.Thread): diff --git a/templates/layouts/index.html b/templates/layouts/index.html index f351b0a..80d5b02 100644 --- a/templates/layouts/index.html +++ b/templates/layouts/index.html @@ -1,44 +1,162 @@ - + - - - + + + - - SUBWAY DISPLAY! + + + + + Hello, world! - - -
-
- PI MTA TRACKER + + +
+ +
+
+
+
+
+

+ North +

+
+
    +
  • + + +

    + 1, 4, and 5 minutes +

    +
    • +
  • +

    1, 4, and 5 minutes

    +
    • +
  • +

    1 and 5 minutes

    +
    • +
+
+
+
+
+
+

+ South +

+
+
    +
  • + + +

    + Pi MTA Display! +

    +
    • +
  • + +

    A second item

    +
    • +
  • + +

    A third item

    +
    • +
+
+
- - - -
+
+ +
+
+
+
+
+

+ North +

+
+
    +
  • -
    - -
    + +

    + Pi MTA Display! +

    +
    • +
  • + +

    A second item

    +
    • +
  • + +

    A third item

    +
    • +
+
+
+
+
+
+

+ South +

+
+
    +
  • + + +

    + Pi MTA Display! +

    +
    • +
  • +

    A second item

    +
    • +
  • +

    A third item

    +
    • +
+
+
+
+
+
+ + + \ No newline at end of file diff --git a/templates/layouts/old.html b/templates/layouts/old.html new file mode 100644 index 0000000..485c807 --- /dev/null +++ b/templates/layouts/old.html @@ -0,0 +1,38 @@ + + + + + + + + + SUBWAY DISPLAY! + + + +
+
+ PI MTA TRACKER +
+
+
+ Times Square Station +
+
+
North
+
Train 1 Info
+
Train 2 Info
+
Train 3 Info
+
+
+
South
+
Train 1 Info
+
Train 2 Info
+
Train 3 Info
+
+
+ + + + +
\ No newline at end of file diff --git a/templates/static/css/old.css b/templates/static/css/old.css new file mode 100644 index 0000000..e4b1b82 --- /dev/null +++ b/templates/static/css/old.css @@ -0,0 +1,80 @@ + +#main_div { + margin: 10px; + width: 90%; + position: absolute; + left: 50%; + margin-left: -45%; + min-width: 500px; + background-color: blueviolet; + padding: 10px; +} + +#test_span { + background-color: blue; +} + +#header_div { + height: 75px; + margin: 10px; + padding: 10px; + display: flex; + background-color: coral; +} + +.station_div { + display: block; + overflow: auto; + margin: 10px; + padding: 10px; + + background-color: lime; +} + +.station_header { + height: 75px; + padding: 10px; + + border-radius: 25px 25px 1px 1px; + display: flex; + background-color: cornflowerblue; +} + +.direction_div { + height: 50%; + width: 50%; + float: left; + border-radius: 1px 1px 25px 25px; + background-color: aquamarine; + +} + +.direction_div div { + padding: 10px; + /*margin: 10px;*/ + border-radius: 1px; + background-color: chocolate; +} + +/*.direction_div div:first-child{*/ +/* border-radius: 25px 25px 1px 1px;*/ +/*}*/ + +.direction_div div:last-child { + border-radius: 1px 1px 25px 25px; +} + +.direction_header { + background-color: bisque !important; + /*border-radius: 1px;*/ +} + +div { + border-radius: 25px; +} + +span { + display: inline-flex; + vertical-align: middle; + align-items: center; +} \ No newline at end of file diff --git a/templates/static/css/style.css b/templates/static/css/style.css index 843dadc..c8be136 100644 --- a/templates/static/css/style.css +++ b/templates/static/css/style.css @@ -1,80 +1,38 @@ - -#main_div { - margin: 10px; - width: 90%; - position: absolute; - left: 50%; - margin-left: -45%; - min-width: 500px; - background-color: blueviolet; - padding: 10px; +.site-title { + font-size: 4rem; } -#test_span { - background-color: blue; +.card-header { + font-size: 3rem !important; } -#header_div { - height: 75px; - margin: 10px; - padding: 10px; - display: flex; - background-color: coral; +.station-name { + font-size: 3.5rem !important; } -.station_div { - display: block; - overflow: auto; - margin: 10px; - padding: 10px; - - background-color: lime; +.station-info { + font-size: 2.5rem !important; } -.station_header { - height: 75px; - padding: 10px; - - border-radius: 25px 25px 1px 1px; - display: flex; - background-color: cornflowerblue; +.station-info h1 { + float: right; } -.direction_div { - height: 50%; - width: 50%; - float: left; - border-radius: 1px 1px 25px 25px; - background-color: aquamarine; +@media screen and (max-width: 1000px) { + .site-title { + font-size: 2rem !important; + } + + .card-header { + font-size: 1.5rem !important; + } + + .station-name { + font-size: 1.75rem !important; + } + + .station-info { + font-size: 1.25rem !important; + } } - -.direction_div div { - padding: 10px; - /*margin: 10px;*/ - border-radius: 1px; - background-color: chocolate; -} - -/*.direction_div div:first-child{*/ -/* border-radius: 25px 25px 1px 1px;*/ -/*}*/ - -.direction_div div:last-child { - border-radius: 1px 1px 25px 25px; -} - -.direction_header { - background-color: bisque !important; - /*border-radius: 1px;*/ -} - -/*div {*/ -/* border-radius: 25px;*/ -/*}*/ - -span { - display: inline-flex; - vertical-align: middle; - align-items: center; -} \ No newline at end of file diff --git a/templates/static/images/RPI-LOGO.png b/templates/static/images/RPI-LOGO.png new file mode 100644 index 0000000..c38e5e8 Binary files /dev/null and b/templates/static/images/RPI-LOGO.png differ