Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mason-today-web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
8
Issues
8
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
mason-today-web
Commits
626a818c
Commit
626a818c
authored
Apr 26, 2018
by
Landon DeCoito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved some stuff around i think
parent
45ed3dd9
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
230 additions
and
247 deletions
+230
-247
mason-today/app.py
mason-today/app.py
+6
-6
mason-today/parscript.py
mason-today/parscript.py
+224
-241
No files found.
mason-today/app.py
View file @
626a818c
...
@@ -8,9 +8,9 @@ app = Flask(__name__)
...
@@ -8,9 +8,9 @@ app = Flask(__name__)
@
app
.
route
(
"/"
)
@
app
.
route
(
"/"
)
def
display_default
():
def
display_default
():
resp
=
Response
((
"Welcome to the masontoday API! Go to https://git.gmu.edu/srct/mason-today-web <br/><br/>"
resp
=
Response
((
"Welcome to the masontoday API! Go to https://git.gmu.edu/srct/mason-today-web <br/><br/>"
+
"Feel free to go to /api/25live/ or /api/getconnected/ to find our api!"
).
encode
(
'utf-8'
))
+
"Feel free to go to /api/25live/ or /api/getconnected/ to find our api!"
).
encode
(
'utf-8'
))
return
resp
return
resp
@
app
.
route
(
"/api/25live"
)
@
app
.
route
(
"/api/25live"
)
def
display_data
():
def
display_data
():
...
@@ -21,6 +21,6 @@ def display_data():
...
@@ -21,6 +21,6 @@ def display_data():
@
app
.
route
(
"/api/getconnected"
)
@
app
.
route
(
"/api/getconnected"
)
def
display_GC_data
():
def
display_GC_data
():
resp
=
Response
(
json
.
dumps
(
load_getconn_data
(),
ensure_ascii
=
False
).
encode
(
'utf-8'
))
resp
=
Response
(
json
.
dumps
(
load_getconn_data
(),
ensure_ascii
=
False
).
encode
(
'utf-8'
))
resp
.
headers
[
'Content-Type'
]
=
'application/json; charset=utf-8'
resp
.
headers
[
'Content-Type'
]
=
'application/json; charset=utf-8'
return
resp
return
resp
mason-today/parscript.py
View file @
626a818c
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment