From 6b5f479c6d796d651e079528929d88d57f5c1cce Mon Sep 17 00:00:00 2001 From: rem Date: Thu, 13 Jun 2024 13:06:42 +0200 Subject: [PATCH] nightmare theme + typo + comments --- assets/styles/app.css | 31 ++++++++++------------- config/packages/security.yaml | 2 +- public/css/base.css | 38 +++++++++++++++++----------- public/css/components/comment.css | 10 +++++++- public/css/components/post.css | 13 ++++++++-- public/css/components/post_mini.css | 6 +++++ templates/base.html.twig | 14 +++++----- templates/comment/comment.html.twig | 9 ++++--- templates/post/post.html.twig | 20 ++++++++++----- templates/post/post_mini.html.twig | 7 ++--- var/data.db | Bin 102400 -> 110592 bytes 11 files changed, 95 insertions(+), 55 deletions(-) diff --git a/assets/styles/app.css b/assets/styles/app.css index 790b83a..4217a6f 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -4,6 +4,11 @@ body { color: #1a2c4c; } +.posts-container ul { + display: flex; + flex-direction: column; + gap: 1rem; +} .profile-container { background-color: #fff; @@ -11,6 +16,7 @@ body { border-radius: 8px; margin: 20px auto; padding: 20px; + padding-bottom: 5px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); width: 70%; } @@ -148,23 +154,6 @@ body { cursor: pointer; } -html { - --s: 257px; - /* control the size */ - --c1: #38476b; - --c2: #bda3b6; - - --_c: var(--c1) calc(100% - var(--s)/2) 99%, #0000; - --_g: var(--s), #0000 calc(99% - var(--s)/2), var(--_c); - background: - radial-gradient(var(--s) at 100% var(--_g)), - radial-gradient(calc(var(--s)/4) at 50% calc(100%/3), var(--_c)) var(--s) 0, - radial-gradient(var(--s) at 0% var(--_g)) 0 calc(3*var(--s)) var(--c2); - background-size: - calc(2*var(--s)) calc(9*var(--s)/4), - calc(2*var(--s)) calc(3*var(--s)/4); -} - header { background-color: #bda3b6; padding: 4px; @@ -172,6 +161,10 @@ header { border-style: solid; border-color: #1a2c4c; border-width: 2px; + + &.nightmare { + background-color: #010101; + } } nav { @@ -190,6 +183,10 @@ nav { text-decoration: none; color: #333; margin-right: 30px; + + &.nightmare { + color: white; + } } nav img { diff --git a/config/packages/security.yaml b/config/packages/security.yaml index a5f1925..c7bb99b 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -21,7 +21,7 @@ security: login_path: app_login check_path: app_login enable_csrf: true - default_target_path: all post + default_target_path: all_posts logout: path: app_logout target: /login diff --git a/public/css/base.css b/public/css/base.css index a2cdfa2..e00ff62 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -2,23 +2,8 @@ font-family: "Helvetica", 'Courier New', Courier, monospace; } -#wrapper { - display: flex; - flex-direction: column; - gap: 1rem; - margin: 2em auto; - width: 70%; - - >h1 { - color: white; - font-size: 3em; - margin-top: 0; - } -} - html { --s: 257px; - /* control the size */ --c1: #38476b; --c2: #bda3b6; @@ -31,4 +16,27 @@ html { background-size: calc(2*var(--s)) calc(9*var(--s)/4), calc(2*var(--s)) calc(3*var(--s)/4); + + &.nightmare { + --c1: #990000; + --c2: #101010; + } +} + +#wrapper { + display: flex; + flex-direction: column; + gap: 1rem; + margin: 2em auto; + width: 70%; + + >h1 { + color: white; + font-size: 3em; + margin-top: 0; + } +} + +ul { + padding: 0; } \ No newline at end of file diff --git a/public/css/components/comment.css b/public/css/components/comment.css index de91daf..b4bd777 100644 --- a/public/css/components/comment.css +++ b/public/css/components/comment.css @@ -2,7 +2,12 @@ background-color: #f2f2f7; border: 1px solid black; border-radius: 1rem; - padding: 20px; + padding: 10px; + + &.nightmare { + background-color: #3a3c6e; + color: white; + } .comment-info { display: flex; @@ -15,7 +20,10 @@ p { white-space: pre-wrap; font-size: 1em; + margin: 0 auto; } + + margin-left: 5px; } a { diff --git a/public/css/components/post.css b/public/css/components/post.css index 18c931e..3559f3f 100644 --- a/public/css/components/post.css +++ b/public/css/components/post.css @@ -1,11 +1,17 @@ #post-wrapper { width: 70%; background-color: #f2f2f7; + color: black; margin: 0 auto; border: 3px solid black; border-radius: 1rem; padding: 20px; - margin-top: 10vh; + margin-top: 5vh; + + &.nightmare { + background-color: #1b1447; + color: white; + } h1 { font-size: 3em; @@ -30,7 +36,10 @@ } #comments-wrapper { - padding: 10px; + display: flex; + flex-direction: column; + gap: 10px; + padding: 10px 0px; } } diff --git a/public/css/components/post_mini.css b/public/css/components/post_mini.css index ca42be8..68d83f6 100644 --- a/public/css/components/post_mini.css +++ b/public/css/components/post_mini.css @@ -1,9 +1,15 @@ #post-wrapper { background-color: #f2f2f7; + color: black; border: 3px solid black; border-radius: 1rem; padding: 20px; transition: .3s; + + &.nightmare { + background-color: #1b1447; + color: white; + } } #post-wrapper:hover { diff --git a/templates/base.html.twig b/templates/base.html.twig index 3d89853..8e1db6d 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,5 +1,5 @@ - + {% block title %}Fukafukashita{% endblock %} @@ -14,19 +14,21 @@ {% endblock %} -
+
diff --git a/templates/comment/comment.html.twig b/templates/comment/comment.html.twig index 864e5b4..5a43958 100644 --- a/templates/comment/comment.html.twig +++ b/templates/comment/comment.html.twig @@ -1,9 +1,10 @@ -
+
- - {{ post.profil.name }} + + {{ comment.profil.name }} {# - {{ post.dateCreated }} #} - - 12 hours ago + - + {# {{ post.createdAt }}|date('l, F j, Y') #}
diff --git a/templates/post/post.html.twig b/templates/post/post.html.twig index 154933c..2ba5e06 100644 --- a/templates/post/post.html.twig +++ b/templates/post/post.html.twig @@ -1,5 +1,9 @@ {% extends 'base.html.twig' %} +{% if post.dream %} + {% set nightmare = 'nightmare' %} +{% endif %} + {% block stylesheets %} @@ -9,13 +13,14 @@ {% block title %}{{ post.title }}{% endblock %} {% block body %} -
+
{{ post.profil.name }} {# - {{ post.dateCreated }} #} - - Il y a 3 jours + - + {{ post.createdAt|date('l, F j, Y') }}

{{ post.title }}

@@ -26,13 +31,16 @@

Comments

-
- {{ form(commentForm) }} -
+ + {% if is_granted('ROLE_USER') %} +
+ {{ form(commentForm) }} +
+ {% endif %}
{% for comment in post.commentaries %} - {% include 'comment/comment.html.twig' with { 'comment' : comment} %} + {% include 'comment/comment.html.twig' with { 'comment' : comment, 'dream' : post.dream } %} {% endfor %}
diff --git a/templates/post/post_mini.html.twig b/templates/post/post_mini.html.twig index b70ceb4..b81faf9 100644 --- a/templates/post/post_mini.html.twig +++ b/templates/post/post_mini.html.twig @@ -1,16 +1,17 @@ {% block body %} -
+
{{ post.profil.name }} {# - {{ post.dateCreated }} #} - - Il y a 3 jours + - + {{ post.createdAt|date('l, F j, Y') }}

{{ post.title }}

-

{{ post.text|u.truncate(150, true, '...') }}

+

{{ post.text|u.truncate(150, '...', false) }}

 diff --git a/var/data.db b/var/data.db index a4ef02bf7636cc0e577ee0952d433e44bccfa3d9..8860131f987fec57572866578abe8f13ea6230cf 100644 GIT binary patch literal 110592 zcmeI5Yiu0Xb;tKXiVuk#$+p5OPU9=XjYONGxyzTRAb|N;Dzx~JDN2>n8pLpSxEyJA zXEhH}G#Ui5krV+^p#55)XaS=@`XLBfq+eRJsK4Yx5uivAwEd6*M)RdeQ>0DP7HC|c z|8rkEON#QNwp*!ZMeS?u+{f>nd(OG%UP{+qS@si8Y==?9O~iQaWGNfC(@GCcp&#PZD@3-}UNv zej%(Tk>B)I{Ceaje%OqE^@bP4cvBuLPmE2K%H{Ip*yI#_x-d3%p;Q*-@}NfC(^xM~J`+#aH{@Yfgan|4$A4TF&`_ z^DXD=&expRox1bc!M6wB8hmpw7<_f`rGcLf{BYopP=p^$fC(@GCcp%k025#WOn?b6 z0VePP2~3>o#&28Ki-j$>u@$EB5xDXp)K`IP->C2L{NhQv>(yex7ge_@+#n7`HEcAz zW+K9-XzYt{uPIt#oQ#M)&yQ-3gB$vu>1yc5&dYM{J7F5s#Fi&oX(D{o zC$`h-9lu!@t;mnV=7`7^s(EfrB%#=I(ORK$=* z;6!(>FaLCLFWDBOqob3@sjOctUQQcZZV(7RrtbQ+Fc?ACJyCPc@6yhVjo@oY+*0l6V-EGoQS{^TVYi5P=D3G)r+zA z-7jU^1Tb&cN1Kx1xkSWC*b)s_j=JgBcajE;A>5|cMdAek;Rt*$mViAPi@5aS^F1`2 zYlXs+2*O?T-V!(~Hg>#y1tJtXY27<>jASrgSjPT*lg1sVEiZ!H!l1Vs1L%9QnKVAx zMenAoVKo#OER7|J(6cSiP5X;*9d!a!HCFMmQ_JWg->>8VeC?v(|4 zN zfC(@GCcp%k025#WOn?b60VY5M1=|1ba{f`B|Nj@f z;Rh370!)AjFaajO1egF5U;<2l2`~XB@F)|IM+Lg%@qqUEfBN_Tb0;6=VR7G?025#W zOn?b60Vco%m;e)C0!)AjFoAa?K>Po^{(m=0e4Pm}0Vco%m;e)C0!)AjFaajO1en01 zO@P<`kGA}{_e_8ZFaajO1egF5U;<2l2`~XBzy#h40bc*V7fM`)2`~XBzyz286JP>N zfC(@GCcp%kz@troe*eEX_)gCGy0eZKelP(hzyz286JP>NfC(@GCcp%k026rZ2y7I4 za_3Ix?sxynv+HZimCftdD(la_>h1c$bLIW#O5@MnnBHGpyfGVGz0;hyd!^#(d*Pt;^%J-Rbq4SI1v#jBT%8+bBG!)~#?W)V0>@!EJB-`i;r; znO13e@s&n-;uUvoZ*A9ir|vG7Uks*~>!TAZmly6_FI}FStY5r$W%urlJZe32u&luC*0{dfy1pIEUu;EwrFQcRD>FBjy_a8W{qj=j<*>C@x%!2PiTb1;26Iz4uUuKF zS9cnB2b}-R6`UXEoPWg=KbQa$U;<2l2`~XBzyz286JP>NfC(^xN1i};v6#;n3*800 z6p9$mv0ScSuK$0ObAIal=#d{F4}b|U0Vco%m;e)C0!)AjFaajO1en18djdUOd0PD! z01&zUe+T>j|D1FF9Z&pV0!)AjFaajO1egF5U;<2l2`~XBzyux(0^M{3ph(XJ z$^dlrJ3q(z|0g-;C(ge;76ar#FaajO1egF5U;<2l2`~XBzyz286JP>z;V+l}@&G`0 zj{g0>+(`z*1egF5U;<2l2`~XBzyz286JP>NfC)U#1bF@bI7^qu#sruE6JP>NfC(@G zCcp%k025#WOh6Inrx)J;XLVo#On?b60Vco%m;e)C0!)AjFaaj;SQFs&|6?s)9vl;3 z0!)AjFaajO1egF5U;<2l2`~XkfX@FP@A*c~d1~;_20nG-FHd;K|EvG`zQ5|7?>*V` zjh>f}t#tiH*Lv~oVzco5{PVd#%uO*kCcp%k025#WOyFZB;2u9VH2F;ai+;1_-CJ6? zxj8#knOPh!FHFo`oEaN0&$q%j*-YGed}4mRGP_X`OREc&o8m!5#oDT{#l?B~)~^kh z`i~7&p2_EA6Y<@^PrOYxO+xv3)84RIvTu*S(bv~A^vpB)FT07m6?pc7ebcWyvoSlj zTzNpF=;cP`a%Ektu5F0b>&wd{g2u4v*B)@?>iW{k?D{QnrE<%3+7=%k5%X)S*EZH? zQKMMAa)^&uTwAX!U0$WT+hZ2%mBq?>Wp%!CP4-Tl2MFS`P+6`3;{5Ej`Pqev?A`(u zU6%t{T3y;$nq6MLC6-oJDho^CeN_7w7pCVX7Uw29+t-5}&bCkAeem{&Z}mb$PUrWm zhD^?0oSmA#xKN&+tSpR8UnHUQ9a4^irHpcbQ50_b0YowU#?_vlq0^`Hzh1OrrpkH` z375KW1(y+*n7zKSwzP`!D;0>REo|F{y{mmK@sq$4H)hx8KR>&EzC1ZO45=*6USGDF z;@wN^^~qBC;B`OVtVN#N5OZs5%az&HOuK1ob2m&p+p4K}EK{Zy?ls@NR23~GUTxD& z!~)b{V`)Wc3n{a>aN+#Ie0gKPdzJ5Bhnv>)6l>FXV4YtlDzL-rdw|R=oosyE}CDz{T@T zx8aT8&fzycUF;b;dp7@-9$9C*lkIn19W}MTfB$npjl$|;dj>poc4U?R0h6QC8XAFF zlARi*Idw4E>#g4Az2rzM4g2)rr0z&Jk0z5A8Q21jWGcxzyz286JP>NfC(@GCcp%k02BCM zAt3kvdk1sQ?+pIliMLPu{)zG9Zyi6^_r<=h-ml_oelP(hzyz286JP?5J%RmCU_-E! zzkkN=)M49rc5-qtmR=}3+@ZM9Z>C=Zsy*M{LK0dWL zcDU)&M>cKlIjU*wNT%K^apPtpPc0JimvG=++KYV}a33>S8 z^;1$(bV`H%KG`7+b9Te-zh!pZjy(K8iePa*U<HbLaA3nUR9)xY+T*=@4bd zB?~}x$BOsR9=!tefa@7WFehqMT_XmyW_xfG-3Z5`>fEwdL)DZzHtyvWwRQht9Aq;6 zFgo?X&3rwE53?V`_g@?689H+&|HfKIeo8un50KdVHh)nVc-qh%Wf*S9VKaM7=iO#( z&5Ns%-=YHtN6%Xb-i_nEFsdD0X4pM(#Cbn+p3EMx8#pw{%+WwoR8BHF;-Rb*J=3Wf zTK^Xc^_=rvJn@4Gd^7}pyI$ze^(}qN>+9_upA|K~8OClJi9I(KI6CJy>!PtQw%j0y zm&3?w2)`Al4N;TMFZL4wFPV(scv&;{syIW3Tiu%9^5ZJqia0VE6<56=z*#jM_DVew zdo|%jVJw|jZKc7k z-*lr9bjObyVNLfDJ;qnt+kVxTyrODqx@S5KE0jjrmbSgL?&B0=;x$@nJR%w}QZ7K^ zs}=_CsxMG&BDVZ33>#p)rr!{0)N}=oTg8b__%Z5WR4hRnSSp|+i5F2(Q++K}Or$)) z9@2XSeWyEZwN_fH{zUAiK?{c_6K_;pOXC(A_pufcTY-yr33`?!BxLGlyJ>XP5J#uB zb~^8k!e;XPULkaNI@JY*dp@}}mzw0%K#=R8DO)71*CW%a2_?i=9o~kjLz8LpG@u-zKs<>F=AvS_j}+@K0db5D^bho_=Br9)q1$K* zV6&4hhF*Bk{#i{Um6sJQphG_}hcHtNSnuA5RQ`+%NHJE^X4Mi^{fVnkO6U*ifE|F* zfl+aThP#ypP$De}C?QbNlr(Cu2RI^74U}5Vnjozv_#lTeBG6yWLr*6`a+5~FOfM_K zG=M%=eW(Wr)Nrm&nt?>l%@LA2tO%5ZBt~`EA$pi*^J(O6$!P}|G#S8KiNkajJ*>ij zLGz(RG@~2UFaq0-_j3A;h$bQlqvmohHr#uD1Ecb52PCfr+U^VHrnXgvrJBuB*A*u@ zV@8zr8!cBdX#pX%2YF*2xJ?2<7DuXuR8r`WF{%m|XfLk?LsLSa4Wx7)N%IJZjz&C#0i%@&Qoz0K*n;DA?jYl#0568U=(0v z3^{at2VNC2*_kXd6Yv{6s?9^qY%RT zM(~RrALfpykRr!$GN5A@inGdc0{@x{X*1@NC$mgA^Tj0JyeXD*91F z)s_K0i14dI^ofq%1BkX54Ig?@%_xj^W>%gkXH2X?Y%CsyWy*wB+bU`-ij9#vR9n?< zLM3BYMg=s;)T(@2#vfP!9nNOgjeN*Q1wYga^5<|lHms6ipU_^0OdV+|c|j>sJKssW z+p>o_(Sq0Akuy++f<_6d&_Hc|X~ws$BsFh?Bo$QRZa8aeZ&e_w!o>F2wFxI*qVBTx zZ=_wHjJ2re*$Jr3p$crHov=y4sERwZA(eK^w1iusPSyh{dtr^Zj*n>&%Ko$vlKbS< z$%oo;RnrJ+M!F9jQb?rqNDlawppb%Hm{Z9(a1qd;Nux{BLYgreBc?yW##B~setW6%|CaoeJ>ajiCake6Clko@JGlAh4Y*g6G?88*iF6yrVG?#&Fw ztP7OSRW`%UTx7@N5?Hg;)Z;zGVJ*LUtTt+PJw?zrN%tN!fZgDqYb zCx1em)bF z$@Bp1kX)P_!>3GZ+laxiDNC%3i;9KYjTu8^T)T`E+iiq3AJN?^)|n7<5Un9!11udP*VX+k;~4;zmvLl~24vQ<#+6am<*0G6@RcaYaN=?=3r(J>DCuEPWE zK(KsAIHqz^s8G6ny{eE7&4l_ovp|S#U@R2yjv;^Ofu0Rtl=D`KA+sNL$)x*jVzoF# zzJ&5j$n5E*00kN zfYQ{Z$&0`FnIbIK-tUf698kENHYl|!v#r`H>5S`6n8H|*<+_7)99o7sYhfwTOg?xX zRwj2W0;#ZeeQ3i%od&Us3N?0_c0f29sFWTBb@!yPp!K%SA)0j&=_45>op8hILYc1Y zN=XM~*kn^drm5tBCbbD`eYC121GQ~0QkEApUnUNWK~bHyOVLbkFbmLgn|d=jCzX*7 zk(UJ@%B0BLA=axlU8F4qI!@uQ$w0~SI?I+xKvI8HmOxHaf{9frnIEjbRqB>zp-k7< zUbeH}DuqpH7R_Bp-B?T*4wR_O>bkMjdOfOEdvZZU)mVdzH!6FM7#(4*9<0RGc07in zTs@c|KAQ&A)J*cgM$fb)P}Z|OD3v3%>ZApZ`R9c;RU;RqCSQfD8o`oJW|3fQKcweV zj-}>91N98nMkckZ5#^NI34C%5T4Go}+l9&jRijml&YWfPU?e5ztxwY$X)Em{u?(YZ zzRXLt*N#>r8-Lgl3ZDRsl&&xJQ>Z7Nk9m$gX7E8y019X-X-Q%XK0FcLo4O~M4n2xPWEWt2>!+AQN$v;vTnhu4Wp#0|!T$=t8fL24Lj7+65X+3KFi z%%)5brl)y3)RMZ5mQV-f^-1aF9zi?I15TN!mJ*iKv3OM@p*6a`i#D9BXr-FTX-Z8? zQ5rL>eLdwwNgqv?%+9&CjZoB^l2trIVFrgp|p8 t>H?50x@qki1xm`ileqvV3|eoCkUo>OgBqyDjTg1<>p-9|Hhrl)`QP{_H6Q>0 delta 239 zcmZp8z}B#UZGto_I|BoQG