Home Explore Help
Sign In
EVCharge
/
ChargEco
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add

vbea 3 years ago
parent
7e7cccdd7a
commit
1b4a55cb5e
63 changed files with 111 additions and 96 deletions
Split View Show Diff Stats
  1. 2 2
      Strides-Admin/.env.development
  2. 1 1
      Strides-Admin/.env.production
  3. 2 2
      Strides-Admin/.env.staging
  4. 1 1
      Strides-Admin/README.md
  5. 1 1
      Strides-Admin/public/index.html
  6. 1 0
      Strides-Admin/src/components/Pagination.vue
  7. BIN
      Strides-Admin/src/icons/logo-app.png
  8. BIN
      Strides-Admin/src/icons/logo.png
  9. 0 0
      Strides-Admin/src/icons/svg/administrator-active.svg
  10. 0 0
      Strides-Admin/src/icons/svg/administrator.svg
  11. 2 2
      Strides-Admin/src/icons/svg/charge-station-management-active.svg
  12. 2 2
      Strides-Admin/src/icons/svg/charge-station-management.svg
  13. 3 3
      Strides-Admin/src/icons/svg/charging-profiles-active.svg
  14. 3 3
      Strides-Admin/src/icons/svg/charging-profiles.svg
  15. 2 2
      Strides-Admin/src/icons/svg/credit-limit-active.svg
  16. 2 2
      Strides-Admin/src/icons/svg/credit-limit.svg
  17. 4 4
      Strides-Admin/src/icons/svg/dashboard-active.svg
  18. 4 4
      Strides-Admin/src/icons/svg/dashboard.svg
  19. 1 1
      Strides-Admin/src/icons/svg/error-table-active.svg
  20. 1 1
      Strides-Admin/src/icons/svg/error-table.svg
  21. 3 3
      Strides-Admin/src/icons/svg/feedback-management-active.svg
  22. 3 3
      Strides-Admin/src/icons/svg/feedback-management.svg
  23. 1 1
      Strides-Admin/src/icons/svg/ocpp-operations-active.svg
  24. 1 1
      Strides-Admin/src/icons/svg/ocpp-operations.svg
  25. 0 0
      Strides-Admin/src/icons/svg/pos-device-active.svg
  26. 0 1
      Strides-Admin/src/icons/svg/pos-device.svg
  27. 0 0
      Strides-Admin/src/icons/svg/reports-active.svg
  28. 0 0
      Strides-Admin/src/icons/svg/reports.svg
  29. 0 2
      Strides-Admin/src/icons/svg/service-provider-management-active.svg
  30. 2 2
      Strides-Admin/src/icons/svg/service-provider-management.svg
  31. 1 1
      Strides-Admin/src/icons/svg/sidebar-submenu-item-active.svg
  32. 1 1
      Strides-Admin/src/icons/svg/sidebar-submenu-item.svg
  33. 2 2
      Strides-Admin/src/icons/svg/site-management-active.svg
  34. 2 2
      Strides-Admin/src/icons/svg/site-management.svg
  35. 1 1
      Strides-Admin/src/icons/svg/transactions-reservations-active.svg
  36. 1 1
      Strides-Admin/src/icons/svg/transactions-reservations.svg
  37. 0 1
      Strides-Admin/src/icons/svg/user-management-active.svg
  38. 1 1
      Strides-Admin/src/icons/svg/user-management.svg
  39. 1 1
      Strides-Admin/src/layout/components/Navbar.vue
  40. 4 3
      Strides-Admin/src/layout/components/Sidebar/Logo.vue
  41. 1 1
      Strides-Admin/src/router/ChargeRouter.js
  42. 13 0
      Strides-Admin/src/styles/index.scss
  43. 9 9
      Strides-Admin/src/styles/variables.scss
  44. 1 1
      Strides-Admin/src/utils/config.js
  45. 9 9
      Strides-Admin/src/views/Administrator.vue
  46. 1 1
      Strides-Admin/src/views/charge/AddCharge.vue
  47. 1 1
      Strides-Admin/src/views/charge/EditCharge.vue
  48. 1 1
      Strides-Admin/src/views/charging/AddProfile.vue
  49. 1 1
      Strides-Admin/src/views/charging/EditProfile.vue
  50. 0 1
      Strides-Admin/src/views/dashboard/Dashboard.vue
  51. 3 2
      Strides-Admin/src/views/driver/DriverDetail.vue
  52. 1 1
      Strides-Admin/src/views/feedback/Detail.vue
  53. 2 1
      Strides-Admin/src/views/fleetCompany/FleetCompanyDetail.vue
  54. 1 1
      Strides-Admin/src/views/limit/Add.vue
  55. 1 1
      Strides-Admin/src/views/limit/Detail.vue
  56. 1 1
      Strides-Admin/src/views/limit/Edit.vue
  57. 1 1
      Strides-Admin/src/views/posDevice/detail.vue
  58. 1 1
      Strides-Admin/src/views/provider/addProvider.vue
  59. 1 1
      Strides-Admin/src/views/provider/editProvider.vue
  60. 1 0
      Strides-Admin/src/views/site/AddSite.vue
  61. 1 0
      Strides-Admin/src/views/site/UpdateSite.vue
  62. 3 2
      Strides-Admin/src/views/user/UserDetail.vue
  63. 1 1
      Strides-Admin/vue.config.js

+ 2 - 2
Strides-Admin/.env.development
View File 

@@ -3,5 +3,5 @@ NODE_ENV = 'development'
 
 ENV = 'development'
 
 
 # base api
 
-VUE_APP_BASE_API = 'http://161.117.183.142/'
 
-VUE_APP_API_PREFIX = 'steve/crmApi'
 
+VUE_APP_BASE_API = 'http://190.92.221.143/'
 
+VUE_APP_API_PREFIX = 'chargeco/crmApi'

+ 1 - 1
Strides-Admin/.env.production
View File 

@@ -4,4 +4,4 @@ ENV = 'production'
 
 
 # base api
 
 VUE_APP_BASE_API = 'https://csms.evctechnology.com/'
 
-VUE_APP_API_PREFIX = 'juiceplus/crmApi'
 
+VUE_APP_API_PREFIX = 'chargeco/crmApi'

+ 2 - 2
Strides-Admin/.env.staging
View File 

@@ -4,5 +4,5 @@ NODE_ENV = 'production'
 
 ENV = 'staging'
 
 
 # base api
 
-VUE_APP_BASE_API = 'http://161.117.183.142/'
 
-VUE_APP_API_PREFIX = 'steve/crmApi'
 
+VUE_APP_BASE_API = 'http://190.92.221.143/'
 
+VUE_APP_API_PREFIX = 'chargeco/crmApi'

+ 1 - 1
Strides-Admin/README.md
View File 

@@ -1,4 +1,4 @@
 
-# Juice Plus Admin
 
+# Strides Admin
 
 
 ## Environment

+ 1 - 1
Strides-Admin/public/index.html
View File 

@@ -6,7 +6,7 @@
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
-  <title>Juice Plus Admin</title>
 
+  <title>ChargEco Admin</title>
 
 </head>
 
 
 <body>

+ 1 - 0
Strides-Admin/src/components/Pagination.vue
View File 

@@ -104,6 +104,7 @@ export default {
 
   background-color: white;
 
 }
 
 .pagination-container >>> .el-pagination.is-background .el-pager li:not(.disabled).active {
 
+  color: #fff;
 
   background-color: #001489;
 
 }
 
 .pagination-container >>> .btn-prev,

BIN
Strides-Admin/src/icons/logo-app.png
View File


BIN
Strides-Admin/src/icons/logo.png
View File


File diff suppressed because it is too large
+ 0 - 0
Strides-Admin/src/icons/svg/administrator-active.svg


File diff suppressed because it is too large
+ 0 - 0
Strides-Admin/src/icons/svg/administrator.svg


+ 2 - 2
Strides-Admin/src/icons/svg/charge-station-management-active.svg
View File 

