Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Design 3.0 #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed public/imgs/book.jpeg
Binary file not shown.
Binary file added public/imgs/searchicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions public/styles/feed.css
Original file line number Diff line number Diff line change
@@ -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;
}
Empty file added public/styles/feed.css~
Empty file.
97 changes: 97 additions & 0 deletions public/styles/home.css
Original file line number Diff line number Diff line change
@@ -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;
}

<style>
/* Style The Dropdown Button */
.dropbtn {
background-color: #4CAF50;
color: white;
padding: 16px;
font-size: 16px;
border: none;
cursor: pointer;
}

/* The container <div> - needed to position the dropdown content */
.dropdown {
position: relative;
display: inline-block;
}

/* Dropdown Content (Hidden by Default) */
.dropdown-content {
display: none;
position: absolute;
background-color: #f9f9f9;
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
}

/* Links inside the dropdown */
.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}

/* Change color of dropdown links on hover */
.dropdown-content a:hover {background-color: #f1f1f1}

/* Show the dropdown menu on hover */
.dropdown:hover .dropdown-content {
display: block;
}

/* Change the background color of the dropdown button when the dropdown content is shown */
.dropdown:hover .dropbtn {
background-color: #3e8e41;
}
</style>

<div class="dropdown">
<button class="dropbtn">Dropdown</button>
<div class="dropdown-content">
<a href="#">Link 1</a>
<a href="#">Link 2</a>
<a href="#">Link 3</a>
</div>
</div>
24 changes: 24 additions & 0 deletions public/styles/home.css~
Original file line number Diff line number Diff line change
@@ -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;
}
60 changes: 60 additions & 0 deletions public/styles/login.css
Original file line number Diff line number Diff line change
@@ -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;
}
Empty file added public/styles/login.css~
Empty file.
1 change: 0 additions & 1 deletion public/styles/register.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ li a {
text-decoration: none;
}

/* Change the link color to #111 (black) on hover */
li a:hover {
background-color: #111;
}
69 changes: 69 additions & 0 deletions public/styles/register.css~
Original file line number Diff line number Diff line change
@@ -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;
}
9 changes: 9 additions & 0 deletions views/feed.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,14 @@
<a href="/"> Back to main </a>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="scripts/main.js"></script>

<ul>
<li><a href="/">Home</a></li>
<li><a href="/Login">Login</a></li>
<li><a href="/Register">Register</a></li>
<li><a href="/donate">Donate</a></li>
<li><a href="/Vote">Vote</a></a></li>
</ul>

</body>
</html>
34 changes: 34 additions & 0 deletions views/feed.ejs~
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html lang="de" dir="ltr">
<head>
<meta charset="utf-8">
<title>DemNet</title>
</head>
<body>
<h2> Your personal feed </h2>
<p> your personal area </p>
<div id='app'>
<% if( feed ) { %>
<% feed.forEach( ( post ) => { %>
<a href="<%= post.href %>">
<h3> <%= post.title %> </h3>
<p> <%= post.description %> </p>
</a>
<% }); %>
<% } %>
</div>

<a href="/"> Back to main </a>
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<script src="scripts/main.js"></script>

<ul>
<li><a href="/">Home</a></li>
<li><a href="/Login">Login</a></li>
<li><a href="/feed">Feed</a></li>
<li><a href="/donate">Donate</a></li>
<li><a href="/vote">Vote</a></a></li>
</ul>

</body>
</html>
10 changes: 10 additions & 0 deletions views/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
<a href="/register"> Register </a> <br>
<!-- link to donactions -->
<a href="https://www.patreon.com/">Donations</a>

<ul>
<li><a href="register">Register</a></li>
<li><a href="/Login">Login</a></li>
<li><a href="/feed">Feed</a></li>
<li><a href="/donate">Donate</a></li>
<li><a href="/vote">Vote</a></a></li>
</ul>



</body>
</html>
19 changes: 19 additions & 0 deletions views/index.ejs~
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">
<head>
<meta charset="utf-8">
<title>DemNet</title>
</head>
<body>
<h2> The Democratic social network </h2>
<p> the area for all </p>

<a href="/login"> Login </a> <br>
<a href="/feed"> To your home </a> <br>
<a href="/register"> Register </a> <br>
<!-- link to donactions -->
<a href="https://www.patreon.com/">Donations</a>


</body>
</html>
Loading