瀏覽代碼

Merge branch 'navbar' of ShariX_Open/sharix-open-webapp-base into unstable

Updating the appearance of the navigation menu according to the layout
Anton Moiseenko 11 月之前
父節點
當前提交
2eb2034ba4
共有 27 個文件被更改,包括 618 次插入208 次删除
  1. 3 4
      SharixAdmin/static/SharixAdmin/img/menu/arrow-right.svg
  2. 3 0
      SharixAdmin/static/SharixAdmin/img/menu/briefcase.svg
  3. 3 0
      SharixAdmin/static/SharixAdmin/img/menu/briefcase_w.svg
  4. 3 8
      SharixAdmin/static/SharixAdmin/img/menu/clock-history.svg
  5. 3 8
      SharixAdmin/static/SharixAdmin/img/menu/clock-history_w.svg
  6. 1 6
      SharixAdmin/static/SharixAdmin/img/menu/credit-card.svg
  7. 1 6
      SharixAdmin/static/SharixAdmin/img/menu/credit-card_w.svg
  8. 1 1
      SharixAdmin/static/SharixAdmin/img/menu/education.svg
  9. 1 1
      SharixAdmin/static/SharixAdmin/img/menu/education_w.svg
  10. 1 1
      SharixAdmin/static/SharixAdmin/img/menu/gear.svg
  11. 1 1
      SharixAdmin/static/SharixAdmin/img/menu/gear_w.svg
  12. 3 8
      SharixAdmin/static/SharixAdmin/img/menu/hdd-network.svg
  13. 3 8
      SharixAdmin/static/SharixAdmin/img/menu/hdd-network_w.svg
  14. 3 4
      SharixAdmin/static/SharixAdmin/img/menu/house.svg
  15. 3 4
      SharixAdmin/static/SharixAdmin/img/menu/house_w.svg
  16. 1 10
      SharixAdmin/static/SharixAdmin/img/menu/people.svg
  17. 1 10
      SharixAdmin/static/SharixAdmin/img/menu/people_w.svg
  18. 3 6
      SharixAdmin/static/SharixAdmin/img/menu/person.svg
  19. 3 6
      SharixAdmin/static/SharixAdmin/img/menu/person_w.svg
  20. 3 8
      SharixAdmin/static/SharixAdmin/img/menu/tikets.svg
  21. 3 8
      SharixAdmin/static/SharixAdmin/img/menu/tikets_w.svg
  22. 75 0
      SharixAdmin/static/drf-yasg/colors2.css
  23. 47 0
      SharixAdmin/static/drf-yasg/navbar-style.css
  24. 2 1
      SharixAdmin/templates/SharixAdmin/base.html
  25. 66 75
      SharixAdmin/templates/SharixAdmin/index.html
  26. 9 24
      SharixAdmin/views/context.py
  27. 372 0
      core/config.py

+ 3 - 4
SharixAdmin/static/SharixAdmin/img/menu/arrow-right.svg

@@ -1,4 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 8C1 7.72386 1.22386 7.5 1.5 7.5L13.2929 7.5L10.1464 4.35355C9.95118 4.15829 9.95118 3.84171 10.1464 3.64645C10.3417 3.45118 10.6583 3.45118 10.8536 3.64645L14.8536 7.64645C15.0488 7.84171 15.0488 8.15829 14.8536 8.35355L10.8536 12.3536C10.6583 12.5488 10.3417 12.5488 10.1464 12.3536C9.95118 12.1583 9.95118 11.8417 10.1464 11.6464L13.2929 8.5H1.5C1.22386 8.5 1 8.27614 1 8Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M15.54 11.29L9.87998 5.64001C9.78702 5.54628 9.67642 5.47188 9.55456 5.42111C9.4327 5.37035 9.30199 5.34421 9.16998 5.34421C9.03797 5.34421 8.90726 5.37035 8.78541 5.42111C8.66355 5.47188 8.55294 5.54628 8.45998 5.64001C8.27373 5.82737 8.16919 6.08082 8.16919 6.34501C8.16919 6.60919 8.27373 6.86264 8.45998 7.05001L13.41 12.05L8.45998 17C8.27373 17.1874 8.16919 17.4408 8.16919 17.705C8.16919 17.9692 8.27373 18.2226 8.45998 18.41C8.5526 18.5045 8.66304 18.5797 8.78492 18.6312C8.90679 18.6827 9.03767 18.7095 9.16998 18.71C9.30229 18.7095 9.43317 18.6827 9.55505 18.6312C9.67692 18.5797 9.78737 18.5045 9.87998 18.41L15.54 12.76C15.6415 12.6664 15.7225 12.5527 15.7779 12.4262C15.8333 12.2997 15.8619 12.1631 15.8619 12.025C15.8619 11.8869 15.8333 11.7503 15.7779 11.6238C15.7225 11.4973 15.6415 11.3836 15.54 11.29Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
SharixAdmin/static/SharixAdmin/img/menu/briefcase.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M17 4.21053H14V3.15789C14 2.32037 13.6839 1.51715 13.1213 0.924926C12.5587 0.332706 11.7956 0 11 0H9C8.20435 0 7.44129 0.332706 6.87868 0.924926C6.31607 1.51715 6 2.32037 6 3.15789V4.21053H3C2.20435 4.21053 1.44129 4.54323 0.87868 5.13545C0.316071 5.72767 0 6.5309 0 7.36842V16.8421C0 17.6796 0.316071 18.4829 0.87868 19.0751C1.44129 19.6673 2.20435 20 3 20H17C17.7956 20 18.5587 19.6673 19.1213 19.0751C19.6839 18.4829 20 17.6796 20 16.8421V7.36842C20 6.5309 19.6839 5.72767 19.1213 5.13545C18.5587 4.54323 17.7956 4.21053 17 4.21053ZM8 3.15789C8 2.87872 8.10536 2.61098 8.29289 2.41357C8.48043 2.21617 8.73478 2.10526 9 2.10526H11C11.2652 2.10526 11.5196 2.21617 11.7071 2.41357C11.8946 2.61098 12 2.87872 12 3.15789V4.21053H8V3.15789ZM18 16.8421C18 17.1213 17.8946 17.389 17.7071 17.5864C17.5196 17.7838 17.2652 17.8947 17 17.8947H3C2.73478 17.8947 2.48043 17.7838 2.29289 17.5864C2.10536 17.389 2 17.1213 2 16.8421V11.0526C4.54626 12.1159 7.26069 12.6624 10 12.6632C12.7392 12.6614 15.4535 12.115 18 11.0526V16.8421ZM18 8.74737C15.4784 9.91345 12.7542 10.5156 10 10.5156C7.24579 10.5156 4.5216 9.91345 2 8.74737V7.36842C2 7.08925 2.10536 6.82151 2.29289 6.6241C2.48043 6.42669 2.73478 6.31579 3 6.31579H17C17.2652 6.31579 17.5196 6.42669 17.7071 6.6241C17.8946 6.82151 18 7.08925 18 7.36842V8.74737Z" fill="#479FF8"/>
+</svg>

