From fb12cc1181c75d130005c428c4fde4b110c97cbd Mon Sep 17 00:00:00 2001 From: mariklolik Date: Sat, 25 Apr 2020 19:19:58 +0700 Subject: [PATCH] Feed ready --- 1111.py | 24 ++++++ __pycache__/stories_api.cpython-37.pyc | Bin 4176 -> 4111 bytes data/1/1_cover.png | Bin 0 -> 10619 bytes db/data.sqlite | Bin 32768 -> 32768 bytes static/css/main2.css | 24 +++++- static/img/green.jpg | Bin 0 -> 26897 bytes static/img/red.jpg | Bin 0 -> 27432 bytes static/img/white.jpg | Bin 0 -> 27433 bytes static/js/main2.js | 2 + static/js/slick.min.js | 1 + stories_api.py | 14 ++-- templates/base.html | 19 +++-- templates/feed.html | 110 +++++++++++++------------ 13 files changed, 123 insertions(+), 71 deletions(-) create mode 100644 1111.py create mode 100644 data/1/1_cover.png create mode 100644 static/img/green.jpg create mode 100644 static/img/red.jpg create mode 100644 static/img/white.jpg create mode 100644 static/js/slick.min.js diff --git a/1111.py b/1111.py new file mode 100644 index 0000000..5605db2 --- /dev/null +++ b/1111.py @@ -0,0 +1,24 @@ +from colour import Color +from PIL import ImageDraw, ImageFont, Image + + +def generate_cover(sid, aid, grad): + img = Image.new("RGBA", (1920, 1080)) + im = img.load() + x, y = img.size + if grad == 0: + col = Color('#9D00B9') + colors = list(map(lambda x: x.rgb, col.range_to(Color("blue"), 1920))) + elif grad == 1: + col = Color('#9D00B9') + colors = list(map(lambda x: x.rgb, col.range_to(Color("white"), 1920))) + elif grad == 2: + col = Color('#9D00B9') + colors = list(map(lambda x: x.rgb, col.range_to(Color((74, 186, 87)), 1920))) + for i in range(x): + for j in range(y): + im[i, j] = (int(colors[i][0]), int(colors[i][1]), int(colors[i][2])) + + img.save(f"data/{aid}/{sid}_cover.png") + +generate_cover(1, 1, 0) diff --git a/__pycache__/stories_api.cpython-37.pyc b/__pycache__/stories_api.cpython-37.pyc index d82c25c8e973f7d6dd1f1117fbd1186c2df43542..411f266f6d223710249277a999e33aa0ff3e7a0f 100644 GIT binary patch delta 434 zcmY*VO-lk%6rDTH=r~`RBGo3QLP_%@un*ko!e|jx+eoB&j$@+^&j*sU2wX)A7w-=w z)UrkRA8H#ehgL!VqxWo+7w+M_b9wjPb3d(#WmXMC6zdB3*#fg?(7AqGNR6M*ZehUUtTNj%-yvS+obQMm92`28R%t4JD65GLCHV^lCTxfR delta 455 zcmeBIxS+u2#LLUY00iqUEskpw*vR*kg^vZu1z~3(F7}wr$g1jCAy&hb#pc2g%Tvo- z!%)L)&QQxxs1?po!k)#E!dSzQ!qm$Y%%I8aSH+o@nwp}QQIeaZ$#{#sxFo+QGqqTg zb8;A~vNA_neojt)d1}fn*0h|&;_O@eMX7lysYUT6sksF?i6yC;ER*N6sv6#6%q&s_ zS`HzUfUH|AAY&Ck4&nn63`{JHY>X0&JV40CSY)#K18WeYfHqK~NC-sefC$~mLF`4W zMS4K?rK|1TXy%^&r zpWnJF@ zx;nc#IRY8ZrYWD%cyh2M;oTS%5e7yx56Y_R|U diff --git a/data/1/1_cover.png b/data/1/1_cover.png new file mode 100644 index 0000000000000000000000000000000000000000..7d86717e95470e7b248b0c2bb61684f0df1727bb GIT binary patch literal 10619 zcmeAS@N?(olHy`uVBq!ia0y~yU~gbxV6os}1B$%3e9)PJLDR|8#WAE}&fA-gybTTv zM-JHjsb&*aX-RW){BL{v9V1X75PT?3zkZz)!e-cWm;t082s#WJpbC_D62Kx14IIo8 z5SGHBQDwl87!43eau`h^;BXktGT>ksEgZnXFj_c_77h%fd0{j!j5ehp1;J=u7|jc# zd0{j!Fffev7r?1tw7&ojhS7Rqv|bpk7e?!a(RyKY=yh~Vb#&AnSQ3sl2}YX)qfLU* zCc$WvV6;gv+9Vil5{xzpM%Q3~YQxbHGjN+=w0R5;hS3>za4?Jxr$d5av~Uzopr0Hfia)&Kwi literal 0 HcmV?d00001 diff --git a/db/data.sqlite b/db/data.sqlite index 8eb620e75d1a2272920810a2fb297d71fa89c2df..166e384143612b6ae47eb4b0a46bf051eded5c06 100644 GIT binary patch delta 215 zcmZo@U}|V!njp={Gf~Ewk!NGV5`G>Q-rWrRaeP<#TzGeH78F>`Ti?jW!ok2V-stJb zk)7?3t(RSpl%0}hWL2DzXk=<;WoT*u1S)}f9*L=*K@}=yX~~HxDXHehsYwr0hg7jg`SDIiG{iOW*4~wj65v-hZ*?q@*n1Z&VP2Zpu%Q;E>31~MzG6R KHlNiu4gdg5u{;(4 delta 61 zcmV-D0K)%(fC7Mk0+1U43y~Z{0SmEUqz?)M4nzPCUJlg`M6(efHV(5y9>4(#0}ssr T58V&v56!a?K)(;O%`Y=h0QV9m diff --git a/static/css/main2.css b/static/css/main2.css index baca256..997c5a7 100644 --- a/static/css/main2.css +++ b/static/css/main2.css @@ -472,23 +472,36 @@ form input { } } +#carousel-example-1z{ + margin:10%; +} +#but{ + display: block; + margin: 25% 0 5% 0; +} +.carousel-caption h2{ + margin-bottom: 30%; +} /* Smartphones (вертикальная и горизонтальная ориентация) ----------- */ @media only screen and (min-width : 320px) and (max-width : 480px) { #carousel-example-1z { margin: 0; - height: 150%; } #but { display: block; margin: 25% 0 5% 0; } -} + .carousel-caption h2{ + color:red; + margin-bottom: 5%; + } +} /* Smartphones (вертикальная) ----------- */ -@media only screen and (max-width: 320px) { +@media only screen and (max-width: 370px) { #carousel-example-1z { margin: 0; } @@ -497,4 +510,9 @@ form input { display: block; margin: 25% 0 5% 0; } + + .carousel-caption h2{ + color:red; + margin-bottom: 5%; + } } diff --git a/static/img/green.jpg b/static/img/green.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ae7ea167521bfa27a1623fc2829c6935eecbf89f GIT binary patch literal 26897 zcmeI*TS${(0LJmxOi^ovn1`iQzUI&LlIPwI&|Yg-T`xii)O2 zo=Pv$nx)j{!sRwv%u}b?ayC?iFb^%fF^e2hcHvcb>&A=ca=RS+f8YCi_~0u~h>N1Q z`M426D4b|Emk=jDA&$hwdF`9`VGKPX{)EG3B^I`P`()tnbl6UeB@tEXExZz4Vf(Rs zD*a<=O^w=?_p&rse`C0xqyKtfF@7?(xoa#?LOXxDcWa`DFj-YEvC6r|NQb3H)q^)q z8jq_D&zPpy=?(oUo0&bMqeewrCriPJN>aUOx#Q==bZ;7#2xNOLyb{m6 z@cEREDO!QaTQTXX)^s!Tr`*&#viGD*JFKj6vp_zVRaHz8xvG8hXcoVmgP9>S5n}p; zURcN4*5{iXygSG{sA(Z#B-(hhXjb6fW6c&FXU&y4U-T7c`ajfN)6NVPoy}3!_IYVo z%z(jJb=kXMsrKHY`OJJ=HPu`fFLvDjLnY|rXNZaoJmHgY$)mUOW%t0=vC!kr3<5q>unDweRY@mhy*(9V2t+|I!`q;RW3k+@bM42daqm+pnQ6p+ZjaU$|AYwtp zf`|nX3nCUoEQnYTAtT5LGJ=dCBghCcf{Y*|$Otlmj36V(2r{x?M$g*~UkGtg{(VOP zT0%=`$^Mqm5Bfnr=;wb|x)t57P=AND7x;L7|D7MYskI&0{TI8_Nt6^NBj8t8y=v{3 OBAgR(?C!|a>wf^S%ua^@ literal 0 HcmV?d00001 diff --git a/static/img/red.jpg b/static/img/red.jpg new file mode 100644 index 0000000000000000000000000000000000000000..804a5bf8a4a76fbb3f8ca36e2a66dfbd22575c73 GIT binary patch literal 27432 zcmeI*Sx^&q9Ki9l6a+Msmf;G;v@*4oayC>dnbZ?gar9{ANYx<8Hp~njC^yvR)$Hmo<0|+vbS|7fW-~_GWm9CSd9L8M zm+uQ>E<}{p?>oet#J^C8ejD{7T{+%Bza$lF`oow@N{$ZdTHGw**&8Mv>l-i6SH^`F z5$s0l^UaRaNHKY9NsA9@TTowCc>jlE;_^7Y(H5iiFzNd)Sy+>*Nm#Qsr2-0ztvrRQpt1J0qC7&3D53&ys?-w@jqqHeHOBEnh&rucFd z_G_n$m~V+PrG1@^VigxcNb$qH&?>s$6-JA8!yZOTIOpKE7PtX48_m zo|3FE`cq(_HPUijinLs5?KAeMhP^^vl-28u&!xJE!im>P(u}b~#O4yMTE5mgpR|6v z^F5THP)2X7`bYkfos!@^RVJU(oqw|EP4hBJV^m{ph1RZlm-R2(kz+sepiR%!S7b>vmdF5D6PHIBIKiAl zzRY7RERrTTPrGSL@8XA;R>Kdt2k;!ge*xA5SQDWOkVDuKz_tjshOj*bB7lrQMj#`Q z5y%K+1Tq2{fs8;#AR~|w$OvQvGTNYwoX9NyH}3*$@Dex;%mwBGbAh?QTwpFR7nlpo z1?B>Cfw@3NAR~|w$OvQvG6ETaj6g;pBajiu2xJ5@0vUmfKt>>=w^&BhKvvnCcL5+- zkSs_RBny%S$$E>E1(||OL8c&6kSWL%WC~_ZFmr;L6U>}o<^(e*kP*lTWCSt-8G(#I zMj#`Q5y%K+1Txy7j6}}HP6%Sy`}!LJ8@vQg19O47z+7N1FxUTNuC$3P>zr3#xIy$+ p*4wO44+KN+p~_HYs4~6dCVuj6MP%gg-_Ebshai8dU#(9>`hO1yfvNxi literal 0 HcmV?d00001 diff --git a/static/img/white.jpg b/static/img/white.jpg new file mode 100644 index 0000000000000000000000000000000000000000..617b4c890015b48da1facaa537db60247cebb774 GIT binary patch literal 27433 zcmeHQYe*DP6duts43RX89-?I=RJu@5_}CRiQ=#nTs!3!@FANMap-gupjM69zqldX0 z7@4`^W+wfR)XcI_G>9chR47w3^O3Elvf7O6-q{(w(EO_C`#JaSojH5wn{&_k&bjww z?Tid_bXe}dFpOhFc*t&snHSA4w#gh?#8mzG5auo~Rj2ngtk(zXtJTTzZ^l{|4jFFt z>+kkoUi$S|PM0htUhSh+`L?IuikZ>}x{cK5WPHkgI@#*3c(8Q%zsIi~e-khr*>pwDX+^d(584{|~3*S$D(-g!9yk3zKs9t zeR7{_+3 zt|aXh;hbD?Ybla&PwUR2$f@-tqn1qnn}#~;i5E)W8?Z~*VEL&bg^V(+=HyDcZT0rV zV>DitabzOQ?p<(UXh50-;!rdtfslg8&*e1+ zKm*XQXh1?1viJzsBeK;IQsB8BUU71>g^&V53J581+!sO$2q~}{5lQCQnLsl8MXM%w z8lmw3b{N}Pg!xTKGDng*lFX6%SsV+OTVy;Ck`696TyD7BaJm1leckg%>TE5!0NCSA z4Q3%tf~=FgcR4d#aKGVxBTa&JE)emiDG8)WP*)a!2B1Nj1R~zF;0F73fU^N-!{vnF zge)AZM&am?CNaw`wU`yyM91%Fu*`|sVFhRa8cv@ew+6X2H1iYW9>_hAdm#5{NvQ1C z0df!I9*$K5PlJ=p&5qVT%hUK2)C2QW|{V+%MI2zA^v+ literal 0 HcmV?d00001 diff --git a/static/js/main2.js b/static/js/main2.js index f715139..be06611 100644 --- a/static/js/main2.js +++ b/static/js/main2.js @@ -8,6 +8,8 @@ $(document).ready(function () { $(this).text('Your link is waiting for you at ЭЛЕКТРОМЫЛО'); }); + + $('#summernote').summernote({ height: 300, // set editor height minHeight: null, // set minimum height of editor diff --git a/static/js/slick.min.js b/static/js/slick.min.js new file mode 100644 index 0000000..42172c2 --- /dev/null +++ b/static/js/slick.min.js @@ -0,0 +1 @@ +!function(i){"use strict";"function"==typeof define&&define.amd?define(["jquery"],i):"undefined"!=typeof exports?module.exports=i(require("jquery")):i(jQuery)}(function(i){"use strict";var e=window.Slick||{};(e=function(){var e=0;return function(t,o){var s,n=this;n.defaults={accessibility:!0,adaptiveHeight:!1,appendArrows:i(t),appendDots:i(t),arrows:!0,asNavFor:null,prevArrow:'',nextArrow:'',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i('