Compare commits

..

19 Commits

Author SHA1 Message Date
teras
58a90fe761 Fixed challenges not having an description 2018-01-31 18:27:35 +02:00
teras
9dec2d6e3a Fixed some front-end visuals 2018-01-31 17:52:23 +02:00
teras
02157c7582 Server changes 2018-01-31 16:44:00 +02:00
4316c33533 Add core team members list and services 2017-12-03 16:51:21 +02:00
teras
c775376419 Challenges now connected to items and added items hidden field 2017-12-03 15:46:54 +02:00
2f510f32e1 Separate map and correct room usage 2017-12-03 14:26:15 +02:00
teras
aff3c50e70 Added argument to inventory item picture function 2017-12-02 22:37:57 +02:00
teras
305ff7b192 Added inventory view and challenge blurb + recurring field 2017-12-02 22:26:04 +02:00
teras
2eb090d16c Removed dead code 2017-12-02 21:46:40 +02:00
teras
f58a4dc05f Added markdown description for challenges and profile info 2017-12-02 21:24:54 +02:00
teras
4814beb40d Changed some cascades to null and removed inventory item item code 2017-12-02 19:46:53 +02:00
teras
f16ae12e7e Added InventoryItemOwner and changed InventoryItem field orders 2017-12-02 19:13:41 +02:00
teras
2f10091592 Lauri's temporary logo 2017-12-02 18:25:25 +02:00
teras
4c27f74099 on_delete for foreign keys for SQL 2017-12-02 18:03:37 +02:00
teras
d0fac6602f Automatic challenge creator user 2017-12-02 17:49:35 +02:00
teras
c70e85342a InventoryItem and InventoryItemLocation models 2017-12-01 21:14:06 +02:00
teras
91c0b509ef Changed project name 2017-11-16 15:13:29 +02:00
teras
7073d76afd Added required files 2017-10-17 11:10:30 +03:00
teras
fe4931a8b4 Removed PyCharm files 2017-10-11 14:14:11 +03:00
3 changed files with 36 additions and 288 deletions

21
LICENSE
View File

@ -1,21 +0,0 @@
MIT License
Copyright (c) 2017 Karl Martin Teras
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -20,7 +20,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = 'gze3mreum6caz26_k2zq8(zn+)v3pdfaup+-e20eu@vca5st=b'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
DEBUG = True
ALLOWED_HOSTS = ['k-space.ee', 'kspace', '127.0.0.1', '10.179.42.230']

View File