+ 3 - 0
SharixAdmin/static/SharixAdmin/img/menu/briefcase_w.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M17 4.21053H14V3.15789C14 2.32037 13.6839 1.51715 13.1213 0.924926C12.5587 0.332706 11.7956 0 11 0H9C8.20435 0 7.44129 0.332706 6.87868 0.924926C6.31607 1.51715 6 2.32037 6 3.15789V4.21053H3C2.20435 4.21053 1.44129 4.54323 0.87868 5.13545C0.316071 5.72767 0 6.5309 0 7.36842V16.8421C0 17.6796 0.316071 18.4829 0.87868 19.0751C1.44129 19.6673 2.20435 20 3 20H17C17.7956 20 18.5587 19.6673 19.1213 19.0751C19.6839 18.4829 20 17.6796 20 16.8421V7.36842C20 6.5309 19.6839 5.72767 19.1213 5.13545C18.5587 4.54323 17.7956 4.21053 17 4.21053ZM8 3.15789C8 2.87872 8.10536 2.61098 8.29289 2.41357C8.48043 2.21617 8.73478 2.10526 9 2.10526H11C11.2652 2.10526 11.5196 2.21617 11.7071 2.41357C11.8946 2.61098 12 2.87872 12 3.15789V4.21053H8V3.15789ZM18 16.8421C18 17.1213 17.8946 17.389 17.7071 17.5864C17.5196 17.7838 17.2652 17.8947 17 17.8947H3C2.73478 17.8947 2.48043 17.7838 2.29289 17.5864C2.10536 17.389 2 17.1213 2 16.8421V11.0526C4.54626 12.1159 7.26069 12.6624 10 12.6632C12.7392 12.6614 15.4535 12.115 18 11.0526V16.8421ZM18 8.74737C15.4784 9.91345 12.7542 10.5156 10 10.5156C7.24579 10.5156 4.5216 9.91345 2 8.74737V7.36842C2 7.08925 2.10536 6.82151 2.29289 6.6241C2.48043 6.42669 2.73478 6.31579 3 6.31579H17C17.2652 6.31579 17.5196 6.42669 17.7071 6.6241C17.8946 6.82151 18 7.08925 18 7.36842V8.74737Z" fill="#FFF"/>
+</svg>

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/clock-history.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.51496 1.01896C8.34401 1.00635 8.17225 1 8 1V0C8.19685 0 8.39314 0.00726199 8.58852 0.0216722L8.51496 1.01896ZM10.5193 1.46905C10.1985 1.34533 9.86912 1.2454 9.53371 1.17008L9.75282 0.194382C10.1361 0.280463 10.5126 0.394665 10.8792 0.536055L10.5193 1.46905ZM11.889 2.17971C11.7458 2.08402 11.5994 1.99388 11.4503 1.90939L11.9432 1.0393C12.1136 1.13586 12.2809 1.23888 12.4446 1.34824C12.6082 1.4576 12.7674 1.5727 12.9219 1.69322L12.3066 2.48158C12.1715 2.37612 12.0322 2.27541 11.889 2.17971ZM13.7231 3.96934C13.5252 3.68829 13.3068 3.42218 13.0697 3.17321L13.794 2.48368C14.0649 2.76821 14.3145 3.07233 14.5407 3.39353L13.7231 3.96934ZM14.4672 5.32122C14.4012 5.16208 14.3296 5.00583 14.2526 4.85271L15.1458 4.40311C15.2339 4.5781 15.3157 4.75667 15.391 4.93853C15.4664 5.12039 15.5348 5.30453 15.5962 5.49054L14.6467 5.80423C14.5929 5.64147 14.5331 5.48035 14.4672 5.32122ZM14.9979 7.82822C14.9895 7.48455 14.9557 7.14197 14.8969 6.80326L15.8822 6.63231C15.9494 7.01939 15.988 7.41092 15.9976 7.80367L14.9979 7.82822ZM14.8655 9.36563C14.8991 9.1967 14.9264 9.02699 14.9474 8.85687L15.9398 8.97929C15.9159 9.17372 15.8847 9.36766 15.8463 9.56072C15.8079 9.75378 15.7625 9.94489 15.7102 10.1337L14.7464 9.867C14.7922 9.70179 14.8319 9.53457 14.8655 9.36563ZM13.914 11.745C14.0979 11.4546 14.2602 11.151 14.3995 10.8367L15.3137 11.2419C15.1545 11.6011 14.969 11.9481 14.7588 12.28L13.914 11.745ZM12.9497 12.9497C13.0715 12.828 13.1885 12.702 13.3005 12.5722L14.0577 13.2254C13.9297 13.3737 13.796 13.5177 13.6569 13.6569L12.9497 12.9497Z" 
-fill="#0081ff"/>
-<path d="M8 1C6.84885 1 5.71545 1.2839 4.70022 1.82655C3.68499 2.3692 2.81926 3.15386 2.17971 4.11101C1.54017 5.06816 1.14654 6.16827 1.03371 7.31388C0.920876 8.45949 1.09232 9.61525 1.53285 10.6788C1.97337 11.7423 2.66939 12.6808 3.55925 13.4111C4.44911 14.1414 5.50533 14.6409 6.63437 14.8655C7.76341 15.0901 8.93041 15.0327 10.032 14.6986C11.1336 14.3644 12.1358 13.7637 12.9497 12.9497L13.6569 13.6569C12.7266 14.5871 11.5812 15.2736 10.3223 15.6555C9.06332 16.0374 7.72961 16.1029 6.43928 15.8463C5.14895 15.5896 3.94183 15.0187 2.92486 14.1841C1.90788 13.3495 1.11243 12.2769 0.608966 11.0615C0.105504 9.846 -0.0904279 8.52514 0.0385242 7.21586C0.167476 5.90659 0.617333 4.64933 1.34825 3.55544C2.07916 2.46155 3.06857 1.5648 4.22883 0.94463C5.38909 0.324457 6.68439 0 8 0V1Z" 
-fill="#0081ff"/>
-<path d="M7.5 3C7.77614 3 8 3.22386 8 3.5V8.70984L11.2481 10.5659C11.4878 10.7029 11.5711 11.0083 11.4341 11.2481C11.2971 11.4878 10.9917 11.5711 10.7519 11.4341L7.25193 9.43412C7.09615 9.3451 7 9.17943 7 9V3.5C7 3.22386 7.22386 3 7.5 3Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M11.44 2C8.87638 2.00731 6.41349 2.99891 4.56 4.77V3C4.56 2.73478 4.45464 2.48043 4.2671 2.29289C4.07957 2.10536 3.82521 2 3.56 2C3.29478 2 3.04043 2.10536 2.85289 2.29289C2.66535 2.48043 2.56 2.73478 2.56 3V7.5C2.56 7.76522 2.66535 8.01957 2.85289 8.20711C3.04043 8.39464 3.29478 8.5 3.56 8.5H8.06C8.32521 8.5 8.57957 8.39464 8.7671 8.20711C8.95464 8.01957 9.06 7.76522 9.06 7.5C9.06 7.23478 8.95464 6.98043 8.7671 6.79289C8.57957 6.60536 8.32521 6.5 8.06 6.5H5.66C6.57171 5.53701 7.7085 4.81576 8.96813 4.40114C10.2277 3.98651 11.5707 3.89152 12.8761 4.1247C14.1816 4.35788 15.4086 4.91193 16.4468 5.73699C17.485 6.56205 18.3018 7.63226 18.8237 8.85133C19.3457 10.0704 19.5564 11.4001 19.4369 12.7208C19.3174 14.0415 18.8715 15.3118 18.1392 16.4174C17.407 17.5231 16.4114 18.4293 15.242 19.0547C14.0726 19.68 12.7661 20.0049 11.44 20C11.1748 20 10.9204 20.1054 10.7329 20.2929C10.5454 20.4804 10.44 20.7348 10.44 21C10.44 21.2652 10.5454 21.5196 10.7329 21.7071C10.9204 21.8946 11.1748 22 11.44 22C14.0922 22 16.6357 20.9464 18.5111 19.0711C20.3864 17.1957 21.44 14.6522 21.44 12C21.44 9.34784 20.3864 6.8043 18.5111 4.92893C16.6357 3.05357 14.0922 2 11.44 2ZM11.44 8C11.1748 8 10.9204 8.10536 10.7329 8.29289C10.5454 8.48043 10.44 8.73478 10.44 9V12C10.44 12.2652 10.5454 12.5196 10.7329 12.7071C10.9204 12.8946 11.1748 13 11.44 13H13.44C13.7052 13 13.9596 12.8946 14.1471 12.7071C14.3346 12.5196 14.44 12.2652 14.44 12C14.44 11.7348 14.3346 11.4804 14.1471 11.2929C13.9596 11.1054 13.7052 11 13.44 11H12.44V9C12.44 8.73478 12.3346 8.48043 12.1471 8.29289C11.9596 8.10536 11.7052 8 11.44 8Z" fill="#479FF8"/>
+</svg>

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/clock-history_w.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.51496 1.01896C8.34401 1.00635 8.17225 1 8 1V0C8.19685 0 8.39314 0.00726199 8.58852 0.0216722L8.51496 1.01896ZM10.5193 1.46905C10.1985 1.34533 9.86912 1.2454 9.53371 1.17008L9.75282 0.194382C10.1361 0.280463 10.5126 0.394665 10.8792 0.536055L10.5193 1.46905ZM11.889 2.17971C11.7458 2.08402 11.5994 1.99388 11.4503 1.90939L11.9432 1.0393C12.1136 1.13586 12.2809 1.23888 12.4446 1.34824C12.6082 1.4576 12.7674 1.5727 12.9219 1.69322L12.3066 2.48158C12.1715 2.37612 12.0322 2.27541 11.889 2.17971ZM13.7231 3.96934C13.5252 3.68829 13.3068 3.42218 13.0697 3.17321L13.794 2.48368C14.0649 2.76821 14.3145 3.07233 14.5407 3.39353L13.7231 3.96934ZM14.4672 5.32122C14.4012 5.16208 14.3296 5.00583 14.2526 4.85271L15.1458 4.40311C15.2339 4.5781 15.3157 4.75667 15.391 4.93853C15.4664 5.12039 15.5348 5.30453 15.5962 5.49054L14.6467 5.80423C14.5929 5.64147 14.5331 5.48035 14.4672 5.32122ZM14.9979 7.82822C14.9895 7.48455 14.9557 7.14197 14.8969 6.80326L15.8822 6.63231C15.9494 7.01939 15.988 7.41092 15.9976 7.80367L14.9979 7.82822ZM14.8655 9.36563C14.8991 9.1967 14.9264 9.02699 14.9474 8.85687L15.9398 8.97929C15.9159 9.17372 15.8847 9.36766 15.8463 9.56072C15.8079 9.75378 15.7625 9.94489 15.7102 10.1337L14.7464 9.867C14.7922 9.70179 14.8319 9.53457 14.8655 9.36563ZM13.914 11.745C14.0979 11.4546 14.2602 11.151 14.3995 10.8367L15.3137 11.2419C15.1545 11.6011 14.969 11.9481 14.7588 12.28L13.914 11.745ZM12.9497 12.9497C13.0715 12.828 13.1885 12.702 13.3005 12.5722L14.0577 13.2254C13.9297 13.3737 13.796 13.5177 13.6569 13.6569L12.9497 12.9497Z" 
-fill="white"/>
-<path d="M8 1C6.84885 1 5.71545 1.2839 4.70022 1.82655C3.68499 2.3692 2.81926 3.15386 2.17971 4.11101C1.54017 5.06816 1.14654 6.16827 1.03371 7.31388C0.920876 8.45949 1.09232 9.61525 1.53285 10.6788C1.97337 11.7423 2.66939 12.6808 3.55925 13.4111C4.44911 14.1414 5.50533 14.6409 6.63437 14.8655C7.76341 15.0901 8.93041 15.0327 10.032 14.6986C11.1336 14.3644 12.1358 13.7637 12.9497 12.9497L13.6569 13.6569C12.7266 14.5871 11.5812 15.2736 10.3223 15.6555C9.06332 16.0374 7.72961 16.1029 6.43928 15.8463C5.14895 15.5896 3.94183 15.0187 2.92486 14.1841C1.90788 13.3495 1.11243 12.2769 0.608966 11.0615C0.105504 9.846 -0.0904279 8.52514 0.0385242 7.21586C0.167476 5.90659 0.617333 4.64933 1.34825 3.55544C2.07916 2.46155 3.06857 1.5648 4.22883 0.94463C5.38909 0.324457 6.68439 0 8 0V1Z" 
-fill="white"/>
-<path d="M7.5 3C7.77614 3 8 3.22386 8 3.5V8.70984L11.2481 10.5659C11.4878 10.7029 11.5711 11.0083 11.4341 11.2481C11.2971 11.4878 10.9917 11.5711 10.7519 11.4341L7.25193 9.43412C7.09615 9.3451 7 9.17943 7 9V3.5C7 3.22386 7.22386 3 7.5 3Z" 
-fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M11.44 2C8.87638 2.00731 6.41349 2.99891 4.56 4.77V3C4.56 2.73478 4.45464 2.48043 4.2671 2.29289C4.07957 2.10536 3.82521 2 3.56 2C3.29478 2 3.04043 2.10536 2.85289 2.29289C2.66535 2.48043 2.56 2.73478 2.56 3V7.5C2.56 7.76522 2.66535 8.01957 2.85289 8.20711C3.04043 8.39464 3.29478 8.5 3.56 8.5H8.06C8.32521 8.5 8.57957 8.39464 8.7671 8.20711C8.95464 8.01957 9.06 7.76522 9.06 7.5C9.06 7.23478 8.95464 6.98043 8.7671 6.79289C8.57957 6.60536 8.32521 6.5 8.06 6.5H5.66C6.57171 5.53701 7.7085 4.81576 8.96813 4.40114C10.2277 3.98651 11.5707 3.89152 12.8761 4.1247C14.1816 4.35788 15.4086 4.91193 16.4468 5.73699C17.485 6.56205 18.3018 7.63226 18.8237 8.85133C19.3457 10.0704 19.5564 11.4001 19.4369 12.7208C19.3174 14.0415 18.8715 15.3118 18.1392 16.4174C17.407 17.5231 16.4114 18.4293 15.242 19.0547C14.0726 19.68 12.7661 20.0049 11.44 20C11.1748 20 10.9204 20.1054 10.7329 20.2929C10.5454 20.4804 10.44 20.7348 10.44 21C10.44 21.2652 10.5454 21.5196 10.7329 21.7071C10.9204 21.8946 11.1748 22 11.44 22C14.0922 22 16.6357 20.9464 18.5111 19.0711C20.3864 17.1957 21.44 14.6522 21.44 12C21.44 9.34784 20.3864 6.8043 18.5111 4.92893C16.6357 3.05357 14.0922 2 11.44 2ZM11.44 8C11.1748 8 10.9204 8.10536 10.7329 8.29289C10.5454 8.48043 10.44 8.73478 10.44 9V12C10.44 12.2652 10.5454 12.5196 10.7329 12.7071C10.9204 12.8946 11.1748 13 11.44 13H13.44C13.7052 13 13.9596 12.8946 14.1471 12.7071C14.3346 12.5196 14.44 12.2652 14.44 12C14.44 11.7348 14.3346 11.4804 14.1471 11.2929C13.9596 11.1054 13.7052 11 13.44 11H12.44V9C12.44 8.73478 12.3346 8.48043 12.1471 8.29289C11.9596 8.10536 11.7052 8 11.44 8Z" fill="#FFF"/>
+</svg>

