Skip to content

Commit

Permalink
added css stylishing, changed some urls for pics and pics themselves
Browse files Browse the repository at this point in the history
  • Loading branch information
Niki Ulmanen committed Mar 21, 2019
1 parent 94cfcbf commit 523e460
Show file tree
Hide file tree
Showing 24 changed files with 417 additions and 64 deletions.
7 changes: 4 additions & 3 deletions OodiUI/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ def start():
searchterm = request.form['searchfield']
print(searchterm)
books = sierra.search_shelved_books(searchterm)

return render_template('search/term_result.html', books = books)
return render_template('/search/term_result.html', books = books, searchterm = searchterm)
#return render_template('search/term_result.html', searchterm = searchterm)

@app.route('/term_result/guidance_term', methods=['POST', 'GET'])
Expand Down Expand Up @@ -81,6 +80,8 @@ def create_arrow():

@app.route('/get_arrow', methods=['GET','POST'])
def read_arrow():
x = request.get_json(silent=True, cache=False)
print("type of x is", jsonify(x))
arrow = "-"
config = Path("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt")
if config.is_file():
Expand All @@ -92,7 +93,7 @@ def read_arrow():
return arrow
#f.close()
else:
print("return some arrow")
print("return upward arrow")
return arrow

@app.route('/guidance', methods=['POST', 'GET'])
Expand Down
13 changes: 10 additions & 3 deletions OodiUI/static/arrow.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ $(document).ready(function(){
function arrow_signal() {
$.ajax({
url: '/get_arrow',
cache: false,
type: "GET",
headers: {
"cache-control": "no-cache"
},
success: function(data) {
var redirect = function(){
window.location.replace("/going_home");
};
$(".arrow").hide();
$(".wayhelp").hide();
if (data == "-") {
Expand Down Expand Up @@ -34,6 +36,11 @@ $(document).ready(function(){
else if (data == "home") {
window.location.replace("/going_home");
}
else {
console.log("empty file meh");
$("#uparrow").show();
$("#showtheway").show();
}
}

});
Expand Down
17 changes: 8 additions & 9 deletions OodiUI/static/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ $(document).ready(function(){
function home_signal() {
$.ajax({
url: '/back_home',
cache: false,
headers: {
"cache-control": "no-cache"
},
success: function(data) {
var redirect_home = function(){
window.location.replace("/");
};
if (data == "-") {
console.log("Home far away");
}
else if (data == "home2") {
if (data == "home2") {
console.log("Back home yay");
window.location.replace("/");
//setTimeout(redirect_home, 5000);

}
else {
console.log("Home far away");
}
}

Expand Down
Binary file added OodiUI/static/images/back_iso.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/back_pieni.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/eteenpain.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/koti.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nappi_bad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nappi_blah.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nappi_good.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nappi_okay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nuoli_molemmat.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nuoli_oikea.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nuoli_vasen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/nuoli_ylos.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OodiUI/static/images/pagebottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 523e460

Please sign in to comment.