@@ -38,12 +38,12 @@
 
      stroke="#666666"
 
      stroke-width="0.3"
 
      id="path19"
 
-     style="stroke:#0bd373;stroke-opacity:0.89999998;fill:#0bd373;fill-opacity:0.89999998;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none" />
 
+     style="stroke:#fff;stroke-opacity:0.89999998;fill:#fff;fill-opacity:0.89999998;stroke-width:0.3;stroke-miterlimit:4;stroke-dasharray:none" />
 
   <path
 
      d="M9.19665 9L5.87486 13.684H7.88603L6.95419 17L10.1285 12.2593H8.2648L9.19665 9ZM10.5642 5H5.43575C5.20112 5 5 5.19228 5 5.40977V5.81954C5 6.04019 5.20447 6.22931 5.43575 6.22931H10.5642C10.7989 6.22931 11 6.03704 11 5.81954V5.40977C10.9732 5.19228 10.7989 5 10.5642 5Z"
 
      fill="#666666"
 
      stroke="#666666"
 
      stroke-width="0.3"
 
      id="path21"
 
-     style="stroke:#0bd373;stroke-opacity:0.89803922;fill:#0bd373;fill-opacity:0.89803922" />
 
+     style="stroke:#fff;stroke-opacity:0.89803922;fill:#fff;fill-opacity:0.89803922" />
 
 </svg>

+ 2 - 2
Strides-Admin/src/icons/svg/charge-station-management.svg
View File 

@@ -38,12 +38,12 @@
 
      stroke="#666666"
 
      stroke-width="0.3"
 
      id="path1032"
 
-     style="fill:#0bd373;fill-opacity:0.89803922;stroke:#0bd373;stroke-opacity:0.89803922" />
 
+     style="fill:#333;fill-opacity:0.89803922;stroke:#333;stroke-opacity:0.89803922" />
 
   <path
 
      d="M9.19665 9L5.87486 13.684H7.88603L6.95419 17L10.1285 12.2593H8.2648L9.19665 9ZM10.5642 5H5.43575C5.20112 5 5 5.19228 5 5.40977V5.81954C5 6.04019 5.20447 6.22931 5.43575 6.22931H10.5642C10.7989 6.22931 11 6.03704 11 5.81954V5.40977C10.9732 5.19228 10.7989 5 10.5642 5Z"
 
      fill="#666666"
 
      stroke="#666666"
 
      stroke-width="0.3"
 
      id="path1034"
 
-     style="stroke:#0bd373;stroke-opacity:0.89803922;fill:#0bd373;fill-opacity:0.89803922" />
 
+     style="stroke:#333;stroke-opacity:0.89803922;fill:#333;fill-opacity:0.89803922" />
 
 </svg>

+ 3 - 3
Strides-Admin/src/icons/svg/charging-profiles-active.svg
View File 

@@ -1,8 +1,8 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
 <g clip-path="url(#clip0)">
 
-<path d="M0 14.875V5.125C0 4.625 0.5 4.125 1 4.125H16.375C16.875 4.125 17.375 4.625 17.375 5.125V14.875C17.375 15.375 16.875 15.875 16.375 15.875H1C0.37502 15.875 0 15.375 0 14.875ZM16.75 5.125C16.75 5.00002 16.625 4.75 16.375 4.75H1.00002C0.875039 4.75 0.62502 4.875 0.62502 5.125V14.875C0.62502 15 0.75002 15.25 1.00002 15.25H16.375C16.5 15.25 16.75 15.125 16.75 14.875V5.125Z" fill="#666666" stroke="#666666" stroke-width="0.4"/>
 
-<path d="M6.00002 5.5L9.37502 14.5H2C1.62502 14.5 1.37502 14.25 1.375 13.875V6.125C1.375 5.75002 1.625 5.50002 2 5.5H5.99998H6.00002Z" fill="#666666"/>
 
-<path d="M13.875 11.125L10.5 10.25V12L5.5 8.87502L9 9.875V7.875L13.875 11.125ZM19.5 8.5V11.5C19.5 11.625 19.375 11.875 19.125 11.875H18.5C18.375 11.875 18.125 11.75 18.125 11.5V8.5C18.125 8.37502 18.25 8.125 18.5 8.125H19.125C19.375 8.125 19.5 8.25 19.5 8.5Z" fill="#666666"/>
 
+<path d="M0 14.875V5.125C0 4.625 0.5 4.125 1 4.125H16.375C16.875 4.125 17.375 4.625 17.375 5.125V14.875C17.375 15.375 16.875 15.875 16.375 15.875H1C0.37502 15.875 0 15.375 0 14.875ZM16.75 5.125C16.75 5.00002 16.625 4.75 16.375 4.75H1.00002C0.875039 4.75 0.62502 4.875 0.62502 5.125V14.875C0.62502 15 0.75002 15.25 1.00002 15.25H16.375C16.5 15.25 16.75 15.125 16.75 14.875V5.125Z" fill="#ffffff" stroke="#ffffff" stroke-width="0.4"/>
 
+<path d="M6.00002 5.5L9.37502 14.5H2C1.62502 14.5 1.37502 14.25 1.375 13.875V6.125C1.375 5.75002 1.625 5.50002 2 5.5H5.99998H6.00002Z" fill="#ffffff"/>
 
+<path d="M13.875 11.125L10.5 10.25V12L5.5 8.87502L9 9.875V7.875L13.875 11.125ZM19.5 8.5V11.5C19.5 11.625 19.375 11.875 19.125 11.875H18.5C18.375 11.875 18.125 11.75 18.125 11.5V8.5C18.125 8.37502 18.25 8.125 18.5 8.125H19.125C19.375 8.125 19.5 8.25 19.5 8.5Z" fill="#ffffff"/>
 
 </g>
 
 <defs>
 
 <clipPath id="clip0">

+ 3 - 3
Strides-Admin/src/icons/svg/charging-profiles.svg
View File 

@@ -39,17 +39,17 @@
 
        stroke="#666666"
 
        stroke-width="0.4"
 
        id="path1193"
 
-       style="fill:#0bd373;fill-opacity:0.89803922;stroke:#0bd373;stroke-opacity:0.89803922" />
 
+       style="fill:#333333;fill-opacity:0.89803922;stroke:#333333;stroke-opacity:0.89803922" />
 
     <path
 
        d="M6.00002 5.5L9.37502 14.5H2C1.62502 14.5 1.37502 14.25 1.375 13.875V6.125C1.375 5.75002 1.625 5.50002 2 5.5H5.99998H6.00002Z"
 
        fill="#666666"
 
        id="path1195"
 
-       style="fill:#0bd373;fill-opacity:0.89803922" />
 
+       style="fill:#333;fill-opacity:0.89803922" />
 
     <path
 
        d="M13.875 11.125L10.5 10.25V12L5.5 8.87502L9 9.875V7.875L13.875 11.125ZM19.5 8.5V11.5C19.5 11.625 19.375 11.875 19.125 11.875H18.5C18.375 11.875 18.125 11.75 18.125 11.5V8.5C18.125 8.37502 18.25 8.125 18.5 8.125H19.125C19.375 8.125 19.5 8.25 19.5 8.5Z"
 
        fill="#666666"
 
        id="path1197"
 
-       style="fill:#0bd373;fill-opacity:0.89803922" />
 
+       style="fill:#333;fill-opacity:0.89803922" />
 
   </g>
 
   <defs
 
      id="defs1204">

+ 2 - 2
Strides-Admin/src/icons/svg/credit-limit-active.svg
View File 

