diff --git a/package.json b/package.json index 8fb3f0e0..86432c7e 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "cross-env": "^5.2.0", "file-saver": "^2.0.2", "frappe-charts": "^1.2.4", - "frappejs": "https://github.com/thefalconx33/frappejs#test", + "frappejs": "0.0.10", "nodemailer": "^4.7.0", "popper.js": "^1.14.4", "vue-color": "^2.7.0", diff --git a/src-electron/main.js b/src-electron/main.js index 04985ad2..f3027c36 100644 --- a/src-electron/main.js +++ b/src-electron/main.js @@ -27,6 +27,7 @@ function createWindow() { mainWindow = new BrowserWindow({ width: 1024, height: 768, + frame: false, useContentSize: true, webPreferences: { webSecurity: false, diff --git a/src/App.vue b/src/App.vue index 9f87decf..b4246ca4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,13 @@ - diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503f..00000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/components/Icons/Add.vue b/src/components/Icons/Add.vue new file mode 100644 index 00000000..9c23f788 --- /dev/null +++ b/src/components/Icons/Add.vue @@ -0,0 +1,12 @@ + diff --git a/src/components/Icons/Dashboard.vue b/src/components/Icons/Dashboard.vue new file mode 100644 index 00000000..a0af327f --- /dev/null +++ b/src/components/Icons/Dashboard.vue @@ -0,0 +1,41 @@ + + diff --git a/src/components/Icons/Items.vue b/src/components/Icons/Items.vue new file mode 100644 index 00000000..22f6d853 --- /dev/null +++ b/src/components/Icons/Items.vue @@ -0,0 +1,14 @@ + diff --git a/src/components/Icons/Purchases.vue b/src/components/Icons/Purchases.vue new file mode 100644 index 00000000..a32b770a --- /dev/null +++ b/src/components/Icons/Purchases.vue @@ -0,0 +1,11 @@ + diff --git a/src/components/Icons/Reports.vue b/src/components/Icons/Reports.vue new file mode 100644 index 00000000..fbd52d71 --- /dev/null +++ b/src/components/Icons/Reports.vue @@ -0,0 +1,14 @@ + diff --git a/src/components/Icons/Sales.vue b/src/components/Icons/Sales.vue new file mode 100644 index 00000000..4aa37d77 --- /dev/null +++ b/src/components/Icons/Sales.vue @@ -0,0 +1,11 @@ + diff --git a/src/components/Icons/Settings.vue b/src/components/Icons/Settings.vue new file mode 100644 index 00000000..6c1dfe20 --- /dev/null +++ b/src/components/Icons/Settings.vue @@ -0,0 +1,14 @@ + diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index e5b1deac..182e229f 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -1,142 +1,91 @@ - diff --git a/src/components/WindowControls.vue b/src/components/WindowControls.vue new file mode 100644 index 00000000..0076d1a4 --- /dev/null +++ b/src/components/WindowControls.vue @@ -0,0 +1,29 @@ + + + diff --git a/src/pages/Desk.vue b/src/pages/Desk.vue index bccef139..44c273aa 100644 --- a/src/pages/Desk.vue +++ b/src/pages/Desk.vue @@ -1,7 +1,7 @@