Merge branch 'main' into change#309/mudanças-em-css

universi-me · Dec 16, 2023 · f626995 · f626995
2 parents 9e26f1c + 4d96b80
commit f626995
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/pages/Group/GroupTabs/GroupContents/GroupContentMaterials/GroupContentMaterials.tsx b/src/pages/Group/GroupTabs/GroupContents/GroupContentMaterials/GroupContentMaterials.tsx
@@ -208,7 +208,10 @@ export function GroupContentMaterials() {
 
     function handleVideoClick(id : string, material : Content){
         if(playingVideo == id){
-            showMiniature(id)
+            if(document.getElementsByClassName("fullscreen"))
+                showMiniature(id)
+            else
+                expand(id)
         }
         else{
             setIsMiniature(false)
@@ -245,8 +248,6 @@ export function GroupContentMaterials() {
         containers.iframeContainer?.classList.add("iframe-container")
         containers.videoContainer?.classList.add("fullscreen")
 
-        let modal = document.getElementsByClassName("universi-modal-overlay")[0] as HTMLElement
-        modal.style.backgroundColor = "rgba(0, 0, 0, 0.5)";
 
         if(containers.close){
             containers.close.innerHTML = "✖";
@@ -267,8 +268,6 @@ export function GroupContentMaterials() {
         containers.iframeContainer?.classList.add("mini-iframe")
         containers.videoContainer?.classList.remove("fullscreen")
 
-        let modal = document.getElementsByClassName("universi-modal-overlay")[0] as HTMLElement
-        modal.style.backgroundColor = "transparent";
 
         if(containers.close){
             containers.close.innerHTML = "&#x26F6;"

diff --git a/src/pages/Group/GroupTabs/GroupFeed/GroupFeed.tsx b/src/pages/Group/GroupTabs/GroupFeed/GroupFeed.tsx
@@ -73,7 +73,7 @@ export function GroupFeed(){
         <section id="feed" className="group-tab">
             <div className="heading top-container">
                 <div className="go-right">
-                    <Filter setter={setFilterPosts} placeholderMessage={`Buscar posts em ${groupContext.group.name}`}/>
+                    <Filter setter={setFilterPosts} placeholderMessage={`Buscar publicação em ${groupContext.group.name}`}/>
                     {
                         canCreatePost()
                         ?
@@ -93,21 +93,21 @@ export function GroupFeed(){
                 groupContext.editPost !== undefined ?
 
                 <UniversiForm
-                    formTitle={groupContext.editGroup == null ? "Criar post" : "Editar grupo"}
+                    formTitle={groupContext.editGroup == null ? "Criar publicação" : "Editar publicação"}
                     objects={[
                         {
                             DTOName: "groupId", label: "", type: FormInputs.HIDDEN, value: groupContext.group.id
                         }, {
                             DTOName: "authorId", label: "", type: FormInputs.HIDDEN, value: groupContext.loggedData.profile.id
                         }, {
-                            DTOName: "content", label: "Mensagem do post", type: FormInputs.LONG_TEXT,
+                            DTOName: "content", label: "Publicação", type: FormInputs.LONG_TEXT,
                             charLimit: 3000,
                             value: groupContext.editPost ? groupContext.editPost.content : ""
                             ,validation: new ValidationComposite<string>().addValidation(new RequiredValidation()).addValidation(new TextValidation())
                         }
                     ]}
                     requisition={groupContext.editPost ? UniversimeApi.Feed.createGroupPost : UniversimeApi.Feed.createGroupPost}
-                    callback={groupContext.refreshData}
+                    callback={() =>{groupContext.refreshData()}}
                 />
                 :
                 <></>

diff --git a/src/pages/Group/GroupTabs/GroupTabs.tsx b/src/pages/Group/GroupTabs/GroupTabs.tsx
@@ -90,7 +90,7 @@ export const EMPTY_LIST_CLASS = "empty-text";
 
 const TABS: GroupTabDefinition[] = [
     {
-        name: 'Feed',
+        name: 'Publicações',
         value: 'feed',
         renderer: GroupFeed,
     },