Ignore:
Timestamp:
03/10/23 21:43:30 (16 months ago)
Author:
SazdovaEkaterina <sazdovaekaterina@…>
Branches:
main
Children:
104185f
Parents:
b46d1f2 (diff), c3278ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

resolve merge conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Prototype Application/Paw5/src/main/resources/templates/home.html

    rb46d1f2 r0078d84  
    11<!DOCTYPE html>
    2 <html lang="en">
     2<html lang="en" xmlns:th="http://thymeleaf.org">
    33<head>
    44    <meta charset="UTF-8">
    … …  
    4141  </nav>
    4242</header>
    43 
    4443<div>
    4544  <h1>Welcome to Paw 5</h1>
    … …  
    4847  </h3>
    4948</div>
    50 
     49<div>
     50  <form method="get" th:action="@{'/create-post'}">
     51    <button id="createPost"
     52            type="submit"
     53            class="btn">Create an Adoption Post</button>
     54  </form>
     55</div>
     56<div>
     57  <form method="get" th:action="@{'/adoption-posts'}">
     58    <button id="submit"
     59            type="submit"
     60            class="btn">View Pet Posts</button>
     61  </form>
     62</div>
    5163</body>
    5264</html>
Note: See TracChangeset for help on using the changeset viewer.