Skip to content

Commit

Permalink
Merge pull request #99 from linea-it/75-daiquiri-home-page
Browse files Browse the repository at this point in the history 
daiquiri home page updates
  • Loading branch information
@glaubervila
glaubervila authored Aug 1, 2024
2 parents e437235 + 763c43d commit 3818f67
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 36 deletions.
37 changes: 29 additions & 8 deletions daiquiri/templates/core/banner.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,38 @@
<img class="first-slide" style="width: 100%; height:550px;"
src="{% static 'daiquiri/imgs/userquery_banner.jpg' %}" alt="First slide">
<div class="container">
<div class="carousel-caption">
<h1 style="color: #fff;">Linea Userquery</h1>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
ut
labore et dolore magna aliqua. Ut quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat.</p>
<p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
<div class="carousel-caption" style="text-align: center; top: 50%; transform: translateY(-50%);">
<h1 style="color: #fff;">LIneA User query</h1>
<p>An interface to query LIneA's database and create user-generated tables. </p>
</div>
</div>
<div class="medias" style="position: absolute; bottom: 20px; right: 20px; display: flex; gap: 10px;">
<a href="https://www.youtube.com/user/lineamcti" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 576 512">
<path fill="#ffffff" d="M549.7 124.1c-6.3-23.7-24.8-42.3-48.3-48.6C458.8 64 288 64 288 64S117.2 64 74.6 75.5c-23.5 6.3-42 24.9-48.3 48.6-11.4 42.9-11.4 132.3-11.4 132.3s0 89.4 11.4 132.3c6.3 23.7 24.8 41.5 48.3 47.8C117.2 448 288 448 288 448s170.8 0 213.4-11.5c23.5-6.3 42-24.2 48.3-47.8 11.4-42.9 11.4-132.3 11.4-132.3s0-89.4-11.4-132.3zm-317.5 213.5V175.2l142.7 81.2-142.7 81.2z"/>
</svg>
</a>

<a href="https://x.com/LIneA_org" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 448 512">
<path fill="#ffffff" d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zm297.1 84L257.3 234.6 379.4 396H283.8L209 298.1 123.3 396H75.8l111-126.9L69.7 116h98l67.7 89.5L313.6 116h47.5zM323.3 367.6L153.4 142.9H125.1L296.9 367.6h26.3z"/>
</svg>
</a>

<a href="https://www.instagram.com/linea_org" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 448 512">
<path fill="#ffffff" d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z"/>
</svg>
</a>

<a href="https://github.com/linea-it/lsp_daiquiri" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 0 496 512">
<path fill="#ffffff" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3 .3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5 .3-6.2 2.3zm44.2-1.7c-2.9 .7-4.9 2.6-4.6 4.9 .3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3 .7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3 .3 2.9 2.3 3.9 1.6 1 3.6 .7 4.3-.7 .7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3 .7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3 .7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/>
</svg>
</a>
</div>
</div>
</div>
</div>
</div>
</section>
</section>
40 changes: 12 additions & 28 deletions daiquiri/templates/core/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,20 @@

<div class="row">
<div class="col-md-12">
<h2 style="text-align: center">Welcome to LIneA services</h2>
<h2 style="text-align: center">Overview</h2>
</div>
</div>
<div class="row">
<div class="col-md-12">
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam a dui vitae enim vestibulum gravida non
congue risus.
Pellentesque id tortor sit amet elit aliquam iaculis. Donec molestie consectetur tristique.
Quisque tincidunt luctus gravida. Nullam vehicula erat nibh, nec tempor odio sodales quis.
The User query service based on <i>daiquiri</i> is a user-friendly interface
that allows one to query the database to create temporary tables.
</p>
<p>
Nulla vehicula at felis vel faucibus. Vivamus lobortis nisi ante, eu pulvinar nunc eleifend id.
Sed dui erat, fringilla non nisi vel, hendrerit pretium turpis.
Nulla laoreet turpis dolor, nec posuere dolor bibendum in.
Donec non ligula neque. Quisque aliquam dolor nisi, in ultrices purus lobortis in.
Etiam quis nisl eu nunc facilisis tempor quis eget enim. Nam in dictum dolor.
Praesent dapibus mi eget interdum laoreet. Nam mollis dapibus lacus aliquam porttitor.
Nunc vehicula lorem lacus. Pellentesque rutrum interdum velit eu interdum. Ut rutrum porta condimentum.
Donec sagittis nunc nec dolor rhoncus aliquam et a dui. Sed non neque urna.
</p>
<p>
Vestibulum pellentesque eu diam suscipit tempus. Vivamus mi dui, fringilla luctus ante id, hendrerit
dictum nisl.
Duis rutrum ornare magna non mollis. Morbi vestibulum augue enim, sit amet vehicula nulla bibendum at.
Integer posuere volutpat lorem, ut sollicitudin lacus mollis eu. Phasellus consequat nibh ut efficitur
aliquam..
User-generated tables are managed by MyDB and can be immediately accessed on
LIneA JupyterHub using <i>dblinea</i>. Also, if a table contains equatorial
coordinates, it automatically becomes a list of targets, so the respective
images from DES DR2 can be visualized using the Target Viewer service.
</p>

