From 44381000edb867d37a6bf7fc4aeb15a8305a53df Mon Sep 17 00:00:00 2001 From: nataly Date: Fri, 24 May 2024 16:57:47 +0300 Subject: [PATCH] new changes. --- .../add/__pycache__/urls.cpython-312.pyc | Bin 1070 -> 1070 bytes .../add/__pycache__/views.cpython-312.pyc | Bin 12211 -> 12211 bytes .../add/__pycache__/views.cpython-312.pyc | Bin 8456 -> 8456 bytes osinaweb/db.sqlite3 | Bin 1355776 -> 1355776 bytes osinaweb/input.css | 50 ++- .../__pycache__/urls.cpython-312.pyc | Bin 6422 -> 6575 bytes .../__pycache__/urls.cpython-312.pyc | Bin 0 -> 415 bytes .../__pycache__/views.cpython-312.pyc | Bin 0 -> 643 bytes osinaweb/osinacore/knowledge_base/urls.py | 10 + osinaweb/osinacore/knowledge_base/views.py | 12 + .../osinacore/templates/add-edit-main.html | 195 +++++++-- .../templates/add_templates/add-ticket.html | 25 +- .../osinacore/templates/customer_main.html | 14 + .../details_templates/project-details.html | 97 +++-- osinaweb/osinacore/templates/index.html | 381 +++++++++++++----- .../project-knowledge-modal.html | 49 +++ .../templates/listing_pages/projects.html | 78 +++- osinaweb/osinacore/templates/main.html | 15 +- .../templates/projects-by-status.html | 37 +- osinaweb/osinacore/urls.py | 1 + osinaweb/static/dist/output.css | 160 +++++--- osinaweb/static/js/inputs/file-uploader.js | 16 +- osinaweb/static/js/notifications-side-bar.js | 6 +- osinaweb/static/js/pop-modals.js | 23 +- 24 files changed, 914 insertions(+), 255 deletions(-) create mode 100644 osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-312.pyc create mode 100644 osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-312.pyc create mode 100644 osinaweb/osinacore/knowledge_base/urls.py create mode 100644 osinaweb/osinacore/knowledge_base/views.py create mode 100644 osinaweb/osinacore/templates/knowledge_base/project-knowledge-modal.html diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index 0bff3b41d6ed0d6e1a456b6fee823b1188e26057..ae463d461242b6aa0de7d19f4e61111f572de1e5 100644 GIT binary patch delta 19 ZcmZ3-v5tf5G%qg~0}yZ&Y~)g50RSwF1Hk|Q delta 19 ZcmZ3-v5tf5G%qg~0}#x0+sLKD0st>K1S|jm diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index 47dffaf331181c70f838eda77121aa6048d3a020..c8309022709a6fe0cdedd3148fa9bbe24d93c867 100644 GIT binary patch delta 19 ZcmdlSzd4@kG%qg~0}w2pvyp41J^(&}1@Hg> delta 19 ZcmdlSzd4@kG%qg~0}zDgZRA?14*)yU1$F=c diff --git a/osinaweb/customercore/add/__pycache__/views.cpython-312.pyc b/osinaweb/customercore/add/__pycache__/views.cpython-312.pyc index 90873afc6dd5ab7f0cf456b3853b5c7ed1656a16..4239a399675a6a5a86dab3dadb67afe3889658ae 100644 GIT binary patch delta 19 ZcmeBh>Tu#Z&CAQh00cAVY~=c<001=l1)Kl? delta 19 ZcmeBh>Tu#Z&CAQh00dPI8@c`|001&{1t9};=y=Q(ZqOym;y0GXy9Nt(ZoZK zLO85?f`f?{q9(%VK|OaAsGmnRzdho%i0Kx4G?s-1fk1 z8&1#pFW~g^p*sscZCo_PI^!jKyBwoC?NO=RoG#c0=$OE|W53pu0?t2Wzn+dV=6tAO&Ifr_zb2sPiGn{))H&{I#S@9#d zoT7kPKK(i)2C|X>HN>)O)cswofX}i@7Q47ffJ3X?vYUK^2Hr~I`wpCnNDhi_3{x+12pK>ZjX-!E|0TM_O6ffY1iWkUDuOR{aYXw>(gU> zNj;iOrV_pB`b~awNoHtZXk>6Rco-B0U{D#F=;o3))Ft^5T!T5qPZiUvD9%e-BWmwA w0!43&VLp+4&Ae;yiZ#3Uct9*^jBa@^;*-YHE$6uq>gc%o$f0m1?TlK=n! delta 817 zcmYjNJxo(k6u$Sp``W(JzVmoUY$zb57TTINuRnppBE~@z2Mv-KCm6s+L1@I)K;qC* z2*XnsVUUfWiEtfB+&Y*Be_~8a32IVIAxcma9q`;1l$?CuaK7(+_nbSu*+0G6KjWo| z+2->!@qFlZgm%rnjx12yTqb&*hVJL0*<6(JTvSReXj?>q0)YbT!*AH-dR|%woe*O4 zg%z37_K;w{SCT+)fj4N*5%>kW@C8S5SbOlIR=i%PkHF#wQnMZBRVsz8j|WoFlKSL^ zl}33TG;AwjCaW|gi2nfD)%P!S7i0g2u0XX!=wq;64$5A&8XA@!2Cc%N9B6^V&8vGu z8P_SmdswTLn0pG=s|op(UmOz-iZeo;f`c7`I|70`PdlMV6s~0C4~b3uuYA*iv$+5v)U(jQElSJyqb0o*9H?2vx^Yv-btUs>!Xx<$vNM}k+HFf zYZG@yZ;q$iE{_jS-oQHa$07++_bUVOq-mO6M~}zjZLwr;qPsVqipEksW-L`xvc)A8 z;Y8FSTnINpLjXcY)brw!5o&j&30#F)XyRJl(6qTLLzk@dhH-)Bt>q14lywK|NVc_P K@YYhpR{k%h5$k0D diff --git a/osinaweb/input.css b/osinaweb/input.css index d280e661..9b84d59b 100644 --- a/osinaweb/input.css +++ b/osinaweb/input.css @@ -58,6 +58,18 @@ } +/* ANIMATE THE NOTIFICATION SIDE BAR WHEN OPENING */ +.slide-in { + right: 0; + transition: right 0.5s ease; +} + +.slide-out { + right: -100%; + transition: right 0.8s ease; +} + + /* TO SHOW AND HIDE MESSAGES SMOOTHLY */ /* Show the message with a fade-in animation */ .show-message { @@ -89,6 +101,35 @@ } +/* UPLOAD FILE PROGRESS BAR */ +.progress { + width: 250px; + height: 15px; + background-color: #f0f0f0; + border-radius: 8px; + overflow: hidden; +} + +.progress-bar { + width: 0; + height: 100%; + background-color: #374a7a; + text-align: center; + color: white; + padding: 5px 5px; + font-size: 12px; + display: flex; + justify-content: center; + align-items: center; +} + +@media screen and (max-width: 650px) { + .progress { + width: 100% + } +} + + /* TO ANIMATE THE BURGER MENU IN THE FIXED HEADER */ /* Default state */ @@ -112,7 +153,8 @@ width: 100%; } - .fixedSideHeader, .topHeader { + .fixedSideHeader, + .topHeader { display: none !important; } @@ -122,7 +164,9 @@ } @media (min-width: 1200px) { - .mobileTopHeader, .mobileFixedSideHeader { + + .mobileTopHeader, + .mobileFixedSideHeader { display: none !important; } @@ -271,7 +315,7 @@ /* TICKETS REPLY DEFAULT STYLES */ .default-css { color: rgb(147, 147, 147) !important; -} +} .default-css h1 { font-size: 2em; diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc index ad1f513e0cad6c99d7ec8ca13d44c64cabf0f982..2cb1798cbb8ae6d26bb8751e9bdc6bfbbe3e57b9 100644 GIT binary patch delta 1096 zcmZ9J%TE(Q9LKw5=vuT^v~0I8&^{=wfoe;!Do`4W5C{lj6D%qs-Qv3{AP6XO!;{@? zV(Y~eFE;TYh6`8EUUt(-HeQVW1&;B?$$7*?-NR1i_xb$3^LiEi5VL%?SQ-rY^FANT zUzaTouJvPZ)nqanq`KTCWz=M^&q(#Rvx;g8aaWW*{J*C7`H;<>sX68#D7# zWW`gMzjc3Rw(v;m_y_HjtP6k}Q4ZKVVjpKUegXS71=+4T+G~v+H4s5{eVmfCiB1B4 znhf>kO|cj+b<5qAn-F6jEa1bMU{D_b`E8LAwlimRN_ zJyFdQRZkB=FpR8}9ir@bHKVtuwDy!bco~8$YQ*h7Y{Dp2M6v-#vA;ATk5tVNM3IBm z-K2haGxIY0B3sTw5I`PUZ>Eu+@}l07&{`5|@*)His0Bw}XmYYMwUSnMaj~>6uUDra zIE{iBZ!`&Rnh++~Q?A#=Hcf1+u0ha^j$`5DAEAQ?uA-z1K}`r&?-3z_h3`!QTOdjV za%sJCZ?yq}7>Z$R6-2f`7s1WtCfyO%9N}#b1W9xX3n@V~;vp+I*-^T&rHN1UJR7Na=6k3K^UbtEPN8&Bf=S;Y9}jdW^vn7c|di?YPQZAh@&}1Zn8z3uLo5Bxtcp& z1O4b0Lk}48RWk3Ux2AW`LNI_HGW3X{*mg#bk8APqVRiBW1P{?X!wU=_tps#$Qu8L& z^H(6aiWV7t{1@%fygh1~-oX;1%j96!pRmaaQU8C%RmRp>Oj|XehX=Lrpn72zf*g9v e=rh{cQV!_Ogyu}_K7(KstyA`VKT0dVMBi`Pl23R5 delta 929 zcmZwF%}*0S7zf~P8QM~;h_ti2{Xi`(r6qvUZUh4i0!qYK!AK#vu!~ccDcK-nWS2^*8qI5@se-MlhR_=E=ci>C_1RXbB5r_=hEo&s&|i z-U@|r++__5llYD?rtpTf58G`@)x@^Bm|k$0Oo`b1WH`Bd%{FD-{a!H*1T#)JeGpZc zKLcADW<*tPC{#8UKoc!Nc+DwE2K}^{O3TvHy0Y1pY0KRv23isR;Dj-Tb_3P2KrX4* z_Gq;|>g6N>DO%3x2&Z6f?$z?v@?IYSz0`s5QI}glIO1~i-jMb7uFq|*WLEOS1hi5S z;V~EF=w*03J-C*5k;tY92vQ%yFM0m;pM341dza7znF)&qSV98Rs@uRdPc4Q|+WrCd@2L1qof5K8E zB&0}8h@o3iw@%ni3j=TPyF0(_Kt4_}7{HTzIl`-ou_dT&WkwhSqWBL^M7h0m(N0X=a(z5L)#@R$&9md!muZKuP12A!&lkg25FnYnvD(SC43_B{Tza zsz53tR6q7bNREV`gur7(S~RA?&|Gl3m%mFmq;tNYbDTmqAM%9+@*B0&r3#1%(ujt$ z;(jPt62PHc)2`;5YF8f<8)N*1wm;C;cNw{*QEBHsd9O8JYt7L?`^`C-xX!wDQ<1BB F_y>WHb0Gi# literal 0 HcmV?d00001 diff --git a/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0bddd24cd70a603bc9d31a6255ac28ea89f48a17 GIT binary patch literal 643 zcmYLHL2DC16n-tvEO_!(iKm`?vsu>%`}n^1&Aj>M&3;{3xdjwg?_Z3z7{E_Q{sphV ze22gp2oNlToDEpc2R!!%9&F*JCx2Kg?G%<`U%-OVdqY#*oT1k-)_As z=MCRdBnM`slj1K#;iL;p#inuEd<6{{hBsu!pwa^SA7Hz=LLwa;(+r_cVhVR`-I=EcVIFPq<&_AVNGbCRJSwC(ER*q%O+ z$|Mt`%iF02$;vgdtED05qenx)OxrvED*{P~jZ{?CCLWEVOpenca+9I=5~ZI{pq5=b z_vhTScc{xG!zXH;sCyOtkkYls82bUc-(dF=?q9-#D|Yuc_t`$1d%*84VA {% endif %} + +
+
+
+
+ + + +

