make things pretty
This commit is contained in:
parent
5b1aac5769
commit
cb9bd385dd
4 changed files with 61 additions and 44 deletions
|
|
@ -4,12 +4,12 @@ let f request =
|
||||||
<br />
|
<br />
|
||||||
<div class="row mb-3">
|
<div class="row mb-3">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
% if Option.is_some @@ Dream.session "nick" request then begin
|
|
||||||
<a href="/babillard/new_thread" >[New Thread]</a>
|
|
||||||
% end;
|
|
||||||
<div id="map"></div>
|
<div id="map"></div>
|
||||||
<br />
|
<br />
|
||||||
<button class="btn btn-primary" onclick="geolocalize()">Geolocalize me</button>
|
<button class="btn btn-primary" onclick="geolocalize()">Geolocalize me</button>
|
||||||
|
% if Option.is_some @@ Dream.session "nick" request then begin
|
||||||
|
<a class="btn btn-primary" href="/babillard/new_thread">New Thread</a>
|
||||||
|
% end;
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div id="thread_preview_div"></div>
|
<div id="thread_preview_div"></div>
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,20 @@
|
||||||
let f request =
|
let f request =
|
||||||
% begin match Dream.session "nick" request with
|
% begin match Dream.session "nick" request with
|
||||||
% | None ->
|
% | None ->
|
||||||
Login to make a new thread.
|
<a href="/login">Login</a> to make a new thread.
|
||||||
% | Some _nick ->
|
% | Some _nick ->
|
||||||
<script type="text/javascript" src="/assets/js/js_newthread.js" defer="defer"></script>
|
<script type="text/javascript" src="/assets/js/js_newthread.js" defer="defer"></script>
|
||||||
<div id="newthread">Click the map to make a new thread:</div>
|
<h1>New thread</h1>
|
||||||
<div class="row mb-3">
|
<div id="newthread">
|
||||||
|
Click the map to make a new thread:
|
||||||
|
</div>
|
||||||
|
<br />
|
||||||
|
<div class="row mb-3">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div id="map"></div>
|
<div id="map"></div>
|
||||||
<button onclick="geolocalize()">Geolocalize me</button>
|
<br />
|
||||||
|
<button class="btn btn-primary" onclick="geolocalize()">Geolocalize me</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-6" id="newthread-form">
|
<div class="col-md-6" id="newthread-form">
|
||||||
<div class="postForm">
|
<div class="postForm">
|
||||||
<%s! Dream.form_tag ~action:"/babillard/new_thread" ~enctype:`Multipart_form_data request %>
|
<%s! Dream.form_tag ~action:"/babillard/new_thread" ~enctype:`Multipart_form_data request %>
|
||||||
|
|
@ -32,8 +36,8 @@ Login to make a new thread.
|
||||||
<label for="alt" id="altLabel" class="form-label">Image description:</label>
|
<label for="alt" id="altLabel" class="form-label">Image description:</label>
|
||||||
<input name="alt" type="text" class="form-control" id="alt" aria-labelledby="altLabel"></input>
|
<input name="alt" type="text" class="form-control" id="alt" aria-labelledby="altLabel"></input>
|
||||||
<button type="submit" class="btn btn-primary">Make Thread</button>
|
<button type="submit" class="btn btn-primary">Make Thread</button>
|
||||||
</form>
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
% end;
|
% end;
|
||||||
|
|
|
||||||
14
src/user.ml
14
src/user.ml
|
|
@ -129,8 +129,18 @@ let public_profile request =
|
||||||
let^? nick, _password, _email, (bio, _) = Db.find_opt Q.get_user nick in
|
let^? nick, _password, _email, (bio, _) = Db.find_opt Q.get_user nick in
|
||||||
let user_info =
|
let user_info =
|
||||||
Format.sprintf
|
Format.sprintf
|
||||||
{|nick = `%s`; bio = '%s';
|
{|
|
||||||
<img src="/user/%s/avatar" class="img-thumbnail" alt="Your avatar picture">|}
|
<h1>%s</h1>
|
||||||
|
<br />
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6">
|
||||||
|
<blockquote>%s</blockquote>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<img src="/user/%s/avatar" class="img-thumbnail" alt="Your avatar picture">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|}
|
||||||
nick (Dream.html_escape bio) nick
|
nick (Dream.html_escape bio) nick
|
||||||
in
|
in
|
||||||
Ok user_info
|
Ok user_info
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
let f nick bio request =
|
let f nick bio request =
|
||||||
<%s Format.sprintf "Hello %s !" nick %>
|
<h1><%s Format.sprintf "Hello %s !" nick %></h1>
|
||||||
<%s! Dream.form_tag ~action:"/profile" request %>
|
<%s! Dream.form_tag ~action:"/profile" request %>
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label for="bio" class="form-label">Bio</label>
|
<label for="bio" class="form-label">Bio</label>
|
||||||
|
|
@ -8,9 +8,12 @@ let f nick bio request =
|
||||||
</div>
|
</div>
|
||||||
<button type="submit" class="btn btn-primary">Save</button>
|
<button type="submit" class="btn btn-primary">Save</button>
|
||||||
</form>
|
</form>
|
||||||
|
<br />
|
||||||
<img src="/user/<%s nick %>/avatar" class="img-thumbnail" alt="Your avatar picture">
|
<img src="/user/<%s nick %>/avatar" class="img-thumbnail" alt="Your avatar picture" />
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
<%s! Dream.form_tag ~action:"/profile" ~enctype:`Multipart_form_data request %>
|
<%s! Dream.form_tag ~action:"/profile" ~enctype:`Multipart_form_data request %>
|
||||||
<input name="file" type="file">
|
<input name="file" type="file"><br />
|
||||||
<button>Submit!</button>
|
<br />
|
||||||
|
<button class="btn btn-primary">Submit picture!</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue