Skip to content

Commit

Permalink
Fix: Ajustes finais (#376)
Browse files Browse the repository at this point in the history
* Ajustes change individual
* Ajuste accordeon track (movimentação)
* Fix publicar trilha
* Add editar atividades
* Fix rendereização
* Add Trilha privada
* Troca da descrição da trilha pública
* Fix loading
  • Loading branch information
PedroAlvesM committed May 19, 2023
1 parent 7175456 commit 556f6fd
Show file tree
Hide file tree
Showing 25 changed files with 1,073 additions and 531 deletions.
521 changes: 311 additions & 210 deletions dist/index.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference types="react" />
import '../../../shared/global.css';
import { IAccordionTranslate } from './IAccordionTrack';
export default function AccordionTrackList({ trailsData, courseData, handleChange, onNewTrail, handleEditCourse, handlePopOverMove, handlePopOverEdit, handlePopOverTrailEdit, handlePopOverTrailDelete, handleSwitchActiveTrail, onSetNameTrail, handleSwitchAtivar, handleDeleteCourse, handleDeleteCourseTrail, handleMessageError, handleUpdateTrail, txtPopOverDeleteContent, txtPopOverEditContent, txtPopOverMoveToTrails, textMeusConteudos, textTotalDe, textRegistros, textMinhasTrihas, txtAtivarCurso, txtButtonLabel, txtCriarNovoCurso, txtAtivarTrilha, isLoading, handlePublicarTrilha }: IAccordionTranslate): JSX.Element;
export default function AccordionTrackList({ trailsData, courseData, handleChange, onNewTrail, handleEditCourse, handlePopOverMove, handlePopOverEdit, handlePopOverTrailEdit, handlePopOverTrailDelete, handleSwitchActiveTrail, onSetNameTrail, handleSwitchAtivar, handleDeleteCourse, handleDeleteCourseTrail, handleMessageError, handleUpdateTrail, txtPopOverDeleteContent, txtPopOverEditContent, txtPopOverMoveToTrails, textMeusConteudos, textTotalDe, textRegistros, textMinhasTrihas, txtAtivarCurso, txtButtonLabel, txtCriarNovoCurso, txtAtivarTrilha, isLoading, handlePublicarTrilha, changeCourses, handlePublicarCheck, handleClickPopOverEditActivity, handleSwitchPrivateTrail }: IAccordionTranslate): JSX.Element;
//# sourceMappingURL=accordionTrackList.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/src/components/LXP/thumbnails/thumbnails.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference types="react" />
import '../../../shared/global.css';
import { IThumbnailsTranslate } from './thumbnails.d';
export default function Thumbnails({ variant, src, showSwitch, handleClickCourse, handleClickNew, handleSwitchAtivar, handleClickPopOverDelete, handleClickPopOverEdit, title, provided, isDisabled, isLoading, txtButtonLabel, txtCriarNovoCurso, txtCriarNovoCurso2, txtAtivarCurso, txtPopOverDeleteContent, txtPopOverMoveToTrails, txtPopOverEditContent, isActive }: IThumbnailsTranslate): JSX.Element;
export default function Thumbnails({ variant, src, showSwitch, handleClickCourse, handleClickNew, handleSwitchAtivar, handleClickPopOverDelete, handleClickPopOverEdit, handleClickPopOverEditActivity, handleClickPopOverDeleteTrail, title, provided, isDisabled, isLoading, txtButtonLabel, txtCriarNovoCurso, txtCriarNovoCurso2, txtAtivarCurso, txtPopOverDeleteContent, txtPopOverMoveToTrails, txtPopOverEditContent, isActive, isTrail, txtPopOverDeleteTrail, txtPopOverEditContentActivity }: IThumbnailsTranslate): JSX.Element;
//# sourceMappingURL=thumbnails.d.ts.map
2 changes: 1 addition & 1 deletion dist/src/components/LXP/thumbnails/thumbnails.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference types="react" />
import '../../../shared/global.css';
import { IThumbnailsTranslate } from './thumbnails.d';
export default function ThumbnailsDraggable({ variant, src, handleClickCourse, handleClickNew, handleClickContent, handleSwitchAtivar, title, id, index, isDisabled, isLoading, txtButtonLabel, txtAtivarCurso, showSwitch, txtCriarNovoCurso, txtCriarNovoCurso2, handleClickPopOverDelete, handleClickPopOverEdit, handleClickPopOverMove, txtPopOverDeleteContent, txtPopOverEditContent, isActive, txtPopOverMoveToTrails }: IThumbnailsTranslate): JSX.Element;
export default function ThumbnailsDraggable({ variant, src, handleClickCourse, handleClickNew, handleClickContent, handleSwitchAtivar, title, id, index, isDisabled, isLoading, txtButtonLabel, txtAtivarCurso, showSwitch, txtCriarNovoCurso, txtCriarNovoCurso2, handleClickPopOverDelete, handleClickPopOverEdit, handleClickPopOverEditActivity, handleClickPopOverMove, txtPopOverDeleteContent, txtPopOverEditContent, isActive, isTrail, txtPopOverMoveToTrails, txtPopOverDeleteTrail, txtPopOverEditContentActivity }: IThumbnailsTranslate): JSX.Element;
//# sourceMappingURL=thumbnailsDraggable.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions dist/src/components/modal/modalLXP/Modal.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// <reference types="react" />
import '../../../shared/global.css';
export default function ModalLXP(props: any): JSX.Element;
//# sourceMappingURL=Modal.d.ts.map
1 change: 1 addition & 0 deletions dist/src/components/modal/modalLXP/Modal.d.ts.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "frst-components",
"homepage": "http://FRST-Falconi.github.io/storybook.frstfalconi.com",
"version": "0.17.1",
"version": "0.17.2",
"private": true,
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
Expand Down
9 changes: 8 additions & 1 deletion src/components/LXP/accordionTrack/IAccordionTrack.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,13 @@ export interface IAccordionTrack {
handlePopOverDuplicate?: (id: string) => void
handlePopOverTrailEdit?: (id: string) => void
handlePopOverTrailDelete?: (id: string) => void
handlePopOverRemoveIndividual?: (id: string) => void
changeCourses?: (course: any) => void

handlePublicarTrilha?: (id: string) => void
handlePublicarCheck?: (id: string) => string

handleClickPopOverEditActivity?: (id: string) => string
handleSwitchPrivateTrail?: (idTrailCourse: string, checked: boolean) => void
}

export interface IAccordionTranslate extends IAccordionTrack {
Expand All @@ -66,6 +71,7 @@ export interface IAccordionTranslate extends IAccordionTrack {
textMinhasTrihas?: string
txtAtivarCurso?: string
txtAtivarTrilha?: string
txtPrivateTrilha?: string
txtButtonLabel?: string
txtCriarNovoCurso?: string
txtCriarNovoCurso2?: string
Expand All @@ -77,5 +83,6 @@ export interface IAccordionTranslate extends IAccordionTrack {
txtTrailsPopOverDelete?: string
txtPlacerolderInputNameTrail?: string
txtCursoIndividual?: string
txtLoadingTrilhas?: any
}

183 changes: 112 additions & 71 deletions src/components/LXP/accordionTrack/accordionTrack.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react'
import { v4 } from 'uuid'
import AccordionTrackList from './accordionTrackList'
import { count } from 'console'

// More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
export default {
Expand All @@ -13,74 +14,74 @@ const Template = (args) => {
// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
const [Course, setCourse] = useState([
{
"id":63,
"uuid":"1b7179d4-b264-44ea-ae09-8c8b38994a4d",
"title":"Curso de HTML 5",
"language":"pt-br",
"desc":"Description content",
"tags":{
"custom":"#tag",
"category":[
"Gestão",
"Liderança"
]
},
"settings":{
"cover_full_url":"",
"cover_thumb_url":"",
"cover_video_url":""
},
"excluded":false,
"private":false,
"active":true,
"active_individual":true,
"channel":104
"id":63,
"uuid":"1b7179d4-b264-44ea-ae09-8c8b38994a4d",
"title":"Curso de HTML 5",
"language":"pt-br",
"desc":"Description content",
"tags":{
"custom":"#tag",
"category":[
"Gestão",
"Liderança"
]
},
"settings":{
"cover_full_url":"",
"cover_thumb_url":"",
"cover_video_url":""
},
"excluded":false,
"private":false,
"active":true,
"active_individual":true,
"channel":104
},
{
"id":82,
"uuid":"63552d66-468e-4c44-87f8-7dca992d9dd9",
"title":"Entendendo funções recursivas",
"language":"pt-br",
"desc":"descrição",
"tags":{
"custom":"#tags",
"category":[
"Gestão"
]
},
"settings":{
"cover_full_url":"https://cdn.discordapp.com/attachments/1001105882358226955/1058104301844693122/image.png",
"cover_thumb_url":"https://cdn.discordapp.com/attachments/1001105882358226955/1058104301844693122/image.png",
"cover_video_url":""
},
"excluded":false,
"private":false,
"active":true,
"active_individual":false,
"channel":104
"id":82,
"uuid":"63552d66-468e-4c44-87f8-7dca992d9dd9",
"title":"Entendendo funções recursivas",
"language":"pt-br",
"desc":"descrição",
"tags":{
"custom":"#tags",
"category":[
"Gestão"
]
},
"settings":{
"cover_full_url":"https://cdn.discordapp.com/attachments/1001105882358226955/1058104301844693122/image.png",
"cover_thumb_url":"https://cdn.discordapp.com/attachments/1001105882358226955/1058104301844693122/image.png",
"cover_video_url":""
},
"excluded":false,
"private":false,
"active":true,
"active_individual":false,
"channel":104
},
{
"id":87,
"uuid":"89f06dc7-82b7-475f-aae0-f3d6b02bc9dc",
"title":"Conteúdo para deletar",
"language":"pt-br",
"desc":"teste",
"tags":{
"custom":"#a",
"category":[
"Gestão"
]
},
"settings":{
"cover_full_url":"",
"cover_thumb_url":"",
"cover_video_url":""
},
"excluded":false,
"private":false,
"active":false,
"active_individual":false,
"channel":104
"id":87,
"uuid":"89f06dc7-82b7-475f-aae0-f3d6b02bc9dc",
"title":"Conteúdo para deletar",
"language":"pt-br",
"desc":"teste",
"tags":{
"custom":"#a",
"category":[
"Gestão"
]
},
"settings":{
"cover_full_url":"",
"cover_thumb_url":"",
"cover_video_url":""
},
"excluded":false,
"private":false,
"active":false,
"active_individual":false,
"channel":104
}
])

Expand All @@ -89,13 +90,15 @@ const Template = (args) => {
"id": 174,
"uuid": "10e6c506-9d66-4312-bda6-3552de5c4a56",
"name": "O Líder que bate Metas",
"publish_status": "pending",
"excluded": false,
"active": true,
"private": true,
"channel": 110,
"trail_course": [
{
"id":32,
"trail_id":174,
"trail_id":174,
"course":{
"id":44,
"uuid":"ff58113f-9cf0-4b65-873c-68bd7624af48",
Expand Down Expand Up @@ -124,7 +127,7 @@ const Template = (args) => {
},
{
"id":33,
"trail_id":174,
"trail_id":174,
"course":{
"id":32,
"uuid":"ff58113f-9cf0-4b65-873c-68bd7624af48",
Expand Down Expand Up @@ -159,6 +162,9 @@ const Template = (args) => {
"name": "Liderança que inspira",
"excluded": false,
"active": true,
"private": true,
// "publish_status": "processing",
"publish_status": "pending",
"channel": 110,
"trail_course": [
{
Expand Down Expand Up @@ -222,6 +228,13 @@ const Template = (args) => {
]}
])

const [Count, setCount] = useState([
0,
0
]);

const sleep = ms => new Promise(r => setTimeout(r, ms));

return <>
<AccordionTrackList
// handleChange={(trailsChange) => {
Expand All @@ -230,6 +243,21 @@ const Template = (args) => {
// }}
trailsData={Trail}
courseData={Course}
handlePublicarCheck={async (idTrilha) => {
await sleep(5 * 1000);
let idx = idTrilha == '174' ? 0 : 1
let value = Count

if (value[idx] === 6) {
return 'complete'
}
else {
console.log(idTrilha, 'Checando novamente...', Count, idx)
value[idx] = value[idx] + 1
setCount(value)
return 'processing'
}
}}
{...args}
/>
</>
Expand All @@ -250,6 +278,9 @@ Opened.args = {
handlePopOverTrailDelete: (id) => {alert(`Trail Deleted id: ${id}`)},
handleSwitchAtivar: (idCourse, checked) => {
alert(`Alterando conteúudo ${idCourse}: ${checked}`)
},
handlePublicarTrilha: (idTrilha) => {
alert(`Publicando trilha ${idTrilha}`)
},
handleDeleteCourse: (idCourse) => {
alert(`Deletando o Curso: ${idCourse}`)
Expand All @@ -260,27 +291,37 @@ Opened.args = {
handleSwitchActiveTrail: (idTrail, active) => {
alert(`Mudando status de Ativo da trilha ID: ${idTrail} para ${active}`)
},
handleSwitchPrivateTrail: (idTrail, active) => {
alert(`Mudando status de privado da trilha ID: ${idTrail} para ${active}`)
},
onSetNameTrail: (idTrail, name) => { alert(`TrailName: ${idTrail} ${name}`) },
handleUpdateTrail: (deletedItem, insertItem, trailCoursesList) => {
console.log(`deletedItem`, deletedItem)
console.log(`insertItem`, insertItem)
console.log(`trailCoursesList`, trailCoursesList)
},
},
changeCourses: (course) => {
console.log(`course`, course)
},
handleClickPopOverEditActivity: (id) => {
alert(`handleClickPopOverEditActivity ${id}`)
},
handlePopOverDuplicate: (id) => {alert(`Selected id: ${id}`)},
textMeusConteudos: "Meus Conteúdos",
textTotalDe: "Total de",
textRegistros: "registros",
textMinhasTrihas: "Minhas Trilhas",
txtAtivarCurso: "Ativar conteúdo",
txtAtivarCurso: "Ativar",
txtAtivarTrilha: "Ativar trilha",
txtCriarNovoCurso: "Criar novo Conteúdo",
txtPopOverEditContent: "Edit content",
txtPopOverEditContent: "Editar Conteúdo",
txtPopOverMoveToTrails: "Move to Trails",
txtPopOverDeleteContent:"Delete content",
txtPopOverDeleteContent:"Deletar Conteúdo",
txtTrailsPopOverEdit: "Editar nome da trilha",
txtTrailsPopOverDuplicar: "Duplicar trilha",
txtTrailsPopOverDelete: "Excluir trilha",
txtPlacerolderInputNameTrail: 'Enter track name'
txtPlacerolderInputNameTrail: 'Enter track name',
txtPopOverEditContentActivity: 'Editar da Trilha'
}

export const Loading = Template.bind({})
Expand Down
Loading

0 comments on commit 556f6fd

Please sign in to comment.