Updated UI

parent dfc509fe
...@@ -18,6 +18,9 @@ app = Starlette(debug=True) ...@@ -18,6 +18,9 @@ app = Starlette(debug=True)
credentials = service_account.Credentials.from_service_account_file("./serviceKey.json", scopes=scopes) credentials = service_account.Credentials.from_service_account_file("./serviceKey.json", scopes=scopes)
authed_session = AuthorizedSession(credentials) authed_session = AuthorizedSession(credentials)
@app.route('/auth')
async def show_index(request):
return templates.TemplateResponse('index.html', {'request': request})
@app.route('/auth',methods=["POST"]) @app.route('/auth',methods=["POST"])
async def firebase_login(request): async def firebase_login(request):
...@@ -60,7 +63,7 @@ async def firebase_register(request): ...@@ -60,7 +63,7 @@ async def firebase_register(request):
try: try:
message = json.loads(response._content)['error']['message'] message = json.loads(response._content)['error']['message']
except: except:
message = "Some error Occured." message = '<div class="alert alert-danger" role="alert">'+"Some error Occured."+"</div>"
return templates.TemplateResponse('register.html', {'request': request, 'err_msg':message}) return templates.TemplateResponse('register.html', {'request': request, 'err_msg':message})
else: else:
message = "Successfully registered." message = "Successfully registered."
...@@ -68,11 +71,13 @@ async def firebase_register(request): ...@@ -68,11 +71,13 @@ async def firebase_register(request):
@app.route('/') @app.route('/')
async def login(request): async def login(request):
return templates.TemplateResponse('login.html', {'request': request}) message = ''
return templates.TemplateResponse('login.html', {'request': request,'err_msg':message})
@app.route('/register') @app.route('/register')
async def login(request): async def login(request):
return templates.TemplateResponse('register.html', {'request': request}) message = ''
return templates.TemplateResponse('register.html', {'request': request,'err_msg':message})
@app.route('/contribute') @app.route('/contribute')
async def contrbPage(request): async def contrbPage(request):
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="container"> <div class="container">
<!-- navbar component from getbootstrap.com --> <!-- navbar component from getbootstrap.com -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px">
<a class="navbar-brand" href="/">Evaluate</a> <a class="navbar-brand" href="/auth">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
...@@ -26,15 +26,17 @@ ...@@ -26,15 +26,17 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/">Logout</a>
</div> </div>
</div> </div>
</nav> </nav>
<br /> <br />
<div class="jumbotron"> <div class="jumbotron">
<h1 class="display-4">Add your essay to our existing corpus</h1> <h1 class="display-4" style="font-size:5vw;">Add your essay to our existing corpus</h1>
<p class="lead">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p> <p class="lead" style="font-size:1.2em;">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p>
<hr class="my-4"> <hr class="my-4">
<p> <p>
<div class="input-group"> <div class="input-group">
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="container"> <div class="container">
<!-- navbar component from getbootstrap.com --> <!-- navbar component from getbootstrap.com -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px">
<a class="navbar-brand" href="/">Home</a> <a class="navbar-brand" href="/auth">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
...@@ -26,15 +26,18 @@ ...@@ -26,15 +26,18 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/">Logout</a>
</div> </div>
</div> </div>
</nav> </nav>
<br /> <br />
<div class="jumbotron"> <div class="jumbotron">
<h1 class="display-4"><i class="fas fa-graduation-cap"></i>Automated essay grading</h1> <h1 class="display-4" style="font-size:5vw;"><i class="fas fa-graduation-cap"></i>Automated essay grading</h1>
<p class="lead">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p> <p class="lead" style="font-size:1.2em;">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p>
<hr class="my-4"> <hr class="my-4">
<p> <p>
<div class="input-group"> <div class="input-group">
......
...@@ -26,16 +26,22 @@ ...@@ -26,16 +26,22 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/register">Register</a>
</div> </div>
</div> </div>
<!-- <div class="navbar-nav"> -->
<!-- <a class="nav-item nav-link active" href="#">Home <span class="sr-only">(current)</span></a> -->
<!-- Internal page links -->
<!-- </div> -->
</nav> </nav>
<br /> <br />
<div class="jumbotron"> <div class="jumbotron">
<h1 class="display-4"><i class="fas fa-graduation-cap"></i>Automated essay grading (Login)</h1> <h1 class="display-4" style="font-size:5vw;"><i class="fas fa-graduation-cap"></i>Automated essay grading</h1>
<p class="lead">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p> <p class="lead" style="font-size:1.2em">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p>
<hr class="my-4"> <hr class="my-4">
{{err_msg}}
<p> <p>
<form action="/auth" method="post"> <form action="/auth" method="post">
...@@ -48,11 +54,8 @@ ...@@ -48,11 +54,8 @@
<label for="exampleInputPassword1">Password</label> <label for="exampleInputPassword1">Password</label>
<input type="password" name ="password" class="form-control" id="exampleInputPassword1" placeholder="Password"> <input type="password" name ="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
</div> </div>
<div class="form-group form-check">
<input type="checkbox" class="form-check-input" id="exampleCheck1"> <button type="submit" class="btn btn-primary">Login</button>
<label class="form-check-label" for="exampleCheck1">Check me out</label>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form> </form>
......
...@@ -26,16 +26,23 @@ ...@@ -26,16 +26,23 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/">Login</a>
</div> </div>
</div> </div>
<!-- <div class="navbar-nav"> -->
<!-- <a class="nav-item nav-link active" href="#">Home <span class="sr-only">(current)</span></a> -->
<!-- Internal page links -->
<!-- </div> -->
</nav> </nav>
<br /> <br />
<div class="jumbotron"> <div class="jumbotron">
<h1 class="display-4"><i class="fas fa-graduation-cap"></i>Automated essay grading (Register)</h1> <h1 class="display-4" style="font-size:5vw;"><i class="fas fa-graduation-cap"></i>Automated essay grading</h1>
<p class="lead">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p> <p class="lead" style="font-size:1.2em;">This is a simple essay evaliation unit, an interface for calling essay evaluation model (ASAP)</p>
<hr class="my-4"> <hr class="my-4">
{{err_msg}}
<p> <p>
<form action="/registration" method="post"> <form action="/registration" method="post">
...@@ -52,11 +59,7 @@ ...@@ -52,11 +59,7 @@
<label for="userpasswordconfirm">Confirm Password</label> <label for="userpasswordconfirm">Confirm Password</label>
<input type="password" name="pass2" class="form-control" id="userpasswordconfirm" placeholder="Password"> <input type="password" name="pass2" class="form-control" id="userpasswordconfirm" placeholder="Password">
</div> </div>
<div class="form-group form-check"> <button type="submit" class="btn btn-primary">Register</button>
<input type="checkbox" class="form-check-input" id="exampleCheck1">
<label class="form-check-label" for="exampleCheck1">Check me out</label>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
</form> </form>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="container"> <div class="container">
<!-- navbar component from getbootstrap.com --> <!-- navbar component from getbootstrap.com -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px">
<a class="navbar-brand" href="/">Evaluate</a> <a class="navbar-brand" href="/auth">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
...@@ -26,8 +26,10 @@ ...@@ -26,8 +26,10 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/">Logout</a>
</div> </div>
</div> </div>
</nav> </nav>
<br /> <br />
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="container"> <div class="container">
<!-- navbar component from getbootstrap.com --> <!-- navbar component from getbootstrap.com -->
<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px"> <nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="margin-top: 1px">
<a class="navbar-brand" href="/">Evaluate</a> <a class="navbar-brand" href="/auth">Home</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
...@@ -26,8 +26,10 @@ ...@@ -26,8 +26,10 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/">Logout</a>
</div> </div>
</div> </div>
</nav> </nav>
<br /> <br />
......
...@@ -26,16 +26,22 @@ ...@@ -26,16 +26,22 @@
<a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links --> <a class="nav-item nav-link" href="/contribute">Contribute</a><!-- Internal page links -->
<a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links --> <a class="nav-item nav-link" href="https://github.com/KartavyaKothari/Automated-essay-grading-UI">About</a><!-- Internal page links -->
<a class="nav-item nav-link" href="#links"></a><!-- Internal page links --> <a class="nav-item nav-link" href="#links"></a><!-- Internal page links -->
<a class="nav-item nav-link" href="/">Logout</a>
</div> </div>
</div> </div>
</nav> </nav>
<br /> <br />
<!-- </div> -->
<div class="jumbotron"> <table class="table">
<p class="lead">{{topic}}</p> <thead class="">
<br /> <tr>
<table> <!-- <th scope="col">#</th> -->
<th scope="col">Essays on {{topic}}</th>
<th scope="col">Score</th>
<!-- <th scope="col">Handle</th> -->
</tr>
</thead>
{% for e in essayResponse %} {% for e in essayResponse %}
<tr> <tr>
<td>{{e['essay']}}</td> <td>{{e['essay']}}</td>
...@@ -53,7 +59,7 @@ ...@@ -53,7 +59,7 @@
<p class="lead"> <p class="lead">
Lorem ipsum dolor sit amet consectetur adipisicing elit. Assumenda asperiores tempore harum eveniet nostrum nobis numquam consectetur cupiditate! Alias quo, iure ipsam nesciunt similique aperiam quas accusantium cupiditate! Quibusdam, architecto! Lorem ipsum dolor sit amet consectetur adipisicing elit. Assumenda asperiores tempore harum eveniet nostrum nobis numquam consectetur cupiditate! Alias quo, iure ipsam nesciunt similique aperiam quas accusantium cupiditate! Quibusdam, architecto!
</p> --> </p> -->
</div> <!-- </div> -->
</div> </div>
<!-- Optional JavaScript --> <!-- Optional JavaScript -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment