Removed useless css and pages, added base templates

This commit is contained in:
teras 2017-10-09 11:29:29 +03:00
parent 94b21c8492
commit 9401ef1b2d
29 changed files with 267 additions and 14423 deletions

View File

@ -12,7 +12,7 @@
</component> </component>
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Python 3.6.3 (C:\Users\Egert\AppData\Local\Programs\Python\Python36\python.exe)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.5.3 (/usr/bin/python3.5)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TemplatesService"> <component name="TemplatesService">

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6.3 (C:\Users\Egert\AppData\Local\Programs\Python\Python36\python.exe)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.3 (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
</project> </project>

View File

@ -24,9 +24,9 @@ from challenges import views
urlpatterns = [ urlpatterns = [
url(r'^$', views.index), url(r'^$', views.index),
url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls),
url(r'^login/', views.login_view), #url(r'^login/', views.login_view),
url(r'^logout/', views.logout_view), #url(r'^logout/', views.logout_view),
url(r'^register/', views.register), #url(r'^register/', views.register),
url(r'^challenge/(?P<id>[0-9]+)', views.challenge), url(r'^challenge/(?P<id>[0-9]+)', views.challenge),
url(r'^challenges/', views.challenges), url(r'^challenges/', views.challenges),
url(r'^halloffame/', views.hall_of_fame), url(r'^halloffame/', views.hall_of_fame),

View File

@ -1,31 +0,0 @@
/*!
* Start Bootstrap - 3 Col Portfolio (http://startbootstrap.com/template-overviews/3-col-portfolio)
* Copyright 2013-2017 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-3-col-portfolio/blob/master/LICENSE)
*/
body {
padding-top: 54px;
font-family: "Arial Black", Gadget, sans-serif;
}
@media (min-width: 992px) {
body {
padding-top: 56px;
}
}
.portfolio-item {
margin-bottom: 30px;
}
.pagination {
margin-bottom: 30px;
}
.card {
width:80%;
}
.achievements{
border:5px solid gray;
}

View File

@ -27,11 +27,7 @@ footer, .map {
margin-top: 30px; margin-top: 30px;
} }
a:link { a:link, a:visited {
color: white;
}
a:visited {
color: white; color: white;
} }
@ -57,11 +53,15 @@ ul {
height: auto; height: auto;
} }
.namelink, .namelink:visited { .darklink:link, .darklink:visited {
color: black; color: black;
} }
.namelink:hover { .darklink:hover {
color: #34495e;
}
.darklink:active {
color: #3498db; color: #3498db;
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,330 +0,0 @@
html {
box-sizing: border-box;
font-family: sans-serif;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-ms-overflow-style: scrollbar;
-webkit-tap-highlight-color: transparent;
}
*,
*::before,
*::after {
box-sizing: inherit;
}
@-ms-viewport {
width: device-width;
}
article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
display: block;
}
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
font-size: 1rem;
font-weight: normal;
line-height: 1.5;
color: #212529;
background-color: #fff;
}
[tabindex="-1"]:focus {
outline: none !important;
}
hr {
box-sizing: content-box;
height: 0;
overflow: visible;
}
h1, h2, h3, h4, h5, h6 {
margin-top: 0;
margin-bottom: .5rem;
}
p {
margin-top: 0;
margin-bottom: 1rem;
}
abbr[title],
abbr[data-original-title] {
text-decoration: underline;
-webkit-text-decoration: underline dotted;
text-decoration: underline dotted;
cursor: help;
border-bottom: 0;
}
address {
margin-bottom: 1rem;
font-style: normal;
line-height: inherit;
}
ol,
ul,
dl {
margin-top: 0;
margin-bottom: 1rem;
}
ol ol,
ul ul,
ol ul,
ul ol {
margin-bottom: 0;
}
dt {
font-weight: bold;
}
dd {
margin-bottom: .5rem;
margin-left: 0;
}
blockquote {
margin: 0 0 1rem;
}
dfn {
font-style: italic;
}
b,
strong {
font-weight: bolder;
}
small {
font-size: 80%;
}
sub,
sup {
position: relative;
font-size: 75%;
line-height: 0;
vertical-align: baseline;
}
sub {
bottom: -.25em;
}
sup {
top: -.5em;
}
a {
color: #007bff;
text-decoration: none;
background-color: transparent;
-webkit-text-decoration-skip: objects;
}
a:hover {
color: #0056b3;
text-decoration: underline;
}
a:not([href]):not([tabindex]) {
color: inherit;
text-decoration: none;
}
a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
color: inherit;
text-decoration: none;
}
a:not([href]):not([tabindex]):focus {
outline: 0;
}
pre,
code,
kbd,
samp {
font-family: monospace, monospace;
font-size: 1em;
}
pre {
margin-top: 0;
margin-bottom: 1rem;
overflow: auto;
}
figure {
margin: 0 0 1rem;
}
img {
vertical-align: middle;
border-style: none;
}
svg:not(:root) {
overflow: hidden;
}
a,
area,
button,
[role="button"],
input,
label,
select,
summary,
textarea {
-ms-touch-action: manipulation;
touch-action: manipulation;
}
table {
border-collapse: collapse;
}
caption {
padding-top: 0.75rem;
padding-bottom: 0.75rem;
color: #868e96;
text-align: left;
caption-side: bottom;
}
th {
text-align: left;
}
label {
display: inline-block;
margin-bottom: .5rem;
}
button:focus {
outline: 1px dotted;
outline: 5px auto -webkit-focus-ring-color;
}
input,
button,
select,
optgroup,
textarea {
margin: 0;
font-family: inherit;
font-size: inherit;
line-height: inherit;
}
button,
input {
overflow: visible;
}
button,
select {
text-transform: none;
}
button,
html [type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
}
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
padding: 0;
border-style: none;
}
input[type="radio"],
input[type="checkbox"] {
box-sizing: border-box;
padding: 0;
}
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
-webkit-appearance: listbox;
}
textarea {
overflow: auto;
resize: vertical;
}
fieldset {
min-width: 0;
padding: 0;
margin: 0;
border: 0;
}
legend {
display: block;
width: 100%;
max-width: 100%;
padding: 0;
margin-bottom: .5rem;
font-size: 1.5rem;
line-height: inherit;
color: inherit;
white-space: normal;
}
progress {
vertical-align: baseline;
}
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
height: auto;
}
[type="search"] {
outline-offset: -2px;
-webkit-appearance: none;
}
[type="search"]::-webkit-search-cancel-button,
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
}
::-webkit-file-upload-button {
font: inherit;
-webkit-appearance: button;
}
output {
display: inline-block;
}
summary {
display: list-item;
}
template {
display: none;
}
[hidden] {
display: none !important;
}
/*# sourceMappingURL=bootstrap-reboot.css.map */

