adds a landing page which gives an overview of the tool
- landing page shows two images of google calendar and tizen watch and how the calendars corelate - routes redesigned to fit this landing page - redesign of coloring in css
This commit is contained in:
		
							
								
								
									
										11
									
								
								server/template/base_navigation.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								server/template/base_navigation.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,11 @@
 | 
			
		||||
 | 
			
		||||
<div class="navigation" id="navigation">
 | 
			
		||||
    <a href="/"><div class='primeblue'>Longidute</div></a>
 | 
			
		||||
    <div class="navigation_rightside">
 | 
			
		||||
        <a href="/login">Log In</a>
 | 
			
		||||
        <a href="/register">Sign up</a>
 | 
			
		||||
    </div>
 | 
			
		||||
    <a href="javascript:void(0);" class="icon" onclick="menuBars()">
 | 
			
		||||
        <i class="fa fa-bars"></i>
 | 
			
		||||
    </a>
 | 
			
		||||
</div>
 | 
			
		||||
@@ -2,6 +2,8 @@
 | 
			
		||||
 | 
			
		||||
{% block content %}
 | 
			
		||||
 | 
			
		||||
{% include "base_navigation.html" %}
 | 
			
		||||
 | 
			
		||||
<div class="banner">
 | 
			
		||||
    <h1 class="title">Longitude</h1>
 | 
			
		||||
    <h5> A calendar watchface</h5>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,25 @@
 | 
			
		||||
{% extends "base.html" %}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
{% block content %}
 | 
			
		||||
    <h1>Register</h1>
 | 
			
		||||
 | 
			
		||||
{% include "base_navigation.html" %}
 | 
			
		||||
 | 
			
		||||
    <!--Google Login-->
 | 
			
		||||
    <div class="center-align">
 | 
			
		||||
    <div class="col s12 m6 offset-m3 center-align"  style=" margin: 5px;">
 | 
			
		||||
        <a class="oauth-container btn darken-4 white black-text" href="/login/google" style="text-transform:none">
 | 
			
		||||
            <div class="left">
 | 
			
		||||
                <img width="20px" style="margin-top:7px; margin-right:8px" alt="Google sign-in" 
 | 
			
		||||
                    src="https://upload.wikimedia.org/wikipedia/commons/thumb/5/53/Google_%22G%22_Logo.svg/512px-Google_%22G%22_Logo.svg.png" />
 | 
			
		||||
            </div class="login_google">
 | 
			
		||||
            <div class="login_google">Register with Google</div>
 | 
			
		||||
        </a>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="container">
 | 
			
		||||
    <div class=login_email>Register with Email</div>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="container">
 | 
			
		||||
    <form action="" method="post">
 | 
			
		||||
        {{ form.hidden_tag() }}
 | 
			
		||||
        <p>
 | 
			
		||||
@@ -34,4 +52,11 @@
 | 
			
		||||
        </p>
 | 
			
		||||
        <p>{{ form.submit() }}</p>
 | 
			
		||||
    </form>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 | 
			
		||||
    </div>
 | 
			
		||||
<!-- Compiled and minified CSS -->
 | 
			
		||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css">
 | 
			
		||||
 | 
			
		||||
<!-- Compiled and minified JavaScript -->
 | 
			
		||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
 | 
			
		||||
{% endblock %}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										33
									
								
								server/template/startpage.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								server/template/startpage.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,33 @@
 | 
			
		||||
{% extends "base.html" %}
 | 
			
		||||
 | 
			
		||||
{% block content %}
 | 
			
		||||
 | 
			
		||||
{% include "base_navigation.html" %}
 | 
			
		||||
 | 
			
		||||
<div class="banner">
 | 
			
		||||
    <div class="title primeblue">Longitude Calendar</div>
 | 
			
		||||
    <h4 class="subtitle">your day on your wrist</h4>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
<div class="grayblock horizontal">
 | 
			
		||||
    <div class="content padded">
 | 
			
		||||
        <div style='margin: 1rem'>
 | 
			
		||||
            Connect your <img src='/static/res/googlelogo.png' style='height: 2.2rem; vertical-align:middle; padding-Bottom: 0.1rem'/> Calendar...
 | 
			
		||||
        </div>
 | 
			
		||||
        <img class="image" src='/static/res/calendar.svg'/>
 | 
			
		||||
    </div>
 | 
			
		||||
    <div class="content padded">
 | 
			
		||||
        <div style='margin: 1rem'>
 | 
			
		||||
            ...with your <img src='/static/res/tizenlogo.png' style='height: 2rem; vertical-align:middle; padding-Bottom:0.3rem;'/> Watchface
 | 
			
		||||
        </div>
 | 
			
		||||
        <img class="image" src='/static/res/watchface.svg'/>
 | 
			
		||||
    </div>
 | 
			
		||||
</div>
 | 
			
		||||
 | 
			
		||||
<!-- Compiled and minified CSS -->
 | 
			
		||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css">
 | 
			
		||||
 | 
			
		||||
<!-- Compiled and minified JavaScript -->
 | 
			
		||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
 | 
			
		||||
 | 
			
		||||
{% endblock %}
 | 
			
		||||
		Reference in New Issue
	
	Block a user