diff --git a/.env.development b/.env.development index 499dd49..4c7cae9 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ NUXT_PUBLIC_APP_URL=http://localhost:3001/ NUXT_PUBLIC_SITE_URL=https://menthor.io/ -NUXT_PUBLIC_API_URL=http://localhost:3000/dev +#NUXT_PUBLIC_API_URL=http://localhost:3000/dev +NUXT_PUBLIC_API_URL=https://2vzfiy8py1.execute-api.sa-east-1.amazonaws.com/dev NUXT_PUBLIC_UMAMI_HOST="https://analytics.umami.is/script.js" NUXT_PUBLIC_UMAMI_ID="3ff16063-e916-4083-ad5e-66dcec525c16" NUXT_PUBLIC_APP_UMAMI_ID="8746ccb0-1a39-489a-8c8f-a394e4e2ee3b" diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..d72dbdb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [menthorlabs] \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 3b16f7a..bb27f02 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,5 @@ "typescript.tsdk": "node_modules/typescript/lib", "cSpell.language": "en,pt,pt-BR", "cSpell.enabledLanguageIds": ["javascript", "typescript"], - "cSpell.words": ["nuxt", "menthor", "ofetch", "menthorlabs", "sakura", "pinia"], + "cSpell.words": ["nuxt", "menthor", "ofetch", "menthorlabs", "sakura", "pinia", "colorthief"], } diff --git a/apps/app/components/atoms/CreatorsImageCard.vue b/apps/app/components/atoms/CreatorsImageCard.vue new file mode 100644 index 0000000..f70bfef --- /dev/null +++ b/apps/app/components/atoms/CreatorsImageCard.vue @@ -0,0 +1,58 @@ + + + diff --git a/apps/app/components/molecules/LeftMenuCreators.vue b/apps/app/components/molecules/LeftMenuCreators.vue new file mode 100644 index 0000000..4637cc2 --- /dev/null +++ b/apps/app/components/molecules/LeftMenuCreators.vue @@ -0,0 +1,18 @@ + diff --git a/apps/app/components/molecules/TaskModal.vue b/apps/app/components/molecules/TaskModal.vue index 2a2a98b..cb23cab 100644 --- a/apps/app/components/molecules/TaskModal.vue +++ b/apps/app/components/molecules/TaskModal.vue @@ -40,6 +40,7 @@ async function sendSubmission(status: "Pending" | "Draft") { if (!currentLesson) return; const payload: typeof submissionsStore.submission = { + Filename: submissionsStore.submission?.Filename || "", Content: submissionsStore.submission?.Content || "", SubmissionType: currentLesson.submissionContent, SubmissionStatus: status, @@ -62,9 +63,11 @@ async function sendSubmission(status: "Pending" | "Draft") { submissionsStore.submission?.SubmissionType === "Image" && uploadedFile.value ) { - await submissionsStore.requestUrl(uploadedFile.value.type); - await submissionsStore.uploadFileOnUrl(uploadedFile.value); - submissionsStore.submission.Content = `https://menthor-lessons.s3.sa-east-1.amazonaws.com/${submissionsStore.uploadUrl?.fileName}`; + const response = await submissionsStore.requestUrl( + uploadedFile.value.type + ); + await submissionsStore.uploadFileOnUrl(uploadedFile.value, response.url); + submissionsStore.submission.Filename = response.fileName; await submissionsStore.updateSubmission(); } coursesStore.updateCourseLessons(currentLesson._id); @@ -90,7 +93,7 @@ async function uploadFile(file: File) { if (!submissionsStore.submission) return; uploadedFile.value = file; - submissionsStore.submission.Content = URL.createObjectURL(file); + submissionsStore.submission.Filename = URL.createObjectURL(file); } @@ -119,9 +122,13 @@ async function uploadFile(file: File) { class="mb-4" /> diff --git a/apps/app/components/molecules/TopBar.vue b/apps/app/components/molecules/TopBar.vue index 0ed2ff7..9950add 100644 --- a/apps/app/components/molecules/TopBar.vue +++ b/apps/app/components/molecules/TopBar.vue @@ -15,6 +15,7 @@ const shadowGenerator = (color: Array): string => {