Skip to content

Commit

Permalink
Merge pull request #8 from elsad3631/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
elsad3631 authored Oct 4, 2024
2 parents 527e493 + 92f2076 commit fd14c31
Show file tree
Hide file tree
Showing 26 changed files with 70 additions and 11 deletions.
Binary file modified src/assets/images/banner/bnr19.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/banner/bnr20.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/banner/bnr21.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/banner/bnr27.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/banner/bnr28.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/banner/bnr29.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/work/work-1/pic-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-13.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-14.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-15.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-16.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-17.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-18.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/work/work-1/pic-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/work/work-1/pic-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/work/work-1/pic-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/work/work-1/pic-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/work/work-1/pic-6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-7.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/work/work-1/pic-9.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 26 additions & 8 deletions src/components/Home3Accordian.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<template>
<section class="section-full content-inner-1 about-bx5 over overflow-hidden">
<!-- <section class="section-full content-inner-1 about-bx5 over overflow-hidden">
<div class="container">
<div class="row">
<div class="col-lg-6 aos-item">
<div class="section-head style-2">
<!-- <h6 class="sub-title text-primary">Services</h6>
<h2 class="title">Frequently Asked Question</h2> -->
<h6 class="sub-title text-primary">Services</h6>
<h2 class="title">Frequently Asked Question</h2>
</div>
<!-- <div class="accordion dz-accordion accordion-sm style-1 mt-5" id="accordionFaq">
<div class="accordion dz-accordion accordion-sm style-1 mt-5" id="accordionFaq">
<div class="accordion-item">
<h2 class="accordion-header" id="headingOne">
<RouterLink
Expand Down Expand Up @@ -95,9 +95,9 @@
</div>
</div>
</div>
</div> -->
</div>
</div>
<!-- <div class="col-lg-6">
<div class="col-lg-6">
<div class="img1 aos-item">
<img src="@/assets/images/about/pic8.jpg" alt="" />
</div>
Expand All @@ -107,10 +107,28 @@
<div class="img3 aos-item">
<img src="@/assets/images/about/pic10.jpg" alt="" />
</div>
</div> -->
</div>
</div>
</div>
</section>
</section> -->
<section class="content-inner-2" :style="`background-image: url(${bg1});`">
<div class="container">
<div class="row section-head-bx align-items-center">
<div class="col-md-8">
<div class="section-head style-1">
<h6 class="sub-title text-primary">IL NOSTRO PORTAFOGLIO</h6>
<h2 class="title">ULTIMI PROGETTI</h2>
</div>
</div>
<!-- <div class="col-md-4 text-start text-md-end mb-4 mb-md-0">
<RouterLink to="/portfolio" class="btn-link"
>See All Projects <i class="fas fa-plus scale08"></i
></RouterLink>
</div> -->
</div>
</div>
<!-- <OurPortfolio /> -->
</section>
<OurPortfolio />
</template>

Expand Down
43 changes: 42 additions & 1 deletion src/components/OurPortfolio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ import work_pic1 from '@/assets/images/work/work-1/pic-1.jpg'
import work_pic2 from '@/assets/images/work/work-1/pic-2.jpg'
import work_pic3 from '@/assets/images/work/work-1/pic-3.jpg'
import work_pic4 from '@/assets/images/work/work-1/pic-4.jpg'
import work_pic5 from '@/assets/images/work/work-1/pic-5.jpg'
import work_pic6 from '@/assets/images/work/work-1/pic-6.jpg'
import work_pic7 from '@/assets/images/work/work-1/pic-7.jpg'
import work_pic8 from '@/assets/images/work/work-1/pic-8.jpg'
import work_pic9 from '@/assets/images/work/work-1/pic-9.jpg'
import work_pic10 from '@/assets/images/work/work-1/pic-10.jpg'
import Lightgallery from 'lightgallery/vue'
import lgThumbnail from 'lightgallery/plugins/thumbnail'
import lgZoom from 'lightgallery/plugins/zoom'
Expand Down Expand Up @@ -144,7 +150,42 @@ export default defineComponent({
// text: 'Paris'
},
{
img: work_pic2,
img: work_pic5,
// subtitle: 'ARCHITECTURAL',
// title: 'Residential Project,',
// text: 'Paris',
setStyle: 'mt-5'
},
{
img: work_pic6,
// subtitle: 'ARCHITECTURAL',
// title: 'Residential Project,',
// text: 'Paris',
setStyle: 'mt-5'
},
{
img: work_pic7,
// subtitle: 'ARCHITECTURAL',
// title: 'Residential Project,',
// text: 'Paris',
setStyle: 'mt-5'
},
{
img: work_pic8,
// subtitle: 'ARCHITECTURAL',
// title: 'Residential Project,',
// text: 'Paris',
setStyle: 'mt-5'
},
{
img: work_pic9,
// subtitle: 'ARCHITECTURAL',
// title: 'Residential Project,',
// text: 'Paris',
setStyle: 'mt-5'
},
{
img: work_pic10,
// subtitle: 'ARCHITECTURAL',
// title: 'Residential Project,',
// text: 'Paris',
Expand Down
4 changes: 2 additions & 2 deletions src/views/portfolio/PortfolioDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@
</div>
<section class="content-inner-1">
<div class="container">
<!-- <div class="section-head style-1 text-center">
<div class="section-head style-1 text-center">
<h6 class="sub-title text-primary">OUR PORTFOLIOS</h6>
<h2 class="title">Our Latest Projects</h2>
</div> -->
</div>
</div>

<div class="container-fluid">
Expand Down

0 comments on commit fd14c31

Please sign in to comment.