SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Joaquin committed 2025-05-06 09:30:30 -07:00
1 parent ae3ddbeaeb
commit 4050e95cc3
1 file changed
+3 -20
Download Patch File Download Diff File Expand all files Collapse all files
src/views/questionnaire.ejs
+3 -20
View File
@@ -1,15 +1,6 @@
<!DOCTYPE html> <%- include("./partials/fileHeader") %>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
<title>Document</title>
</head>
<body>
<%- include("./partials/header") %> <%- include("./partials/header") %>
<main class="container mx-auto p-4"> <main class="container mx-auto p-4">
<h2 class="text-xl font-semibold mb-4">Welcome: <%= user.email %></h2> <h2 class="text-xl font-semibold mb-4">Welcome: <%= user.email %></h2>
<div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md"> <div class="max-w-md mx-auto bg-white p-8 mb-10 rounded-lg shadow-md">
@@ -96,13 +87,5 @@
</form> </form>
</div> </div>
</main> </main>
<footer>
<div class="fixed bottom-0 left-0 z-50 sm:hidden mt-5 lg:block w-full h-16 bg-gray-100 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 p-6 text-center text-gray-500 dark:text-gray-400 text-sm">
<div class="container mx-auto">
<p>&copy; 2025 RCalculator. All rights reserved.</p>
</div>
</div>
</footer>
</body>
</html> <%- include("./partials/footer") %>