diff --git a/app/routes.py b/app/routes.py index 2f64533e..95759653 100644 --- a/app/routes.py +++ b/app/routes.py @@ -61,14 +61,20 @@ def search(): def marches(): return render_template('marches.html', worlds=get_worlds()) +@app.route("/marches/maps/") +def marchMap(world): + image_map = [("Temple of Constant Explosions",10,20,35),("Deep Gnome Workshop",50,40,20)] #(place,x,y,r) + return render_template("marchMap.html",worldname=world,imap=image_map) + + @app.route("/marches/worlds/") def marchWorld(world): worldDir = "../Worlds/"+world #copy .png from world.png into static player_list = ["INVALID1","INVALID2","INVALID3"] - image_map = [(10,20,35),(50,40,20)] #(x,y,r) + #image_map = [("Temple of Constant Explosions",10,20,35),("Deep Gnome Workshop",50,40,20)] #(place,x,y,r) log_list = [("5/3/19",[("Josh Gordon","bottom text"),("Anthony Rinaldo","lorem ipsum")])] # :: [(Date,[(CharacterName,String)])] - return render_template("marchWorld.html",worldname=world,players=player_list,imap=image_map,logs=log_list) + return render_template("marchWorld.html",worldname=world,players=player_list,logs=log_list) def bucket_route(uri, dir, sing=None): if sing is None: diff --git a/app/static/Test1.png b/app/static/Test1.png new file mode 100644 index 00000000..069f19ed Binary files /dev/null and b/app/static/Test1.png differ diff --git a/app/static/Test2.png b/app/static/Test2.png new file mode 100644 index 00000000..802c5836 Binary files /dev/null and b/app/static/Test2.png differ diff --git a/app/static/marchStyle.css b/app/static/marchStyle.css new file mode 100644 index 00000000..0ca37004 --- /dev/null +++ b/app/static/marchStyle.css @@ -0,0 +1,22 @@ +section.info { + display: flex; + flex-direction: row; + justify-content: center; +} + +img.map { + display: block; + width: 30%; + padding: 10px; +} + +img.bigmap { + display: block; + width: auto; + height: auto; +} + +.characters { + display: flex; + flex-direction: column; +} diff --git a/app/templates/base.html b/app/templates/base.html index 3103b76b..10945c27 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -2,8 +2,10 @@ + {% block style %} + {% endblock %} {% block title %}COSI D&D Archive{% endblock %} diff --git a/app/templates/marchMap.html b/app/templates/marchMap.html new file mode 100644 index 00000000..c20548be --- /dev/null +++ b/app/templates/marchMap.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% block content %} + +themap + + + {% for (name,x,y,r) in imap %} + + {% endfor %} + +{% endblock %} diff --git a/app/templates/marchWorld.html b/app/templates/marchWorld.html index c8b701f5..5227e95f 100644 --- a/app/templates/marchWorld.html +++ b/app/templates/marchWorld.html @@ -1,4 +1,23 @@ {% extends "base.html" %} +{% block style %} +{{super()}} + +{% endblock %} {% block content %}

{{worldname}}

+
+ + themap + +
+
    + {% for name in players %} +
  • {{name}}
  • + {% endfor %} +
+
+
+
+ +
{% endblock %}