From 870bdb7554560da91ba9fa5bb2940a6f595679e5 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Fri, 17 May 2024 11:59:14 +0300 Subject: [PATCH] vectorize png --- admin_front/assets/css/main.css | 20 ++++++++--- admin_front/nuxt.config.ts | 6 ++++ admin_front/pages/plan/mark.vue | 25 ++++--------- admin_front/pages/plan/upload.vue | 59 +++++++++++++++++++++++++------ 4 files changed, 76 insertions(+), 34 deletions(-) diff --git a/admin_front/assets/css/main.css b/admin_front/assets/css/main.css index f508342..60d83c1 100644 --- a/admin_front/assets/css/main.css +++ b/admin_front/assets/css/main.css @@ -5,12 +5,21 @@ @font-face { font-family: 'albertus'; - src: url( - '../font/Albertus\ Extra\ Bold\ Regular.ttf' - ); + src: url('../font/Albertus\ Extra\ Bold\ Regular.ttf' + ); } -@layer components {} +@layer components { + .bg-primary { + @apply bg-pink-300 + } + .bg-primary-hover { + @apply bg-pink-400 + } + .border-primary { + @apply border-pink-500 + } +} .header { @apply col-span-12 p-2 font-extrabold text-2xl flex align-middle justify-center; @@ -35,4 +44,5 @@ .router-link-active { @apply bg-slate-200 dark:bg-slate-700 -} \ No newline at end of file +} + diff --git a/admin_front/nuxt.config.ts b/admin_front/nuxt.config.ts index ede65f0..842b1a8 100644 --- a/admin_front/nuxt.config.ts +++ b/admin_front/nuxt.config.ts @@ -13,6 +13,12 @@ export default defineNuxtConfig({ css: ['~/assets/css/main.css'], ssr: false, devServer: { + host: '0.0.0.0', port: 3011 }, + runtimeConfig: { + public: { + apiBase: '', // can be overridden by NUXT_PUBLIC_API_BASE environment variable + } + }, }) \ No newline at end of file diff --git a/admin_front/pages/plan/mark.vue b/admin_front/pages/plan/mark.vue index b94eb7a..f9276c0 100644 --- a/admin_front/pages/plan/mark.vue +++ b/admin_front/pages/plan/mark.vue @@ -1,30 +1,17 @@ \ No newline at end of file diff --git a/admin_front/pages/plan/upload.vue b/admin_front/pages/plan/upload.vue index 6f1b14a..61a9695 100644 --- a/admin_front/pages/plan/upload.vue +++ b/admin_front/pages/plan/upload.vue @@ -1,15 +1,54 @@ \ No newline at end of file