Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Possibilidade de acessar entidade ao clicar no avatar. #419

Merged
merged 11 commits into from
Aug 28, 2024
Merged

Possibilidade de acessar entidade ao clicar no avatar. #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8486940
issue80
gabi-gandine Jun 21, 2024
6b0ad4b
issue 80
gabi-gandine Jun 26, 2024
cac9875
issue80
gabi-gandine Jun 26, 2024
b47c77e
mapas#44
gabi-gandine Jul 3, 2024
ec015c2
email caixa-baixa
gabi-gandine Jul 5, 2024
b2f8928
Corrigir varios issues das tags
gabi-gandine Jul 10, 2024
b7ef74c
palavra você duplicada corrigida
gabi-gandine Jul 16, 2024
019fa3d
Incluir clique nos textos/imagens referentes às seções da plataforma
gabi-gandine Jul 16, 2024
8ec8e91
Correcao do mouse ao clicar nos textos das entidades da home
gabi-gandine Aug 2, 2024
026b206
Padronizacao perfis destaque home
gabi-gandine Aug 13, 2024
217697b
Acesso de entidadas ao clicar o avatar
gabi-gandine Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/modules/Components/components/entity-card/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
<div class="entity-card" :class="classes">
<div class="entity-card__header" :class="{'with-labels': useLabels, 'without-labels': !useLabels}">
<div class="entity-card__header user-details">
<slot name="avatar">
<mc-avatar :entity="entity" size="small"></mc-avatar>
</slot>
<a :href="entity.singleUrl">
<slot name="avatar">
<mc-avatar :entity="entity" size="small"></mc-avatar>
</slot>
</a>
<div class="user-info" :class="{'with-labels': useLabels, 'without-labels': !useLabels}">
<a :href="entity.singleUrl">
<slot name="title">
Expand Down Expand Up @@ -92,19 +94,19 @@
<div class="entity-card__content--terms">
<div v-if="areas" class="entity-card__content--terms-area">
<label v-if="entity.__objectType === 'opportunity'" class="area__title">
<?php i::_e('Áreas de interesse:') ?> ({{entity.terms.area.length}}):
<?php i::_e('Áreas de interesse') ?> ({{entity.terms.area.length}}):
</label>
<label v-if="entity.__objectType === 'agent' || entity.__objectType === 'space'" class="area__title">
<?php i::_e('Áreas de atuação:') ?> ({{entity.terms.area.length}}):
<?php i::_e('Áreas de atuação') ?> ({{entity.terms.area.length}}):
</label>
<p :class="['terms', entity.__objectType+'__color']"> {{areas}} </p>
<p :class="['terms']"> {{areas}} </p>
</div>

<div v-if="tags" class="entity-card__content--terms-tag">
<label class="tag__title">
<?php i::_e('Tags:') ?> ({{entity.terms.tag.length}}):
<?php i::_e('Tags') ?> ({{entity.terms.tag.length}}):
</label>
<p :class="['terms', entity.__objectType+'__color']"> {{tags}} </p>
<p :class="'terms'"> {{tags}} </p>
</div>

<div v-if="linguagens" class="entity-card__content--terms-linguagem">
Expand Down
10 changes: 5 additions & 5 deletions src/modules/Components/components/occurrence-card/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@
</div>
</div>
<div class="entity-card__content--terms">
<div v-if="tags" class="entity-card__content--terms-tag">
<div v-if="tags" class="-tag">
<label class="tag__title">
<?php i::_e('Tags:') ?> ({{event.terms.tag.length}}):
<?php i::_e('Tags') ?> ({{event.terms.tag.length}}):
</label>
<p :class="['terms', 'event__color']"> {{tags}} </p>
<p :class="'terms'"> {{tags}} </p>
</div>
<div v-if="linguagens" class="entity-card__content--terms-linguagem">
<label class="linguagem__title">
<?php i::_e('linguagens:') ?> ({{event.terms.linguagem.length}}):
<?php i::_e('linguagens') ?> ({{event.terms.linguagem.length}}):
</label>
<p :class="['terms', 'event__color']"> {{linguagens}} </p>
<p :class="'terms'"> {{linguagens}} </p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Entities/components/entity-map/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
?>