文件差異過大導致無法顯示
+ 1 - 6
SharixAdmin/static/SharixAdmin/img/menu/credit-card.svg


文件差異過大導致無法顯示
+ 1 - 6
SharixAdmin/static/SharixAdmin/img/menu/credit-card_w.svg


+ 1 - 1
SharixAdmin/static/SharixAdmin/img/menu/education.svg

@@ -1,4 +1,4 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8.21144 2.04691C8.07742 1.98436 7.92258 1.98436 7.78856 2.04691L0.288558 5.54691C0.107914 5.63121 -0.00539504 5.81476 0.000197994 6.01403C0.005791 6.2133 0.129217 6.3902 0.314306 6.46424L7.81431 9.46424C7.93351 9.51192 8.06649 9.51192 8.1857 9.46424L14 7.13852V13C13.4477 13 13 13.4477 13 14V16H16V14C16 13.4477 15.5523 13 15 13V6.73852L15.6857 6.46424C15.8708 6.3902 15.9942 6.2133 15.9998 6.01403C16.0054 5.81476 15.8921 5.63121 15.7114 5.54691L8.21144 2.04691ZM8 8.46148L1.75802 5.96469L8 3.05176L14.242 5.96469L8 8.46148Z" 
 fill="#0081ff"/>
 <path d="M4.17556 9.03184C4.04549 8.98306 3.90098 8.99059 3.77669 9.05264C3.6524 9.11468 3.55952 9.22564 3.52032 9.35892L3.02032 11.0589C2.94756 11.3063 3.07488 11.5685 3.31431 11.6642L7.81431 13.4642C7.93351 13.5119 8.06649 13.5119 8.1857 13.4642L12.6857 11.6642C12.9251 11.5685 13.0524 11.3063 12.9797 11.0589L12.4797 9.35892C12.4405 9.22564 12.3476 9.11468 12.2233 9.05264C12.099 8.99059 11.9545 8.98306 11.8244 9.03184L8 10.466L4.17556 9.03184ZM4.10803 10.9047L4.32795 10.157L7.82444 11.4682C7.93763 11.5106 8.06237 11.5106 8.17556 11.4682L11.6721 10.157L11.892 10.9047L8 12.4615L4.10803 10.9047Z" 

+ 1 - 1
SharixAdmin/static/SharixAdmin/img/menu/education_w.svg

@@ -1,4 +1,4 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8.21144 2.04691C8.07742 1.98436 7.92258 1.98436 7.78856 2.04691L0.288558 5.54691C0.107914 5.63121 -0.00539504 5.81476 0.000197994 6.01403C0.005791 6.2133 0.129217 6.3902 0.314306 6.46424L7.81431 9.46424C7.93351 9.51192 8.06649 9.51192 8.1857 9.46424L14 7.13852V13C13.4477 13 13 13.4477 13 14V16H16V14C16 13.4477 15.5523 13 15 13V6.73852L15.6857 6.46424C15.8708 6.3902 15.9942 6.2133 15.9998 6.01403C16.0054 5.81476 15.8921 5.63121 15.7114 5.54691L8.21144 2.04691ZM8 8.46148L1.75802 5.96469L8 3.05176L14.242 5.96469L8 8.46148Z" 
 fill="white"/>
 <path d="M4.17556 9.03184C4.04549 8.98306 3.90098 8.99059 3.77669 9.05264C3.6524 9.11468 3.55952 9.22564 3.52032 9.35892L3.02032 11.0589C2.94756 11.3063 3.07488 11.5685 3.31431 11.6642L7.81431 13.4642C7.93351 13.5119 8.06649 13.5119 8.1857 13.4642L12.6857 11.6642C12.9251 11.5685 13.0524 11.3063 12.9797 11.0589L12.4797 9.35892C12.4405 9.22564 12.3476 9.11468 12.2233 9.05264C12.099 8.99059 11.9545 8.98306 11.8244 9.03184L8 10.466L4.17556 9.03184ZM4.10803 10.9047L4.32795 10.157L7.82444 11.4682C7.93763 11.5106 8.06237 11.5106 8.17556 11.4682L11.6721 10.157L11.892 10.9047L8 12.4615L4.10803 10.9047Z" 

文件差異過大導致無法顯示
+ 1 - 1
SharixAdmin/static/SharixAdmin/img/menu/gear.svg


文件差異過大導致無法顯示
+ 1 - 1
SharixAdmin/static/SharixAdmin/img/menu/gear_w.svg


+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/hdd-network.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 5C4.77614 5 5 4.77614 5 4.5C5 4.22386 4.77614 4 4.5 4C4.22386 4 4 4.22386 4 4.5C4 4.77614 4.22386 5 4.5 5Z" 
-fill="#0081ff"/>
-<path d="M3 4.5C3 4.77614 2.77614 5 2.5 5C2.22386 5 2 4.77614 2 4.5C2 4.22386 2.22386 4 2.5 4C2.77614 4 3 4.22386 3 4.5Z" 
-fill="#0081ff"/>
-<path d="M0 4C0 2.89543 0.895431 2 2 2H14C15.1046 2 16 2.89543 16 4V5C16 6.10457 15.1046 7 14 7H8.5V10C9.32843 10 10 10.6716 10 11.5H15.5C15.7761 11.5 16 11.7239 16 12C16 12.2761 15.7761 12.5 15.5 12.5H10C10 13.3284 9.32843 14 8.5 14H7.5C6.67157 14 6 13.3284 6 12.5H0.5C0.223858 12.5 0 12.2761 0 12C0 11.7239 0.223858 11.5 0.5 11.5H6C6 10.6716 6.67157 10 7.5 10V7H2C0.895431 7 0 6.10457 0 5V4ZM1 4V5C1 5.55228 1.44772 6 2 6H14C14.5523 6 15 5.55228 15 5V4C15 3.44772 14.5523 3 14 3H2C1.44772 3 1 3.44772 1 4ZM7 11.5V12.5C7 12.7761 7.22386 13 7.5 13H8.5C8.77614 13 9 12.7761 9 12.5V11.5C9 11.2239 8.77614 11 8.5 11H7.5C7.22386 11 7 11.2239 7 11.5Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M19.0909 12.7273H17.2727V10C17.2727 9.75889 17.177 9.52766 17.0065 9.35718C16.836 9.18669 16.6047 9.09091 16.3636 9.09091H10.9091V7.27273H12.7273C12.9684 7.27273 13.1996 7.17695 13.3701 7.00646C13.5406 6.83597 13.6364 6.60474 13.6364 6.36364V0.909091C13.6364 0.667985 13.5406 0.436754 13.3701 0.266267C13.1996 0.0957789 12.9684 0 12.7273 0H7.27273C7.03162 0 6.80039 0.0957789 6.6299 0.266267C6.45942 0.436754 6.36364 0.667985 6.36364 0.909091V6.36364C6.36364 6.60474 6.45942 6.83597 6.6299 7.00646C6.80039 7.17695 7.03162 7.27273 7.27273 7.27273H9.09091V9.09091H3.63636C3.39526 9.09091 3.16403 9.18669 2.99354 9.35718C2.82305 9.52766 2.72727 9.75889 2.72727 10V12.7273H0.909091C0.667985 12.7273 0.436754 12.8231 0.266267 12.9935C0.0957789 13.164 0 13.3953 0 13.6364V19.0909C0 19.332 0.0957789 19.5632 0.266267 19.7337C0.436754 19.9042 0.667985 20 0.909091 20H6.36364C6.60474 20 6.83597 19.9042 7.00646 19.7337C7.17695 19.5632 7.27273 19.332 7.27273 19.0909V13.6364C7.27273 13.3953 7.17695 13.164 7.00646 12.9935C6.83597 12.8231 6.60474 12.7273 6.36364 12.7273H4.54545V10.9091H15.4545V12.7273H13.6364C13.3953 12.7273 13.164 12.8231 12.9935 12.9935C12.8231 13.164 12.7273 13.3953 12.7273 13.6364V19.0909C12.7273 19.332 12.8231 19.5632 12.9935 19.7337C13.164 19.9042 13.3953 20 13.6364 20H19.0909C19.332 20 19.5632 19.9042 19.7337 19.7337C19.9042 19.5632 20 19.332 20 19.0909V13.6364C20 13.3953 19.9042 13.164 19.7337 12.9935C19.5632 12.8231 19.332 12.7273 19.0909 12.7273ZM5.45455 14.5455V18.1818H1.81818V14.5455H5.45455ZM8.18182 5.45455V1.81818H11.8182V5.45455H8.18182ZM18.1818 18.1818H14.5455V14.5455H18.1818V18.1818Z" fill="#479FF8"/>
+</svg>

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/hdd-network_w.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 5C4.77614 5 5 4.77614 5 4.5C5 4.22386 4.77614 4 4.5 4C4.22386 4 4 4.22386 4 4.5C4 4.77614 4.22386 5 4.5 5Z" 
-fill="white"/>
-<path d="M3 4.5C3 4.77614 2.77614 5 2.5 5C2.22386 5 2 4.77614 2 4.5C2 4.22386 2.22386 4 2.5 4C2.77614 4 3 4.22386 3 4.5Z" 
-fill="white"/>
-<path d="M0 4C0 2.89543 0.895431 2 2 2H14C15.1046 2 16 2.89543 16 4V5C16 6.10457 15.1046 7 14 7H8.5V10C9.32843 10 10 10.6716 10 11.5H15.5C15.7761 11.5 16 11.7239 16 12C16 12.2761 15.7761 12.5 15.5 12.5H10C10 13.3284 9.32843 14 8.5 14H7.5C6.67157 14 6 13.3284 6 12.5H0.5C0.223858 12.5 0 12.2761 0 12C0 11.7239 0.223858 11.5 0.5 11.5H6C6 10.6716 6.67157 10 7.5 10V7H2C0.895431 7 0 6.10457 0 5V4ZM1 4V5C1 5.55228 1.44772 6 2 6H14C14.5523 6 15 5.55228 15 5V4C15 3.44772 14.5523 3 14 3H2C1.44772 3 1 3.44772 1 4ZM7 11.5V12.5C7 12.7761 7.22386 13 7.5 13H8.5C8.77614 13 9 12.7761 9 12.5V11.5C9 11.2239 8.77614 11 8.5 11H7.5C7.22386 11 7 11.2239 7 11.5Z" 
-fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="none">
+  <path d="M19.0909 12.7273H17.2727V10C17.2727 9.75889 17.177 9.52766 17.0065 9.35718C16.836 9.18669 16.6047 9.09091 16.3636 9.09091H10.9091V7.27273H12.7273C12.9684 7.27273 13.1996 7.17695 13.3701 7.00646C13.5406 6.83597 13.6364 6.60474 13.6364 6.36364V0.909091C13.6364 0.667985 13.5406 0.436754 13.3701 0.266267C13.1996 0.0957789 12.9684 0 12.7273 0H7.27273C7.03162 0 6.80039 0.0957789 6.6299 0.266267C6.45942 0.436754 6.36364 0.667985 6.36364 0.909091V6.36364C6.36364 6.60474 6.45942 6.83597 6.6299 7.00646C6.80039 7.17695 7.03162 7.27273 7.27273 7.27273H9.09091V9.09091H3.63636C3.39526 9.09091 3.16403 9.18669 2.99354 9.35718C2.82305 9.52766 2.72727 9.75889 2.72727 10V12.7273H0.909091C0.667985 12.7273 0.436754 12.8231 0.266267 12.9935C0.0957789 13.164 0 13.3953 0 13.6364V19.0909C0 19.332 0.0957789 19.5632 0.266267 19.7337C0.436754 19.9042 0.667985 20 0.909091 20H6.36364C6.60474 20 6.83597 19.9042 7.00646 19.7337C7.17695 19.5632 7.27273 19.332 7.27273 19.0909V13.6364C7.27273 13.3953 7.17695 13.164 7.00646 12.9935C6.83597 12.8231 6.60474 12.7273 6.36364 12.7273H4.54545V10.9091H15.4545V12.7273H13.6364C13.3953 12.7273 13.164 12.8231 12.9935 12.9935C12.8231 13.164 12.7273 13.3953 12.7273 13.6364V19.0909C12.7273 19.332 12.8231 19.5632 12.9935 19.7337C13.164 19.9042 13.3953 20 13.6364 20H19.0909C19.332 20 19.5632 19.9042 19.7337 19.7337C19.9042 19.5632 20 19.332 20 19.0909V13.6364C20 13.3953 19.9042 13.164 19.7337 12.9935C19.5632 12.8231 19.332 12.7273 19.0909 12.7273ZM5.45455 14.5455V18.1818H1.81818V14.5455H5.45455ZM8.18182 5.45455V1.81818H11.8182V5.45455H8.18182ZM18.1818 18.1818H14.5455V14.5455H18.1818V18.1818Z" fill="#FFF"/>
+</svg>

