diff --git a/resources/images/admin.svg b/resources/images/admin.svg index dbaae3f..c0cc2a9 100644 --- a/resources/images/admin.svg +++ b/resources/images/admin.svg @@ -1,4 +1,3 @@ - - - - \ No newline at end of file + + + diff --git a/resources/images/box-seam.svg b/resources/images/box-seam.svg new file mode 100644 index 0000000..e1506b8 --- /dev/null +++ b/resources/images/box-seam.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/images/cart3.svg b/resources/images/cart3.svg index 2187149..31029fe 100644 --- a/resources/images/cart3.svg +++ b/resources/images/cart3.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/resources/images/home.svg b/resources/images/home.svg new file mode 100644 index 0000000..9f76093 --- /dev/null +++ b/resources/images/home.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/orders.svg b/resources/images/orders.svg index 479f3a0..94b73e2 100644 --- a/resources/images/orders.svg +++ b/resources/images/orders.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/images/settings.svg b/resources/images/settings.svg index 2aa36a1..0f498a1 100644 --- a/resources/images/settings.svg +++ b/resources/images/settings.svg @@ -1,3 +1,3 @@ - + - \ No newline at end of file + diff --git a/resources/images/summary.svg b/resources/images/summary.svg index 682bd4e..cc981ec 100644 --- a/resources/images/summary.svg +++ b/resources/images/summary.svg @@ -1,4 +1,4 @@ - + - \ No newline at end of file + diff --git a/resources/js/main.js b/resources/js/main.js index 45ec807..18a16cd 100644 --- a/resources/js/main.js +++ b/resources/js/main.js @@ -1,5 +1,5 @@ import RegisterArea from './register-area/register-area.vue' -import Sidebar from './sidebar/sidebar.vue' +import Panel from './panel/panel.vue' import '../scss/main.scss' import { createApp } from 'vue' importAll(require.context('../images', false, /\.(png|jpe?g|svg)$/)) @@ -20,7 +20,7 @@ function getCookie(name) { return (value != null) ? unescape(value[1]) : null } -function getToken() { +function getToken(app) { fetch("/sanctum/csrf-cookie", { method: 'GET' }).then( () => { @@ -76,15 +76,13 @@ function toggleNav() { this.classList.toggle("toggled") } -if (!token) {getToken()} if (window.location.pathname == '/') { document.getElementById('nav_toggle').addEventListener('click', toggleNav) document.querySelector('#login_form button').addEventListener('click', login) const app = createApp(RegisterArea).mount('#app') - app.token = token - // console.log(app.token) - // console.log(app.$data.active) + // app.token = token + if (!token) {getToken(app)} //Triggers for registration menu for (let i = 0; i < registerToggles.length; i++) { @@ -110,7 +108,7 @@ if (window.location.pathname == '/') { } else if (window.location.pathname == '/verify-email') { document.getElementById('resend_verification').addEventListener("click", resendLink) } else if (window.location.pathname == '/panel') { - const app = createApp(Sidebar).mount('#panel') - app.token = token + const app = createApp(Panel).mount('#panel') + if (!token) {getToken(app)} } diff --git a/resources/js/panel/admin.vue b/resources/js/panel/admin.vue new file mode 100644 index 0000000..e69de29 diff --git a/resources/js/panel/orders.vue b/resources/js/panel/orders.vue new file mode 100644 index 0000000..e69de29 diff --git a/resources/js/panel/panel.vue b/resources/js/panel/panel.vue new file mode 100644 index 0000000..0173fe2 --- /dev/null +++ b/resources/js/panel/panel.vue @@ -0,0 +1,25 @@ + + + diff --git a/resources/js/panel/settings.vue b/resources/js/panel/settings.vue new file mode 100644 index 0000000..e69de29 diff --git a/resources/js/panel/summary.vue b/resources/js/panel/summary.vue new file mode 100644 index 0000000..9a8bdf5 --- /dev/null +++ b/resources/js/panel/summary.vue @@ -0,0 +1,3 @@ + diff --git a/resources/js/sidebar/sidebar.vue b/resources/js/sidebar/sidebar.vue deleted file mode 100644 index d8008f4..0000000 --- a/resources/js/sidebar/sidebar.vue +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/resources/scss/main.scss b/resources/scss/main.scss index eb54964..eb0f40b 100644 --- a/resources/scss/main.scss +++ b/resources/scss/main.scss @@ -669,21 +669,52 @@ div.register-area.active { } main.panel { - min-height: 85vh; - max-height: 100vh; + min-height: 750px; + height: 90vh; + // max-height: 100vh; background-image: linear-gradient(315deg, #ff4e00 0%, #ec9f05 74%); } +#panel { + top: 50px; + padding: 10px; + margin: auto; + position: relative; + max-width: 450px; + height: 600px; + display: flex; + gap: 10px; +} + #sidebar { - width: 40px; + position: relative; + width: 35px; + height: 50%; color: white; background: transparent; + display: block; + flex-shrink: 0; a { display: block; + margin: 20px 0; } img { - width: 50px + width: 35px; + color: white; } } + +#panel #main { + height: 100%; + background: white; + width: 100%; + // min-width: 300px; + flex-shrink: 1; + // width: 100%; + // max-width: 300px; + margin-left: auto; + position: relative; + @include vars.hovering3; +}