From 954ef22ca92ae53975862a8c5a557942053214f9 Mon Sep 17 00:00:00 2001 From: Tucan444 <66880425+Tucan444@users.noreply.github.com> Date: Mon, 10 May 2021 15:03:04 +0200 Subject: [PATCH] _ --- website/GitHub-Mark-Light-64px.png | Bin 0 -> 2330 bytes websites/index.html => website/WikiSpot.html | 4 +- {websites => website}/WikiSpotCSS.css | 23 +++ {websites => website}/WikiSpotLoc.html | 0 website/WikiSpotPro.html | 36 ++++ website/WikiSpotWS.html | 37 ++++ website/about.js | 10 ++ {websites => website}/app.css | 175 ++++++++++++++++--- website/appjs.js | 44 +++++ {websites => website}/desc_short.js | 31 ++-- {websites => website}/header-background.jpg | Bin {websites => website}/samsung1.png | Bin website/test.txt | 8 + {websites => website}/wikispot-white.png | Bin websites/WikiSpotCon.html | 33 ---- websites/WikiSpotPro.html | 33 ---- websites/WikiSpotWS.html | 36 ---- websites/appjs.js | 4 - 18 files changed, 326 insertions(+), 148 deletions(-) create mode 100644 website/GitHub-Mark-Light-64px.png rename websites/index.html => website/WikiSpot.html (86%) rename {websites => website}/WikiSpotCSS.css (81%) rename {websites => website}/WikiSpotLoc.html (100%) create mode 100644 website/WikiSpotPro.html create mode 100644 website/WikiSpotWS.html create mode 100644 website/about.js rename {websites => website}/app.css (62%) create mode 100644 website/appjs.js rename {websites => website}/desc_short.js (69%) rename {websites => website}/header-background.jpg (100%) rename {websites => website}/samsung1.png (100%) create mode 100644 website/test.txt rename {websites => website}/wikispot-white.png (100%) delete mode 100644 websites/WikiSpotCon.html delete mode 100644 websites/WikiSpotPro.html delete mode 100644 websites/WikiSpotWS.html delete mode 100644 websites/appjs.js diff --git a/website/GitHub-Mark-Light-64px.png b/website/GitHub-Mark-Light-64px.png new file mode 100644 index 0000000000000000000000000000000000000000..73db1f61f3aa55fcaecbca896dbea067706bb7bd GIT binary patch literal 2330 zcmaJ@dpy&7A0KVQT+TU3iOLKmvh6n;HrL%O6)ohFIM()K!!EXAIjO}-B}W%^)GMS^ zbRj&Vi`ep%r%r`PE0rauRMJE)p`NWn=lP@Od|$8M_wsqY-=EL>bNS=9n;FC~MOYyq z5Qu5ON?Ne?^wWKYaP5AUm;6k7ER@nCq#?pMX&OrmLdYE9CJ-6GXT^iTAd9m(`4;E} zfy}Yzg+@pt0@sk(LOz-_L`>RbTB#+~b3MT|& z14UGj%UhW)21C+=LfPqwY$6Bc>x1-?k+cr@pp=D_@sk7+lFS?R)h|hV*O@UW6`Ai_H`049j)JozV)4d8r`BUo7M!zgCCD`;G!S0dV&q zp8LL%~Ba#6Eg$iKtZe$N47EeRXa5>+}e1_})f4LZ~7>us9|I_MOlXiY|*KdQX zeS8~zP@tW6v39VXfr*USwp~rS`=B$j`)nk?@}kq(ClF4d>YOz8hkr;=W~kkm zCW7a<(pcz5X#A0R<9Z{E*BfJ?`u2(tHC?l!+(h-PRUM^q=-1CbjbNI^81U7VyU;3( zT2f^?#ma%q8;EN&iz|Pk@=)pdaMq3d25mbDNrIP#bi|hqP`3*fT}kuvR+%ng#;F!o z!3#SBB2F;iNzfJ(L`*fNFT`NdGQiAH|Ej|Hc2f5bF>p2ufwkUZTFe}(dJ$`MX;C(0 z-V{r-E2m(c5BI}drL(~k6SEswne#fEUdvi&3FiZh%N)80&$C_2kh}Zs$!WSMT5)2L z->t!4_PuW(@0iMUf!tM3EXsxR=8aqQJS!tI77vxXD$Q$NZ1vCFp)TCJPPKgJ6$dq6 z6AvwIT>T_kTfhs9Ro&hblgcP`#)4Y!f6RfcKKz5}fFeLswhx__Ru z`f>qsFw=AMC$D2)!n`KC&FVyxLH=oq<|UuIL`hLk2jvOa!Qq_R3CqNXSp|NlZhBlh z@V0BxvHNAmtK__)^rv^SNw9j3M7}#zg*ToWtbKT~2{x#g2)k9TC|R>Dzhq!T-pA~R z>ZL3u2sdInHHePlU?n!;#-16SNWGJd=j+gQ4vI}N_YbJpa3kc$Q-$nCw8DusXXMl4 z*nJS|qzj=rNJpZI; z$vRbg>YS|lmxjj--{P0zyGBQ?yoS4%MX$EkOMqE$O+Pm%_1o-3WM-q=b4f2dQfTt> zOFR@zTq!4JBAQzKEZEFs#YOE+WUR@=e`!;~PCh-+ddeAuP%>I*Cd8Cb%!1YNZFKDIJTra-- zG#+}%TS;ZSZaqDK8^0CL=AU{B|LU>Hu0mU~}a9D5U= zlszxG=SokFC;8liaQHBlh z2BUO}iYG`REj!%$Xj-syeaVfwq3hF5*L>e!Jm^2?Jo?@}>G*`TrXZHmap&CnfJ4u^ zk68!bvsByruv+!zzl{#!R8}8y9^Ra-sENMbl68A9w_o}?z5eO*E&If08t#Rq+K#s{ zb}mq^_${jVjmeHhTXNWUoFMIe)lJ26`vXz zWvk~HR@whs?OF8cKV8YyEs1et|A`i*;GS`_+RH=ns17TKJg|lJv;Y(H<+2}hIXsat z5ANw;3-!HT?J@e?t>VkCV$sSaXTfoVh-!;h=kN@TPi^X~Dlo@yIP4fl2 z#pt2|1Jj>Ov$71^ei~h1H$uM|R6wY=ZG3Q99U>X|mV`BoS9`4vYw~J@(FazM_8hI9o-&aIo@yE| z6xi92RAt7!kM;6HVQV)mjXu!6Snn}L!YlYRm7CF)XL~-WsBd9Uk6GUDFm8S4@oR}s z!f_@&&0G2FHTy?nQd8F&@&}*SrC)xRgU!h6eepUXk}}=;?q@wX1aZ#AJc}avS@*XR MKo6o-Qerdz3wwRZj{pDw literal 0 HcmV?d00001 diff --git a/websites/index.html b/website/WikiSpot.html similarity index 86% rename from websites/index.html rename to website/WikiSpot.html index cd0c55c..968f2db 100644 --- a/websites/index.html +++ b/website/WikiSpot.html @@ -16,7 +16,7 @@
  • DOMOV
  • WIKISPOT
  • O PROJEKTE
    • -
  • KONTAKT
    • +
  • githublogo
    • ☰
    @@ -31,7 +31,7 @@
    SŤIAHNUŤ ▼
    -
    +
    \ No newline at end of file diff --git a/websites/WikiSpotCSS.css b/website/WikiSpotCSS.css similarity index 81% rename from websites/WikiSpotCSS.css rename to website/WikiSpotCSS.css index 49bb271..3489fcf 100644 --- a/websites/WikiSpotCSS.css +++ b/website/WikiSpotCSS.css @@ -4,6 +4,8 @@ header { } body { background-image: url(header-background.jpg); + background-repeat: no-repeat; + background-attachment: fixed; margin: 0; user-select: none; } @@ -14,6 +16,7 @@ body { display: flex; justify-content: flex-end; align-items: center; + flex-direction: row; } .item { list-style: none; @@ -58,6 +61,9 @@ body { display: none; } @media (max-width: 800px) { + #githubImg { + display: none; + } .item { display: none; } @@ -111,4 +117,21 @@ body { } #phoneImg { width: 350px; +} +#conHolder { + width: 500px; + height: 500px; + margin-top: 15%; + display: flex; + justify-content: center; + align-items: center; + flex-direction: row; +} +/* ---------- O projekte ---------- */ +#projectInfo { + background-color: rgb(255, 255, 255); + font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif; + color: black; + width: 300px; + height: auto; } \ No newline at end of file diff --git a/websites/WikiSpotLoc.html b/website/WikiSpotLoc.html similarity index 100% rename from websites/WikiSpotLoc.html rename to website/WikiSpotLoc.html diff --git a/website/WikiSpotPro.html b/website/WikiSpotPro.html new file mode 100644 index 0000000..8bd1249 --- /dev/null +++ b/website/WikiSpotPro.html @@ -0,0 +1,36 @@ + + + + WikiSpot + + + + + + + +
    + +
    + +
    + + + \ No newline at end of file diff --git a/website/WikiSpotWS.html b/website/WikiSpotWS.html new file mode 100644 index 0000000..9ffbaed --- /dev/null +++ b/website/WikiSpotWS.html @@ -0,0 +1,37 @@ + + + + + + + + WikiSpot + + + +
    + +
    + + + + + + \ No newline at end of file diff --git a/website/about.js b/website/about.js new file mode 100644 index 0000000..7cbe6aa --- /dev/null +++ b/website/about.js @@ -0,0 +1,10 @@ +$(document).ready(function(){ + $.get("test.txt", function(data){ + console.log(data); + let data_string = data.toString(); + + data_string.replace(new RegExp("\\\\n", "g"), "*"); + console.log(JSON.stringify(data_string)); + $("#projectInfo").html(data_string); + }); +}); \ No newline at end of file diff --git a/websites/app.css b/website/app.css similarity index 62% rename from websites/app.css rename to website/app.css index 22f4852..23dec8d 100644 --- a/websites/app.css +++ b/website/app.css @@ -6,6 +6,8 @@ body { background-image: url(header-background.jpg); margin: 0; user-select: none; + background-repeat: no-repeat; + background-attachment: fixed; } /* ---------- Navigačná lišta (navbar) ---------- */ .list { @@ -37,12 +39,6 @@ body { color: chartreuse; transition: color 0.2s ease-in-out; } -.wsImg { - border-radius: 10px; -} -.wsImg:first-child { - margin-right: auto; -} /* ---------- Burger Menu ---------- */ .burger { cursor: pointer; @@ -161,22 +157,31 @@ body { flex-direction: row; justify-content: flex-end; } -.klol { +.short_description { + width: 300px; +} +.list_item_holder { display: flex; - flex-direction: row; - justify-content: flex-end; + flex-direction: column; + justify-content: space-between; + margin-top: 5px; + margin-right: 71px; margin-bottom: 10px; margin-left: 10px; font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif; } -.constantImg { - grid-area: obrazok; +.sens_style_heat { + grid-area: senzory; + font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif; + font-size: 20px; display: flex; - width: 300px; - height: 300px; - top: 250px; - left: 50px; - transition: display 1s 1s; + align-items: center; + flex-direction: column; + +} +.wsImg { + border-radius: 10px; + margin-right: auto; } .mystyle { transform: rotate(180deg); @@ -194,24 +199,72 @@ body { transition: transform 0.5s ease-in-out; } /* ---------- Grid Layout ---------- */ -.obrazok { +.obrazok_small { grid-area: obrazok; - width: 500px; + display: flex; + align-items: center; + flex-direction: column; + width: 100px; + height: 100px; + margin-left: 25px; + border-radius: 10px; + transition: display 1s 1s; +} +.obrazok_big { + grid-area: obrazok; + width: 400px; height: 300px; + margin-left: 0px; + border-radius: 10px; + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + +} +.imgBig { + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; +} +.text_small { + grid-area: description; + font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif; + display: flex; + justify-content: center; + flex-direction: column; margin-left: 25px; } -.text { - grid-area: description; +.text_big { + grid-area: description; + font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif; + display: flex; + justify-content: center; + flex-direction: column; + margin-left: 25px; } -.senzory { - grid-area: senzory; +.sensors_small { + width: 140px; + grid-area: senzory; + display: flex; + justify-content: center; + flex-direction: column; } -.info { +.sensors_big { + grid-area: senzory; + display: flex; + justify-content: center; + flex-direction: column; +} +.info_small { + grid-area: info; +} +.info_big { grid-area: info; } .listHide { display: none; - background: #ffffff; } .expand { display: grid; @@ -227,6 +280,7 @@ body { border-radius: 10px; height: 600px; width: 550px; + background-color: white; } .big { display: grid; @@ -238,6 +292,7 @@ body { "description info"; position: absolute; border-radius: 10px; + margin-top: -12px; left: 650px; top: 117px; height: 700px; @@ -249,7 +304,27 @@ body { display: flex; } /* ---------- Responzívnosť (media tag) ---------- */ -@media (max-width: 1000px) { +@media (max-width: 1550px) { + .obrazok_big { + width: 400px; + height: 250px; + } + .big { + width: 800px; + height: 600px; + } +} +@media (max-width: 1450px) { + .obrazok_big { + width: 350px; + height: 200px; + } + .big { + width: 700px; + height: 500px; + } +} +@media (max-width: 1350px) { .big { display: none; } @@ -262,7 +337,6 @@ body { visibility: visible; } .burgerList { - display: none; flex-direction: column; align-items: center; margin-right: 30px; @@ -275,4 +349,53 @@ body { .bItem { margin-top: 10px; } + +} +@media (max-width: 570px) { + .wsList { + background: white; + width: 500px; + height: 100px; + border-radius: 10px; + margin-left: 0px; + margin-top: 5px; + } + .wsImg { + width: 120px; + border-radius: 10px; + margin-right: auto; + } + .title0 { + font-size: 15px; + } + .short_description { + font-size: 15px; + } + .list_item_holder { + margin-right: 0px; + } + #arrow0 { + margin-top: 32px; + font-size: 30px; + width: 30px; + height: 30px; + } + .expand { + margin-left: 0px; + width: 500px; + height: 550px; + } +} +@media (max-width: 360px) and (max-height: 640px) { + .wsList { + background: white; + width: 360px; + height: 100px; + border-radius: 10px; + margin-left: 0px; + margin-top: 5px; + } + .list_item_holder { + margin-right: -10px; + } } \ No newline at end of file diff --git a/website/appjs.js b/website/appjs.js new file mode 100644 index 0000000..d08b203 --- /dev/null +++ b/website/appjs.js @@ -0,0 +1,44 @@ +function onclick1() { + var click = document.getElementById("arrow0"); + click.classList.toggle("mystyle"); + var expand = document.getElementById("listExpand1"); + expand.classList.toggle("expand"); + var appear = document.getElementById("roko1"); + appear.classList.toggle("appear"); +} +function onclick2() { + var click = document.getElementById("arrow2"); + click.classList.toggle("mystyle"); + var expand = document.getElementById("listExpand2"); + expand.classList.toggle("expand"); + var appear = document.getElementById("roko2"); + appear.classList.toggle("appear"); +} +function onclick3() { + var click = document.getElementById("arrow3"); + click.classList.toggle("mystyle"); + var expand = document.getElementById("listExpand3"); + expand.classList.toggle("expand"); + var appear = document.getElementById("roko3"); + appear.classList.toggle("appear"); +} +function onclick4() { + var click = document.getElementById("arrow4"); + click.classList.toggle("mystyle"); + var expand = document.getElementById("listExpand4"); + expand.classList.toggle("expand"); + var appear = document.getElementById("roko4"); + appear.classList.toggle("appear"); +} +function onclick5() { + var click = document.getElementById("arrow5"); + click.classList.toggle("mystyle"); + var expand = document.getElementById("listExpand5"); + expand.classList.toggle("expand"); + var appear = document.getElementById("roko5"); + appear.classList.toggle("appear"); +} +function bmenu() { + var burger = document.getElementById("bonger"); + burger.classList.toggle("appear") +} \ No newline at end of file diff --git a/websites/desc_short.js b/website/desc_short.js similarity index 69% rename from websites/desc_short.js rename to website/desc_short.js index 2be92e3..7f74d8f 100644 --- a/websites/desc_short.js +++ b/website/desc_short.js @@ -1,43 +1,46 @@ $(document).ready(function() { - let base_url = "http://192.168.1.156:8000/"; + let base_url = "http://localhost:8000/"; function append_element(image_urls, descriptions, title, id) { let template = `
    -
    - # +
    + #
    ${title}
    -
    ${descriptions[0]}
    +
    ${descriptions[0]}
    ▼
    - # -
    ${descriptions[1]}
    -
    + # +
    ${descriptions[1]}
    +
    -
    +
    - # -
    ${descriptions[1]}
    +
    #
    +
    ${descriptions[1]}
    +
    +
    +
    `; $("body").append(template); - $.get(`http://192.168.1.156:8000/${id}/sensors`, function(data1) { - console.log(data1); + $.get(`${base_url}${id}/sensors`, function(data1) { Object.keys(data1).forEach(function(key) { let value = data1[key]; if (key.startsWith("[translate]-")) { key = key.slice(12, key.length); } - $(".sensors").append(`

    ${key}: ${value}

    `); + $(".sensors_small").append(`

    ${key}: ${value}

    `); + $(".sensors_big").append(`

    ${key}: ${value}

    `); }); }); @@ -48,7 +51,7 @@ $(document).ready(function() { $(`#arrow${id}`).toggleClass("mystyle"); $(`#listExpand${id}`).toggleClass("expand"); - + id.a(); }); } diff --git a/websites/header-background.jpg b/website/header-background.jpg similarity index 100% rename from websites/header-background.jpg rename to website/header-background.jpg diff --git a/websites/samsung1.png b/website/samsung1.png similarity index 100% rename from websites/samsung1.png rename to website/samsung1.png diff --git a/website/test.txt b/website/test.txt new file mode 100644 index 0000000..bf8e94d --- /dev/null +++ b/website/test.txt @@ -0,0 +1,8 @@ +sf +fsd +f +sdf +sd +fsd +f +sd \ No newline at end of file diff --git a/websites/wikispot-white.png b/website/wikispot-white.png similarity index 100% rename from websites/wikispot-white.png rename to website/wikispot-white.png diff --git a/websites/WikiSpotCon.html b/websites/WikiSpotCon.html deleted file mode 100644 index 6b4f73a..0000000 --- a/websites/WikiSpotCon.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - WikiSpot - - - - - - - -
    - -
    - - \ No newline at end of file diff --git a/websites/WikiSpotPro.html b/websites/WikiSpotPro.html deleted file mode 100644 index 6b4f73a..0000000 --- a/websites/WikiSpotPro.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - WikiSpot - - - - - - - -
    - -
    - - \ No newline at end of file diff --git a/websites/WikiSpotWS.html b/websites/WikiSpotWS.html deleted file mode 100644 index 6e4e487..0000000 --- a/websites/WikiSpotWS.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - Flextest - - - - -
    - -
    - - - - \ No newline at end of file diff --git a/websites/appjs.js b/websites/appjs.js deleted file mode 100644 index cac37c9..0000000 --- a/websites/appjs.js +++ /dev/null @@ -1,4 +0,0 @@ -function bmenu() { - var burger = document.getElementById("bonger"); - burger.classList.toggle("appear") -} \ No newline at end of file