+ 3 - 4
SharixAdmin/static/SharixAdmin/img/menu/house.svg

@@ -1,4 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.70711 1.50005C8.31658 1.10952 7.68342 1.10952 7.29289 1.50005L0.646447 8.14649C0.451184 8.34176 0.451184 8.65834 0.646447 8.8536C0.841709 9.04886 1.15829 9.04886 1.35355 8.8536L2 8.20715V13.5C2 14.3285 2.67157 15 3.5 15H12.5C13.3284 15 14 14.3285 14 13.5V8.20715L14.6464 8.8536C14.8417 9.04886 15.1583 9.04886 15.3536 8.8536C15.5488 8.65834 15.5488 8.34176 15.3536 8.14649L13 5.79294V2.50005C13 2.2239 12.7761 2.00005 12.5 2.00005H11.5C11.2239 2.00005 11 2.2239 11 2.50005V3.79294L8.70711 1.50005ZM13 7.20715L8 2.20715L3 7.20715V13.5C3 13.7762 3.22386 14 3.5 14H12.5C12.7761 14 13 13.7762 13 13.5V7.20715Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M20 8.00001L14 2.74001C13.45 2.24805 12.7379 1.97607 12 1.97607C11.2621 1.97607 10.55 2.24805 10 2.74001L4 8.00001C3.68237 8.28408 3.4289 8.63256 3.25648 9.02225C3.08405 9.41194 2.99662 9.83389 3 10.26V19C3 19.7957 3.31607 20.5587 3.87868 21.1213C4.44129 21.6839 5.20435 22 6 22H18C18.7957 22 19.5587 21.6839 20.1213 21.1213C20.6839 20.5587 21 19.7957 21 19V10.25C21.002 9.82557 20.9139 9.40555 20.7415 9.01769C20.5691 8.62983 20.3164 8.28296 20 8.00001ZM14 20H10V15C10 14.7348 10.1054 14.4804 10.2929 14.2929C10.4804 14.1054 10.7348 14 11 14H13C13.2652 14 13.5196 14.1054 13.7071 14.2929C13.8946 14.4804 14 14.7348 14 15V20ZM19 19C19 19.2652 18.8946 19.5196 18.7071 19.7071C18.5196 19.8946 18.2652 20 18 20H16V15C16 14.2044 15.6839 13.4413 15.1213 12.8787C14.5587 12.3161 13.7957 12 13 12H11C10.2044 12 9.44129 12.3161 8.87868 12.8787C8.31607 13.4413 8 14.2044 8 15V20H6C5.73479 20 5.48043 19.8946 5.2929 19.7071C5.10536 19.5196 5 19.2652 5 19V10.25C5.00018 10.108 5.0306 9.9677 5.08922 9.83839C5.14784 9.70907 5.23333 9.59372 5.34 9.50001L11.34 4.25001C11.5225 4.08969 11.7571 4.00127 12 4.00127C12.2429 4.00127 12.4775 4.08969 12.66 4.25001L18.66 9.50001C18.7667 9.59372 18.8522 9.70907 18.9108 9.83839C18.9694 9.9677 18.9998 10.108 19 10.25V19Z" fill="#479FF8"/>
+</svg>

+ 3 - 4
SharixAdmin/static/SharixAdmin/img/menu/house_w.svg

@@ -1,4 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M8.70711 1.50005C8.31658 1.10952 7.68342 1.10952 7.29289 1.50005L0.646447 8.14649C0.451184 8.34176 0.451184 8.65834 0.646447 8.8536C0.841709 9.04886 1.15829 9.04886 1.35355 8.8536L2 8.20715V13.5C2 14.3285 2.67157 15 3.5 15H12.5C13.3284 15 14 14.3285 14 13.5V8.20715L14.6464 8.8536C14.8417 9.04886 15.1583 9.04886 15.3536 8.8536C15.5488 8.65834 15.5488 8.34176 15.3536 8.14649L13 5.79294V2.50005C13 2.2239 12.7761 2.00005 12.5 2.00005H11.5C11.2239 2.00005 11 2.2239 11 2.50005V3.79294L8.70711 1.50005ZM13 7.20715L8 2.20715L3 7.20715V13.5C3 13.7762 3.22386 14 3.5 14H12.5C12.7761 14 13 13.7762 13 13.5V7.20715Z" 
-fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M20 8.00001L14 2.74001C13.45 2.24805 12.7379 1.97607 12 1.97607C11.2621 1.97607 10.55 2.24805 10 2.74001L4 8.00001C3.68237 8.28408 3.4289 8.63256 3.25648 9.02225C3.08405 9.41194 2.99662 9.83389 3 10.26V19C3 19.7957 3.31607 20.5587 3.87868 21.1213C4.44129 21.6839 5.20435 22 6 22H18C18.7957 22 19.5587 21.6839 20.1213 21.1213C20.6839 20.5587 21 19.7957 21 19V10.25C21.002 9.82557 20.9139 9.40555 20.7415 9.01769C20.5691 8.62983 20.3164 8.28296 20 8.00001ZM14 20H10V15C10 14.7348 10.1054 14.4804 10.2929 14.2929C10.4804 14.1054 10.7348 14 11 14H13C13.2652 14 13.5196 14.1054 13.7071 14.2929C13.8946 14.4804 14 14.7348 14 15V20ZM19 19C19 19.2652 18.8946 19.5196 18.7071 19.7071C18.5196 19.8946 18.2652 20 18 20H16V15C16 14.2044 15.6839 13.4413 15.1213 12.8787C14.5587 12.3161 13.7957 12 13 12H11C10.2044 12 9.44129 12.3161 8.87868 12.8787C8.31607 13.4413 8 14.2044 8 15V20H6C5.73479 20 5.48043 19.8946 5.2929 19.7071C5.10536 19.5196 5 19.2652 5 19V10.25C5.00018 10.108 5.0306 9.9677 5.08922 9.83839C5.14784 9.70907 5.23333 9.59372 5.34 9.50001L11.34 4.25001C11.5225 4.08969 11.7571 4.00127 12 4.00127C12.2429 4.00127 12.4775 4.08969 12.66 4.25001L18.66 9.50001C18.7667 9.59372 18.8522 9.70907 18.9108 9.83839C18.9694 9.9677 18.9998 10.108 19 10.25V19Z" fill="#FFF"/>
+</svg>

文件差異過大導致無法顯示
+ 1 - 10
SharixAdmin/static/SharixAdmin/img/menu/people.svg


文件差異過大導致無法顯示
+ 1 - 10
SharixAdmin/static/SharixAdmin/img/menu/people_w.svg


+ 3 - 6
SharixAdmin/static/SharixAdmin/img/menu/person.svg

