projects / projectNeoUtesa / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: b3f942f)
comienzo del trabajo del header
authorOscar J. Rodriguez B <josuer08@gmail.com>
Thu, 12 Dec 2019 21:05:44 +0000 (17:05 -0400)
committerOscar J. Rodriguez B <josuer08@gmail.com>
Thu, 12 Dec 2019 21:05:44 +0000 (17:05 -0400)
app.js patch | blob | history
partials/header.ejs [new file with mode: 0644] patch | blob
public/images/favicon.ico [new file with mode: 0644] patch | blob
public/stylesheets/header.css [new file with mode: 0644] patch | blob
routes/index.js patch | blob | history
views/index.ejs patch | blob | history

diff --git a/app.js b/app.js
index 62dff0d03aeddb3cfc3e10ded315193fcf00f4c4..c8e252c0db961bae49cc63e1513f8199fdc17146 100644 (file)
--- a/app.js
+++ b/app.js
@@ -18,6 +18,11 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
+//setup places
+app.use('/public/stylesheets', express.static('stylesheets'));
+app.use('/public/images', express.static('images'));
+app.use('/public/javascripts', express.static('javascripts'));
+app.use('/favicon.ico', express.static('/public/images/favicon.ico'));
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
 
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
diff --git a/partials/header.ejs b/partials/header.ejs
new file mode 100644 (file)
index 0000000..6d85ec5
--- /dev/null
+++ b/partials/header.ejs
@@ -0,0 +1,15 @@
+<header>
+  <link rel="stylesheet" type="text/css" href="stylesheets/header.css" />
+  <div class="pane">
+    <img src="http://www.utesa.edu/webutesa/IMAGES/LogoUtesaSC.gif" alt="">
+    <h1>UNIVERSIDAD TECNOLOGICA DE SANTIAGO</h1>
+  </div>
+  <div class="navbar">
+      <a href="index">Inicio</a>
+      <a href="message">Mensaje del rector</a>
+      <a href="posts">Publicaciones</a>
+      <a href="activities">Actividades</a>
+      <a href="news">Noticias</a>
+      <a href="mail">E-Mail</a>
+  </div>
+</header>
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
new file mode 100644 (file)
index 0000000..5e45d97
Binary files /dev/null and b/public/images/favicon.ico differ
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
new file mode 100644 (file)
index 0000000..37723e2
--- /dev/null
+++ b/public/stylesheets/header.css
@@ -0,0 +1,42 @@
+*{
+  box-sizing: border-box;
+  padding: 0;
+  margin: 0;
+}
+.pane{
+  display: flex;
+  background: #FFCC00;
+  color: white;
+  align-content: space-around;
+  align-items: center;
+}
+
+.pane > img {
+  height: 6em;
+}
+.pane > h1 {
+  text-shadow: 2px 2px #000000;
+  padding-left: 6em;
+}
+
+.navbar {
+  background: #dddddd;
+  display: flex;
+  flex-flow: row nowrap;
+  align-items: center;
+  height: 2em;
+}
+.navbar > a{
+  height: 100%;
+  flex-grow: 1;
+  text-align: center;
+  color: black;
+  text-decoration: none;
+  padding-top: 0.5em;
+  transition: color 0.3s ease, background 0.3s ease, box-shadow 0.3s ease;
+}
+.navbar > a:hover {
+  color: white;
+  background: green;
+  box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.75);
+}
diff --git a/routes/index.js b/routes/index.js
index ecca96a56b309a315ddf6399155fd2f953031d3b..d0a85ba7303a4f10d840f665f908013112b70038 100644 (file)
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,4 +6,5 @@ router.get('/', function(req, res, next) {
   res.render('index', { title: 'Express' });
 });
 
   res.render('index', { title: 'Express' });
 });
 
+
 module.exports = router;
 module.exports = router;
diff --git a/views/index.ejs b/views/index.ejs
index 7b7a1d6dee032384b91037c9f87cf57cad727a65..e20f2aa9fc45cd6d7ce0ac3dd6a3f4006a723dc0 100644 (file)
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,11 +1,21 @@
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <!DOCTYPE html>
 <!DOCTYPE html>
-<html>
+<html lang="en" dir="ltr">
   <head>
   <head>
-    <title><%= title %></title>
-    <link rel='stylesheet' href='/stylesheets/style.css' />
+    <meta charset="utf-8">
+    <title>UTESA</title>
   </head>
   </head>
+  <%include ../partials/header%>
   <body>
   <body>
-    <h1><%= title %></h1>
-    <p>Welcome to <%= title %></p>
+    <aside class="">
+
+    </aside>
+    <main>
+
+    </main>
+    <aside class="">
+
+    </aside>
   </body>
   </body>
+  <%include ../partials/footer%>
 </html>
 </html>
Unnamed repository; edit this file 'description' to name the repository.