Diff between ddae01ad6017fb4efea15a8a6e5e24b3876da507 and 87b0d762297f28fdaf7e0f504564646868fa15c3

Changed Files

File Additions Deletions Status
db_dump.sql +25 -0 added
koivuhaka.sqlite +0 -0 deleted
koivuhaka.sqlite-journal +0 -0 deleted
static/images/4124379_3_600x600_t_g.webp +0 -0 deleted
static/images/n02112018_1611.jpg +0 -0 deleted
team-description +0 -1 deleted
team-description.txt +1 -1 modified
views/hallintapaneeli.etlua +2 -1 modified
views/index.etlua +9 -0 modified

Full Patch

diff --git a/db_dump.sql b/db_dump.sql
new file mode 100644
index 0000000..6a625d9
--- /dev/null
+++ b/db_dump.sql
@@ -0,0 +1,25 @@
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE IF NOT EXISTS "asunnot" (
+	"id"	INTEGER,
+	"osoite"	TEXT NOT NULL,
+	"kuva"	TEXT NOT NULL,
+	"hinta"	INTEGER,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+INSERT INTO asunnot VALUES(1,'Punaketunkatu 4 I, Koivuhaka, Kokkola','https://cdn.asunnot.oikotie.fi/Ih_sUqa6ojLgDQT96F-4-gGIyws=/full-fit-in/980x653/filters:watermark(https://cdn.asunnot.oikotie.fi/FNgYc0cxRts1I9PguvqoW4Bqtrw=/static.asunnot.oikotie.fi/oikotie_watermark.png,0,-1,1):background_color(white):format(jpeg)/ot-real-estate-mediabank-prod/540/160/source/225061045',65000);
+INSERT INTO asunnot VALUES(7,'Mäyränkatu 5, 55, Koivuhaka, Kokkola','https://cdn.asunnot.oikotie.fi/OVSKC8aSElH0mLOqs9XKtBH5wWg=/filters:watermark(https://cdn.asunnot.oikotie.fi/FNgYc0cxRts1I9PguvqoW4Bqtrw=/static.asunnot.oikotie.fi/oikotie_watermark.png,0,-1,1)/ot-real-estate-mediabank-prod/980/741/source/225147089',59000);
+INSERT INTO asunnot VALUES(8,'Punaketunkatu 4 B, Koivuhaka, Kokkola','https://cdn.asunnot.oikotie.fi/s5oMh1riaTM8h1CfxKEsjvP-n_o=/filters:watermark(https://cdn.asunnot.oikotie.fi/FNgYc0cxRts1I9PguvqoW4Bqtrw=/static.asunnot.oikotie.fi/oikotie_watermark.png,0,-1,1)/ot-real-estate-mediabank-prod/995/480/source/225084599',59000);
+INSERT INTO asunnot VALUES(9,'Mäntynäädänkatu 8, Koivuhaka, Kokkola','https://cdn.asunnot.oikotie.fi/hJU-1_6rzXHvLDh03mSYGS9YbaE=/full-fit-in/980x550/filters:watermark(https://cdn.asunnot.oikotie.fi/FNgYc0cxRts1I9PguvqoW4Bqtrw=/static.asunnot.oikotie.fi/oikotie_watermark.png,0,-1,1):background_color(white):format(jpeg)/ot-real-estate-mediabank-prod/157/220/source/225022751',45000);
+INSERT INTO asunnot VALUES(19,'Oravankatu 16 tal, Koivuhaka, Kokkola','http://localhost:8080/static/images/n02112018_4583.jpg',100000);
+CREATE TABLE IF NOT EXISTS "kayttajat" (
+	"id"	INTEGER,
+	"nimi"	TEXT,
+	"salasana_hash"	TEXT,
+	PRIMARY KEY("id" AUTOINCREMENT)
+);
+INSERT INTO kayttajat VALUES(1,'admin','$2b$10$xpW1l4GAPlT4AogncTVaT.tKZvm/jpRSsJ0DZMmikewnpdKfPVOuC');
+DELETE FROM sqlite_sequence;
+INSERT INTO sqlite_sequence VALUES('asunnot',19);
+INSERT INTO sqlite_sequence VALUES('kayttajat',1);
+COMMIT;
diff --git a/koivuhaka.sqlite b/koivuhaka.sqlite
deleted file mode 100644
index a8af9bc..0000000
Binary files a/koivuhaka.sqlite and /dev/null differ
diff --git a/koivuhaka.sqlite-journal b/koivuhaka.sqlite-journal
deleted file mode 100644
index b30d24a..0000000
Binary files a/koivuhaka.sqlite-journal and /dev/null differ
diff --git a/static/images/4124379_3_600x600_t_g.webp b/static/images/4124379_3_600x600_t_g.webp
deleted file mode 100644
index 0685fa0..0000000
Binary files a/static/images/4124379_3_600x600_t_g.webp and /dev/null differ
diff --git a/static/images/n02112018_1611.jpg b/static/images/n02112018_1611.jpg
deleted file mode 100644
index ddd4af2..0000000
Binary files a/static/images/n02112018_1611.jpg and /dev/null differ
diff --git a/team-description b/team-description
deleted file mode 100644
index 45c9412..0000000
--- a/team-description
+++ /dev/null
@@ -1 +0,0 @@
-asdfddsdfdsfsdfdsaf
\ No newline at end of file
diff --git a/team-description.txt b/team-description.txt
index 559ea59..1b2c06b 100644
--- a/team-description.txt
+++ b/team-description.txt
@@ -1 +1 @@
-Ota yhteyttä!
\ No newline at end of file
+Ota rohkeasti yhteyttä!
\ No newline at end of file
diff --git a/views/hallintapaneeli.etlua b/views/hallintapaneeli.etlua
index 4f0e570..9d4266e 100644
--- a/views/hallintapaneeli.etlua
+++ b/views/hallintapaneeli.etlua
@@ -13,7 +13,8 @@
 	    <div class="col-sm-8">
 			<input type="file" name="file" id="file" class="form-control mb-3">
 	    </div>
-	<button type="submit" class="btn btn-secondary">Luo</button>
+	<button type="submit" class="btn btn-primary">Luo</button>
+	<button type="button" class="btn btn-secondary" onclick="window.location.replace('/')">Takaisin</button>
     </form> 
 
 </div>
diff --git a/views/index.etlua b/views/index.etlua
index 4034b5b..520792b 100644
--- a/views/index.etlua
+++ b/views/index.etlua
@@ -15,6 +15,15 @@
 	    <li class="nav-item">
 	      <a class="nav-link" href="#tiimi">Ota yhteyttä</a>
 	    </li>
+		<% if session.user then %>
+		<li class="nav-item">
+	      <a class="nav-link" href="/kirjaudu-ulos">Kirjaudu ulos</a>
+	    </li>
+	    <% else %>
+	    <li class="nav-item">
+	      <a class="nav-link" href="/kirjaudu">Kirjaudu</a>
+	    </li>
+	    <% end %>
 	  </ul>
 	</div>
   </div>