@@ -1,4 +1,4 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7486 9.99668C18.7486 5.16699 14.8334 1.25195 10.0039 1.25195C5.1742 1.25195 1.25916 5.16699 1.25916 9.99668C1.25916 14.8264 5.1742 18.7414 10.0039 18.7414C14.8336 18.7414 18.7486 14.8262 18.7486 9.99668ZM2.96155 9.99746C2.96155 5.89238 5.89866 2.95508 10.0039 2.95508C14.109 2.95508 17.0463 5.89238 17.0463 9.99746C17.0463 14.1025 14.109 17.0398 10.0039 17.0398C5.89885 17.0398 2.96155 14.1025 2.96155 9.99746Z" fill="#666666"/>
 
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.294 9.15231L14.3817 9.98102C13.2477 11.0121 11.9475 11.0121 10.3262 9.93121C8.31233 8.58766 6.46213 8.58766 4.93069 9.98102C4.82463 10.0896 4.76135 10.233 4.75256 10.3845C4.75256 13.2955 7.11233 15.6552 10.0233 15.6552C12.9342 15.6552 15.294 13.2955 15.294 10.3845V9.15231ZM6.38733 10.9042C7.38655 10.1072 8.30471 10.307 9.71038 11.2441C11.1469 12.2011 12.178 12.3101 13.3658 11.756C12.8635 13.5609 11.4567 14.1574 9.59397 13.9572C7.73127 13.7572 6.49495 12.7745 6.38733 10.9042Z" fill="#666666"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7486 9.99668C18.7486 5.16699 14.8334 1.25195 10.0039 1.25195C5.1742 1.25195 1.25916 5.16699 1.25916 9.99668C1.25916 14.8264 5.1742 18.7414 10.0039 18.7414C14.8336 18.7414 18.7486 14.8262 18.7486 9.99668ZM2.96155 9.99746C2.96155 5.89238 5.89866 2.95508 10.0039 2.95508C14.109 2.95508 17.0463 5.89238 17.0463 9.99746C17.0463 14.1025 14.109 17.0398 10.0039 17.0398C5.89885 17.0398 2.96155 14.1025 2.96155 9.99746Z" fill="#ffffff"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.294 9.15231L14.3817 9.98102C13.2477 11.0121 11.9475 11.0121 10.3262 9.93121C8.31233 8.58766 6.46213 8.58766 4.93069 9.98102C4.82463 10.0896 4.76135 10.233 4.75256 10.3845C4.75256 13.2955 7.11233 15.6552 10.0233 15.6552C12.9342 15.6552 15.294 13.2955 15.294 10.3845V9.15231ZM6.38733 10.9042C7.38655 10.1072 8.30471 10.307 9.71038 11.2441C11.1469 12.2011 12.178 12.3101 13.3658 11.756C12.8635 13.5609 11.4567 14.1574 9.59397 13.9572C7.73127 13.7572 6.49495 12.7745 6.38733 10.9042Z" fill="#ffffff"/>
 
 </svg>

+ 2 - 2
Strides-Admin/src/icons/svg/credit-limit.svg
View File 

@@ -1,4 +1,4 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7486 9.99668C18.7486 5.16699 14.8334 1.25195 10.0039 1.25195C5.1742 1.25195 1.25916 5.16699 1.25916 9.99668C1.25916 14.8264 5.1742 18.7414 10.0039 18.7414C14.8336 18.7414 18.7486 14.8262 18.7486 9.99668ZM2.96155 9.99746C2.96155 5.89238 5.89866 2.95508 10.0039 2.95508C14.109 2.95508 17.0463 5.89238 17.0463 9.99746C17.0463 14.1025 14.109 17.0398 10.0039 17.0398C5.89885 17.0398 2.96155 14.1025 2.96155 9.99746Z" fill="#0bd373"/>
 
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.294 9.15231L14.3817 9.98102C13.2477 11.0121 11.9475 11.0121 10.3262 9.93121C8.31233 8.58766 6.46213 8.58766 4.93069 9.98102C4.82463 10.0896 4.76135 10.233 4.75256 10.3845C4.75256 13.2955 7.11233 15.6552 10.0233 15.6552C12.9342 15.6552 15.294 13.2955 15.294 10.3845V9.15231ZM6.38733 10.9042C7.38655 10.1072 8.30471 10.307 9.71038 11.2441C11.1469 12.2011 12.178 12.3101 13.3658 11.756C12.8635 13.5609 11.4567 14.1574 9.59397 13.9572C7.73127 13.7572 6.49495 12.7745 6.38733 10.9042Z" fill="#0bd373"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7486 9.99668C18.7486 5.16699 14.8334 1.25195 10.0039 1.25195C5.1742 1.25195 1.25916 5.16699 1.25916 9.99668C1.25916 14.8264 5.1742 18.7414 10.0039 18.7414C14.8336 18.7414 18.7486 14.8262 18.7486 9.99668ZM2.96155 9.99746C2.96155 5.89238 5.89866 2.95508 10.0039 2.95508C14.109 2.95508 17.0463 5.89238 17.0463 9.99746C17.0463 14.1025 14.109 17.0398 10.0039 17.0398C5.89885 17.0398 2.96155 14.1025 2.96155 9.99746Z" fill="#333333"/>
 
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.294 9.15231L14.3817 9.98102C13.2477 11.0121 11.9475 11.0121 10.3262 9.93121C8.31233 8.58766 6.46213 8.58766 4.93069 9.98102C4.82463 10.0896 4.76135 10.233 4.75256 10.3845C4.75256 13.2955 7.11233 15.6552 10.0233 15.6552C12.9342 15.6552 15.294 13.2955 15.294 10.3845V9.15231ZM6.38733 10.9042C7.38655 10.1072 8.30471 10.307 9.71038 11.2441C11.1469 12.2011 12.178 12.3101 13.3658 11.756C12.8635 13.5609 11.4567 14.1574 9.59397 13.9572C7.73127 13.7572 6.49495 12.7745 6.38733 10.9042Z" fill="#333333"/>
 
 </svg>

+ 4 - 4
Strides-Admin/src/icons/svg/dashboard-active.svg
View File 

@@ -1,6 +1,6 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M16.3823 1.90002H2.70318C1.75953 1.90002 1 2.68001 1 3.62196L1.00597 3.63901V13.87L1 13.853C0.999991 14.0759 1.04415 14.2967 1.12993 14.5024C1.21571 14.7082 1.34141 14.895 1.49977 15.0519C1.65813 15.2088 1.84601 15.3328 2.05256 15.4168C2.25911 15.5007 2.48024 15.5428 2.70318 15.5408H7.83148C8.06095 15.5437 8.28017 15.6363 8.4422 15.7988C8.60423 15.9613 8.6962 16.1808 8.69841 16.4103V16.4018C8.69841 16.8732 8.30373 17.2465 7.83148 17.2465H5.26733C4.79593 17.2465 4.42511 17.6446 4.42511 18.116V18.1075C4.42511 18.5781 4.79593 18.5589 5.26733 18.5589H13.8148C14.287 18.5589 14.6809 18.5866 14.6809 18.116V18.1075C14.6786 17.879 14.5865 17.6605 14.4244 17.4994C14.2623 17.3383 14.0433 17.2474 13.8148 17.2465H11.2506C11.14 17.2484 11.0301 17.228 10.9274 17.1867C10.8248 17.1454 10.7314 17.084 10.6528 17.0061C10.5743 16.9282 10.5121 16.8353 10.47 16.733C10.4279 16.6307 10.4066 16.521 10.4076 16.4103V16.4018C10.4076 15.9312 10.7784 15.5408 11.2506 15.5408H16.3823L16.3874 15.5579C17.3302 15.5579 18.1 14.8128 18.1 13.8726V3.6356C18.0987 3.18126 17.918 2.74583 17.5973 2.424C17.2766 2.10218 16.8418 1.91999 16.3874 1.91707L16.3823 1.90002ZM16.8188 13.4285C16.8188 13.8991 16.4361 14.281 15.9638 14.281H3.12897C3.12897 14.281 2.68537 14.1915 2.52505 14.0317C2.36473 13.8719 2.27442 13.6549 2.27397 13.4285V4.01085C2.27397 3.5403 2.65672 3.15841 3.12897 3.15841H15.9638C16.4361 3.15841 16.8188 3.5403 16.8188 4.01085V13.4285Z" fill="#666666"/>
 
-<rect x="6" y="9" width="1" height="3" rx="0.5" fill="#666666" stroke="#666666" stroke-width="0.5"/>
 