<?php $this->applyTemplateHook('entity-map','before'); ?>
<mc-map :center="entity.location">
<mc-map v-if="entity.endereco" :center="entity.location">
<mc-map-marker :entity="entity" :draggable="editable" @moved="change($event)"></mc-map-marker>
</mc-map>
<?php $this->applyTemplateHook('entity-map','after'); ?>
4 changes: 2 additions & 2 deletions src/modules/Entities/components/entity-status/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<template v-if="entity.__objectType == 'project'">
<span v-if="entity.status == 0">
<strong><?= i::__('Este projeto está em rascunho.'); ?></strong>
<?= i::__('Você Você precisa <strong>publicar</strong> para exibir para todas as pessoas.') ?>
<?= i::__('Você precisa <strong>publicar</strong> para exibir para todas as pessoas.') ?>
</span>
<span v-if="entity.status == -10">
<strong><?= i::__('Este projeto está na lixeira.'); ?></strong>
Expand All @@ -76,7 +76,7 @@
<template v-if="entity.__objectType == 'opportunity'">
<span v-if="entity.status == 0">
<strong><?= i::__('Este oportunidade está em rascunho.'); ?></strong>
<?= i::__('Você Você precisa <strong>publicar</strong> para exibir para todas as pessoas.') ?>
<?= i::__('Você precisa <strong>publicar</strong> para exibir para todas as pessoas.') ?>
</span>
<span v-if="entity.status == -10">
<strong><?= i::__('Este oportunidade está na lixeira.'); ?></strong>
Expand Down
25 changes: 20 additions & 5 deletions src/modules/Entities/components/entity-terms/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,29 @@ app.component('entity-terms', {


addTerm(term) {
if (this.entity.terms[this.taxonomy].indexOf(term) < 0) {
this.entity.terms[this.taxonomy].push(term);
if(this.spaceCheck(term)) {
if (this.entity.terms[this.taxonomy].indexOf(term) < 0) {
this.entity.terms[this.taxonomy].push(term);

}

if (this.terms.indexOf(term) < 0) {
this.terms.push(term);
}
}
},

if (this.terms.indexOf(term) < 0) {
this.terms.push(term);
spaceCheck(term) {
if(this.taxonomy == "tag") {
let tam = term.length;
for (let i = 0; i < tam; i++) {
if (term[i] != " ") {
return true;
}
}
return false;
}

return true;
},

taxomyExists() {
Expand Down
1 change: 0 additions & 1 deletion src/modules/Entities/components/entity-terms/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<div v-if="taxomyExists() && (editable || entity.terms?.[taxonomy].length > 0)" :class="['entity-terms', classes, error]">
<div class="entity-terms__header">
<mc-title tag="h4" :short-length="0" size="medium" class="bold">{{title ?? taxonomy}}</mc-title>
<span class="entity-terms__required" style="color: red">*</span>
</div>

<mc-popover v-if="allowInsert && editable" openside="down-right" @open="loadTerms()" :title="popoverTitle">
Expand Down
2 changes: 1 addition & 1 deletion src/modules/Entities/views/project/single.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<div v-if="entity.emailPublico" class="additional-info__item">
<p class="additional-info__item__title"><?php i::_e("email:"); ?></p>
<p class="additional-info__item__content">{{entity.emailPublico}}</p>
<p>{{entity.emailPublico}}</p>
</div>
</div>
<div v-if="entity.longDescription!=null" class="col-12">
Expand Down
130 changes: 70 additions & 60 deletions src/modules/Home/components/home-entities/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,21 @@
<div class="home-entities__content--cards">
<div v-if="global.enabledEntities.opportunities" class="card">
<div class="card__left">
<div class="card__left--content">
<div class="card__left--content-icon opportunity__background">
<mc-icon name="opportunity"></mc-icon>
</div>
<div class="card__left--content-title">
<label class="title">
<?= i::__('Oportunidades') ?>
</label>
<mc-link route="search/opportunities">
<div class="card__left--content">
<div class="card__left--content-icon opportunity__background">
<mc-icon name="opportunity"></mc-icon>
</div>
<div class="card__left--content-title">
<h3 class="title">
<?= i::__('Oportunidades') ?>
</h3>
</div>
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-opportunities']) ?>" />
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-opportunities']) ?>" />
</div>
</mc-link>
</div>
<div class="card__right">
<p><?= $this->text('opportunities', i::__('Faça a sua inscrição ou acesse o resultado de diversas convocatórias como editais, oficinas, prêmios e concursos. Você também pode criar o seu próprio formulário e divulgar uma oportunidade para outros agentes culturais.')) ?></p>
Expand All @@ -50,19 +52,21 @@

<div v-if="global.enabledEntities.events" class="card">
<div class="card__left">
<div class="card__left--content">
<div class="card__left--content-icon event__background">
<mc-icon name="event"></mc-icon>
</div>
<div class="card__left--content-title">
<label class="title">
<?= i::__('Eventos') ?>
</label>
<mc-link route="search/events">
<div class="card__left--content">
<div class="card__left--content-icon event__background">
<mc-icon name="event"></mc-icon>
</div>
<div class="card__left--content-title">
<h3 class="title">
<?= i::__('Eventos') ?>
</h3>
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-events']) ?>" />
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-events']) ?>" />
</div>
</mc-link>
</div>
<div class="card__right">
<p><?= $this->text('events', i::__('Você pode pesquisar eventos culturais nos campos de busca combinada. Como usuário cadastrado, você pode incluir seus eventos na plataforma e divulgá-los gratuitamente. (Mais uma linha aqui pra fechar cinco linhas)')) ?></p>
Expand All @@ -75,19 +79,21 @@

<div v-if="global.enabledEntities.spaces" class="card">
<div class="card__left">
<div class="card__left--content">
<div class="card__left--content-icon space__background">
<mc-icon name="space"></mc-icon>
</div>
<div class="card__left--content-title">
<label class="title">
<?= i::__('Espaços') ?>
</label>
<mc-link route="search/spaces">
<div class="card__left--content">
<div class="card__left--content-icon space__background">
<mc-icon name="space"></mc-icon>
</div>
<div class="card__left--content-title">
<h3 class="title">
<?= i::__('Espaços') ?>
</h3>
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-spaces']) ?>" />
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-spaces']) ?>" />
</div>
</mc-link>
</div>
<div class="card__right">
<p><?= $this->text('spaces', i::__('Procure por espaços culturais incluídos na plataforma, acessando os campos de busca combinada que ajudam na precisão de sua pesquisa. Cadastre também os espaços onde desenvolve suas atividades artísticas e culturais.')) ?></p>
Expand All @@ -100,19 +106,21 @@

<div v-if="global.enabledEntities.agents" class="card">
<div class="card__left">
<div class="card__left--content">
<div class="card__left--content-icon agent__background">
<mc-icon name="agent-2"></mc-icon>
</div>
<div class="card__left--content-title">
<label class="title">
<?= i::__('Agentes') ?>
</label>
<mc-link route="search/agents">
<div class="card__left--content">
<div class="card__left--content-icon agent__background">
<mc-icon name="agent-2"></mc-icon>
</div>
<div class="card__left--content-title">
<h3 class="title">
<?= i::__('Agentes') ?>
</h3>
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-agents']) ?>" />
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-agents']) ?>" />
</div>
</mc-link>
</div>
<div class="card__right">
<p><?= $this->text('agents', i::__('Neste espaço, estão registrados artistas, gestores e produtores; uma rede de atores envolvidos na cena cultural da região. Você pode cadastrar um ou mais agentes (grupos, coletivos, bandas instituições, empresas, etc.), (...)')) ?></p>
Expand All @@ -125,19 +133,21 @@

<div v-if="global.enabledEntities.projects" class="card">
<div class="card__left">
<div class="card__left--content">
<div class="card__left--content-icon project__background">
<mc-icon name="project"></mc-icon>
</div>
<div class="card__left--content-title">
<label class="title">
<?= i::__('Projetos') ?>
</label>
<mc-link route="search/projects">
<div class="card__left--content">
<div class="card__left--content-icon project__background">
<mc-icon name="project"></mc-icon>
</div>
<div class="card__left--content-title">
<h3 class="title">
<?= i::__('Projetos') ?>
</h3>
</div>
</div>
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-projects']) ?>" />
</div>
<div class="card__left--img">
<img src="<?php $this->asset($app->config['module.home']['home-projects']) ?>" />
</div>
</mc-link>
</div>
<div class="card__right">
<p><?= $this->text('projects', i::__('Aqui você encontra leis de fomento, mostras, convocatórias e editais criados, além de diversas iniciativas cadastradas pelos usuários da plataforma.')) ?></p>
Expand Down
3 changes: 3 additions & 0 deletions src/themes/BaseV2/assets-src/sass/2.components/_entity-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,9 @@
}

&.portrait {
display: flex;
flex-direction: column;
justify-content: space-between;
.entity-card__header {
&.user-details {
flex-direction: column;
Expand Down
5 changes: 3 additions & 2 deletions src/themes/BaseV2/assets-src/sass/2.components/_home-feature.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@

&__viewport {
ol {
li{
li{

justify-content: flex-start;
align-items: stretch;
padding: 0 size(40) 0 0;

@media (max-width: size(600)) {
Expand All @@ -130,7 +131,7 @@
}

&__track {
align-items: flex-start;
align-items: stretch;
}
}

Expand Down
Loading