nodejs server api

conceptree · Dec 14, 2017 · b7ded23 · b7ded23
1 parent 1783644
commit b7ded23
Show file tree

Hide file tree

Showing 10 changed files with 2,048 additions and 91 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+# dependencies
+/node_modules
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
diff --git a/css/style.css b/css/style.css
@@ -260,7 +260,7 @@ section {
       -o-transition: all 1s ease;
       -ms-transition: all 1s ease;
       transition: all 1s ease; }
-  .main-wrapper .logo {
+  .main-wrapper .logo-style {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -434,7 +434,7 @@ section {
           .main-wrapper .contacts .contact-links .contact-list ul li a {
             height: 30px; }
   .main-wrapper .login-window {
-    position: absolute;
+    position: fixed;
     top: 35px;
     left: calc(100vw);
     width: 250px;
@@ -457,10 +457,16 @@ section {
         padding: 10px;
         width: 100%;
         margin-bottom: 10px; }
-      .main-wrapper .login-window form label {
+      .main-wrapper .login-window form label, .main-wrapper .login-window form a {
         width: 100%;
         color: #ccc;
         font-size: 0.8em; }
+      .main-wrapper .login-window form a {
+        font-size: 0.6em;
+        color: #1976d2;
+        cursor: pointer; }
+        .main-wrapper .login-window form a:hover {
+          color: #fff; }
       .main-wrapper .login-window form button {
         border-radius: 5px;
         width: 100%;
@@ -480,6 +486,8 @@ section {
       font-size: 0.6em;
       color: #1976d2;
       cursor: pointer; }
+      .main-wrapper .login-window .sign-in:hover {
+        color: #fff; }
   .main-wrapper .login-window-on {
     left: calc(100vw - 250px);
     opacity: 1; }
diff --git a/css/style.scss b/css/style.scss
@@ -323,7 +323,7 @@ section {
     }
   }
 
-  .logo {
+  .logo-style {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -569,7 +569,7 @@ section {
   }
 
   .login-window {
-    position: absolute;
+    position: fixed;
     top: 35px;
     left: calc(100vw);
     width: 250px;
@@ -596,12 +596,22 @@ section {
         margin-bottom: 10px;
       }
 
-      label {
+      label, a {
         width: 100%;
         color: #ccc;
         font-size: 0.8em;
       }
 
+      a{
+        font-size: 0.6em;
+        color: $materialBlue700;
+        cursor: pointer;
+
+        &:hover{
+          color:$whiteColor;
+        }
+      }
+
       button {
         border-radius: 5px;
         width: 100%;
@@ -624,6 +634,9 @@ section {
       font-size: 0.6em;
       color: $materialBlue700;
       cursor: pointer;
+      &:hover{
+        color:$whiteColor
+      }
     }
   }
 

diff --git a/index.html b/index.html
@@ -1,8 +1,9 @@
+<!DOCTYPE HTML>
 <html>
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Conceptree - Design&Development</title>
+    <title>Conceptree - DesignDevelopment</title>
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M"
@@ -26,7 +27,7 @@
             </div>
         </div>
 
-        <div class="logo"></div>
+        <div class="logo-style" id="logo"></div>
 
         <section class="about row">
             <div class="col-lg-6 side-by-side-wrapper">
@@ -208,9 +209,6 @@ <h1>Contactos</h1>
             </div>
 
             <i class="material-icons menu-user" id="loginBtn">person</i>
-            <a href="https://github.com/conceptree" target="_blank">
-                <i class="menu-github fa fa-github" aria-hidden="true"></i>
-            </a>
 
             <nav></nav>
 
@@ -221,7 +219,8 @@ <h1>Contactos</h1>
                 <label>User Name</label>
                 <input name="user" type="email" placeholder="Email..." />
                 <label>Password</label>
-                <input name="password" type="password" placeholder="" />
+                <input name="password" type="password" placeholder="Password..." />
+                <a>Forgot password?</a>
                 <button name="login" type="button">Login</button>
             </form>
             <div class="sign-in">Dont have an account?</div>

diff --git a/js/webpage.js b/js/webpage.js
@@ -1,4 +1,3 @@
-"use strict";
 function webpageJS() {
   var self = this;
   var menu = document.getElementsByClassName("menu-nav")[0];
@@ -9,6 +8,8 @@ function webpageJS() {
   var loginWindow = document.getElementsByClassName("login-window")[0];
   var mainWrapper = document.getElementsByClassName("main-wrapper")[0];
   var downButton = document.getElementById("downBtn");
+  var logo = document.getElementById("logo");
+
   var menuBtnsList = [
     { id: "homeBtn", content: "Home" },
     { id: "aboutBtn", content: "Sobre" },

diff --git a/node_modules/body-parser/package.json b/node_modules/body-parser/package.json