-<rect x="9" y="8" width="1" height="4" rx="0.5" fill="#666666" stroke="#666666" stroke-width="0.5"/>
 
-<rect x="12" y="6" width="1" height="6" rx="0.5" fill="#666666" stroke="#666666" stroke-width="0.5"/>
 
+<path d="M16.3823 1.90002H2.70318C1.75953 1.90002 1 2.68001 1 3.62196L1.00597 3.63901V13.87L1 13.853C0.999991 14.0759 1.04415 14.2967 1.12993 14.5024C1.21571 14.7082 1.34141 14.895 1.49977 15.0519C1.65813 15.2088 1.84601 15.3328 2.05256 15.4168C2.25911 15.5007 2.48024 15.5428 2.70318 15.5408H7.83148C8.06095 15.5437 8.28017 15.6363 8.4422 15.7988C8.60423 15.9613 8.6962 16.1808 8.69841 16.4103V16.4018C8.69841 16.8732 8.30373 17.2465 7.83148 17.2465H5.26733C4.79593 17.2465 4.42511 17.6446 4.42511 18.116V18.1075C4.42511 18.5781 4.79593 18.5589 5.26733 18.5589H13.8148C14.287 18.5589 14.6809 18.5866 14.6809 18.116V18.1075C14.6786 17.879 14.5865 17.6605 14.4244 17.4994C14.2623 17.3383 14.0433 17.2474 13.8148 17.2465H11.2506C11.14 17.2484 11.0301 17.228 10.9274 17.1867C10.8248 17.1454 10.7314 17.084 10.6528 17.0061C10.5743 16.9282 10.5121 16.8353 10.47 16.733C10.4279 16.6307 10.4066 16.521 10.4076 16.4103V16.4018C10.4076 15.9312 10.7784 15.5408 11.2506 15.5408H16.3823L16.3874 15.5579C17.3302 15.5579 18.1 14.8128 18.1 13.8726V3.6356C18.0987 3.18126 17.918 2.74583 17.5973 2.424C17.2766 2.10218 16.8418 1.91999 16.3874 1.91707L16.3823 1.90002ZM16.8188 13.4285C16.8188 13.8991 16.4361 14.281 15.9638 14.281H3.12897C3.12897 14.281 2.68537 14.1915 2.52505 14.0317C2.36473 13.8719 2.27442 13.6549 2.27397 13.4285V4.01085C2.27397 3.5403 2.65672 3.15841 3.12897 3.15841H15.9638C16.4361 3.15841 16.8188 3.5403 16.8188 4.01085V13.4285Z" fill="#FFFFFF"/>
 
+<rect x="6" y="9" width="1" height="3" rx="0.5" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.5"/>
 
+<rect x="9" y="8" width="1" height="4" rx="0.5" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.5"/>
 
+<rect x="12" y="6" width="1" height="6" rx="0.5" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="0.5"/>
 
 </svg>

+ 4 - 4
Strides-Admin/src/icons/svg/dashboard.svg
View File 

@@ -36,7 +36,7 @@
 
      d="M16.3823 1.90002H2.70318C1.75953 1.90002 1 2.68001 1 3.62196L1.00597 3.63901V13.87L1 13.853C0.999991 14.0759 1.04415 14.2967 1.12993 14.5024C1.21571 14.7082 1.34141 14.895 1.49977 15.0519C1.65813 15.2088 1.84601 15.3328 2.05256 15.4168C2.25911 15.5007 2.48024 15.5428 2.70318 15.5408H7.83148C8.06095 15.5437 8.28017 15.6363 8.4422 15.7988C8.60423 15.9613 8.6962 16.1808 8.69841 16.4103V16.4018C8.69841 16.8732 8.30373 17.2465 7.83148 17.2465H5.26733C4.79593 17.2465 4.42511 17.6446 4.42511 18.116V18.1075C4.42511 18.5781 4.79593 18.5589 5.26733 18.5589H13.8148C14.287 18.5589 14.6809 18.5866 14.6809 18.116V18.1075C14.6786 17.879 14.5865 17.6605 14.4244 17.4994C14.2623 17.3383 14.0433 17.2474 13.8148 17.2465H11.2506C11.14 17.2484 11.0301 17.228 10.9274 17.1867C10.8248 17.1454 10.7314 17.084 10.6528 17.0061C10.5743 16.9282 10.5121 16.8353 10.47 16.733C10.4279 16.6307 10.4066 16.521 10.4076 16.4103V16.4018C10.4076 15.9312 10.7784 15.5408 11.2506 15.5408H16.3823L16.3874 15.5579C17.3302 15.5579 18.1 14.8128 18.1 13.8726V3.6356C18.0987 3.18126 17.918 2.74583 17.5973 2.424C17.2766 2.10218 16.8418 1.91999 16.3874 1.91707L16.3823 1.90002ZM16.8188 13.4285C16.8188 13.8991 16.4361 14.281 15.9638 14.281H3.12897C3.12897 14.281 2.68537 14.1915 2.52505 14.0317C2.36473 13.8719 2.27442 13.6549 2.27397 13.4285V4.01085C2.27397 3.5403 2.65672 3.15841 3.12897 3.15841H15.9638C16.4361 3.15841 16.8188 3.5403 16.8188 4.01085V13.4285Z"
 
      fill="#666666"
 
      id="path864"
 
-     style="fill:#0bd373;fill-opacity:0.89803922" />
 
+     style="fill:#333333;fill-opacity:0.89803922" />
 
   <rect
 
      x="6"
 
      y="9"
 
@@ -47,7 +47,7 @@
 
      stroke-width="0.5"
 
      id="rect866"
 
      width="1.0015748"
 
-     style="fill:#0bd373;fill-opacity:0.89803922;stroke:#0bd373;stroke-opacity:0.89803922" />
 
+     style="fill:#333333;fill-opacity:0.89803922;stroke:#333333;stroke-opacity:0.89803922" />
 
   <rect
 
      x="9"
 
      y="8"
 
@@ -58,7 +58,7 @@
 
      stroke="#666666"
 
      stroke-width="0.5"
 
      id="rect868"
 
-     style="fill:#0bd373;fill-opacity:0.89803922;stroke:#0bd373;stroke-opacity:0.89803922" />
 
+     style="fill:#333333;fill-opacity:0.89803922;stroke:#333333;stroke-opacity:0.89803922" />
 
   <rect
 
      x="12"
 
      y="6"
 
@@ -69,5 +69,5 @@
 
      stroke="#666666"
 
      stroke-width="0.5"
 
      id="rect870"
 
-     style="fill:#0bd373;fill-opacity:0.89803922;stroke:#0bd373;stroke-opacity:0.89803922" />
 
+     style="fill:#333333;fill-opacity:0.89803922;stroke:#333333;stroke-opacity:0.89803922" />
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/error-table-active.svg
View File 

@@ -1,3 +1,3 @@
 
 <svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M5.14286 9.42857V5.14286H6.85714V9.42857H5.14286ZM5.14286 4.28571V2.57143H6.85714V4.28571H5.14286ZM6 10.7143C8.59971 10.7143 10.7143 8.59971 10.7143 6C10.7143 3.40029 8.59971 1.28571 6 1.28571C4.75011 1.28708 3.55181 1.78419 2.668 2.668C1.78419 3.55181 1.28708 4.75011 1.28571 6C1.28571 8.59971 3.40029 10.7143 6 10.7143ZM6 0C7.5913 0 9.11742 0.632141 10.2426 1.75736C11.3679 2.88258 12 4.4087 12 6C12 7.5913 11.3679 9.11742 10.2426 10.2426C9.11742 11.3679 7.5913 12 6 12C4.4087 12 2.88258 11.3679 1.75736 10.2426C0.632141 9.11742 0 7.5913 0 6C0 4.4087 0.632141 2.88258 1.75736 1.75736C2.88258 0.632141 4.4087 0 6 0V0Z" fill="#666666"/>
 
