From 53e973cf5359e010a2024cb08ad0950394a76f83 Mon Sep 17 00:00:00 2001
From: Bernardo Simonassi <bernardosimonassi@hotmail.com>
Date: Wed, 29 Nov 2023 00:03:50 -0300
Subject: [PATCH] fix: website layout issues and gh issues

---
 apps/app/components/molecules/TaskModal.vue |  18 +--
 apps/app/nuxt.config.ts                     |   1 +
 apps/app/pages/[...slug].vue                |   7 +-
 apps/www/components/atoms/Header.vue        |   7 +-
 apps/www/nuxt.config.ts                     |  20 ++--
 apps/www/package.json                       |   3 +-
 packages/tailwind-config/package.json       |   5 +-
 packages/tailwind-config/tailwind.config.ts |   3 +
 pnpm-lock.yaml                              | 117 --------------------
 9 files changed, 38 insertions(+), 143 deletions(-)

diff --git a/apps/app/components/molecules/TaskModal.vue b/apps/app/components/molecules/TaskModal.vue
index cb23cab..5aa37d8 100644
--- a/apps/app/components/molecules/TaskModal.vue
+++ b/apps/app/components/molecules/TaskModal.vue
@@ -7,11 +7,11 @@ const emit = defineEmits(["next"]);
 const taskModalStore = useTaskModalStore();
 
 const submissionsStore = useSubmissionsStore();
-const coursesStore = useCoursesStore();
 const config = useRuntimeConfig();
 const loadingButton = ref(false);
 const loading = ref(true);
