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

[525] fix our projects component #527

Merged
merged 2 commits into from
Jul 5, 2023
Merged

[525] fix our projects component #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fe30da
523 - fixes join us header
stanislawK Jun 14, 2023
312d6e8
523 - Join us component vuetify migration fixes
stanislawK Jun 28, 2023
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
1 change: 1 addition & 0 deletions frontend/src/components/HomePage/ContactUs/ContactUs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export default {
},
emailErrors() {
const errors = [];

if (!this.v$.email.$dirty) return errors;
this.v$.email.email.$invalid &&
errors.push('Poprawny adres email jest wymagany');
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/components/HomePage/OurProjects/ModalContent/ModalContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<section class="modal">
<v-card class="modal">
<div class="modal__title">
<h2>{{ selectedProject.name }}</h2>
<div class="modal__button-close" @click="onClick">
Expand Down Expand Up @@ -78,7 +78,7 @@
</a>
</div>
</div>
</section>
</v-card>
</template>

<script>
Expand All @@ -92,10 +92,10 @@ export default {
},
computed: {
countPartners() {
return this.selectedProject.partner;
return this.selectedProject.partner.length;
},
countTech() {
return this.selectedProject.stack;
return this.selectedProject.stack.length;
},
},
};
Expand Down Expand Up @@ -140,7 +140,7 @@ h2 {
.modal__description,
.modal__list,
.modal__title {
padding: 0.5rem 1.5rem;
padding: 0.7rem 1.5rem;
position: relative;
display: flex;
align-items: center;
Expand Down
14 changes: 10 additions & 4 deletions frontend/src/components/HomePage/OurProjects/OurProjects.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@
xl="3"
>
<v-item-group>
<v-hover>
<v-card @click.stop="clickImage(project)">
<v-hover v-slot="{ isHovering, props }">
<v-card @click.stop="clickImage(project)" v-bind="props">
<v-img :src="project.imageAdress" aspect-ratio="1.9">
<div :class="'card__badge--' + project.badge" />
</v-img>
<v-card-title class="card">
{{ project.name }}
</v-card-title>
<v-expand-transition>
<div v-if="hover" class="card--reveal">
<div
v-if="isHovering"
class="card--reveal d-flex transition-fast-in-fast-out v-card--reveal"
>
<v-img class="card--hover" :src="hoveredImg" />
</div>
</v-expand-transition>
Expand All @@ -40,7 +43,10 @@
</v-col>
</v-row>
<v-dialog v-model="dialog" max-width="50rem">
<app-modal-content :selectedProject="selectedProject" @close="onClose" />
<app-modal-content
v-bind:selectedProject="selectedProject"
@close="onClose"
/>
</v-dialog>
</v-container>
</template>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/scss/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ a {
.white-title {
color: $white;
@include main-title;
margin-bottom: 16px;

&::before {
@include title-before;
Expand Down