+<path d="M5.14286 9.42857V5.14286H6.85714V9.42857H5.14286ZM5.14286 4.28571V2.57143H6.85714V4.28571H5.14286ZM6 10.7143C8.59971 10.7143 10.7143 8.59971 10.7143 6C10.7143 3.40029 8.59971 1.28571 6 1.28571C4.75011 1.28708 3.55181 1.78419 2.668 2.668C1.78419 3.55181 1.28708 4.75011 1.28571 6C1.28571 8.59971 3.40029 10.7143 6 10.7143ZM6 0C7.5913 0 9.11742 0.632141 10.2426 1.75736C11.3679 2.88258 12 4.4087 12 6C12 7.5913 11.3679 9.11742 10.2426 10.2426C9.11742 11.3679 7.5913 12 6 12C4.4087 12 2.88258 11.3679 1.75736 10.2426C0.632141 9.11742 0 7.5913 0 6C0 4.4087 0.632141 2.88258 1.75736 1.75736C2.88258 0.632141 4.4087 0 6 0V0Z" fill="#fff"/>
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/error-table.svg
View File 

@@ -1,3 +1,3 @@
 
 <svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M5.14286 9.42857V5.14286H6.85714V9.42857H5.14286ZM5.14286 4.28571V2.57143H6.85714V4.28571H5.14286ZM6 10.7143C8.59971 10.7143 10.7143 8.59971 10.7143 6C10.7143 3.40029 8.59971 1.28571 6 1.28571C4.75011 1.28708 3.55181 1.78419 2.668 2.668C1.78419 3.55181 1.28708 4.75011 1.28571 6C1.28571 8.59971 3.40029 10.7143 6 10.7143ZM6 0C7.5913 0 9.11742 0.632141 10.2426 1.75736C11.3679 2.88258 12 4.4087 12 6C12 7.5913 11.3679 9.11742 10.2426 10.2426C9.11742 11.3679 7.5913 12 6 12C4.4087 12 2.88258 11.3679 1.75736 10.2426C0.632141 9.11742 0 7.5913 0 6C0 4.4087 0.632141 2.88258 1.75736 1.75736C2.88258 0.632141 4.4087 0 6 0V0Z" fill="#0bd373"/>
 
+<path d="M5.14286 9.42857V5.14286H6.85714V9.42857H5.14286ZM5.14286 4.28571V2.57143H6.85714V4.28571H5.14286ZM6 10.7143C8.59971 10.7143 10.7143 8.59971 10.7143 6C10.7143 3.40029 8.59971 1.28571 6 1.28571C4.75011 1.28708 3.55181 1.78419 2.668 2.668C1.78419 3.55181 1.28708 4.75011 1.28571 6C1.28571 8.59971 3.40029 10.7143 6 10.7143ZM6 0C7.5913 0 9.11742 0.632141 10.2426 1.75736C11.3679 2.88258 12 4.4087 12 6C12 7.5913 11.3679 9.11742 10.2426 10.2426C9.11742 11.3679 7.5913 12 6 12C4.4087 12 2.88258 11.3679 1.75736 10.2426C0.632141 9.11742 0 7.5913 0 6C0 4.4087 0.632141 2.88258 1.75736 1.75736C2.88258 0.632141 4.4087 0 6 0V0Z" fill="#333"/>
 
 </svg>

+ 3 - 3
Strides-Admin/src/icons/svg/feedback-management-active.svg
View File 

@@ -1,5 +1,5 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M16.1061 1.4144H3.98329C3.19822 1.4144 2.44368 1.72625 1.88759 2.28234C1.3315 2.83843 1.01965 3.59079 1.01965 4.37804V13.1817C1.01965 14.8173 2.34555 16.1454 3.98329 16.1454H7.70147L9.41554 18.1386C9.67287 18.4352 10.0458 18.6053 10.4383 18.6009H10.5037C10.9312 18.5965 11.3324 18.3894 11.581 18.0404L12.8742 16.1432H16.1061C17.7438 16.1432 19.0697 14.8173 19.0697 13.1795V4.37804C19.0697 2.74029 17.7416 1.4144 16.1061 1.4144ZM17.8834 13.3693C17.8834 14.174 16.684 14.983 16.0843 14.9743H12.1371L10.4383 17.4582L8.62611 15.2992L8.28373 14.9721H4.1185C3.74123 14.9721 3.04557 14.7061 2.77734 14.4335C2.50911 14.1609 2.2038 13.4718 2.2038 13.0858V4.41729C2.2038 3.6126 3.19168 2.52876 3.97893 2.52876H16.0341C16.4114 2.52876 17.0046 2.71849 17.384 3.09576C17.7874 3.4992 17.8812 4.0313 17.8812 4.41729V13.3693H17.8834Z" fill="#666666" stroke="#666666" stroke-width="0.1"/>
 
-<rect x="6" y="6" width="8" height="1" rx="0.5" fill="#666666" stroke="#666666" stroke-width="0.5"/>
 
-<rect x="6" y="10" width="8" height="1" rx="0.5" fill="#666666" stroke="#666666" stroke-width="0.5"/>
 
+<path d="M16.1061 1.4144H3.98329C3.19822 1.4144 2.44368 1.72625 1.88759 2.28234C1.3315 2.83843 1.01965 3.59079 1.01965 4.37804V13.1817C1.01965 14.8173 2.34555 16.1454 3.98329 16.1454H7.70147L9.41554 18.1386C9.67287 18.4352 10.0458 18.6053 10.4383 18.6009H10.5037C10.9312 18.5965 11.3324 18.3894 11.581 18.0404L12.8742 16.1432H16.1061C17.7438 16.1432 19.0697 14.8173 19.0697 13.1795V4.37804C19.0697 2.74029 17.7416 1.4144 16.1061 1.4144ZM17.8834 13.3693C17.8834 14.174 16.684 14.983 16.0843 14.9743H12.1371L10.4383 17.4582L8.62611 15.2992L8.28373 14.9721H4.1185C3.74123 14.9721 3.04557 14.7061 2.77734 14.4335C2.50911 14.1609 2.2038 13.4718 2.2038 13.0858V4.41729C2.2038 3.6126 3.19168 2.52876 3.97893 2.52876H16.0341C16.4114 2.52876 17.0046 2.71849 17.384 3.09576C17.7874 3.4992 17.8812 4.0313 17.8812 4.41729V13.3693H17.8834Z" fill="#fff" stroke="#fff" stroke-width="0.1"/>
 
+<rect x="6" y="6" width="8" height="1" rx="0.5" fill="#fff" stroke="#fff" stroke-width="0.5"/>
 
+<rect x="6" y="10" width="8" height="1" rx="0.5" fill="#fff" stroke="#fff" stroke-width="0.5"/>
 
 </svg>

+ 3 - 3
Strides-Admin/src/icons/svg/feedback-management.svg
View File 

@@ -38,7 +38,7 @@
 
      stroke="#666666"
 
      stroke-width="0.1"
 
      id="path1595"
 
-     style="fill:#0bd373;fill-opacity:0.97435898;stroke:#0bd373;stroke-opacity:1" />
 
+     style="fill:#333333;fill-opacity:0.97435898;stroke:#333333;stroke-opacity:1" />
 
   <rect
 
      x="6"
 
      y="6"
 
@@ -49,7 +49,7 @@
 
      stroke="#666666"
 
      stroke-width="0.5"
 
      id="rect1597"
 
-     style="stroke:#0bd373;stroke-opacity:1;fill:#0bd373;fill-opacity:1" />
 
+     style="stroke:#333333;stroke-opacity:1;fill:#333333;fill-opacity:1" />
 
   <rect
 
      x="6"
 
      y="10"
 
@@ -60,5 +60,5 @@
 
      stroke="#666666"
 
      stroke-width="0.5"
 
      id="rect1599"
 
-     style="stroke:#0bd373;stroke-opacity:1;fill:#0bd373;fill-opacity:1" />
 
+     style="stroke:#333333;stroke-opacity:1;fill:#333333;fill-opacity:1" />
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/ocpp-operations-active.svg
View File 