File diff suppressed because one or more lines are too long

View File

@ -1,2 +0,0 @@
html{box-sizing:border-box;font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}*,::after,::before{box-sizing:inherit}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input,label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#868e96;text-align:left;caption-side:bottom}th{text-align:left}label{display:inline-block;margin-bottom:.5rem}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}
/*# sourceMappingURL=bootstrap-reboot.min.css.map */

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -72,14 +72,10 @@ ul {
} }
#svgtext{ #svgtext{
font-size: 20pt; font-size: 14pt;
} }
a:link { a:link, a:visited {
color: white;
}
a:visited {
color: white; color: white;
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

13
templates/base.html Normal file
View File

@ -0,0 +1,13 @@
<head>
<link rel="stylesheet" href="/static/css/app.css">
</head>
{% extends 'base_footer.html' %}
{% block base_footer %}
<div class="header section center-align">
<h1 class="section darken-2 z-depth-1 white-text"><a href="/">k-space.ee</a></h1>
</div>
{% block content %}
{% endblock %}
{% endblock %}

View File

@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>k-space</title>
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/static/css/materialize.min.css">
</head>
<body>
<div id="container" class="grey lighten-4">
{% block base_footer %}
{% endblock %}
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">
<i class="material-icons">phone</i> Phone: +372 5332 9412
<br>
<i class="material-icons">email</i> Email: lauri.vosandi@gmail.com
</p>
<h5 class="white-text">Sponsors</h5>
<p class="grey-text text-lighten-4">
We have more than 10 companies supporting us financially and by equipment
</br>
<a class="highlight" href="#">I want to become a sponsor</a>
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Links</h5>
<ul>
<li><a class="highlight" href="#!">Mission</a></li>
<li><a class="highlight" href="#!">People</a></li>
</ul>
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1015.5421689053422!2d24.659768056865254!3d59.39830538168295!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x469295abf80677bd%3A0x89a6e8a5671f608b!2sAkadeemia+tee+21%2F1%2C+12618+Tallinn!5e0!3m2!1set!2see!4v1507405326247"
width="350" height="200" frameborder="0" style="border:0" allowfullscreen></iframe>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2017 k-space
<!-- <a class="grey-text text-lighten-4 right" href="#!">More Links</a> -->
</div>
</div>
</footer>
</div>
</body>
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script>
</html>

View File

@ -1,126 +1,55 @@
<!DOCTYPE html> {% extends 'base.html' %}
<html> {% block content %}
<div class="row container">
<head> <div class="row">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <div class="col m8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <h3 class="">{{ challenge.name }}</h3>
<title>k-space</title>
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/static/css/materialize.min.css">
<link rel="stylesheet" href="/static/css/app.css">
</head>
<body>
<div id="container" class="grey lighten-4">
<div class="header section center-align">
<h1 class="section darken-2 z-depth-1 white-text"><a href="/">k-space.ee</a></h1>
</div>
<div class="row container">
<div class="row">
<div class="col m8">
<h3 class="">{{ challenge.name }}</h3>
<div>
{% for tag in challenge.tags.all %}
<div class="chip">{{ tag.name }}</div>
{% endfor %}
</div>
<p style="">{{ challenge.description }}
</p>
<div class="section">
<p>I am usually at k-space on weekends. Come and take a look.</p>
<div class="valign-wrapper"><i class="material-icons">email</i>&nbsp; eric.cartman@email.com</div>
<br>
<div class="valign-wrapper"><i class="material-icons">phone</i>&nbsp;55 55 5555</div>
</div>
<div>
{% for tag in challenge.tags.all %}
<div class="chip">{{ tag.name }}</div>
{% endfor %}
</div> </div>
<div class="col m4"> <p style="">{{ challenge.description }}
</p>
<ul class="collection"> <div class="section">
<li class="collection-item avatar"> <p>I am usually at k-space on weekends. Come and take a look.</p>
<img src="https://vignette.wikia.nocookie.net/southpark/images/0/0d/1a.jpg/revision/latest/scale-to-width-down/310?cb=20100826182516" alt="" class="circle"> <div class="valign-wrapper"><i class="material-icons">email</i>&nbsp; eric.cartman@email.com</div>
<span class="title">Author</span> <br>
<p><b>{{ challenge.creator.username }}</b></p> <div class="valign-wrapper"><i class="material-icons">phone</i>&nbsp;55 55 5555</div>
</li>
<li class="collection-item">
<span class="title">Programming</span>
</li>
<li class="collection-item">
<span class="title">Soldering</span>
</li>
</ul>
<ul class="collection with-header">
<li class="collection-header">
<span class="title"><b>What we need</b></span>
</li>
<li class="collection-item">
<span class="">CNC bench experience</span>
</li>
<li class="collection-item">
<span class="title">Screwdriver</span>
</li>
</ul>
</div>
</div>
</div>
<!-- dashboard custom -->
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">
<i class="material-icons">phone</i>&nbsp;Call Lauri 55 55 5555
</p>
<h5 class="white-text">Sponsors</h5>
<p class="grey-text text-lighten-4">
We have more than 10 companies supporting us financially and by equipment
</br>
<a class="highlight" href="#">I want to become a sponsor</a>
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Links</h5>
<ul>
<li><a class="highlight" href="#!">Location</a></li>
<li><a class="highlight" href="#!">Mission</a></li>
<li><a class="highlight" href="#!">People</a></li>
</ul>
</div>
</div> </div>
</div> </div>
<div class="footer-copyright">
<div class="container"> <div class="col m4">
© 2017 k-space <ul class="collection">
<!-- <a class="grey-text text-lighten-4 right" href="#!">More Links</a> --> <li class="collection-item avatar">
</div> <img src="https://vignette.wikia.nocookie.net/southpark/images/0/0d/1a.jpg/revision/latest/scale-to-width-down/310?cb=20100826182516"
alt="" class="circle">
<span class="title">Author</span>
<p><b>{{ challenge.creator.username }}</b></p>
</li>
<li class="collection-item">
<span class="title">Programming</span>
</li>
<li class="collection-item">
<span class="title">Soldering</span>
</li>
</ul>
<ul class="collection with-header">
<li class="collection-header">
<span class="title"><b>What we need</b></span>
</li>
<li class="collection-item">
<span class="">CNC bench experience</span>
</li>
<li class="collection-item">
<span class="title">Screwdriver</span>
</li>
</ul>
</div> </div>
</footer>
</div> </div>
</div> </div>
{% endblock %}
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script>
</body>
</html>

View File

@ -1,104 +1,40 @@
<!DOCTYPE html> {% extends 'base.html' %}
<html> {% block content %}
<div class="row container">
<head> <div class="section slogan">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <h2 class="center-align" style="font-weight:bold">Challenges<br></h2>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<title>k-space</title>
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/static/css/materialize.min.css">
<link rel="stylesheet" href="/static/css/app.css">
</head>
<body>
<div id="container" class="grey lighten-4">
<div class="header section center-align">
<h1 class="section darken-2 z-depth-1 white-text"><a href="/">k-space.ee</a></h1>
</div> </div>
</div>
<!-- dashboard custom --> <div class="row container challenges">
<div class="row">
<div class="row container"> {% for challenge in challenges %}
<div class="section slogan"> <div class="col s12 m4">
<h2 class="center-align" style="font-weight:bold">Challenges<br></h2> <div class="card" style="height:350px;">
</div> <div class="card-content">
</div> <div class="row" style="height:210px;">
<div class="col s12 m12">
<div class="row container challenges"> <div class="card-title"><b>{{ challenge.name }}</b></div>
<div class="row"> <p style="text-align: justify; max-height: 120px; overflow: auto;">{{ challenge.description }}</p>
{% for challenge in challenges %} <div style="padding-top: 15px;">
<div class="col s12 m4"> {% for tag in challenge.tags.all %}
<div class="card" style="height:350px;"> <div class="chip">{{ tag.name }}</div>
<div class="card-content"> {% endfor %}
<div class="row" style="height:210px;"> </div>
<div class="col s12 m12"> </div>
<div class="card-title"><b>{{ challenge.name }}</b></div> </div>
<p style="text-align: justify; max-height: 120px; overflow: auto;">{{ challenge.description }}</p> </br>
<div style="padding-top: 15px;"> <div class="row">
{% for tag in challenge.tags.all %} <div class="col s12 m12">
<div class="chip">{{ tag.name }}</div> <div class="center-align">
{% endfor %} <a href="/challenge/{{ challenge.id }}" class="btn-large">I can do it</a>
</div> </div>
</div>
</div>
</br>
<div class="row">
<div class="col s12 m12">
<div class="center-align">
<a href="/challenge/{{ challenge.id }}" class="btn-large">I can do it</a>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %} </div>
</div> </div>
{% endfor %}
</div> </div>
<!-- dashboard custom -->
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">
<i class="material-icons">phone</i>&nbsp;Call Lauri 55 55 5555
</p>
<h5 class="white-text">Sponsors</h5>
<p class="grey-text text-lighten-4">
We have more than 10 companies supporting us financially and by equipment
</br>
<a class="highlight" href="#">I want to become a sponsor</a>
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Links</h5>
<ul>
<li><a class="highlight" href="#!">Location</a></li>
<li><a class="highlight" href="#!">Mission</a></li>
<li><a class="highlight" href="#!">People</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2017 k-space
<!-- <a class="grey-text text-lighten-4 right" href="#!">More Links</a> -->
</div>
</div>
</footer>
</div> </div>
{% endblock %}
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script>
</body>
</html>

View File

@ -1,110 +1,48 @@
<!DOCTYPE html> {% extends 'base.html' %}
<html> {% block content %}
<div class="row container">
<head> <div class="section slogan">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <h2 class="center-align" style="font-weight:bold">Hall of Fame<br></h2>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" />
<title>k-space</title>
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/static/css/materialize.min.css">
<link rel="stylesheet" href="/static/css/app.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
</head>
<body>
<div id="container" class="grey lighten-4">
<div class="header section center-align">
<h1 class="section z-depth-1 white-text"><a href="/">k-space.ee</a></h1>
</div> </div>
</div>
<!-- landing page custom --> <div class="row container section">
{% for user in users %}
<div class="row container"> <div class="col s12 m4">
<div class="section slogan"> <div class="section center-align">
<h2 class="center-align" style="font-weight:bold">Hall of Fame<br></h2> <div class="card">
</div> <div class="card-content white-text">
</div> <div class="card-image">
<a href="/profile/{{ user.username }}"><img src='/media/{{ user.profile.icon }}'></a>
<!-- ideas solution success --> </div>
<div class="row container section"> <h5 class="card-title" style="padding-top: 10px;color:black;"><a class='darklink'
{% for user in users %} href="/profile/{{ user.username }}"><b>{{ user.username }}</b></a>
<div class="col s12 m4"> </h5>
<div class="section center-align"> <div class="row">
<div class="card"> <div class="col s12 m1">
<div class="card-content white-text"> <i class="material-icons" style="font-size: 20px; padding-right: 5px; color: black">flash_on</i>
<div class="card-image">
<a href="/profile/{{ user.username }}"><img src='/media/{{ user.profile.icon }}'></a>
</div> </div>
<h5 class="card-title" style="padding-top: 10px;color:black;"><a class='namelink' href="/profile/{{ user.username }}"><b>{{ user.username }}</b></a></h5> <div class="col s12 m10">
<div class="row"> <div class="progress" style="background-color: #f1f1f1">
<div class="col s12 m1"> <div class="determinate" style="width: 70%; background-color:#ffc107;"></div>
<i class="material-icons" style="font-size: 20px; padding-right: 5px; color: black">flash_on</i>
</div>
<div class="col s12 m10">
<div class="progress" style="background-color: #f1f1f1">
<div class="determinate" style="width: 70%; background-color:#ffc107;"></div>
</div>
</div>
</div> </div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col s12 m1"> <div class="col s12 m1">
<i class="material-icons" style="font-size: 20px; padding-right: 5px; color: black">computer</i> <i class="material-icons" style="font-size: 20px; padding-right: 5px; color: black">computer</i>
</div> </div>
<div class="col s12 m10"> <div class="col s12 m10">
<div class="progress" style="background-color: #f1f1f1"> <div class="progress" style="background-color: #f1f1f1">
<div class="determinate" style="width: 70%; background-color:#3498db;"></div> <div class="determinate" style="width: 70%; background-color:#3498db;"></div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endfor %}
</div>
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">
<i class="material-icons">phone</i>&nbsp;Call Lauri 55 55 5555
</p>
<h5 class="white-text">Sponsors</h5>
<p class="grey-text text-lighten-4">
We have more than 10 companies supporting us financially and by equipment
</br>
<a class="highlight" href="#">I want to become a sponsor</a>
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Links</h5>
<ul>
<li><a class="highlight" href="#!">Location</a></li>
<li><a class="highlight" href="#!">Mission</a></li>
<li><a class="highlight" href="#!">People</a></li>
</ul>
</div>
</div>
</div> </div>
<div class="footer-copyright"> {% endfor %}
<div class="container">
© 2017 k-space
<!-- <a class="grey-text text-lighten-4 right" href="#!">More Links</a> -->
</div>
</div>
</footer>
</div> </div>
{% endblock %}
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script>
</body>
</html>