<p style="text-align: right">
Expand All @@ -57,8 +44,7 @@ <h2 style="text-align: center">Welcome to LIneA services</h2>
d="M448 80v48c0 44.2-100.3 80-224 80S0 172.2 0 128V80C0 35.8 100.3 0 224 0S448 35.8 448 80zM393.2 214.7c20.8-7.4 39.9-16.9 54.8-28.6V288c0 44.2-100.3 80-224 80S0 332.2 0 288V186.1c14.9 11.8 34 21.2 54.8 28.6C99.7 230.7 159.5 240 224 240s124.3-9.3 169.2-25.3zM0 346.1c14.9 11.8 34 21.2 54.8 28.6C99.7 390.7 159.5 400 224 400s124.3-9.3 169.2-25.3c20.8-7.4 39.9-16.9 54.8-28.6V432c0 44.2-100.3 80-224 80S0 476.2 0 432V346.1z" />
</svg>
<h3>Data Access</h3>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula
porta felis euismod semper.</p>
<p>Interface to perform queries on the database.</p>
<p><a class="btn btn-default" href="/query/" role="button">View details »</a></p>
</div>
<div class="col-md-3">
Expand All @@ -68,8 +54,7 @@ <h3>Data Access</h3>
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z" />
</svg>
<h3>Documentation</h3>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula
porta felis euismod semper</p>
<p>Details and instructions on how to use the query interface.</p>
<p><a class="btn btn-default" href="/cms/services" role="button">View details »</a></p>
</div>
<div class="col-md-3">
Expand All @@ -79,8 +64,7 @@ <h3>Documentation</h3>
d="M264.5 5.2c14.9-6.9 32.1-6.9 47 0l218.6 101c8.5 3.9 13.9 12.4 13.9 21.8s-5.4 17.9-13.9 21.8l-218.6 101c-14.9 6.9-32.1 6.9-47 0L45.9 149.8C37.4 145.8 32 137.3 32 128s5.4-17.9 13.9-21.8L264.5 5.2zM476.9 209.6l53.2 24.6c8.5 3.9 13.9 12.4 13.9 21.8s-5.4 17.9-13.9 21.8l-218.6 101c-14.9 6.9-32.1 6.9-47 0L45.9 277.8C37.4 273.8 32 265.3 32 256s5.4-17.9 13.9-21.8l53.2-24.6 152 70.2c23.4 10.8 50.4 10.8 73.8 0l152-70.2zm-152 198.2l152-70.2 53.2 24.6c8.5 3.9 13.9 12.4 13.9 21.8s-5.4 17.9-13.9 21.8l-218.6 101c-14.9 6.9-32.1 6.9-47 0L45.9 405.8C37.4 401.8 32 393.3 32 384s5.4-17.9 13.9-21.8l53.2-24.6 152 70.2c23.4 10.8 50.4 10.8 73.8 0z" />
</svg>
<h3>Science Server</h3>
<p>Deve ser um link para página com a lista de serviços do LIneA, Science Server, Jupiter Notebook e
documentações.</p>
<p>Visualization tools to explore astronomical images and catalogs.</p>
<p><a class="btn btn-default" href="https://scienceserver-dev.linea.org.br/" taget="_blank"
role="button">View details
»</a></p>
Expand All @@ -92,7 +76,7 @@ <h3>Science Server</h3>
d="M217.9 105.9L340.7 228.7c7.2 7.2 11.3 17.1 11.3 27.3s-4.1 20.1-11.3 27.3L217.9 406.1c-6.4 6.4-15 9.9-24 9.9c-18.7 0-33.9-15.2-33.9-33.9l0-62.1L32 320c-17.7 0-32-14.3-32-32l0-64c0-17.7 14.3-32 32-32l128 0 0-62.1c0-18.7 15.2-33.9 33.9-33.9c9 0 17.6 3.6 24 9.9zM352 416l64 0c17.7 0 32-14.3 32-32l0-256c0-17.7-14.3-32-32-32l-64 0c-17.7 0-32-14.3-32-32s14.3-32 32-32l64 0c53 0 96 43 96 96l0 256c0 53-43 96-96 96l-64 0c-17.7 0-32-14.3-32-32s14.3-32 32-32z" />
</svg>
<h3>Login</h3>
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. </p>
<p>Login to access the data and tools. </p>
<p><a class="btn btn-default" href="/login" role="button">View details »</a></p>
</div>
</div>
Expand Down Expand Up @@ -136,4 +120,4 @@ <h3>Login</h3>
</main>


{% endblock %}
{% endblock %}

0 comments on commit 3818f67

Please sign in to comment.