@@ -1,6 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 8C9.65685 8 11 6.65685 11 5C11 3.34315 9.65685 2 8 2C6.34315 2 5 3.34315 5 5C5 6.65685 6.34315 8 8 8ZM10 5C10 6.10457 9.10457 7 8 7C6.89543 7 6 6.10457 6 5C6 3.89543 6.89543 3 8 3C9.10457 3 10 3.89543 10 5Z" 
-fill="#0081ff"/>
-<path d="M14 13C14 14 13 14 13 14H3C3 14 2 14 2 13C2 12 3 9 8 9C13 9 14 12 14 13ZM13 12.9965C12.9986 12.7497 12.8462 12.0104 12.1679 11.3321C11.5156 10.6798 10.2891 10 7.99999 10C5.71088 10 4.48435 10.6798 3.8321 11.3321C3.15375 12.0104 3.00142 12.7497 3 12.9965H13Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M15.71 12.71C16.6904 11.9387 17.406 10.8809 17.7572 9.68394C18.1085 8.48697 18.0779 7.21027 17.6698 6.03147C17.2617 4.85267 16.4963 3.83039 15.4801 3.10686C14.4639 2.38332 13.2474 1.99451 12 1.99451C10.7525 1.99451 9.53611 2.38332 8.51993 3.10686C7.50374 3.83039 6.73834 4.85267 6.33021 6.03147C5.92208 7.21027 5.89151 8.48697 6.24276 9.68394C6.59401 10.8809 7.3096 11.9387 8.29 12.71C6.61007 13.383 5.14428 14.4994 4.04889 15.9399C2.95349 17.3805 2.26956 19.0913 2.07 20.89C2.05555 21.0213 2.06711 21.1542 2.10402 21.2811C2.14093 21.4079 2.20246 21.5263 2.28511 21.6293C2.45202 21.8375 2.69478 21.9708 2.96 22C3.22521 22.0292 3.49116 21.9518 3.69932 21.7849C3.90749 21.618 4.04082 21.3752 4.07 21.11C4.28958 19.1552 5.22168 17.3498 6.68822 16.0388C8.15475 14.7278 10.0529 14.003 12.02 14.003C13.9871 14.003 15.8852 14.7278 17.3518 16.0388C18.8183 17.3498 19.7504 19.1552 19.97 21.11C19.9972 21.3557 20.1144 21.5827 20.2991 21.747C20.4838 21.9114 20.7228 22.0015 20.97 22H21.08C21.3421 21.9698 21.5817 21.8373 21.7466 21.6313C21.9114 21.4252 21.9881 21.1624 21.96 20.9C21.7595 19.0962 21.0719 17.381 19.9708 15.9382C18.8698 14.4954 17.3969 13.3795 15.71 12.71ZM12 12C11.2089 12 10.4355 11.7654 9.77772 11.3259C9.11992 10.8864 8.60723 10.2616 8.30448 9.53074C8.00173 8.79983 7.92251 7.99557 8.07686 7.21964C8.2312 6.44372 8.61216 5.73099 9.17157 5.17158C9.73098 4.61217 10.4437 4.2312 11.2196 4.07686C11.9956 3.92252 12.7998 4.00173 13.5307 4.30448C14.2616 4.60724 14.8863 5.11993 15.3259 5.77772C15.7654 6.43552 16 7.20888 16 8C16 9.06087 15.5786 10.0783 14.8284 10.8284C14.0783 11.5786 13.0609 12 12 12Z" fill="#479FF8"/>
+</svg>

+ 3 - 6
SharixAdmin/static/SharixAdmin/img/menu/person_w.svg

@@ -1,6 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 8C9.65685 8 11 6.65685 11 5C11 3.34315 9.65685 2 8 2C6.34315 2 5 3.34315 5 5C5 6.65685 6.34315 8 8 8ZM10 5C10 6.10457 9.10457 7 8 7C6.89543 7 6 6.10457 6 5C6 3.89543 6.89543 3 8 3C9.10457 3 10 3.89543 10 5Z" 
-fill="white"/>
-<path d="M14 13C14 14 13 14 13 14H3C3 14 2 14 2 13C2 12 3 9 8 9C13 9 14 12 14 13ZM13 12.9965C12.9986 12.7497 12.8462 12.0104 12.1679 11.3321C11.5156 10.6798 10.2891 10 7.99999 10C5.71088 10 4.48435 10.6798 3.8321 11.3321C3.15375 12.0104 3.00142 12.7497 3 12.9965H13Z" 
-fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M15.71 12.71C16.6904 11.9387 17.406 10.8809 17.7572 9.68394C18.1085 8.48697 18.0779 7.21027 17.6698 6.03147C17.2617 4.85267 16.4963 3.83039 15.4801 3.10686C14.4639 2.38332 13.2474 1.99451 12 1.99451C10.7525 1.99451 9.53611 2.38332 8.51993 3.10686C7.50374 3.83039 6.73834 4.85267 6.33021 6.03147C5.92208 7.21027 5.89151 8.48697 6.24276 9.68394C6.59401 10.8809 7.3096 11.9387 8.29 12.71C6.61007 13.383 5.14428 14.4994 4.04889 15.9399C2.95349 17.3805 2.26956 19.0913 2.07 20.89C2.05555 21.0213 2.06711 21.1542 2.10402 21.2811C2.14093 21.4079 2.20246 21.5263 2.28511 21.6293C2.45202 21.8375 2.69478 21.9708 2.96 22C3.22521 22.0292 3.49116 21.9518 3.69932 21.7849C3.90749 21.618 4.04082 21.3752 4.07 21.11C4.28958 19.1552 5.22168 17.3498 6.68822 16.0388C8.15475 14.7278 10.0529 14.003 12.02 14.003C13.9871 14.003 15.8852 14.7278 17.3518 16.0388C18.8183 17.3498 19.7504 19.1552 19.97 21.11C19.9972 21.3557 20.1144 21.5827 20.2991 21.747C20.4838 21.9114 20.7228 22.0015 20.97 22H21.08C21.3421 21.9698 21.5817 21.8373 21.7466 21.6313C21.9114 21.4252 21.9881 21.1624 21.96 20.9C21.7595 19.0962 21.0719 17.381 19.9708 15.9382C18.8698 14.4954 17.3969 13.3795 15.71 12.71ZM12 12C11.2089 12 10.4355 11.7654 9.77772 11.3259C9.11992 10.8864 8.60723 10.2616 8.30448 9.53074C8.00173 8.79983 7.92251 7.99557 8.07686 7.21964C8.2312 6.44372 8.61216 5.73099 9.17157 5.17158C9.73098 4.61217 10.4437 4.2312 11.2196 4.07686C11.9956 3.92252 12.7998 4.00173 13.5307 4.30448C14.2616 4.60724 14.8863 5.11993 15.3259 5.77772C15.7654 6.43552 16 7.20888 16 8C16 9.06087 15.5786 10.0783 14.8284 10.8284C14.0783 11.5786 13.0609 12 12 12Z" fill="#FFF"/>
+</svg>

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/tikets.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 0C9.77614 0 10 0.223858 10 0.5C10 0.776142 10.2239 1 10.5 1C10.7761 1 11 1.22386 11 1.5V2C11 2.27614 10.7761 2.5 10.5 2.5H5.5C5.22386 2.5 5 2.27614 5 2V1.5C5 1.22386 5.22386 1 5.5 1C5.77614 1 6 0.776142 6 0.5C6 0.223858 6.22386 0 6.5 0H9.5Z" 
-fill="#0081ff"/>
-<path d="M3 2.5C3 2.22386 3.22386 2 3.5 2H4C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1H3.5C2.67157 1 2 1.67157 2 2.5V14.5C2 15.3284 2.67157 16 3.5 16H12.5C13.3284 16 14 15.3284 14 14.5V2.5C14 1.67157 13.3284 1 12.5 1H12C11.7239 1 11.5 1.22386 11.5 1.5C11.5 1.77614 11.7239 2 12 2H12.5C12.7761 2 13 2.22386 13 2.5V14.5C13 14.7761 12.7761 15 12.5 15H3.5C3.22386 15 3 14.7761 3 14.5V2.5Z" 
-fill="#0081ff"/>
-<path d="M10.8536 7.85355C11.0488 7.65829 11.0488 7.34171 10.8536 7.14645C10.6583 6.95118 10.3417 6.95118 10.1464 7.14645L7.5 9.79289L6.35355 8.64645C6.15829 8.45118 5.84171 8.45118 5.64645 8.64645C5.45118 8.84171 5.45118 9.15829 5.64645 9.35355L7.14645 10.8536C7.24021 10.9473 7.36739 11 7.5 11C7.63261 11 7.75979 10.9473 7.85355 10.8536L10.8536 7.85355Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M21 11.9999C20.7348 11.9999 20.4804 12.1053 20.2929 12.2928C20.1054 12.4804 20 12.7347 20 12.9999V18.9999C20 19.2652 19.8946 19.5195 19.7071 19.707C19.5196 19.8946 19.2652 19.9999 19 19.9999H5C4.73478 19.9999 4.48043 19.8946 4.29289 19.707C4.10536 19.5195 4 19.2652 4 18.9999V4.99994C4 4.73472 4.10536 4.48037 4.29289 4.29283C4.48043 4.1053 4.73478 3.99994 5 3.99994H11C11.2652 3.99994 11.5196 3.89458 11.7071 3.70705C11.8946 3.51951 12 3.26516 12 2.99994C12 2.73472 11.8946 2.48037 11.7071 2.29283C11.5196 2.1053 11.2652 1.99994 11 1.99994H5C4.20435 1.99994 3.44129 2.31601 2.87868 2.87862C2.31607 3.44123 2 4.20429 2 4.99994V18.9999C2 19.7956 2.31607 20.5587 2.87868 21.1213C3.44129 21.6839 4.20435 21.9999 5 21.9999H19C19.7956 21.9999 20.5587 21.6839 21.1213 21.1213C21.6839 20.5587 22 19.7956 22 18.9999V12.9999C22 12.7347 21.8946 12.4804 21.7071 12.2928C21.5196 12.1053 21.2652 11.9999 21 11.9999ZM6 12.7599V16.9999C6 17.2652 6.10536 17.5195 6.29289 17.707C6.48043 17.8946 6.73478 17.9999 7 17.9999H11.24C11.3716 18.0007 11.5021 17.9755 11.6239 17.9257C11.7457 17.8759 11.8566 17.8026 11.95 17.7099L18.87 10.7799L21.71 7.99994C21.8037 7.90698 21.8781 7.79637 21.9289 7.67452C21.9797 7.55266 22.0058 7.42195 22.0058 7.28994C22.0058 7.15793 21.9797 7.02722 21.9289 6.90536C21.8781 6.7835 21.8037 6.6729 21.71 6.57994L17.47 2.28994C17.377 2.19621 17.2664 2.12182 17.1446 2.07105C17.0227 2.02028 16.892 1.99414 16.76 1.99414C16.628 1.99414 16.4973 2.02028 16.3754 2.07105C16.2536 2.12182 16.143 2.19621 16.05 2.28994L13.23 5.11994L6.29 12.0499C6.19732 12.1434 6.12399 12.2542 6.07423 12.376C6.02446 12.4979 5.99924 12.6283 6 12.7599ZM16.76 4.40994L19.59 7.23994L18.17 8.65994L15.34 5.82994L16.76 4.40994ZM8 13.1699L13.93 7.23994L16.76 10.0699L10.83 15.9999H8V13.1699Z" fill="#479FF8"/>
+</svg>

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/tikets_w.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.5 0C9.77614 0 10 0.223858 10 0.5C10 0.776142 10.2239 1 10.5 1C10.7761 1 11 1.22386 11 1.5V2C11 2.27614 10.7761 2.5 10.5 2.5H5.5C5.22386 2.5 5 2.27614 5 2V1.5C5 1.22386 5.22386 1 5.5 1C5.77614 1 6 0.776142 6 0.5C6 0.223858 6.22386 0 6.5 0H9.5Z" 
-fill="white"/>
-<path d="M3 2.5C3 2.22386 3.22386 2 3.5 2H4C4.27614 2 4.5 1.77614 4.5 1.5C4.5 1.22386 4.27614 1 4 1H3.5C2.67157 1 2 1.67157 2 2.5V14.5C2 15.3284 2.67157 16 3.5 16H12.5C13.3284 16 14 15.3284 14 14.5V2.5C14 1.67157 13.3284 1 12.5 1H12C11.7239 1 11.5 1.22386 11.5 1.5C11.5 1.77614 11.7239 2 12 2H12.5C12.7761 2 13 2.22386 13 2.5V14.5C13 14.7761 12.7761 15 12.5 15H3.5C3.22386 15 3 14.7761 3 14.5V2.5Z" 
-fill="white"/>
-<path d="M10.8536 7.85355C11.0488 7.65829 11.0488 7.34171 10.8536 7.14645C10.6583 6.95118 10.3417 6.95118 10.1464 7.14645L7.5 9.79289L6.35355 8.64645C6.15829 8.45118 5.84171 8.45118 5.64645 8.64645C5.45118 8.84171 5.45118 9.15829 5.64645 9.35355L7.14645 10.8536C7.24021 10.9473 7.36739 11 7.5 11C7.63261 11 7.75979 10.9473 7.85355 10.8536L10.8536 7.85355Z" 
-fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+  <path d="M21 11.9999C20.7348 11.9999 20.4804 12.1053 20.2929 12.2928C20.1054 12.4804 20 12.7347 20 12.9999V18.9999C20 19.2652 19.8946 19.5195 19.7071 19.707C19.5196 19.8946 19.2652 19.9999 19 19.9999H5C4.73478 19.9999 4.48043 19.8946 4.29289 19.707C4.10536 19.5195 4 19.2652 4 18.9999V4.99994C4 4.73472 4.10536 4.48037 4.29289 4.29283C4.48043 4.1053 4.73478 3.99994 5 3.99994H11C11.2652 3.99994 11.5196 3.89458 11.7071 3.70705C11.8946 3.51951 12 3.26516 12 2.99994C12 2.73472 11.8946 2.48037 11.7071 2.29283C11.5196 2.1053 11.2652 1.99994 11 1.99994H5C4.20435 1.99994 3.44129 2.31601 2.87868 2.87862C2.31607 3.44123 2 4.20429 2 4.99994V18.9999C2 19.7956 2.31607 20.5587 2.87868 21.1213C3.44129 21.6839 4.20435 21.9999 5 21.9999H19C19.7956 21.9999 20.5587 21.6839 21.1213 21.1213C21.6839 20.5587 22 19.7956 22 18.9999V12.9999C22 12.7347 21.8946 12.4804 21.7071 12.2928C21.5196 12.1053 21.2652 11.9999 21 11.9999ZM6 12.7599V16.9999C6 17.2652 6.10536 17.5195 6.29289 17.707C6.48043 17.8946 6.73478 17.9999 7 17.9999H11.24C11.3716 18.0007 11.5021 17.9755 11.6239 17.9257C11.7457 17.8759 11.8566 17.8026 11.95 17.7099L18.87 10.7799L21.71 7.99994C21.8037 7.90698 21.8781 7.79637 21.9289 7.67452C21.9797 7.55266 22.0058 7.42195 22.0058 7.28994C22.0058 7.15793 21.9797 7.02722 21.9289 6.90536C21.8781 6.7835 21.8037 6.6729 21.71 6.57994L17.47 2.28994C17.377 2.19621 17.2664 2.12182 17.1446 2.07105C17.0227 2.02028 16.892 1.99414 16.76 1.99414C16.628 1.99414 16.4973 2.02028 16.3754 2.07105C16.2536 2.12182 16.143 2.19621 16.05 2.28994L13.23 5.11994L6.29 12.0499C6.19732 12.1434 6.12399 12.2542 6.07423 12.376C6.02446 12.4979 5.99924 12.6283 6 12.7599ZM16.76 4.40994L19.59 7.23994L18.17 8.65994L15.34 5.82994L16.76 4.40994ZM8 13.1699L13.93 7.23994L16.76 10.0699L10.83 15.9999H8V13.1699Z" fill="#FFF"/>
+</svg>

