Skip to content

Commit 35c9764

Browse files
committed
the .html files are also updated to match what is shown in the classes
1 parent 2cf0238 commit 35c9764

File tree

4 files changed

+79
-73
lines changed

4 files changed

+79
-73
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
node_modules/
1+
node_modules/

nodeapp/views/header.html

Lines changed: 49 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,54 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="UTF-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<title><%= appName %></title>
7-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
8-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
9-
<link rel="stylesheet" href="main.css">
10-
</head>
11-
<body>
12-
<nav class="navbar navbar-expand-lg bg-body-tertiary">
13-
<div class="container-fluid">
14-
<a class="navbar-brand" href="/"><%= appName %></a>
15-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
16-
<span class="navbar-toggler-icon"></span>
17-
</button>
18-
<div class="collapse navbar-collapse" id="navbarSupportedContent">
19-
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
20-
<li class="nav-item">
21-
<a class="nav-link active" aria-current="page" href="#">Home</a>
22-
</li>
23-
<% if (session.userId) { %>
24-
<li class="nav-item">
25-
<a class="nav-link" href="/agents/new">New Agent</a>
26-
</li>
27-
<% } %>
28-
</ul>
29-
<% if (!session.userId) { %>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<title><%= appName %></title>
7+
<link
8+
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
9+
rel="stylesheet"
10+
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
11+
crossorigin="anonymous"
12+
/>
13+
<link
14+
rel="stylesheet"
15+
href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css"
16+
/>
17+
<link rel="stylesheet" href="main.css" />
18+
</head>
19+
<body>
20+
<nav class="navbar navbar-expand-lg bg-body-tertiary">
21+
<div class="container-fluid">
22+
<a class="navbar-brand" href="/"><%= appName %></a>
23+
<button
24+
class="navbar-toggler"
25+
type="button"
26+
data-bs-toggle="collapse"
27+
data-bs-target="#navbarSupportedContent"
28+
aria-controls="navbarSupportedContent"
29+
aria-expanded="false"
30+
aria-label="Toggle navigation"
31+
>
32+
<span class="navbar-toggler-icon"></span>
33+
</button>
34+
<div class="collapse navbar-collapse" id="navbarSupportedContent">
35+
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
36+
<li class="nav-item">
37+
<a class="nav-link active" aria-current="page" href="#">Home</a>
38+
</li>
39+
<% if (session.userId) { %>
40+
<li class="nav-item">
41+
<a class="nav-link" href="/agents/new">New Agent</a>
42+
</li>
43+
<% } %>
44+
</ul>
45+
<% if (!session.userId) { %>
3046
<a class="btn btn-success" href="/login">Login</a>
31-
<% } else { %>
47+
<% } else { %>
3248
<a class="btn btn-outline-success" href="/logout">Logout</a>
33-
<% } %>
34-
49+
<% } %>
50+
</div>
3551
</div>
36-
</div>
37-
</nav>
52+
</nav>
53+
</body>
54+
</html>

nodeapp/views/home.html

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,23 @@
11
<%- include('header.html') %>
22

3-
<p>User ID: <%= session.userId %></p>
3+
<p>User ID: <%= session.userId %></p>
44

5-
<% if (!session.userId) { %>
6-
<% // contenido para usuarios NO logados %>
7-
<p><a href="/login">Login</a> to access your agents</p>
8-
<% } else { %>
9-
<h2><%= __('Agents') %></h2>
10-
<% agents.forEach(agent => { %>
11-
<p>
12-
<img
13-
src="<%= agent.avatar ? `/avatars/${agent.avatar}` : 'https://placehold.co/30' %>"
14-
alt="avatar"
15-
width="30"
16-
>
17-
<%= __('{{name}} is {{age}} years old', agent) %>
18-
<a href="/agents/delete/<%= agent._id%>"><i class="bi bi-trash3"></i></a>
19-
</p>
20-
<% }) %>
21-
<% } %>
5+
<% if (!session.userId) { %> <% // contenido para usuarios NO logados %>
6+
<p><a href="/login">Login</a> to access your agents</p>
7+
<% } else { %>
8+
<h2>Agentes</h2>
9+
<% agents.forEach(agent => { %>
10+
<p>
11+
<%= agent.name %> tiene <%= agent.age %> años.
12+
<a href="/agents/delete/<%= agent._id%>"><i class="bi bi-trash3"></i></a>
13+
</p>
14+
<% }) %> <% } %>
2215

23-
<h2><%= __('Conditionals') %></h2>
16+
<h2>Condicionales</h2>
2417

25-
<p>El segundo actual es <%= segundoActual %></p>
26-
<% if (esPar) { %>
27-
<p>El segundo actual es par.</p>
28-
<% } else { %>
29-
<p>El segundo actual es impar.</p>
30-
<% } %>
31-
32-
<%= codigo %>
33-
34-
<h2><%= __('Pluralization example') %></h2>
35-
<p>0 <%= __n('Mouse', 0) %></p>
36-
<p>1 <%= __n('Mouse', 1) %></p>
37-
<p>2 <%= __n('Mouse', 2) %></p>
38-
<p>3 <%= __n('Mouse', 3) %></p>
39-
<p>4 <%= __n('Mouse', 4) %></p>
40-
41-
<%- include('footer.html') %>
18+
<p>El segundo actual es <%= segundoActual %></p>
19+
<% if (esPar) { %>
20+
<p>El segundo actual es par.</p>
21+
<% } else { %>
22+
<p>El segundo actual es impar.</p>
23+
<% } %> <%= codigo %> <%- include('footer.html') %>

nodeapp/views/login.html

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,23 @@ <h1>Login</h1>
1212
class="form-control"
1313
id="exampleInputEmail1"
1414
aria-describedby="emailHelp"
15-
>
16-
<div id="emailHelp" class="form-text">We'll never share your email with anyone else.</div>
15+
/>
16+
<div id="emailHelp" class="form-text">
17+
We'll never share your email with anyone else.
18+
</div>
1719
</div>
1820
<div class="mb-3">
1921
<label for="exampleInputPassword1" class="form-label">Password</label>
20-
<input type="password" name="password" class="form-control" id="exampleInputPassword1">
22+
<input
23+
type="password"
24+
name="password"
25+
class="form-control"
26+
id="exampleInputPassword1"
27+
/>
2128
</div>
2229
<button type="submit" class="btn btn-primary">Submit</button>
2330
<p><%= error %></p>
2431
</form>
2532
</div>
2633

27-
<%- include('footer.html') %>
34+
<%- include('footer.html') %>

0 commit comments

Comments
 (0)