@@ -1,3 +1,3 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M0 1.66667C0 0.75 0.75 0 1.66667 0H13.3333C14.25 0 15 0.75 15 1.66667V3.33333H13.3333V1.66667H1.66667V13.3333H3.33333V15H1.66667C0.75 15 0 14.25 0 13.3333V1.66667ZM5 6.66667C5 5.75 5.75 5 6.66667 5H18.3333C19.25 5 20 5.75 20 6.66667V18.3333C20 19.25 19.25 20 18.3333 20H6.66667C5.75 20 5 19.25 5 18.3333V6.66667ZM18.3333 6.66667H6.66667V18.3333H18.3333V6.66667Z" fill="#666666"/>
 
+<path d="M0 1.66667C0 0.75 0.75 0 1.66667 0H13.3333C14.25 0 15 0.75 15 1.66667V3.33333H13.3333V1.66667H1.66667V13.3333H3.33333V15H1.66667C0.75 15 0 14.25 0 13.3333V1.66667ZM5 6.66667C5 5.75 5.75 5 6.66667 5H18.3333C19.25 5 20 5.75 20 6.66667V18.3333C20 19.25 19.25 20 18.3333 20H6.66667C5.75 20 5 19.25 5 18.3333V6.66667ZM18.3333 6.66667H6.66667V18.3333H18.3333V6.66667Z" fill="#fff"/>
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/ocpp-operations.svg
View File 

@@ -36,5 +36,5 @@
 
      d="M0 1.66667C0 0.75 0.75 0 1.66667 0H13.3333C14.25 0 15 0.75 15 1.66667V3.33333H13.3333V1.66667H1.66667V13.3333H3.33333V15H1.66667C0.75 15 0 14.25 0 13.3333V1.66667ZM5 6.66667C5 5.75 5.75 5 6.66667 5H18.3333C19.25 5 20 5.75 20 6.66667V18.3333C20 19.25 19.25 20 18.3333 20H6.66667C5.75 20 5 19.25 5 18.3333V6.66667ZM18.3333 6.66667H6.66667V18.3333H18.3333V6.66667Z"
 
      fill="#666666"
 
      id="path832"
 
-     style="fill:#0bd373;fill-opacity:1" />
 
+     style="fill:#333333;fill-opacity:1" />
 
 </svg>

File diff suppressed because it is too large
+ 0 - 0
Strides-Admin/src/icons/svg/pos-device-active.svg


File diff suppressed because it is too large
+ 0 - 1
Strides-Admin/src/icons/svg/pos-device.svg


File diff suppressed because it is too large
+ 0 - 0
Strides-Admin/src/icons/svg/reports-active.svg


File diff suppressed because it is too large
+ 0 - 0
Strides-Admin/src/icons/svg/reports.svg


File diff suppressed because it is too large
+ 0 - 2
Strides-Admin/src/icons/svg/service-provider-management-active.svg


File diff suppressed because it is too large
+ 2 - 2
Strides-Admin/src/icons/svg/service-provider-management.svg


+ 1 - 1
Strides-Admin/src/icons/svg/sidebar-submenu-item-active.svg
View File 

@@ -1,3 +1,3 @@
 
 <svg width="5" height="5" viewBox="0 0 5 5" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<circle cx="2.5" cy="2.5" r="2.5" fill="#333333"/>
 
+<circle cx="2.5" cy="2.5" r="2.5" fill="#fff"/>
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/sidebar-submenu-item.svg
View File 

@@ -38,5 +38,5 @@
 
      r="2.5"
 
      fill="#333333"
 
      id="circle1122"
 
-     style="fill:#0bd373;fill-opacity:1" />
 
+     style="fill:#333333;fill-opacity:1" />
 
 </svg>

+ 2 - 2
Strides-Admin/src/icons/svg/site-management-active.svg
View File 

@@ -1,4 +1,4 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M18.433 17.9102H17.8759V11.912C17.8759 11.5902 17.7085 11.1569 17.3089 10.996L12.2527 7.81832V2.84071L12.1987 2.72914C11.9692 2.1877 11.467 1.91525 10.8487 2.02337L2.9197 4.29205C2.69105 4.37554 2.49383 4.52322 2.35371 4.71589C2.21358 4.90855 2.13702 5.13729 2.134 5.37233V17.9102H1.567C1.49248 17.91 1.41864 17.9239 1.34974 17.9512C1.28084 17.9785 1.21824 18.0186 1.16554 18.0693C1.11285 18.1199 1.07109 18.1801 1.04268 18.2463C1.01427 18.3125 0.999765 18.3835 1 18.4551C1 18.7864 1.2286 19 1.567 19H18.433C18.7777 19 19 18.7803 19 18.4551C18.9964 18.1238 18.7678 17.9102 18.433 17.9102ZM16.7455 11.8532V17.9102H12.2527V9.05602L16.7455 11.8532ZM3.2446 5.37233L11.1124 3.10365V17.9102H3.2446V5.37233Z" fill="#666666" stroke="#666666" stroke-width="0.3"/>
 
-<path d="M8.49648 7.5H5.50432C5.19706 7.5 5 7.69692 5 8.00316C5 8.30939 5.2035 8.50712 5.50352 8.50712H8.49568C8.80294 8.50712 9 8.30939 9 8.00316C9 7.69371 8.79409 7.5 8.49648 7.5ZM8.49648 10.4876H5.50432C5.19706 10.4876 5 10.6901 5 10.9908V10.9972C5 11.3026 5.2035 11.5003 5.50352 11.5003H8.49568C8.80294 11.5003 9 11.297 9 10.9972V10.9908C9 10.6845 8.79409 10.4876 8.49648 10.4876ZM8.49648 13.4865H5.50432C5.19706 13.4865 5 13.6842 5 13.9904V13.996C5 14.3023 5.2035 14.5 5.50352 14.5H8.49568C8.80294 14.5 9 14.3023 9 13.996V13.9904C9 13.6842 8.79409 13.4865 8.49648 13.4865Z" fill="#666666" stroke="#666666" stroke-width="0.3"/>
 
+<path d="M18.433 17.9102H17.8759V11.912C17.8759 11.5902 17.7085 11.1569 17.3089 10.996L12.2527 7.81832V2.84071L12.1987 2.72914C11.9692 2.1877 11.467 1.91525 10.8487 2.02337L2.9197 4.29205C2.69105 4.37554 2.49383 4.52322 2.35371 4.71589C2.21358 4.90855 2.13702 5.13729 2.134 5.37233V17.9102H1.567C1.49248 17.91 1.41864 17.9239 1.34974 17.9512C1.28084 17.9785 1.21824 18.0186 1.16554 18.0693C1.11285 18.1199 1.07109 18.1801 1.04268 18.2463C1.01427 18.3125 0.999765 18.3835 1 18.4551C1 18.7864 1.2286 19 1.567 19H18.433C18.7777 19 19 18.7803 19 18.4551C18.9964 18.1238 18.7678 17.9102 18.433 17.9102ZM16.7455 11.8532V17.9102H12.2527V9.05602L16.7455 11.8532ZM3.2446 5.37233L11.1124 3.10365V17.9102H3.2446V5.37233Z" fill="#ffffff" stroke="#fff" stroke-width="0.3"/>
 
+<path d="M8.49648 7.5H5.50432C5.19706 7.5 5 7.69692 5 8.00316C5 8.30939 5.2035 8.50712 5.50352 8.50712H8.49568C8.80294 8.50712 9 8.30939 9 8.00316C9 7.69371 8.79409 7.5 8.49648 7.5ZM8.49648 10.4876H5.50432C5.19706 10.4876 5 10.6901 5 10.9908V10.9972C5 11.3026 5.2035 11.5003 5.50352 11.5003H8.49568C8.80294 11.5003 9 11.297 9 10.9972V10.9908C9 10.6845 8.79409 10.4876 8.49648 10.4876ZM8.49648 13.4865H5.50432C5.19706 13.4865 5 13.6842 5 13.9904V13.996C5 14.3023 5.2035 14.5 5.50352 14.5H8.49568C8.80294 14.5 9 14.3023 9 13.996V13.9904C9 13.6842 8.79409 13.4865 8.49648 13.4865Z" fill="#ffffff" stroke="#ffffff" stroke-width="0.3"/>
 
 </svg>