+ 75 - 0
SharixAdmin/static/drf-yasg/colors2.css

@@ -0,0 +1,75 @@
+
+:root{
+  --btn-bg-color: #fdb4b4;
+  --btn-txt-color: #ff0000;
+  --btn-hover-color: #0a58ca;
+  --pills-bg-color: #479FF8;
+  --pills-txt-color: None;
+  --links-txt-color: #479FF8;
+  --links-hover-color: #88b9ea;
+  --btn-success: #821e27;
+  --btn-success-txt: #821e27;
+  --btn-success-hover: #821e27;
+  --btn-danger: #821e27;
+  --btn-danger-txt: #821e27;
+  --btn-danger-hover: #821e27;
+}
+
+.btn-primary, .btn-outline-primary{
+  background-color: var(--btn-bg-color);
+  color: var(--btn-txt-color);
+  border-color: var(--btn-bg-color);
+}
+
+.btn-primary:hover, .btn-outline-primary:hover{
+  background-color: var(--btn-hover-color);
+  border-color: var(--btn-hover-color);
+}
+
+.nav-pills .nav-link.active, .nav-pills .show>.nav-link{
+  background-color: var(--pills-bg-color);
+  color: var(--pills-txt-color);
+}
+
+a{
+ color: var(--links-txt-color); 
+}
+
+.link img {
+  color: var(--links-txt-color); 
+}
+
+a:hover{
+  color:var(--links-hover-color)
+}
+
+.nav-link{
+  color: var(--links-txt-color)
+}
+
+.nav-link:hover{
+  color:var(--links-hover-color)
+}
+
+.btn-success, .btn-outline-success{
+  color: var(--btn-txt-color);
+  background-color: var(--btn-success);
+  border-color: var(--btn-success);
+}
+
+.btn-success:hover, .btn-outline-success:hover{
+  background-color: var(--btn-success-hover);
+  border-color: var(--btn-success-hover);
+}
+
+.btn-danger, .btn-outline-danger{
+  color: var(--btn-danger-txt);
+  background-color: var(--btn-danger);
+  border-color: var(--btn-danger);
+}
+
+.btn-danger:hover, .btn-outline-danger:hover{
+  background-color: var(--btn-danger-hover);
+  border-color: var(--btn-danger-hover);
+}
+

+ 47 - 0
SharixAdmin/static/drf-yasg/navbar-style.css