-const toast: { error: Function } | undefined = inject("toast");
+const toast: { error: Function; success: Function } | undefined =
+  inject("toast");
 const uploadedFile: Ref<File | null> = ref(null);
 
 watch(taskModalStore, async (newValue) => {
@@ -20,6 +20,10 @@ watch(taskModalStore, async (newValue) => {
   }
 });
 
+const taskNotSent = computed(
+  () => submissionsStore.submission?.SubmissionStatus === "Draft"
+);
+
 async function loadSubmission() {
   loading.value = true;
   try {
@@ -70,7 +74,7 @@ async function sendSubmission(status: "Pending" | "Draft") {
       submissionsStore.submission.Filename = response.fileName;
       await submissionsStore.updateSubmission();
     }
-    coursesStore.updateCourseLessons(currentLesson._id);
+    toast?.success("Tarefa enviada com sucesso!");
     goToNextLesson();
   } finally {
     loadingButton.value = false;
@@ -146,11 +150,7 @@ async function uploadFile(file: File) {
                   submissionsStore.submission?.SubmissionStatus || 'Pending'
                 )
               "
-              :status="
-                submissionsStore.submission?.SubmissionStatus === 'Draft'
-                  ? 'warning'
-                  : 'success'
-              "
+              :status="taskNotSent ? 'warning' : 'success'"
             />
             <div class="flex gap-3 items-center">
               <MButton
@@ -160,7 +160,7 @@ async function uploadFile(file: File) {
               />
               <MButton
                 variant="primary"
-                text="Enviar"
+                :text="taskNotSent ? 'Enviar' : 'Reenviar'"
                 type="submit"
                 :loading="loadingButton"
               />
diff --git a/apps/app/nuxt.config.ts b/apps/app/nuxt.config.ts
index 64ce643..c2f6c00 100644
--- a/apps/app/nuxt.config.ts
+++ b/apps/app/nuxt.config.ts
@@ -116,5 +116,6 @@ export default defineNuxtConfig({
   },
   tailwindcss: {
     cssPath: "@/styles/main.css",
+    viewer: false,
   },
 });
diff --git a/apps/app/pages/[...slug].vue b/apps/app/pages/[...slug].vue
index c42b0f4..e61ac0b 100644
--- a/apps/app/pages/[...slug].vue
+++ b/apps/app/pages/[...slug].vue
@@ -54,8 +54,13 @@ const hasTask = computed(() => {
   return ["Content", "Image"].includes(currentLesson?.submissionContent);
 });
 
-function redirectToNextLesson() {
+async function redirectToNextLesson() {
   if (!nextLesson) return;
+
+  if (sessionStore.isConnected()) {
+    await coursesStore.updateCourseLessons(currentLesson._id);
+  }
+
   router.push(nextLesson._path as RouteLocationRaw);
 }
 
diff --git a/apps/www/components/atoms/Header.vue b/apps/www/components/atoms/Header.vue
index 4216798..50877c2 100644
--- a/apps/www/components/atoms/Header.vue
+++ b/apps/www/components/atoms/Header.vue
@@ -79,7 +79,10 @@ onMounted(() => {
 
           <!-- <AtomsHeaderLink title="Documentação" /> -->
 
-          <UPopover :popper="{ placement: 'bottom-end' }">
+          <UPopover
+            :popper="{ placement: 'bottom' }"
+            class="[&>*]:block [&>*]:md:inline-flex"
+          >
             <AtomsHeaderLink title="Comunidade" chevron />
 
             <template #panel>
@@ -135,7 +138,7 @@ onMounted(() => {
         </nuxt-link>
         <nuxt-link
           class="block"
-          :to="`${$config.public.appUrl}sign-in?utm_source=landing_page`"
+          :to="`${$config.public.appUrl}?utm_source=landing_page`"
         >
           <MButton
             icon-right="arrow-right"
diff --git a/apps/www/nuxt.config.ts b/apps/www/nuxt.config.ts
index f4efb63..e39b082 100644
--- a/apps/www/nuxt.config.ts
+++ b/apps/www/nuxt.config.ts
@@ -1,3 +1,4 @@
+// @ts-expect-error avoid lint error
 import eslintPlugin from "vite-plugin-eslint";
 import path from "node:path";
 
@@ -5,7 +6,6 @@ export default defineNuxtConfig({
   colorMode: {
     preference: "light",
   },
-  sourcemap: { server: true, client: false }, // Disable sourcemap errors
   runtimeConfig: {
     public: {
       siteUrl: process.env.NUXT_PUBLIC_SITE_URL || "https://menthor.io/",
@@ -16,14 +16,21 @@ export default defineNuxtConfig({
   nitro: {
     preset: "cloudflare_pages_static",
   },
-  imports: {
-    dirs: ["composables", "../../packages/composables"],
-  },
+  // imports: {
+  //   dirs: ["./composables", "../../packages/composables"],
+  // },
   vue: {
     propsDestructure: true,
     defineModel: true,
   },
   extends: ["nuxt-umami"],
+  typescript: {
+    tsConfig: {
+      compilerOptions: {
+        moduleResolution: "bundler",
+      },
+    },
+  },
   css: ["@/styles/font.css", "@fortawesome/fontawesome-svg-core/styles.css"],
   alias: {
     "@": path.resolve(__dirname, "../../packages/assets"),
@@ -50,10 +57,6 @@ export default defineNuxtConfig({
   vite: {
     plugins: [eslintPlugin()],
   },
-  delayHydration: {
-    mode: "mount",
-    debug: process.env.NODE_ENV === "development",
-  },
   appConfig: {
     umami: {
       version: 2,
@@ -62,5 +65,6 @@ export default defineNuxtConfig({
   },
   tailwindcss: {
     cssPath: "@/styles/main.css",
+    viewer: false,
   },
 });
diff --git a/apps/www/package.json b/apps/www/package.json
index 242d1a5..78685cf 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -28,7 +28,6 @@
     "@vueuse/nuxt": "^10.3.0",
     "eslint-config-custom": "workspace:*",
     "humps": "^2.0.1",
-    "nuxt-umami": "^2.5.2",
-    "tailwind-config": "workspace:*"
+    "nuxt-umami": "^2.5.2"
   }
 }
\ No newline at end of file
diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json
index 76def23..1885ead 100644
--- a/packages/tailwind-config/package.json
+++ b/packages/tailwind-config/package.json
@@ -8,9 +8,6 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "autoprefixer": "^10.4.14",
-    "eslint-config-custom": "workspace:*",
-    "postcss": "^8.4.27",
-    "tailwindcss": "^3.3.3"
+    "eslint-config-custom": "workspace:*"
   }
 }
diff --git a/packages/tailwind-config/tailwind.config.ts b/packages/tailwind-config/tailwind.config.ts
index 3800866..de71e99 100644
--- a/packages/tailwind-config/tailwind.config.ts
+++ b/packages/tailwind-config/tailwind.config.ts
@@ -26,6 +26,8 @@ export default <Partial<Config>>{
           sm: "2rem",
           md: "2.5rem",
           lg: "2.5rem",
+          xl: "2.5rem",
+          "2xl": "2.5rem",
         },
       },
       screens: {
@@ -33,6 +35,7 @@ export default <Partial<Config>>{
         md: "768px",
         lg: "1024px",
         xl: "1190px",
+        "2xl": "1190px",
       },
     },
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d9f117f..24fe351 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -158,9 +158,6 @@ importers:
       nuxt-umami:
         specifier: ^2.5.2
         version: 2.5.2(vue@3.3.9)
-      tailwind-config:
-        specifier: workspace:*
-        version: link:../../packages/tailwind-config
     devDependencies:
       '@nuxtjs/fontaine':
         specifier: ^0.2.5
@@ -234,18 +231,9 @@ importers:
 
   packages/tailwind-config:
     dependencies:
-      autoprefixer:
-        specifier: ^10.4.14
-        version: 10.4.14(postcss@8.4.27)
       eslint-config-custom:
         specifier: workspace:*
         version: link:../eslint-config-custom
-      postcss:
-        specifier: ^8.4.27
-        version: 8.4.27
-      tailwindcss:
-        specifier: ^3.3.3
-        version: 3.3.3
 
   packages/ui:
     dependencies:
@@ -3893,22 +3881,6 @@ packages:
     resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
     engines: {node: '>= 4.0.0'}
 
-  /autoprefixer@10.4.14(postcss@8.4.27):
-    resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      browserslist: 4.22.1
-      caniuse-lite: 1.0.30001564
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.0.0
-      postcss: 8.4.27
-      postcss-value-parser: 4.2.0
-    dev: false
-
   /autoprefixer@10.4.16(postcss@8.4.31):
     resolution: {integrity: sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==}
     engines: {node: ^10 || ^12 || >=14}
@@ -8883,18 +8855,6 @@ packages:
     dependencies:
       enhanced-resolve: 4.5.0
 
-  /postcss-import@15.1.0(postcss@8.4.27):
-    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
-    dependencies:
-      postcss: 8.4.27
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.8
-    dev: false
-
   /postcss-import@15.1.0(postcss@8.4.31):
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
     engines: {node: '>=14.0.0'}
@@ -8906,16 +8866,6 @@ packages:
       read-cache: 1.0.0
       resolve: 1.22.8
 
-  /postcss-js@4.0.1(postcss@8.4.27):
-    resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
-    engines: {node: ^12 || ^14 || >= 16}
-    peerDependencies:
-      postcss: ^8.4.21
-    dependencies:
-      camelcase-css: 2.0.1
-      postcss: 8.4.27
-    dev: false
-
   /postcss-js@4.0.1(postcss@8.4.31):
     resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
     engines: {node: ^12 || ^14 || >= 16}
@@ -8926,23 +8876,6 @@ packages:
       postcss: 8.4.31
     dev: false
 
-  /postcss-load-config@4.0.2(postcss@8.4.27):
-    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
-    engines: {node: '>= 14'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 3.0.0
-      postcss: 8.4.27
-      yaml: 2.3.4
-    dev: false
-
   /postcss-load-config@4.0.2(postcss@8.4.31):
     resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
     engines: {node: '>= 14'}
@@ -9022,16 +8955,6 @@ packages:
       postcss: 8.4.31
       postcss-selector-parser: 6.0.13
 
-  /postcss-nested@6.0.1(postcss@8.4.27):
-    resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.2.14
-    dependencies:
-      postcss: 8.4.27
-      postcss-selector-parser: 6.0.13
-    dev: false
-
   /postcss-nested@6.0.1(postcss@8.4.31):
     resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
     engines: {node: '>=12.0'}
@@ -9212,15 +9135,6 @@ packages:
   /postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  /postcss@8.4.27:
-    resolution: {integrity: sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: false
-
   /postcss@8.4.31:
     resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
     engines: {node: ^10 || ^12 || >=14}
@@ -10347,37 +10261,6 @@ packages:
     resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
     dev: false
 
-  /tailwindcss@3.3.3:
-    resolution: {integrity: sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-    dependencies:
-      '@alloc/quick-lru': 5.2.0
-      arg: 5.0.2
-      chokidar: 3.5.3
-      didyoumean: 1.2.2
-      dlv: 1.1.3
-      fast-glob: 3.3.2
-      glob-parent: 6.0.2
-      is-glob: 4.0.3
-      jiti: 1.21.0
-      lilconfig: 2.1.0
-      micromatch: 4.0.5
-      normalize-path: 3.0.0
-      object-hash: 3.0.0
-      picocolors: 1.0.0
-      postcss: 8.4.27
-      postcss-import: 15.1.0(postcss@8.4.27)
-      postcss-js: 4.0.1(postcss@8.4.27)
-      postcss-load-config: 4.0.2(postcss@8.4.27)
-      postcss-nested: 6.0.1(postcss@8.4.27)
-      postcss-selector-parser: 6.0.13
-      resolve: 1.22.8
-      sucrase: 3.34.0
-    transitivePeerDependencies:
-      - ts-node
-    dev: false
-
   /tailwindcss@3.3.5:
     resolution: {integrity: sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==}
     engines: {node: '>=14.0.0'}