diff --git a/package-lock.json b/package-lock.json index b9d63c4..755078e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "digitalpower-stock", "version": "0.1.0", "dependencies": { + "axios": "^1.7.7", "bootstrap": "^5.3.3", "boxicons": "^2.1.4", "pinia": "^2.2.2", @@ -2683,7 +2684,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, "license": "MIT" }, "node_modules/at-least-node": { @@ -2734,6 +2734,17 @@ "postcss": "^8.1.0" } }, + "node_modules/axios": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -3730,7 +3741,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -4696,7 +4706,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -5902,7 +5911,6 @@ "version": "1.15.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", - "dev": true, "funding": [ { "type": "individual", @@ -6017,7 +6025,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -8057,7 +8064,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "devOptional": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -8067,7 +8073,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "devOptional": true, "license": "MIT", "dependencies": { "mime-db": "1.52.0" @@ -10047,6 +10052,12 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", diff --git a/package.json b/package.json index 0967221..6d9eb43 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ } }, "dependencies": { + "axios": "^1.7.7", "bootstrap": "^5.3.3", "boxicons": "^2.1.4", "pinia": "^2.2.2", diff --git a/public/DPIntro.mp4 b/public/DPIntro.mp4 new file mode 100644 index 0000000..331d7c2 Binary files /dev/null and b/public/DPIntro.mp4 differ diff --git a/public/DigitalPower.png b/public/DigitalPower.png new file mode 100644 index 0000000..10466b8 Binary files /dev/null and b/public/DigitalPower.png differ diff --git a/public/login.mp4 b/public/login.mp4 new file mode 100644 index 0000000..ce79af5 Binary files /dev/null and b/public/login.mp4 differ diff --git a/public/notification.mp3 b/public/notification.mp3 new file mode 100644 index 0000000..0296f8d Binary files /dev/null and b/public/notification.mp3 differ diff --git a/src/App.vue b/src/App.vue index 9fefda2..c82800a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,6 +4,9 @@
+
+ +
@@ -13,7 +16,10 @@ import {onMounted, ref} from 'vue'; import {useRouter} from 'vue-router'; import Nav from "@/components/app/Nav.vue"; +import Intro from "@/components/app/Intro.vue"; +import {useUi} from "@/pinia/ui"; +const ui = useUi() const router = useRouter(); onMounted(() => { @@ -61,6 +67,10 @@ body { height: 720px; } +label { + text-align: left !important; +} + .window-container { box-shadow: 0px 0px 20px 0px #0a0a0a; border-radius: 15px; @@ -68,6 +78,8 @@ body { height: 720px; background: white; overflow-y: auto; + + position: relative; } #title-bar { @@ -104,6 +116,13 @@ body { animation: slideOut var(--duration) forwards; } +#notification-container { + top: unset !important; + bottom: 2em !important; + margin-top: 6em; + right: 4% !important; +} + [selectedNav="true"] { background: white; diff --git a/src/components/app/Intro.vue b/src/components/app/Intro.vue new file mode 100644 index 0000000..e889b0d --- /dev/null +++ b/src/components/app/Intro.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/src/components/app/Layout.vue b/src/components/app/Layout.vue index a687275..259da68 100644 --- a/src/components/app/Layout.vue +++ b/src/components/app/Layout.vue @@ -1,10 +1,21 @@ diff --git a/src/components/app/Nav.vue b/src/components/app/Nav.vue index ee9e8e1..03ae901 100644 --- a/src/components/app/Nav.vue +++ b/src/components/app/Nav.vue @@ -1,17 +1,27 @@