@@ -0,0 +1,47 @@
+@import url('https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;700&display=swap');
+
+* {
+    font-family: 'Open Sans', sans-serif;
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+.nav-item {
+    margin-bottom: 6px;
+    font-size: 16px;
+    line-height: 24px;
+}
+
+.arrow {
+    margin: auto;
+    color: #479FF8;
+}
+.rectangle-arrow {
+    position: fixed;
+    display: flex;
+    top: 0;
+    left: 0;
+    width: 75px;
+    height: 40px;
+    align-items: center;
+    vertical-align: middle;
+    border-radius: 6px;
+    border: 1px solid #D8D8D8;
+    background: #FFF;
+    box-shadow: 4px 5px 40px 0px #E5E5E5;
+    margin-top: 24px;
+    margin-left: 10px;
+    justify-content: center;
+}
+.nav-item span {
+    margin-left: 4px;
+}
+.nav-pills .nav-link {
+    height: 48px;
+    display: flex;
+
+}
+.link {
+    margin-top: 4px;
+}

+ 2 - 1
SharixAdmin/templates/SharixAdmin/base.html

@@ -6,8 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" href="{% static 'SharixAdmin/img/logo.png' %}"/>
+    <link rel="stylesheet" href="{% static 'drf-yasg/navbar-style.css' %}" >
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
-    <link type="text/css" href="{% static 'design_template/colors.css' %}" rel="stylesheet" />
+    <link type="text/css" href="{% static 'drf-yasg/colors2.css' %}" rel="stylesheet" />
     <title>{{ title }}</title>
 </head>
 <body style="min-width: 1050px;">

+ 66 - 75
SharixAdmin/templates/SharixAdmin/index.html

@@ -7,86 +7,66 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-3" id="leftmainpage">
-            <div class="d-flex flex-column p-2" style="width: 100%; min-width: 80px; height: 800px;  border-radius: 15px; box-shadow: 4px 5px 40px #cfcfcf; margin-top: 50px;">
-                <a class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-decoration-none" 
-                onclick="barMenuHide()" 
-                style="cursor: pointer;">
-                  <img src="{% static 'SharixAdmin/img/menu/arrow-right.svg' %}" 
-                  style="width: 30px; height: 30px; rotate: 180deg; color: #0081ff; transition-duration: 0.4s;" 
-                  class="mx-3 my-2" id="row-bar-menu" alt="">
-                  <span class="fs-4" id="sharix-menu-row">{% trans 'ShariX Menu' %}</span>
-                </a>
-                <hr>
-                <form action="{% url 'set_language' %}" method="post">{% csrf_token %}
-                  <input name="next" type="hidden" value="{{ redirect_to }}">
-                  <select name="language">
-                      {% get_current_language as LANGUAGE_CODE %}
-                      {% get_available_languages as LANGUAGES %}
-                      {% get_language_info_list for LANGUAGES as languages %}
-                      {% for language in languages %}
-                          <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>
-                              {{ language.name_local }} ({{ language.code }})
-                          </option>
-                      {% endfor %}
-                  </select>
-                  <input type="submit" value="{% trans 'Change' %}">
-              </form>
-              <hr>
-                <ul class="nav nav-pills flex-column mb-auto">
-                  {% for item in menu %}
-                  {% if item.link == url_path %}
-                  <li class="nav-item">
-                    <a class="nav-link active" >
-                      {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'_w.svg' as image_static %}
-                        <img  src="{% static image_static %}" alt="" style="width: 30px; height: 30px; "> 
+            <div class="d-flex flex-column p-2" style="width: 100%; min-width: 72px; max-width: 280px; height: 464px; position: sticky; top: 76px;
+            border-radius: 10px; border: 1px solid #D8D8D8; box-shadow: 4px 5px 40px 0px #E5E5E5; align-items: center;">
+
+
+              <ul class="nav nav-pills flex-column mb-auto" style="margin-top: 12px;">
+                {% for item in menu %}
+                {% if item.link == url_path %}
+                <li class="nav-item">
+                  <a class="nav-link active" style="color: #FFF; border-radius: 10px;" >
+                    {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'_w.svg' as image_static %}
+                    <div class="link">
+                      <img  src="{% static image_static %}" alt="" style="width: 22px; height: 22px;"> 
                       {% endwith %}
                       
-                      <span class="hidemenu">{{ item.title }}</span>
-                    </a>
-                  </li>
-                  {% elif item.link == 'tickets' %}
-                  <li class="nav-item">
-                    <a href="{% url 'tickets:ticket_list_list' %}" class="nav-link" >
-                      {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
-                        <img  src="{% static image_static %}" alt="" style="width: 30px; height: 30px;"> 
+                      <span class="hidemenu" style="color: #FFF;">{{ item.title }}</span>
+                    </div>
+                  </a>
+                </li>
+                {% elif item.link == 'tickets' %}
+                <li class="nav-item">
+                  <a href="{% url 'tickets:ticket_list_list' %}" class="nav-link" >
+                    {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
+                    <div class="link">
+                      <img  src="{% static image_static %}" alt="" style="width: 22px; height: 22px;"> 
                       {% endwith %}
                       <span class="hidemenu">{{ item.title }}</span>
-                    </a>
-                  </li>
-                  {% elif item.link == 'course' %}
-                  <li class="nav-item">
-                    <a href="http://study.reversea.net/" class="nav-link" >
-                      {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
-                        <img  src="{% static image_static %}" alt="" style="width: 30px; height: 30px;"> 
+                    </div>
+                  </a>
+                </li>
+                {% elif item.link == 'course' %}
+                <li class="nav-item">
+                  <a href="http://study.reversea.net/" class="nav-link" >
+                    {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
+                    <div class="link">
+                      <img  src="{% static image_static %}" alt="" style="width: 22px; height: 22px;"> 
                       {% endwith %}
                       <span class="hidemenu">{{ item.title }}</span>
-                    </a>
-                  </li>
-                  {% else %}
-                  <li class="nav-item">
-                    <a href="{% url item.link %}" class="nav-link" >
-                      {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
-                        <img  src="{% static image_static %}" alt="" style="width: 30px; height: 30px; "> 
+                    </div>
+                  </a>
+                </li>
+                {% else %}
+                <li class="nav-item">
+                  <a href="{% url item.link %}" class="nav-link" >
+                    {% with 'SharixAdmin/img/menu/'|add:item.sel|add:'.svg' as image_static %}
+                    <div class="link">
+                      <img  src="{% static image_static %}" alt="" style="width: 22px; height: 22px; "> 
                       {% endwith %}
                       <span class="hidemenu">{{ item.title }}</span>
-                    </a>
-                  </li>
-                  {% endif%}
-                  {% endfor %}
-                </ul>
+                    </div>
+                  </a>
+                </li>
+                {% endif%}
+                {% endfor %}
+              </ul>
                 <hr>
                 <div class="dropdown">
-                  <a href="#" class="d-flex align-items-center link-dark text-decoration-none dropdown-toggle" id="dropdownUser2" data-bs-toggle="dropdown" aria-expanded="false">
-                    <img alt="" width="32" height="32" class="rounded-circle me-2">
-                    <strong id="user-name-exit">{{ request.user.username }}</strong>
+                  <a href="#" aria-expanded="false">
+                    <img alt="" width="1" height="1" class="rounded-circle me-2">
+                    <strong id="user-name-exit"></strong>
                   </a>
-                  <ul class="dropdown-menu text-small shadow" aria-labelledby="dropdownUser2">
-                    <li><a class="dropdown-item" href="#">{% trans 'Contacts' %}Контакты</a></li>
-                    <li><a class="dropdown-item" href="#">{% trans 'Terms of use' %}</a></li>
-                    <li><a class="dropdown-item" href="#">{% trans 'Privacy policy' %}</a></li>
-                    <li><hr class="dropdown-divider"></li>
-                    <li><a class="btn btn-danger mx-2" href="{% url 'logoutweb' %}">{% trans 'Log out' %}</a></li>
-                  </ul>
                 </div>
               </div>      
         </div>
@@ -94,11 +74,11 @@
             <div class="d-flex flex-column p-4" 
             style="
             width: 100%; 
-            height: 800px; 
-            border-radius: 15px; 
-            background-color:white;
-            box-shadow: 4px 5px 40px #cfcfcf; 
-            margin-top: 50px;">
+            height: 857px; 
+            border: 1px solid #D8D8D8;
+            border-radius: 10px;
+            box-shadow: 4px 5px 40px 0px #E5E5E5;
+            margin-top: 76px;">
             {% block contenthome %}
             {% endblock contenthome%}
         </div>
@@ -107,6 +87,17 @@
     </div>
 </div>
 
+<a class="d-flex align-items-center mb-3 mb-md-0 me-md-auto text-decoration-none" 
+onclick="barMenuHide()" 
+style="cursor: pointer; position: fixed; align-items: center;">
+  <div class="rectangle-arrow">
+    <img src="{% static 'SharixAdmin/img/menu/arrow-right.svg' %}" 
+    style="width: 24px; height: 24px; rotate: 180deg; color: #0081ff; transition-duration: 0.4s;" 
+    class="mx-3 my-2" id="row-bar-menu" alt="">
+    <span class="fs-4" id="sharix-menu-row"></span>
+  </div>
+</a>
+
 <script>
   hidemenu = document.getElementsByClassName('hidemenu')
   shMenuRow = document.getElementById('sharix-menu-row')
@@ -120,7 +111,7 @@
     rowBarMenu.style.transform = 'rotate(0deg)';
     shMenuRow.style.display = "inline"
       usNameExit.style.display = "inline"
-      leftmainpage.style.maxWidth = "unset"
+      leftmainpage.style.maxWidth = "310px"
       leftmainpage.classList.remove("col-1")
       leftmainpage.classList.add("col-3")
       rightmainpage.classList.remove("col-11")

+ 9 - 24
SharixAdmin/views/context.py

@@ -2,33 +2,18 @@ from django.urls import resolve
 from django.utils.translation import gettext_lazy as _
 
 menu = [
-    {'title':_('Home/Balance'),          'link':'home', 'sel':'house'},
-    {'title':_('Payment information'),    'link':'test-page', 'sel':'credit-card'},
-    {'title':_('Payment history'),        'link':'trans','sel':'clock-history'},
-    {'title':_('Courses'),                   'link':'course', 'sel':'education'},
-    {'title':_('Personal information'),       'link':'test-page', 'sel':'person'},
-    {'title':_('Service management'),    'link':'test-page', 'sel':'hdd-network'},
-    {'title':_('My connections'),               'link':'test-page', 'sel':'people'},
-    {'title':_('Partnership'),          'link':'test-page', 'sel':'sotrud'},
-    {'title':_('Techsupport'),            'link':'test-page', 'sel':'gear'},
-    {'title':_('My tickets'),              'link':'tickets', 'sel':'tikets'},
-    {'title':_('Performers'),             'link':'provider', 'sel':'people', 
+    {'title':_('Главная'),          'link':'home', 'sel':'house'},
+    {'title':_('Заявки'),              'link':'tickets', 'sel':'tikets'},
+    {'title':_('Партнеры'),                'link':'partners', 'sel':'people',
      'roles':['METASERVICE-ADMIN']},
-    {'title':_('Service rates'),            'link':'service_tariff', 'sel':'person',
-     'roles':['PARTNER-ADMIN']},
-    {'title':_('Partners'),                'link':'partners', 'sel':'people',
+    {'title':_('Управление правами'),'link':'user_information', 'sel':'hdd-network'},
+    {'title':_('Услуги сервиса'),          'link':'service_type', 'sel':'briefcase',
      'roles':['METASERVICE-ADMIN']},
-    {'title':_('Resources'),                 'link':'resource', 'sel':'sotrud',
-     'roles':['PARTNER-ADMIN']},
-    {'title':_('Service services'),          'link':'service_type', 'sel':'hdd-network',
+    {'title':_('История заказов'),        'link':'trans','sel':'clock-history'},
+    {'title':_('Информация о сервисе'),    'link':'service_information/add/', 'sel':'person',
      'roles':['METASERVICE-ADMIN']},
-    {'title':_('Information about the service'),    'link':'service_information/add/', 'sel':'hdd-network',
-     'roles':['METASERVICE-ADMIN']},
-    {'title':_('Partner Information'),   'link':'partner_information/', 'sel':'person',
-     'roles':['PARTNER-ADMIN']},
-    {'title':_('Rates'),                  'link':'service', 'sel':'tikets',
-     'roles':['PARTNER-ADMIN']},
-    {'title':_('User Management'),'link':'user_information', 'sel':'person'}
+    {'title':_('Оплата'),    'link':'test-page', 'sel':'credit-card'},
+
 ]
 
 def get_context(request, page_context) -> dict:

+ 372 - 0
core/config.py

@@ -0,0 +1,372 @@
+import os
+
+from pathlib import Path
+
+from django.contrib.messages import constants as message_constants
+
+
+class ConfigDjango:
+    # Build paths inside the project like this: BASE_DIR / 'subdir'.
+    BASE_DIR = Path(__file__).resolve().parent.parent
+
+    # SECURITY WARNING: keep the secret key used in production secret!
+    SECRET_KEY = 'django-insecure-$eodx2ilnb*djkahfguiwegbwelgbnajl*u$qkt7j-b)7t1iq'
+    # SECURITY WARNING: don't run with debug turned on in production!
+    DEBUG = True
+    CSRF_TRUSTED_ORIGINS = []
+    ALLOWED_HOSTS = ["127.0.0.1"]
+    INTERNAL_IPS = ["127.0.0.1"]
+
+    # Application definition
+    INSTALLED_APPS = [
+        'jazzmin',
+        'django.contrib.admin',
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+        'django.contrib.messages',
+        'django.contrib.staticfiles',
+        'SharixAdmin.apps.SharixadminConfig',
+        'tickets.apps.TicketsConfig',
+        'metaservicesynced.apps.MetaservicesyncedConfig',
+        'django_tables2',
+        "django.contrib.sites",
+        "django.contrib.flatpages",
+        "django.contrib.admindocs",
+        "django_extensions",
+        'rest_framework',
+        'rest_framework.authtoken',
+        'djoser',
+        'schema_graph',
+        'drf_yasg',
+        'django_spaghetti',
+        'debug_toolbar',
+    ]
+
+    MIDDLEWARE = [
+        'django.middleware.security.SecurityMiddleware',
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.contrib.admindocs.middleware.XViewMiddleware',        
+        "debug_toolbar.middleware.DebugToolbarMiddleware",
+    ]
+
+    ROOT_URLCONF = "core.urls"
+
+    SESSION_EXPIRE_AT_BROWSER_CLOSE = False
+    SESSION_SECURITY_WARN_AFTER = 5
+    SESSION_SECURITY_EXPIRE_AFTER = 12
+
+    TEMPLATES = [
+        {
+            "BACKEND": "django.template.backends.django.DjangoTemplates",
+            "DIRS": [os.path.join(BASE_DIR, "templates")],
+            "APP_DIRS": True,
+            "OPTIONS": {
+                "context_processors": [
+                    "django.template.context_processors.debug",
+                    "django.template.context_processors.request",
+                    "django.contrib.auth.context_processors.auth",
+                    "django.template.context_processors.i18n",
+                    "django.template.context_processors.media",
+                    "django.template.context_processors.static",
+                    "django.template.context_processors.tz",
+                    "django.contrib.messages.context_processors.messages",
+                ],
+            },
+        }
+    ]
+
+    WSGI_APPLICATION = 'core.wsgi.application'
+
+    # Database
+    # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': BASE_DIR / 'db.sqlite3',
+        }
+    }
+
+    # Password validation
+    # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
+    AUTH_PASSWORD_VALIDATORS = [
+        {
+            'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        },
+        {
+            'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        },
+        {
+            'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        },
+        {
+            'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        },
+    ]
+
+    # Internationalization
+    # https://docs.djangoproject.com/en/4.0/topics/i18n/
+    LANGUAGE_CODE = 'ru'
+    USE_TZ = True
+    TIME_ZONE = 'Europe/Moscow'
+    SITE_ID = 1
+
+    # If you set this to False, Django will make some optimizations so as not
+    # to load the internationalization machinery.
+    USE_I18N = True
+
+    # Static files (CSS, JavaScript, Images)
+    # https://docs.djangoproject.com/en/4.0/howto/static-files/
+    STATIC_URL = "/static/"
+    STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
+
+    # Uploaded media
+    MEDIA_URL = "/media/"
+    MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+
+    # Without this, uploaded files > 4MB end up with perm 0600, unreadable by web server process
+    FILE_UPLOAD_PERMISSIONS = 0o644
+
+    # Override CSS class for the ERROR tag level to match Bootstrap class name
+    MESSAGE_TAGS = {message_constants.ERROR: "danger"}
+
+    # Default primary key field type
+    # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
+    DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+    AUTH_USER_MODEL = 'SharixAdmin.SharixUser'
+
+
+class ConfigJazzmin:
+    JAZZMIN_SETTINGS = {
+        # title of the window (Will default to current_admin_site.site_title if absent or None)
+        "site_title": "ShariX Admin",
+
+        # Title on the login screen (19 chars max) (defaults to current_admin_site.site_header if absent or None)
+        "site_header": "ShariX Platform",
+
+        # Title on the brand (19 chars max) (defaults to current_admin_site.site_header if absent or None)
+        "site_brand": "ShariX Platform",
+
+        # Logo to use for your site, must be present in static files, used for brand on top left
+        "site_logo": "SharixAdmin/img/logo.svg",
+
+        # Logo to use for your site, must be present in static files, used for login form logo (defaults to site_logo)
+        "login_logo": None,
+
+        # Logo to use for login form in dark themes (defaults to login_logo)
+        "login_logo_dark": None,
+
+        # CSS classes that are applied to the logo above
+        "site_logo_classes": "img-circle",
+
+        # Relative path to a favicon for your site, will default to site_logo if absent (ideally 32x32 px)
+        "site_icon": None,
+
+        # Welcome text on the login screen
+        "welcome_sign": "Welcome to the ShariX Admin",
+
+        # Copyright on the footer
+        "copyright": "Acme Library Ltd",
+
+        # List of model admins to search from the search bar, search bar omitted if excluded
+        # If you want to use a single search field you dont need to use a list, you can use a simple string 
+        "search_model": ["SharixAdmin.SharixUser"],
+
+        # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user
+        "user_avatar": "",
+
+        ############
+        # Top Menu #
+        ############
+
+        # Links to put along the top menu
+        "topmenu_links": [
+
+            # Url that gets reversed (Permissions can be added)
+            {"name": "Главная",  "url": "admin:index", "permissions": ["auth.view_user"]},
+
+            # external url that opens in a new window (Permissions can be added)
+            #{"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True},
+
+            # model admin to link to (Permissions checked against model)
+            {"model": "SharixAdmin.SharixUser"},
+
+            # App with dropdown menu to all its models pages (Permissions checked against models)
+            {"app": "tickets"},
+        ],
+
+        #############
+        # User Menu #
+        #############
+
+        # Additional links to include in the user menu on the top right ("app" url type is not allowed)
+        # "usermenu_links": [
+        #     {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True},
+        #     {"model": "SharixAdmin.SharixUser"}
+        # ],
+
+        # #############
+        # # Side Menu #
+        # #############
+
+        # # Whether to display the side menu
+        # "show_sidebar": True,
+
+        # # Whether to aut expand the menu
+        # "navigation_expanded": True,
+
+        # # Hide these apps when generating side menu e.g (auth)
+        # "hide_apps": [],
+
+        # # Hide these models when generating side menu (e.g auth.user)
+        # "hide_models": [],
+
+        # # List of apps (and/or models) to base side menu ordering off of (does not need to contain all apps/models)
+        # #"order_with_respect_to": ["auth", "books", "books.author", "books.book"],
+
+        # # Custom links to append to app groups, keyed on app name
+        # "custom_links": {
+        #     "tickets": [{
+        #         "name": "Make Messages", 
+        #         "url": "make_messages", 
+        #         "icon": "fas fa-comments",
+        #         "permissions": ["tickets.view_book"]
+        #     }]
+        # },
+
+        # # Custom icons for side menu apps/models See https://fontawesome.com/icons?d=gallery&m=free&v=5.0.0,5.0.1,5.0.10,5.0.11,5.0.12,5.0.13,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.13.0,5.12.0,5.11.2,5.11.1,5.10.0,5.9.0,5.8.2,5.8.1,5.7.2,5.7.1,5.7.0,5.6.3,5.5.0,5.4.2
+        # # for the full list of 5.13.0 free icon classes
+        "icons": {
+            "auth": "fas fa-users-cog",
+            "auth.user": "fas fa-user",
+            "auth.Group": "fas fa-users",
+            "SharixAdmin": "fas fa-users-cog",
+            "SharixAdmin.SharixUser": "fas fa-user",
+            "tickets.Task": "fas fa-check",
+            "tickets.TaskList": "fas fa-list",
+            "tickets.Comment": "fas fa-comment",
+            "tickets.Attachment": "fas fa-file",
+        },
+        # # Icons that are used when one is not manually specified
+        # # "default_icon_parents": "fas fa-chevron-circle-right",
+        # # "default_icon_children": "fas fa-circle",
+
+        # #################
+        # # Related Modal #
+        # #################
+        # # Use modals instead of popups
+        # "related_modal_active": False,
+
+        # #############
+        # # UI Tweaks #
+        # #############
+        # # Relative paths to custom CSS/JS scripts (must be present in static files)
+        "custom_css": None,
+        "custom_js": None,
+        # Whether to link font from fonts.googleapis.com (use custom_css to supply font otherwise)
+        "use_google_fonts_cdn": True,
+        # # Whether to show the UI customizer on the sidebar
+        "show_ui_builder": True,
+
+        ###############
+        # Change view #
+        ###############
+        # Render out the change view as a single form, or in tabs, current options are
+        # - single
+        # - horizontal_tabs (default)
+        # - vertical_tabs
+        # - collapsible
+        # - carousel
+        #"changeform_format": "horizontal_tabs",
+        # override change forms on a per modeladmin basis
+        #"changeform_format_overrides": {"SharixAdmin.SharixUser": "collapsible", "auth.group": "vertical_tabs"},
+        # Add a language dropdown into the admin
+        #"language_chooser": True,
+    }
+    JAZZMIN_UI_TWEAKS = {
+        "navbar_small_text": True,
+        "footer_small_text": True,
+        "body_small_text": False,
+        "brand_small_text": True,
+        "brand_colour": "navbar-light",
+        "accent": "accent-navy",
+        "navbar": "navbar-navy navbar-dark",
+        "no_navbar_border": False,
+        "navbar_fixed": False,
+        "layout_boxed": False,
+        "footer_fixed": False,
+        "sidebar_fixed": True,
+        "sidebar": "sidebar-light-navy",
+        "sidebar_nav_small_text": False,
+        "sidebar_disable_expand": False,
+        "sidebar_nav_child_indent": False,
+        "sidebar_nav_compact_style": True,
+        "sidebar_nav_legacy_style": False,
+        "sidebar_nav_flat_style": False,
+        "theme": "default",
+        "dark_mode_theme": None,
+        "button_classes": {
+            "primary": "btn-outline-primary",
+            "secondary": "btn-outline-secondary",
+            "info": "btn-outline-info",
+            "warning": "btn-outline-warning",
+            "danger": "btn-outline-danger",
+            "success": "btn-outline-success"
+        },
+        "actions_sticky_top": False
+    }
+
+
+class ConfigAPI:
+    REST_FRAMEWORK = {
+        # Use Django's standard `django.contrib.auth` permissions,
+        # or allow read-only access for unauthenticated users.
+        'DEFAULT_RENDERER_CLASSES':[
+            'rest_framework.renderers.JSONRenderer',
+            'rest_framework.renderers.BrowsableAPIRenderer',
+        ],
+        'DEFAULT_PERMISSION_CLASSES': [
+            #'rest_framework.permissions.AllowAny',
+            #'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly'
+        ],
+        'DEFAULT_AUTHENTICATION_CLASSES': (
+            'rest_framework.authentication.TokenAuthentication',
+            'rest_framework.authentication.BasicAuthentication',
+            'rest_framework.authentication.SessionAuthentication',
+        ),
+    }
+
+    SPAGHETTI_SAUCE = {
+        'apps': ['auth', 'SharixAdmin', 
+                'tickets', 'admin', 
+                'flatpages', 'sessions', 'sites', 'metaservicesynced'],
+        'show_fields': False,
+        'show_proxy':True,
+    }
+
+    GRAPH_MODELS = {
+        'all_applications': True,
+        'group_models': True,
+    }
+
+    DJOSER = {
+        'SERIALIZERS': {
+            'token': 'SharixAdmin.api.serializers.CustomTokenSerializer',
+        }
+    }
+
+
+class ConfigGunicorn:
+    bind = "127.0.0.1:8000"
+    workers = 2
+    worker_class = "sync"
+    threads = 4
+    timeout = 30
+    max_requests = 1000
+    capture_output = True

部分文件因文件數量過多而無法顯示