View File

@ -1,18 +1,9 @@
<!DOCTYPE html>
<html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
<title>k-space</title>
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/static/css/materialize.min.css">
<link rel="stylesheet" href="/static/css/index.css"> <link rel="stylesheet" href="/static/css/index.css">
</head> </head>
<body> {% extends 'base_footer.html' %}
<div id="container" class="grey lighten-4"> {% block base_footer %}
<div class="headerblock section"> <div class="headerblock section">
@ -110,7 +101,6 @@
</div> </div>
<div class="section map z-depth-1"> <div class="section map z-depth-1">
<div class="container white-text"> <div class="container white-text">
<h2 class="">We have</h2> <h2 class="">We have</h2>
<div class="row section"> <div class="row section">
@ -124,17 +114,17 @@
<div class="container white-text" id="svgtext" > <div class="container white-text" id="svgtext" >
<div class="row"> <div class="row">
<div class="col s1" style="font-size: 1.5vw;">Office 21m<sup>2</sup></div> <div class="col s1">Office 21m<sup>2</sup></div>
<div class="col s1" >&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1" style="font-size: 1.5vw;">Lockers</div> <div class="col s1">Lockers</div>
<div class="col s1">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1" style="font-size: 1.5vw;">Office 15m<sup>2</sup></div> <div class="col s1">Office 15m<sup>2</sup></div>
<div class="col s1">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1" style="font-size: 1.5vw;">More lockers</div> <div class="col s1">More lockers</div>
<div class="col s1">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1" style="font-size: 1.5vw;">Office 20m<sup>2</sup></div> <div class="col s1">Office 20m<sup>2</sup></div>
<div class="col s1">&nbsp;</div> <div class="col s1">&nbsp;</div>
</div> </div>
@ -254,16 +244,16 @@
<div class="container white-text" id="svgtext"> <div class="container white-text" id="svgtext">
<div class="row"> <div class="row">
<div class="col s1" style="font-size: 1.5vw;">Servers</div> <div class="col s1">Servers</div>
<div class="col s2" style="font-size: 1.5vw;">3D printers, lasercutter, soldering</div> <div class="col s2">3D printers, lasercutter, soldering</div>
<div class="col s2" style="font-size: 1.5vw;">CNC machine, saw, lathe, mill</div> <div class="col s2">CNC machine, saw, lathe, mill</div>
<div class="col s2" style="font-size: 1.5vw;">Kitchen, toilet, sauna</div> <div class="col s2">Kitchen, toilet, sauna</div>
<div class="col s1" style="font-size: 1.5vw;">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1" style="font-size: 1.5vw;">Meeting room</div> <div class="col s1">Meeting room</div>
<div class="col s1" style="font-size: 1.5vw;">Lounge</div> <div class="col s1">Lounge</div>
<div class="col s1" style="font-size: 1.5vw;">&nbsp;</div> <div class="col s1">&nbsp;</div>
<div class="col s1" style="font-size: 1.5vw;">&nbsp;</div> <div class="col s1">&nbsp;</div>
</div> </div>
</div> </div>
</div> </div>
@ -295,7 +285,7 @@
<div class="card-content"> <div class="card-content">
<div class="card-title">{{ challenge.name }}</div> <div class="card-title">{{ challenge.name }}</div>
<p style="text-align: justify; max-height: 160px; overflow: auto;">{{ challenge.description }}</p> <p style="text-align: justify; max-height: 120px; overflow: auto;">{{ challenge.description }}</p>
</br> </br>
<div> <div>
{% for tag in challenge.tags.all %} {% for tag in challenge.tags.all %}
@ -317,48 +307,4 @@
</div> </div>
<br> <br>
{% endblock %}
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">
<i class="material-icons">phone</i>&nbsp;Call Lauri 55 55 5555
</p>
<h5 class="white-text">Sponsors</h5>
<p class="grey-text text-lighten-4">
We have more than 10 companies supporting us financially and by equipment
</br>
<a class="highlight" href="#">I want to become a sponsor</a>
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Links</h5>
<ul>
<li><a class="highlight" href="#!">Mission</a></li>
<li><a class="highlight" href="#!">People</a></li>
</ul>
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d1015.5421689053422!2d24.659768056865254!3d59.39830538168295!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x469295abf80677bd%3A0x89a6e8a5671f608b!2sAkadeemia+tee+21%2F1%2C+12618+Tallinn!5e0!3m2!1set!2see!4v1507405326247"
width="350" height="200" frameborder="0" style="border:0" allowfullscreen></iframe>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2017 k-space
<!-- <a class="grey-text text-lighten-4 right" href="#!">More Links</a> -->
</div>
</div>
</footer>
</div>
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script>
</body>
</html>

