Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/.public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/.public/mpmlogo_banner.png
Binary file not shown.
Binary file modified docs/.public/mpmlogo_raw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/.public/mpmlogo_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/.public/mpmlogo_stylized.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions docs/.public/mpmlogo_stylized.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 10 additions & 9 deletions docs/.vitepress/theme/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@
} */

:root {
--vp-c-brand-1: #b23028;
--vp-c-brand-2: #b23028;
--vp-c-brand-3: #9d302a;
--vp-c-brand-1: #1b75ba;
--vp-c-brand-2: #174569;
--vp-c-brand-3: #1b75ba;
--vp-c-brand-4: #77d9f7;
}

/* Purple from icons: #8575c3 */
/* MPM Red Light: #b23028 */
/*MPM Red Dark: #9d302a */
/* MPM Main Blue: #1b75ba */
/* MPM Light Blue: #77d9f7 */
/* MPM Dark Blue: #174569 */

/**
* Component: Home
Expand All @@ -67,14 +68,14 @@
--vp-home-hero-name-color: transparent;
--vp-home-hero-name-background: -webkit-linear-gradient(
120deg,
#8575c3 30%,
var(--vp-c-brand-4),
var(--vp-c-brand-1)
);

--vp-home-hero-image-background-image: linear-gradient(
-45deg,
#8575c3 50%,
var(--vp-c-brand-1) 50%
var(--vp-c-brand-4) 20%,
var(--vp-c-brand-1) 80%
);
--vp-home-hero-image-filter: blur(44px);
}
Expand Down
2 changes: 1 addition & 1 deletion docs/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ order: 1
<p align="center">
<a href="https://github.com/EnAccess/micropowermanager">
<img
src="https://micropowermanager.io/mpmlogo_raw.png"
src="/mpmlogo_stylized.svg"
alt="MicroPowerManager"
width="320"
>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hero:
text: Demo Version
link: https://demo.micropowermanager.io/#/login
image:
src: /mpmlogo_raw.png
src: /mpmlogo_stylized.svg
alt: MicroPowerManager

features:
Expand Down
Binary file removed src/frontend/public/favicon.ico
Binary file not shown.
Binary file added src/frontend/public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions src/frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<link rel="icon" href="<%= BASE_URL %>favicon.png" />
<title>MicroPowerManager</title>
<link
href="https://fonts.googleapis.com/icon?family=Material+Icons"
Expand All @@ -14,10 +14,6 @@
rel="stylesheet"
href="//fonts.googleapis.com/css?family=Roboto:200,300,400,300italic|Material+Icons"
/>
<script
type="text/javascript"
src="https://www.gstatic.com/charts/loader.js"
></script>
</head>
<body>
<script>
Expand Down
Binary file removed src/frontend/src/assets/images/Logo1.png
Binary file not shown.
Binary file removed src/frontend/src/assets/images/Logo2.png
Binary file not shown.
Binary file added src/frontend/src/assets/images/mpmlogo_raw.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/frontend/src/assets/images/mpmlogo_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/frontend/src/assets/images/mpmlogo_stylized.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions src/frontend/src/assets/sass/_variables.scss

This file was deleted.

7 changes: 0 additions & 7 deletions src/frontend/src/assets/sass/app.scss

This file was deleted.

18 changes: 18 additions & 0 deletions src/frontend/src/assets/sass/brand.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// primary colors
$brand-primary-dark: #174569;
$brand-primary: #1b75ba;
$brand-primary-light: #28aae1;
$brand-primary-lighter: #77d9f7;

$brand-background: #f3f8fb;
$brand-background-dark: #e0f7fa;
$brand-white: #ffffff;

// accent colors
$brand-secondary-dark: #fa8d41;
$brand-secondary: #fab15b;
$brand-secondary-light: #fad087;

$brand-accent-dark: #628b45;
$brand-accent: #81a872;
$brand-accent-light: #c3e8b5;
3 changes: 3 additions & 0 deletions src/frontend/src/assets/sass/mpm.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
// =========================================================
//
// * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

@import "theme";

@import "mpm/variables";
@import "mpm/mixins";
@import "mpm/shadows";
Expand Down
19 changes: 0 additions & 19 deletions src/frontend/src/assets/sass/mpm/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
@import "~vue-material/dist/theme/engine"; // Import the theme engine

@include md-register-theme(
"selection-black",
(
accent: md-get-palette-color(black, 500),
)
);

@include md-register-theme(
"default",
(
primary: md-get-palette-color(blue, 500),
// The primary color of your application
)
);

@import "~vue-material/dist/theme/all"; // Apply the theme

$red-50: #ffebee !default;
$red-100: #ffcdd2 !default;
$red-200: #ef9a9a !default;
Expand Down
7 changes: 6 additions & 1 deletion src/frontend/src/assets/sass/mpm/_misc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ h6,
border-bottom-right-radius: 6px;
}

a {
/*
Only apply to <a> that is NOT inside a button/
Else the button style looks odd when using
https://www.creative-tim.com/vuematerial/components/button
*/
a:not(.md-button) {
color: $link-color;

&:hover,
Expand Down
22 changes: 22 additions & 0 deletions src/frontend/src/assets/sass/theme.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@import "brand.scss";

// Apply the color scheme to theme
@import "~vue-material/dist/theme/engine"; // Import the theme engine

@include md-register-theme(
"selection-black",
(
accent: md-get-palette-color(black, 500),
)
);

@include md-register-theme(
"default",
(
primary: $brand-primary,
accent: $brand-secondary,
theme: light,
)
);

@import "~vue-material/dist/theme/all"; // Apply the theme
2 changes: 1 addition & 1 deletion src/frontend/src/layouts/Default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default {
showed: false,
confirmed: false,
expires_in: null,
sidebarBackground: "green",
sidebarBackground: "primary",
sidebarBackgroundImage: null,
showWizard: false,
tail: [],
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Agent/AgentTicketList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:subscriber="subscriber"
:title="$tc('phrases.agentTicket', 1)"
:paginator="agentTicketService.paginator"
color="green"
color="primary"
>
<ticket-item
:allow-comment="true"
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Agent/AgentTransactionList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<widget
:class="'col-sm-6 col-md-5'"
:title="$tc('phrases.lastTransactions')"
color="green"
color="primary"
:paginator="agentTransactionService.paginator"
:subscriber="subscriber"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:button-text="$tc('phrases.assignAppliance', 0)"
:button="true"
:title="$tc('phrases.assignAppliance', 1)"
color="green"
color="primary"
:subscriber="subscriber"
@widgetAction="addNewAppliance"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:button-color="'red'"
:paginator="agentSoldApplianceService.paginator"
:subscriber="subscriber"
color="green"
color="primary"
>
<md-table>
<md-table-row>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
:subscriber="subscriber"
:resetKey="resetKey"
:show_per_page="true"
color="green"
color="primary"
>
<div>
<md-table md-sort="id" md-sort-order="asc">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:button="true"
:title="$tc('phrases.commissionType', 2)"
@widgetAction="newCommission"
color="green"
color="primary"
:subscriber="subscriber"
>
<md-progress-bar md-mode="indeterminate" v-if="loading" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:paginator="agentReceiptService.paginator"
:subscriber="subscriber"
:resetKey="resetKey"
color="green"
color="primary"
>
<md-table md-sort="id" md-sort-order="asc">
<md-table-row>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Appliances/ApplianceTypeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:title="$tc('phrases.applianceType', 1)"
:subscriber="subscriber"
:route_name="'/appliances'"
color="green"
color="primary"
:reset-key="resetKey"
>
<md-table>
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Client/Addresses.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:title="$tc('words.address', 1)"
:button="true"
:button-text="$tc('phrases.newAddress')"
color="green"
color="primary"
@widgetAction="addNewAddress"
:paginator="addresses.paginator"
:subscriber="subscriber"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<widget
:title="deviceInfoTitle"
color="green"
color="primary"
id="device-info"
style="margin-top: 2rem"
>
Expand Down Expand Up @@ -62,7 +62,7 @@
<div class="md-layout-item md-size-60">
<widget
:title="'Details of ' + soldAppliance.applianceType.name"
color="green"
color="primary"
:key="updateDetail"
:subscriber="subscriber"
>
Expand Down Expand Up @@ -154,7 +154,7 @@
<div class="md-layout-item md-size-100">
<widget
title="Payment Plan"
color="green"
color="primary"
:paginator="applianceRateService.paginator"
:subscriber="ratesSubscriber"
>
Expand Down Expand Up @@ -275,7 +275,7 @@
<div class="md-layout-item md-size-100">
<widget
title="History"
color="green"
color="primary"
:paginator="applianceLogService.paginator"
:subscriber="logsSubscriber"
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div>
<widget
color="green"
color="primary"
@widgetAction="
() => {
showSellApplianceModal = true
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Client/Clients.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:button="true"
:paginator="paginator"
:route_name="'/people'"
color="green"
color="primary"
:button-text="$tc('phrases.addCustomer')"
:key="widgetKey"
@widgetAction="
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Client/DeferredPayments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:button="true"
:title="$tc('phrases.soldAppliances')"
:button-color="'red'"
color="green"
color="primary"
:subscriber="subscriber"
@widgetAction="
() => {
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Client/Devices.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div>
<widget
:title="$tc('words.devices')"
color="green"
color="primary"
:subscriber="subscriber"
>
<div class="md-layout md-gutter">
Expand Down
5 changes: 0 additions & 5 deletions src/frontend/src/modules/Client/PaymentDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,12 @@ export default {
const seriesNames = headers.slice(1)
const categories = data.slice(1).map((row) => row[0] || "")

const colors = ["#0b920b", "#8b2621", "#0c7cd5", "#aad4df"]

const series = seriesNames.map((name, index) => {
const seriesIndex = index + 1
return {
name: String(name || `Series ${index + 1}`),
type: "bar",
data: data.slice(1).map((row) => parseFloat(row[seriesIndex]) || 0),
itemStyle: {
color: colors[index % colors.length],
},
}
})

Expand Down
5 changes: 0 additions & 5 deletions src/frontend/src/modules/Client/PaymentFlow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,12 @@ export default {
const seriesNames = headers.slice(1)
const categories = data.slice(1).map((row) => row[0] || "")

const colors = ["#1b9e77", "#d95f02", "#7570b3"]

const series = seriesNames.map((name, index) => {
const seriesIndex = index + 1
return {
name: String(name || `Series ${index + 1}`),
type: "bar",
data: data.slice(1).map((row) => parseFloat(row[seriesIndex]) || 0),
itemStyle: {
color: colors[index % colors.length],
},
}
})

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Client/SmsHistory.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<widget
:title="$tc('phrases.smsHistory') + ' (' + smses.length + ')'"
color="green"
color="primary"
:subscriber="subscriber"
:button="true"
:empty-state-create-button="true"
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/modules/Client/Ticket.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="col-sm-12">
<widget
:subscriber="subscriber"
color="green"
color="primary"
:title="$tc('phrases.userTicket', 2)"
:paginator="tickets.paginator"
:button="true"
Expand Down
Loading
Loading