@ -145,6 +145,7 @@
</div>
</div>
<!-- SVG END -->
<div class="container black-text">
<div class="row" style="margin-top: 32px">
@ -192,6 +193,7 @@
</div>
</div>
<div class="section map z-depth-1">
<div class="container white-text">
<div class="row" style="margin-top: 32px">
@ -209,21 +211,19 @@
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/members/lauri.jpg">
<img src="https://media.licdn.com/mpr/mpr/shrinknp_200_200/p/8/000/1ad/2da/203cd14.jpg">
</div>
<div class="card-content">
<div class="card-title">Lauri Võsandi</div>
<p style="height: 6em; overflow: auto;">Founder of the k-space.
<a href="http://www.lpi.org/our-certifications/lpic-3-300-overview">Certified Linux expert</a>, Python developer and systems integrator.
See more info at <a href="https://lauri.vosandi.com/" target="_blank">lauri.vosandi.com</a>
</p>
<a href="http://www.lpi.org/our-certifications/lpic-3-300-overview">Certified Linux expert</a>. Python developer and systems integrator.</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/members/allan.jpg"/>
<img src="https://media-exp2.licdn.com/mpr/mpr/shrinknp_200_200/AAEAAQAAAAAAAAetAAAAJDA1ZTNlMTA0LTJlZTEtNGM1NC05YzE3LTI4NDg0MzhmMjE5MQ.jpg"/>
</div>
<div class="card-content">
@ -251,7 +251,7 @@
</div>
<div class="card-content">
<div class="card-title">Priit Laes</div>
<p style="height: 6em; overflow: auto;">Embedded Linux systems expert and kernel developer. See more info at <a href="http://plaes.org" target="_blank">plaes.org</a></p>
<p style="height: 6em; overflow: auto;">Embedded Linux systems expert and kernel developer</p>
</div>
</div>
</div>
@ -263,71 +263,11 @@
</div>
<div class="card-content">
<div class="card-title">Silver Kuusik</div>
<p style="height: 6em; overflow: auto;">Electronics schematic design & software development. Founder of <a href="http://www.robokoding.com/" target="_blank">Robokoding</a></p>
<p style="height: 6em; overflow: auto;">Electronics schematic design & software development. Founder of <a href="http://www.robokoding.com/">Robokoding</a></p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/members/mihkel.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Mihkel Raba</div>
<p style="height: 6em; overflow: auto;">IT Management, Pentesting, Firewalls, Storage, Linux servers, ESP32 software development</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/members/jaan.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Jaan Jänesmäe</div>
<p style="height: 6em; overflow: auto;">3D printing, weekly Chaostreff and drone building</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="https://gitlab.pld.ttu.ee/uploads/-/system/user/avatar/74/avatar.png"/>
</div>
<div class="card-content">
<div class="card-title">Aaditya Parashar</div>
<p style="height: 6em; overflow: auto;">Web design at <a href="http://www.apdesigns.xyz/">AP designs</a></p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/members/arti.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Arti Zirk</div>
<p style="height: 6em; overflow: auto;">Random tinkering</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/members/anto.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Anto Veldre</div>
<p style="height: 6em; overflow: auto;">That legendary computer security guy</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
@ -346,198 +286,19 @@
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Marju</div>
<p style="height: 6em; overflow: auto;">Interested in combining <a href="https://marju.niinemaa.com/">history &amp; computers</a></p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Karl Hendrik</div>
<p style="height: 6em; overflow: auto;">Server hosting & clustering</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Marvin</div>
<p style="height: 6em; overflow: auto;">Server hosting</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Artur</div>
<p style="height: 6em; overflow: auto;">Altcoin mining</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Arp</div>
<p style="height: 6em; overflow: auto;">Drone building & robotics</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Endel</div>
<p style="height: 6em; overflow: auto;">Tinkering with hobby projects</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Jordan</div>
<p style="height: 6em; overflow: auto;">Needs a punchline here</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Andres</div>
<p style="height: 6em; overflow: auto;">Needs a punchline here</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Frank</div>
<p style="height: 6em; overflow: auto;">That space probe guy</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minion.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Kristjan</div>
<p style="height: 6em; overflow: auto;">Veteran sysadmin & high availability expert</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minions.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Valdur & Kristjan</div>
<p style="height: 6em; overflow: auto;">Honorary members. Robotics & CNC experts. See more at <a href="http://wiseparker.com/">wiseparker.com</a></p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minions.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Raul & Janno</div>
<p style="height: 6em; overflow: auto;">Honorary members. Team Dozer. CUDA programming experts.</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/minions.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Erik & Indrek</div>
<p style="height: 6em; overflow: auto;">Honorary members. Team Neve.</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/professor.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Truls</div>
<p style="height: 6em; overflow: auto;">Honorary member. Cisco networking expert.</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/professor.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Fred</div>
<p style="height: 6em; overflow: auto;">Honorary member. That algorithm sorcery and Python guy</p>
</div>
</div>
</div>
<div class="col s12 m3 black-text">
<div class="card">
<div class="card-image">
<img src="//media.k-space.ee/professor.jpg"/>
</div>
<div class="card-content">
<div class="card-title">Mohanad</div>
<p style="height: 6em; overflow: auto;">Honorary member. The captain.</p>
<div class="card-title">Jaan Jänesmäe</div>
<p style="height: 6em; overflow: auto;">Drone building and 3D printing</p>
</div>
</div>
</div>
</div>
<p>Interested in joining the core team? Give Lauri a call and schedule for a visit.</p>
</div>
</div>
<div class="container black-text">
<div class="row" style="margin-top: 32px">
<div class="col s12">
@ -549,9 +310,9 @@
<div class="col s12 m6">
<p>In addition to the regular and not so regular events on the right we're in talks about hosting following as well:</p>
<ul class="browser-default">
<li>Laphack</li>
<li>Python CodeClub</li>
<li><a href="https://www.meetup.com/TallinnSec/">TallinnSec Meetup</a></li>
<li><a href="https://www.facebook.com/events/203931076859994/">Cryptoparty</a></li>
<li>Cryptocurrency interest groups</li>
<li>Robotex prep arena</li>
</ul>
</div>
@ -580,21 +341,18 @@
<li>As a bonus we also have a server room so you can get your machine up and online in no time</li>
</ul>
</div>
<div class="row">
<div class="col s12 m4">
<div class="card">
<div class="card-content">
<span class="card-title" style="font-family: 'Orbitron', cursive; font-size:200%;">Supporter</span>
<span class="card-title" style="font-family: 'Orbitron', cursive; font-size:200%;">Newbie</span>
<p>Beginner package the get you started at our hackerspace</p>
<ul class="browser-default">
<li>Access to rooms 24/7</li>
<li>Locker for personal belongings</li>
<li>Access to common equipment</li>
<li>Access to coffee machine</li>
<li>Use any free desk space available</li>
<li><a href="https://nextcloud.k-space.ee">10TB+ Nextcloud instance</a></li>
<li>Host your workshops/trainings at our lab</li>
</ul>
<p style="text-align:right; font-size:200%;font-family: 'Orbitron', cursive;">29€/month</p>
</div>
@ -604,12 +362,12 @@
<div class="col s12 m4">
<div class="card">
<div class="card-content">
<span class="card-title" style="font-family: 'Orbitron', cursive; font-size:200%;">Member</span>
<span class="card-title" style="font-family: 'Orbitron', cursive; font-size:200%;">Resident</span>
<p>In addition to the stuff on the left you get following for your freelance work or hobby projects:</p>
<ul class="browser-default">
<li>Slightly more permanent desk setup and a cupboard</li>
<li>Couple units of rack space in the server room</li>
<li>Couple public IPv4 addresses for your projects</li>
<li>Personal desk</li>
<li>Personal shelf</li>
<li>Space in the server room</li>
</ul>
<p style="text-align:right; font-size:200%;font-family: 'Orbitron', cursive;">59€/month</p>
</div>
@ -619,20 +377,26 @@
<div class="col s12 m4">
<div class="card">
<div class="card-content">
<span class="card-title" style="font-family: 'Orbitron', cursive; font-size:200%;">Resident</span>
<span class="card-title" style="font-family: 'Orbitron', cursive; font-size:200%;">Office space</span>
<p>In addition to the stuff on the left you get:</p>
<ul class="browser-default">
<li>Permanent desk and equipment setup</li>
<li>Dedicated section of the hackerspace for your activities</li>
</ul>
<p style="text-align:right; font-size:200%;font-family: 'Orbitron', cursive;">99€/month</p>
</div>
</div>
</div>
</div>
</div>
<div class="gallery" style="height:400px;">
<img src="//media.k-space.ee/nixiesp12.jpg"/
@ -646,8 +410,10 @@
><img src="//media.k-space.ee/basketball-robots.jpg"/
>
</div>
<div class="container black-text">
<div class="row" style="margin-top: 32px">
<div class="col s12">
@ -668,13 +434,14 @@
</p>
</div>
</div>
<div style="position:relative;">
<video loop autoplay width="100%">
<source src="https://media.k-space.ee/zoidberg-football.mp4" type="video/mp4">
</video>
</div>
<div class="container black-text">
<div class="row" style="margin-top: 32px">
<div class="col s12">
@ -694,8 +461,10 @@
<li>Corporate visibility at international robotics competiton Robotex. Our hackerspace members have participated repeatedly at the Robotex in the past. In 2018 we're planning to participate in the basketball robots and ICD grand challenge categories.</li>
</ul>
<p>Contact Lauri via e-mail address below for more information</p>
</div>
</div>