+ 2 - 2
Strides-Admin/src/icons/svg/site-management.svg
View File 

@@ -38,12 +38,12 @@
 
      stroke="#666666"
 
      stroke-width="0.3"
 
      id="path978"
 
-     style="fill:#0bd373;fill-opacity:1;stroke:#0bd373;stroke-opacity:1" />
 
+     style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" />
 
   <path
 
      d="M8.49648 7.5H5.50432C5.19706 7.5 5 7.69692 5 8.00316C5 8.30939 5.2035 8.50712 5.50352 8.50712H8.49568C8.80294 8.50712 9 8.30939 9 8.00316C9 7.69371 8.79409 7.5 8.49648 7.5ZM8.49648 10.4876H5.50432C5.19706 10.4876 5 10.6901 5 10.9908V10.9972C5 11.3026 5.2035 11.5003 5.50352 11.5003H8.49568C8.80294 11.5003 9 11.297 9 10.9972V10.9908C9 10.6845 8.79409 10.4876 8.49648 10.4876ZM8.49648 13.4865H5.50432C5.19706 13.4865 5 13.6842 5 13.9904V13.996C5 14.3023 5.2035 14.5 5.50352 14.5H8.49568C8.80294 14.5 9 14.3023 9 13.996V13.9904C9 13.6842 8.79409 13.4865 8.49648 13.4865Z"
 
      fill="#666666"
 
      stroke="#666666"
 
      stroke-width="0.3"
 
      id="path980"
 
-     style="stroke:#0bd373;stroke-opacity:1;fill:#0bd373;fill-opacity:1" />
 
+     style="stroke:#333333;stroke-opacity:1;fill:#333333;fill-opacity:1" />
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/transactions-reservations-active.svg
View File 

@@ -1,3 +1,3 @@
 
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
 
-<path d="M8.68857 17.7704L7.39144 19L1.19975 12.0189H18.6V13.8379H5.20023L8.68857 17.7704ZM10.9114 2.62959L12.2086 1.4L18.4002 8.38106L1 8.38106V6.56214H14.3998L10.9114 2.62959Z" fill="#666666"/>
 
+<path d="M8.68857 17.7704L7.39144 19L1.19975 12.0189H18.6V13.8379H5.20023L8.68857 17.7704ZM10.9114 2.62959L12.2086 1.4L18.4002 8.38106L1 8.38106V6.56214H14.3998L10.9114 2.62959Z" fill="#fff"/>
 
 </svg>

+ 1 - 1
Strides-Admin/src/icons/svg/transactions-reservations.svg
View File 

@@ -36,5 +36,5 @@
 
      d="M8.68857 17.7704L7.39144 19L1.19975 12.0189H18.6V13.8379H5.20023L8.68857 17.7704ZM10.9114 2.62959L12.2086 1.4L18.4002 8.38106L1 8.38106V6.56214H14.3998L10.9114 2.62959Z"
 
      fill="#666666"
 
      id="path1317"
 
-     style="fill:#0bd373;fill-opacity:1" />
 
+     style="fill:#333333;fill-opacity:1" />
 
 </svg>

File diff suppressed because it is too large
+ 0 - 1
Strides-Admin/src/icons/svg/user-management-active.svg


File diff suppressed because it is too large
+ 1 - 1
Strides-Admin/src/icons/svg/user-management.svg


+ 1 - 1
Strides-Admin/src/layout/components/Navbar.vue
View File 

@@ -188,7 +188,7 @@ export default {
 
     }
 
 
     .account {
 
-      background-color: #001489;
 
+      /*background-color: #001489;*/
 
       padding: 9px;
 
       border-radius: 6px;
 
     }

+ 4 - 3
Strides-Admin/src/layout/components/Sidebar/Logo.vue
View File 

@@ -1,7 +1,8 @@
 
 <template>
 
   <div class="sidebar-logo-container">
 
     <router-link class="sidebar-logo-link" to="/">
 
-      <img src="../../../icons/logo.png" class="sidebar-logo">
 
+      <img src="../../../icons/logo-app.png" class="sidebar-logo" v-if="collapse">
 
+      <img src="../../../icons/logo.png" class="sidebar-logo" v-else>
 
     </router-link>
 
   </div>
 
 </template>
 
