Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Register login design #6

Merged
merged 4 commits into from
Jul 26, 2018
Merged

Register login design #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c80838
register design
aboud20-meet Jul 26, 2018
482a529
Merge branch 'master' of github.com:zain18-meet/Roots into Register_l…
aboud20-meet Jul 26, 2018
23e0054
design
aboud20-meet Jul 26, 2018
bfc98f1
Merge branch 'master' into Register_login_design
zainalqalawi Jul 26, 2018
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
90 changes: 88 additions & 2 deletions project/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,89 @@
h1 {
color: blue;
.fixed-bg {
background-attachment: fixed;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
}

form, input {

-webkit-appearance: textfield;

background-color: #D9DBDC;

cursor: text;

padding: 10px 10px;

border-width: 0px;

border-style: inset;

border-color: #D9DBDC;

border-image: initial;

border-radius: 7px;

}



form, input, textarea, select, button {

text-rendering: auto;

color: white;

letter-spacing: normal;

word-spacing: normal;

text-transform: none;

text-indent: 0px;

text-shadow: none;

display: inline-block;

text-align: start;

margin: 0em;

font: 400 13.3333px Arial;

}



form, input, textarea, select, button, meter, progress {

-webkit-writing-mode: horizontal-tb !important;

}



.button {

background-color: #1C6E8C;

border: none;

color: white;

padding: 6px 60px;

text-align: center;

text-decoration: none;

display: inline-block;

font-size: 20px;

cursor: pointer;

border-radius:7px;
}
Binary file added project/static/pictures/Login_Background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 coverphoto.jpg → project/static/pictures/coverphoto.jpg
View file
Open in desktop
File renamed without changes
0 logo.jpg → project/static/pictures/logo.jpg
View file
Open in desktop
File renamed without changes
0 project/static/profile.png → project/static/pictures/profile.png
View file
Open in desktop
File renamed without changes
Binary file added project/static/pictures/register_bg.PNG
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions project/templates/apply.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{% extends "layout.html" %}
{% block content %}

<!DOCTYPE html>
<html>
<head>
<title>story teller</title>
<h1>Become A StoryTeller</h1>
</head>
<body>

Hi {{ current_user.name }},
Expand Down Expand Up @@ -72,5 +66,5 @@ <h4>add image url</h4>

</form>
</body>
</html>

{% endblock %}
4 changes: 4 additions & 0 deletions project/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
<title>Hello</title>
<link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
<link rel=stylesheet type=text/css href="{{ url_for('static', filename='css/style.css') }}">

<meta name="viewport" content="width=device-width, initial-scale=1">

<script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/script.js') }}"></script>
</head>

<body>

current user: {{ current_user.name }}

<!-- child template -->
{% block content %}
{% endblock %}
Expand Down
14 changes: 9 additions & 5 deletions project/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
{% extends "layout.html" %}
{% block content %}



<body class="fixed-bg" background="{{ url_for('static', filename='pictures/Login_Background.png') }}">

<center>
<div class="add-user">

<div class="page-header">

<h2>Log in</h2>

</div>

<form action="{{ url_for('users.login') }}" method="post">

{{ form.csrf_token }}
{{ form.email(placeholder="email") }}
{{ form.password(placeholder="Password") }}
<!-- <input type="email" name = "email" placeholder="email">
<br>
<input type="password" name = "password" placeholder="password" >
<br> -->
<button class="btn btn-sm btn-success" type="submit">Log in</button>
<button class="button" type="submit">Log in</button>
</form>

</div>

</center>
</body>
{% endblock %}
33 changes: 17 additions & 16 deletions project/templates/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
{% extends "layout.html" %}
{% block content %}

<div class="add-user">

<div class="page-header">

<h2>Register New User</h2>

</div>

<form action="{{ url_for('users.register') }}" method="post">
{{ form.csrf_token }}
{{ form.email(placeholder="Email Adress") }}
{{ form.name(placeholder="Full Name") }}

<body>

<div class="add-user">

<div class="page-header">

<h2>Register New User</h2>
</div>
<form action="{{ url_for('users.register') }}" method="post">

{{ form.csrf_token }}
{{ form.email(placeholder="Email Adress") }}
{{ form.name(placeholder="Full Name") }}
<!-- <input type="text" name = "name" placeholder="Name+Surname" required>
<br>
<input type="email" name = "email" placeholder="email" required>
<br>
<input type="password" name = "password" placeholder="password" required>
<br> -->
{{ form.password(placeholder="Password") }}
{{ form.confirm(placeholder="Confirm Password") }}
{{ form.password(placeholder="Password") }}
{{ form.confirm(placeholder="Confirm Password") }}
<button class="btn btn-sm btn-success" type="submit">Register User</button>
</form>

</div>

</body>
{% endblock %}