13 New Notifications

+
+ + + +
+ +
+
+
+
+
+ +
+
+
+

Salim Elliye added a reaction on your + status

+
+
+ +
+ + + +
+
+ + +
+
+
+
+ +
+
+
+

Salim Elliye added you into Osimenu + Project

+
+
+ +
+ + + +
+
+ +
+
+
+

You are now offline!

+
+
+ +
+ + + +
+
+ +
+
+
+

Your Osimenu subscription expires in 3 + days. Save on your renewal now.

+
+
+ +
+ + + +
+
+ + + +
+
+
+
@@ -651,35 +764,53 @@
-
-
-
-
- user-image -
+
+ +
+
+

1

- -
-

{{request.user.first_name}} {{request.user.last_name}}

- - +
+ + +
- - @@ -792,6 +923,19 @@ id="closeModalButton"> +
+
+ +
+
@@ -808,6 +952,9 @@ + + + \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-ticket.html b/osinaweb/osinacore/templates/add_templates/add-ticket.html index 652567c1..7671435c 100644 --- a/osinaweb/osinacore/templates/add_templates/add-ticket.html +++ b/osinaweb/osinacore/templates/add_templates/add-ticket.html @@ -68,22 +68,31 @@
+ class="w-full py-1 px-3 border border-gray-300 outline-none rounded-md mt-1 resize-none" + rows="8">
-
+
- +
- - - + + + - -
diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html index fa7e1cf5..d5fc138a 100644 --- a/osinaweb/osinacore/templates/customer_main.html +++ b/osinaweb/osinacore/templates/customer_main.html @@ -555,6 +555,20 @@ id="closeModalButton"> +
+
+ +
+
+
diff --git a/osinaweb/osinacore/templates/details_templates/project-details.html b/osinaweb/osinacore/templates/details_templates/project-details.html index b58f8022..d651e7ec 100644 --- a/osinaweb/osinacore/templates/details_templates/project-details.html +++ b/osinaweb/osinacore/templates/details_templates/project-details.html @@ -13,15 +13,17 @@ {% if project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %} {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %} bg-opacity-70">

{{project.name}}

- {% for type in project.project_type.all %} -

- {{type.name}} {% if not forloop.last %} | {% endif %} -

- {% endfor %} +
+ {% for type in project.project_type.all %} +

+ {{type.name}} {% if not forloop.last %} | {% endif %} +

+ {% endfor %} +
- +