@@ -39,7 +40,7 @@ export default {
 
   width: 100%;
 
   height: 135px;
 
   line-height: 135px;
 
-  background: #000000;
 
+  background: #fff;
 
   text-align: center;
 
   vertical-align: middle;
 
   overflow: hidden;
 
@@ -51,7 +52,7 @@ export default {
 
     & .sidebar-logo {
 
       width: 80%;
 
       max-width: 167px;
 
-      max-height: 39px;
 
+      max-height: 52px;
 
       vertical-align: middle;
 
     }

+ 1 - 1
Strides-Admin/src/router/ChargeRouter.js
View File 

@@ -7,7 +7,7 @@ export default {
 
   meta: {
 
     title: 'Charge Station Management',
 
     icon: 'charge-station-management',
 
-    activeIcon: 'charge-station-management-active',
 
+    activeIcon: 'charge-station-management',
 
     affix: true,
 
   },
 
   children: [

+ 13 - 0
Strides-Admin/src/styles/index.scss
View File 

@@ -293,4 +293,17 @@ aside {
 
 .el-message-box {
 
   width: 100%;
 
   max-width: 420px;
 
+}
 
+
 
+.el-button.cancel-button {
 
+  color: #555;
 
+  background: #FFFFFF;
 
+  border: 1px solid #001489;
 
+  box-sizing: border-box;
 
+  border-radius: 4px;
 
+  transition: all .3s;
 
+}
 
+
 
+.el-button.cancel-button:hover {
 
+  background: #e0e0e0;
 
 }

+ 9 - 9
Strides-Admin/src/styles/variables.scss
View File 

@@ -12,20 +12,20 @@ $navigationBarHeight: 64px;
 
 $mainAppMinHeight: calc(100vh - #{$navigationBarHeight});
 
 
 // sidebar
 
-$menuText: #0bd373;
 
-$menuActiveText: #333333;
 
-$subMenuActiveText: #0bd373; // https://github.com/ElemeFE/element/issues/12951
 
+$menuText: #000;
 
+$menuActiveText: #fff;
 
+$subMenuActiveText: #000; // https://github.com/ElemeFE/element/issues/12951
 
 
-$menuBg: #000000;
 
-$menuHover: #ffe9a8;
 
+$menuBg: #FFF;
 
+$menuHover: #909DD8;
 
 
-$subMenuBg: #000000;
 
-$subMenuHover: #ffe9a8;
 
+$subMenuBg: #FFF;
 
+$subMenuHover: #909DD8;
 
 
 $itemActiveBg: #001489;
 
-$subMenuActiveBg: #000000;
 
+$subMenuActiveBg: #fff;
 
 
-$sideBarWidth: 298px;
 
+$sideBarWidth: 300px;
 
 
 // the :export directive is the magic sauce for webpack
 
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

+ 1 - 1
Strides-Admin/src/utils/config.js
View File 

@@ -1,6 +1,6 @@
 
 module.exports = {
 
   baseUrl: '/steve',
 
-  title: 'Juice Plus Admin',
 
+  title: 'ChargEco Admin',
 
 
   /**
 
    * @type {boolean} true | false

+ 9 - 9
Strides-Admin/src/views/Administrator.vue
View File 

@@ -21,7 +21,7 @@
 
                   class="value-text"
 
                   v-model="settingsForm.heartbeat"
 
                   placeholder="Add text"
 
-                  maxlength="10"/>
 
+                  maxlength="5"/>
 
               </el-form-item>
 
               <span class="el-form-item">&nbsp;&nbsp;Minutes</span>
 
             </div>
 
@@ -41,7 +41,7 @@
 
                   class="value-text"
 
                   v-model="settingsForm.expiration"
 
                   placeholder="Add text"
 
-                  maxlength="10"/>
 
+                  maxlength="5"/>
 
               </el-form-item>
 
               <span class="el-form-item">&nbsp;&nbsp;Hours</span>
 
             </div>
 
@@ -90,7 +90,7 @@
 
                 class="add-text"
 
                 v-model="settingsForm.host"
 
                 placeholder="Add text"
 
-                maxlength="10"/>
 
+                maxlength="30"/>
 
             </el-form-item>
 
           </el-col>
 
           <el-col :xs="4" :sm="8" :md="4" :lg="6" :xl="6">
 
@@ -116,7 +116,7 @@
 
                 class="add-text"
 
                 v-model="settingsForm.port"
 
                 placeholder="Add text"
 
-                maxlength="10"/>
 
+                maxlength="5"/>
 
             </el-form-item>
 
           </el-col>
 
           <el-col :xs="4" :sm="8" :md="4" :lg="6" :xl="6">
 
@@ -142,7 +142,7 @@
 
                 class="add-text"
 
                 v-model="settingsForm.from"
 
                 placeholder="Add text"
 
-                maxlength="10"/>
 
+                maxlength="50"/>
 
             </el-form-item>
 
           </el-col>
 
         </el-row>
 
@@ -155,7 +155,7 @@
 
                 class="add-text"
 
                 v-model="settingsForm.username"
 
                 placeholder="Add text"
 
-                maxlength="10"/>
 
+                maxlength="30"/>
 
             </el-form-item>
 
           </el-col>
 
         </el-row>
 
@@ -195,7 +195,7 @@
 
                   class="add-text"
 
                   v-model="recipient"
 
                   placeholder="Add text"
 
-                  maxlength="30"/>
 
+                  maxlength="50"/>
 
               </el-form-item>
 
             </el-col>
 
             <el-col :span="8">
 
@@ -229,7 +229,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="clearAllField">
 
             Clear All
 
           </el-button>
 
@@ -528,7 +528,7 @@
 
     color: #333;
 
   }
 
   ::v-deep .el-checkbox__input.is-checked .el-checkbox__inner::after {
 
-    border-color: #000;
 
+    border-color: #fff;
 
   }
 
   .el-checkbox + .el-checkbox {
 
     margin: 12px 0;

+ 1 - 1
Strides-Admin/src/views/charge/AddCharge.vue
View File 

@@ -188,7 +188,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/charge/EditCharge.vue
View File 

@@ -282,7 +282,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/charging/AddProfile.vue
View File 

@@ -248,7 +248,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/charging/EditProfile.vue
View File 

@@ -248,7 +248,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 0 - 1
Strides-Admin/src/views/dashboard/Dashboard.vue
View File 

@@ -117,7 +117,6 @@
 
       <div class="radio-group">
 
         <el-radio-group
 
           v-model="dateTabIndex"
 
-          text-color="#333"
 
           size="small"
 
           @change="changeTab">
 
           <el-radio-button

+ 3 - 2
Strides-Admin/src/views/driver/DriverDetail.vue
View File 

@@ -141,7 +141,7 @@
 
           v-if="!isFulfilled"
 
           @click="onClickRejectButton"
 
           type="primary"
 
-          class="cancelButton"
 
+          class="cancel-button"
 
           :loading="rejectButtonLoading"
 
         >
 
           Reject
 
@@ -159,7 +159,7 @@
 
         <el-button
 
           @click="onClickCancelButton"
 
           type="primary"
 
-          class="cancelButton"
 
+          class="cancel-button"
 
         >
 
           Cancel
 
         </el-button>
 
@@ -480,6 +480,7 @@ export default {
 
       .buttons {
 
         padding: 0 45px;
 
         .cancelButton {
 
+          color: #555;
 
           background: #FFFFFF;
 
           border: 1px solid #001489;
 
           box-sizing: border-box;

+ 1 - 1
Strides-Admin/src/views/feedback/Detail.vue
View File 

@@ -67,7 +67,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleBackClick">
 
             Back
 
           </el-button>

+ 2 - 1
Strides-Admin/src/views/fleetCompany/FleetCompanyDetail.vue
View File 

@@ -56,7 +56,7 @@
 
         <el-button
 
           @click="onClickCancelButton"
 
           type="primary"
 
-          class="cancelButton"
 
+          class="cancel-button"
 
         >
 
           Cancel
 
         </el-button>
 
@@ -225,6 +225,7 @@ export default {
 
     .buttons {
 
       padding: 0 45px;
 
       .cancelButton {
 
+        color: #555;
 
         background: #FFFFFF;
 
         border: 1px solid #001489;
 
         box-sizing: border-box;

+ 1 - 1
Strides-Admin/src/views/limit/Add.vue
View File 

@@ -106,7 +106,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/limit/Detail.vue
View File 

@@ -92,7 +92,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Back
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/limit/Edit.vue
View File 

@@ -128,7 +128,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/posDevice/detail.vue
View File 

@@ -99,7 +99,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/provider/addProvider.vue
View File 

@@ -73,7 +73,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 1
Strides-Admin/src/views/provider/editProvider.vue
View File 

@@ -73,7 +73,7 @@
 
         <div class="buttons">
 
           <el-button
 
             type="primary"
 
-            plain
 
+            class="cancel-button"
 
             @click="handleClickCancleButton">
 
             Cancel
 
           </el-button>

+ 1 - 0
Strides-Admin/src/views/site/AddSite.vue
View File 

@@ -1299,6 +1299,7 @@ export default {
 
   .cancel-button {
 
     width: 94px;
 
     height: 40px;
 
+    color: #555;
 
     background: #FFFFFF;
 
     border: 1px solid #001489;
 
     box-sizing: border-box;

+ 1 - 0
Strides-Admin/src/views/site/UpdateSite.vue
View File 

@@ -1555,6 +1555,7 @@ export default {
 
   .cancel-button {
 
     width: 94px;
 
     height: 40px;
 
+    color: #555;
 
     background: #FFFFFF;
 
     border: 1px solid #001489;
 
     box-sizing: border-box;

+ 3 - 2
Strides-Admin/src/views/user/UserDetail.vue
View File 

@@ -348,13 +348,13 @@ export default {
 
           //const phone = this.getPhone()
 
 
           const params = {
 
-            userPk: this.userModel.userPk,
 
+            userPk: this.userModel.profile.userPk,
 
             nickName: this.userModel.profile.nickName,
 
             email: this.userModel.profile.email,
 
             phone: this.userModel.profile.phoneNumber,
 
             callingCode: this.userModel.profile.areaCode,
 
             address: this.userModel.address,
 
-            userVehicleRequests: [...vehicleList.filter(vehicle =>
 
+            userVehicleRequests: [...this.userModel.vehicleList.filter(vehicle =>
 
               (vehicle.brand && vehicle.model && vehicle.licensePlate))],
 
             // ocppTagRequest: this.userModel.ocppTagResponse,
 
           }
 
@@ -549,6 +549,7 @@ export default {
 
   .cancel-button {
 
     width: 94px;
 
     height: 40px;
 
+    color: #555;
 
     background: #FFFFFF;
 
     border: 1px solid #001489;
 
     box-sizing: border-box;

+ 1 - 1
Strides-Admin/vue.config.js
View File 

@@ -24,7 +24,7 @@ module.exports = {
 
    * In most cases please use '/' !!!
 
    * Detail: https://cli.vuejs.org/config/#publicpath
 
    */
 
-  publicPath: process.env.ENV === 'production' ? '/crm' : '/chargeco',
 
+  publicPath: process.env.ENV === 'production' ? '/crm' : '/csms',
 
   outputDir: 'dist',
 
   assetsDir: 'static',
 
   lintOnSave: process.env.NODE_ENV === 'development',

Some files were not shown because too many files changed in this diff