View File

@ -1,79 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='http://fonts.googleapis.com/css?family=Raleway:400,300' rel='stylesheet' type='text/css'>
<title>login</title>
<link href="../static/css/bootstrap.min.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<style type="text/css">
#teade{
text-align: center;
}
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #eee;
}
.form-signin {
max-width: 330px;
padding: 15px;
margin: 0 auto;
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin .checkbox {
font-weight: normal;
}
.form-signin .form-control {
position: relative;
height: auto;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
.form-signin .form-control:focus {
z-index: 2;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
</style>
</head>
<body>
<div class="container">
<form class="form-signin" id="reg" action="/login/" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading"><strong>k-space login</strong></h2>
<label for="user" class="sr-only">user</label>
<input type="text" name="user" id="user" class="form-control" placeholder="user" required autofocus>
<label for="pw" class="sr-only">Password</label>
<input type="password" name="pw" id="pw" class="form-control" placeholder="password" required>
<button class="btn btn-lg btn-primary btn-block" type="submit">sign in</button>
</form>
</div>
</body>
</html>

View File

@ -1,116 +1,56 @@
<!DOCTYPE html> {% extends 'base.html' %}
<html> {% block content %}
<div class="row container section">
<head> <div class="col s12 m12 l12">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <h2 class="header center-align">{{ user.username }}</h2>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0" /> <div class="card horizontal" style="width:100%;">
<title>k-space</title> <div class="card-image">
<link href="https://fonts.googleapis.com/css?family=Orbitron" rel="stylesheet"> <img src="/media/{{ user.profile.icon }}">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="/static/css/materialize.min.css">
<link rel="stylesheet" href="/static/css/app.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
</head>
<body>
<div id="container" class="grey lighten-4">
<div class="header section center-align">
<h1 class="section z-depth-1 white-text"><a href="/">k-space.ee</a></h1>
</div> </div>
<div class="card-stacked">
<div class="row container section"> <div class="card-content">
<div class="col s12 m12 l12"> <span class="card-title" style="font-weight: bold">Description</span>
<h2 class="header center-align">{{ user.username }}</h2> <p style="font-size: 18px;text-align: justify">I am a very simple man. I am good at processing small bits of
<div class="card horizontal" style="width:100%;"> information.
<div class="card-image">
<img src="/media/{{ user.profile.icon }}">
</div>
<div class="card-stacked">
<div class="card-content">
<span class="card-title" style="font-weight: bold">Description</span>
<p style="font-size: 18px;text-align: justify">I am a very simple man. I am good at processing small bits of information.
I am convenient because I require little food to function effectively.</p><br> I am convenient because I require little food to function effectively.</p><br>
<span class="card-title" style="font-weight: bold">Challenges completed</span> <span class="card-title" style="font-weight: bold">Challenges completed</span>
<ul> <ul>
{% for challenge in challenges %} {% for challenge in challenges %}
<li><a class="grey-text text-lighten-3" href="/challenge/{{ challenge.challenge.id }}">{{ challenge.challenge.name }}</a></li> <li><a class="darklink"
{% empty %} href="/challenge/{{ challenge.challenge.id }}">{{ challenge.challenge.name }}</a></li>
<li>User has not completed any challenges</li> {% empty %}
{% endfor %} <li>User has not completed any challenges</li>
</ul> {% endfor %}
</ul>
</div>
<div class="row">
<div class="col s1 m1 l1">
<i class="material-icons" style="font-size: 20px;padding-left:50%;">flash_on</i>
</div>
<div class="col s9 m9 l10">
<div class="progress" style="background-color: #f1f1f1;width:100%;">
<div class="determinate" style="width: 30%; background-color:#ffc107;"></div>
</div>
</div>
<div class="col s1 m1 l1">
<span style="color: #ffc107;">3</span>
</div>
</div>
<div class="row">
<div class="col s1 m1 l1">
<i class="material-icons" style="font-size: 20px;padding-left:50%">computer</i>
</div>
<div class="col s9 m19 l10">
<div class="progress" style="background-color: #f1f1f1;width:100%">
<div class="determinate" style="width: 70%; background-color:#3498db;"></div>
</div>
</div>
<div class="col s1 m1 l1">
<span style="color:#3498db;">7</span>
</div> </div>
<div class="row">
<div class="col s1 m1 l1">
<i class="material-icons" style="font-size: 20px;padding-left:50%;">flash_on</i>
</div>
<div class="col s9 m9 l10">
<div class="progress" style="background-color: #f1f1f1;width:100%;">
<div class="determinate" style="width: 30%; background-color:#ffc107;"></div>
</div>
</div>
<div class="col s1 m1 l1" >
<span style="color: #ffc107;">3</span>
</div>
</div>
<div class="row">
<div class="col s1 m1 l1">
<i class="material-icons" style="font-size: 20px;padding-left:50%">computer</i>
</div>
<div class="col s9 m19 l10">
<div class="progress" style="background-color: #f1f1f1;width:100%">
<div class="determinate" style="width: 70%; background-color:#3498db;"></div>
</div>
</div>
<div class="col s1 m1 l1">
<span style="color:#3498db;">7</span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<footer class="page-footer">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">Contact</h5>
<p class="grey-text text-lighten-4">
<i class="material-icons">phone</i>&nbsp;Call Lauri 55 55 5555
</p>
<h5 class="white-text">Sponsors</h5>
<p class="grey-text text-lighten-4">
We have more than 10 companies supporting us financially and by equipment
<br>
<a class="highlight" href="#">I want to become a sponsor</a>
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">Links</h5>
<ul>
<li><a class="highlight" href="#!">Location</a></li>
<li><a class="highlight" href="#!">Mission</a></li>
<li><a class="highlight" href="#!">People</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
© 2017 k-space
<!-- <a class="grey-text text-lighten-4 right" href="#!">More Links</a> -->
</div>
</div>
</footer>
</div> </div>
</div>
<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script> {% endblock %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.98.0/js/materialize.min.js"></script>
<script src="/static/js/app.js"></script>
</body>
</html>

View File

@ -1,80 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='http://fonts.googleapis.com/css?family=Raleway:400,300' rel='stylesheet' type='text/css'>
<title>register</title>
<link href="../static/css/bootstrap.min.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<style type="text/css">
#teade{
text-align: center;
}
body {
padding-top: 40px;
padding-bottom: 40px;
background-color: #eee;
}
.form-signin {
max-width: 330px;
padding: 15px;
margin: 0 auto;
}
.form-signin .form-signin-heading,
.form-signin .checkbox {
margin-bottom: 10px;
}
.form-signin .checkbox {
font-weight: normal;
}
.form-signin .form-control {
position: relative;
height: auto;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 10px;
font-size: 16px;
}
.form-signin .form-control:focus {
z-index: 2;
}
.form-signin input[type="email"] {
margin-bottom: -1px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
.form-signin input[type="password"] {
margin-bottom: 10px;
border-top-left-radius: 0;
border-top-right-radius: 0;
}
</style>
</head>
<body>
<div class="container">
<form class="form-signin" id="reg" action="/register/" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading"><strong>k-space register</strong></h2>
<label for="user" class="sr-only">user</label>
<input type="text" name="user" id="user" class="form-control" placeholder="user" required autofocus>
<label for="pw" class="sr-only">password</label>
<input type="password" name="pw" id="pw" class="form-control" placeholder="password" required>
<label for="password_confirmation" class="sr-only">confirm password</label>
<input type="password" name="password_confirmation" id="password_confirmation" class="form-control" placeholder="confirm password" required>
<button class="btn btn-lg btn-primary btn-block" type="submit">register</button>
</form>
</div>
</body>
</html>