diff --git a/public/imgs/book.jpeg b/public/imgs/book.jpeg deleted file mode 100644 index 28effc45..00000000 Binary files a/public/imgs/book.jpeg and /dev/null differ diff --git a/public/imgs/searchicon.png b/public/imgs/searchicon.png new file mode 100644 index 00000000..bfe5d5fd Binary files /dev/null and b/public/imgs/searchicon.png differ diff --git a/public/styles/feed.css b/public/styles/feed.css index e69de29b..6f546158 100644 --- a/public/styles/feed.css +++ b/public/styles/feed.css @@ -0,0 +1,24 @@ +ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; +} + +li { + float: left; +} + +li a { + display: block; + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + +/* Change the link color to #111 (black) on hover */ +li a:hover { + background-color: #111; +} \ No newline at end of file diff --git a/public/styles/feed.css~ b/public/styles/feed.css~ new file mode 100644 index 00000000..e69de29b diff --git a/public/styles/home.css b/public/styles/home.css index e69de29b..a90b281b 100644 --- a/public/styles/home.css +++ b/public/styles/home.css @@ -0,0 +1,97 @@ +ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; +} + +li { + float: left; +} + +li a { + display: block; + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + + +li a:hover { + background-color: #111; +} + +input[type=text] { + width: 130px; + box-sizing: border-box; + border: 2px solid #ccc; + border-radius: 4px; + font-size: 16px; + background-color: white; + background-image: url('searchicon.png'); + background-position: 10px 10px; + background-repeat: no-repeat; + padding: 12px 20px 12px 40px; + -webkit-transition: width 0.4s ease-in-out; + transition: width 0.4s ease-in-out; +} + + + + \ No newline at end of file diff --git a/public/styles/home.css~ b/public/styles/home.css~ new file mode 100644 index 00000000..eb90358e --- /dev/null +++ b/public/styles/home.css~ @@ -0,0 +1,24 @@ +ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; +} + +li { + float: left; +} + +li a { + display: block; + color: white; + text-align: center; + padding: 14px 16px; + text-decoration: none; +} + + +li a:hover { + background-color: #111; +} \ No newline at end of file diff --git a/public/styles/login.css b/public/styles/login.css index e69de29b..5fb2679a 100644 --- a/public/styles/login.css +++ b/public/styles/login.css @@ -0,0 +1,60 @@ +body { + background-color: white; +} + +form { + color:white; + background-color: #333; + margin-top: 10%; + margin-bottom: 10%; + padding-bottom: 1%; + margin-right: 40%; + margin-left: 40%; // pading + resize: none; +} + + +h2 { + color: #ffffff; + text-align: center; + padding-top: 10px; + margin-bottom: 10px; //problem +} + +p { + font-family: verdana; + font-size: 20px; +} + +body { +background-color: #a6a6a6; + background-position: center; + height: 1000px; + background-repeat: repeat; +} + +ul { + list-style-type: none; + position: fixed; + top: -1.5%; + left: -1.5%; + width: 100%; + overflow: hidden; + background-color: #333; +} + +li { + float: left; +} + +li a { + display: block; + color: white; + text-align: center; + padding: 25px 30px; + text-decoration: none; +} + +li a:hover { + background-color: #111; +} \ No newline at end of file diff --git a/public/styles/login.css~ b/public/styles/login.css~ new file mode 100644 index 00000000..e69de29b diff --git a/public/styles/register.css b/public/styles/register.css index 06a1114d..4ec70adf 100644 --- a/public/styles/register.css +++ b/public/styles/register.css @@ -63,7 +63,6 @@ li a { text-decoration: none; } -/* Change the link color to #111 (black) on hover */ li a:hover { background-color: #111; } diff --git a/public/styles/register.css~ b/public/styles/register.css~ new file mode 100644 index 00000000..06a1114d --- /dev/null +++ b/public/styles/register.css~ @@ -0,0 +1,69 @@ +body { + background-color: white; +} + +form { + color:white; + background-color: #333; + margin-top: 10%; + margin-bottom: 10%; + padding-bottom: 1%; + margin-right: 40%; + margin-left: 40%; // pading + resize: none; +} + +} + +#register { + padding-bottom: 50%; + padding-top: 50%; // problem +} + + + +h2 { + color: #ffffff; + text-align: center; + padding-top: 10px; + margin-bottom: 10px; //problem +} + +p { + font-family: verdana; + font-size: 20px; +} + +body { +background-color: #a6a6a6; + background-position: center; + height: 1000px; + background-repeat: repeat; +} + +ul { + list-style-type: none; + position: fixed; + top: -1.5%; + left: -1.5%; + width: 100%; + overflow: hidden; + background-color: #333; +} + +li { + float: left; +} + +li a { + display: block; + color: white; + text-align: center; + padding: 25px 30px; + text-decoration: none; +} + +/* Change the link color to #111 (black) on hover */ +li a:hover { + background-color: #111; +} diff --git a/views/feed.ejs b/views/feed.ejs index 5d172bd9..2d612e6c 100644 --- a/views/feed.ejs +++ b/views/feed.ejs @@ -21,5 +21,14 @@ Back to main + + + diff --git a/views/feed.ejs~ b/views/feed.ejs~ new file mode 100644 index 00000000..00dcf6c1 --- /dev/null +++ b/views/feed.ejs~ @@ -0,0 +1,34 @@ + + + + + DemNet + + +

Your personal feed

+

your personal area

+
+ <% if( feed ) { %> + <% feed.forEach( ( post ) => { %> + +

<%= post.title %>

+

<%= post.description %>

+
+ <% }); %> + <% } %> +
+ + Back to main + + + + + + + diff --git a/views/index.ejs b/views/index.ejs index f9a6a615..9faf781b 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -13,6 +13,16 @@ Register
Donations + + + + diff --git a/views/index.ejs~ b/views/index.ejs~ new file mode 100644 index 00000000..4d96e751 --- /dev/null +++ b/views/index.ejs~ @@ -0,0 +1,19 @@ + + + + + DemNet + + +

The Democratic social network

+

the area for all

+ + Login
+ To your home
+ Register
+ + Donations + + + + diff --git a/views/login.ejs b/views/login.ejs index 583bb389..203cdea1 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -5,7 +5,7 @@ DemNet -

your login

+

Login

Username:
@@ -14,5 +14,14 @@
+ + + diff --git a/views/login.ejs~ b/views/login.ejs~ new file mode 100644 index 00000000..3149e66a --- /dev/null +++ b/views/login.ejs~ @@ -0,0 +1,27 @@ + + + + + DemNet + + +

your login

+ +
+ Username:
+
+ Pasword:
+ + +
+ + + + + diff --git a/views/register.ejs b/views/register.ejs index d999325c..4deefbfd 100644 --- a/views/register.ejs +++ b/views/register.ejs @@ -22,7 +22,8 @@
  • Home
  • Login
  • Feed
  • -
  • Donate
  • +
  • Donate
  • +
  • Vote
  • diff --git a/views/register.ejs~ b/views/register.ejs~ new file mode 100644 index 00000000..d999325c --- /dev/null +++ b/views/register.ejs~ @@ -0,0 +1,29 @@ + + + + + DemNet + + + +
    +
    +

    your register for the democratic network

    + Name:
    +
    +
    + E-Mail:
    +
    + Password:
    +
    + Repeat:
    +
    + + + +