diff --git a/database/database.json b/database/database.json index cc1f52d..bd29679 100644 --- a/database/database.json +++ b/database/database.json @@ -33,7 +33,7 @@ }, { "name": "valeo", - "page-link": "valeo.com", + "page-link": "https://www.valeo.com", "image-link": "https://picsum.photos/1024/480/?image=10" }, { @@ -390,9 +390,55 @@ "contact-us": {}, "mutex": { "years": [ - 2018, - 2019, - 2020 + { + "title": "Mutex 2018", + "year": 2018, + "text": "Improved own provided blessing may peculiar domestic. Sight house has sex never. No visited raising gravity outward subject my cottage mr be. Hold do at tore in park feet near my case. Invitation at understood occasional sentiments insipidity inhabiting in.", + "Speakers": [ + { + "details": "linus tech tips", + "imgSrc": "/images/linus.jpg" + }, + { + "details": "linus tech tips", + "imgSrc": "/images/cards/cs/cs.png" + }, + { + "details": "linus tech tips", + "imgSrc": "/images/linus.jpg" + }, + { + "details": "linus tech tips", + "imgSrc": "/images/linus.jpg" + } + ] + }, + { + "title": "Mutex 2019", + "year": 2019, + "text": "Finished her are its honoured drawings nor. Pretty see mutual thrown all not edward ten. Particular an boisterous up he reasonably frequently. Several any had enjoyed shewing studied two. Up intention remainder sportsmen behaviour ye happiness.", + "Speakers": [ + { + "details": "linus tech tips", + "imgSrc": "/images/linus.jpg" + }, + { + "details": "linus tech tips", + "imgSrc": "/images/cards/cs/cs.png" + } + ] + }, + { + "title": "Mutex 2020", + "year": 2020, + "text": "Insipidity the sufficient discretion imprudence resolution sir him decisively. Proceed how any engaged visitor. Explained propriety off out perpetual his you. Feel sold off felt nay rose met you.", + "Speakers": [ + { + "details": "linus tech tips", + "imgSrc": "/images/linus.jpg" + } + ] + } ] }, "social": [ diff --git a/src/components/AppNavigation.vue b/src/components/AppNavigation.vue index 01c467a..5db0799 100644 --- a/src/components/AppNavigation.vue +++ b/src/components/AppNavigation.vue @@ -19,17 +19,6 @@ - - - - EN - AR - - - - Search - - diff --git a/src/components/HomeFooter.vue b/src/components/HomeFooter.vue index de7616f..b858c56 100644 --- a/src/components/HomeFooter.vue +++ b/src/components/HomeFooter.vue @@ -6,7 +6,7 @@

CONTACT US

- email: cs@ieee-zsb.org + email: info@ieee-zsb.org
@@ -14,14 +14,9 @@

FOLLOW US

@@ -33,8 +28,14 @@ diff --git a/src/components/Mutex/MutexHistory.vue b/src/components/Mutex/MutexHistory.vue index df69638..e278106 100644 --- a/src/components/Mutex/MutexHistory.vue +++ b/src/components/Mutex/MutexHistory.vue @@ -10,8 +10,8 @@ - - + + @@ -31,8 +31,16 @@ export default { }, data () { return { + selected:0, Years : json.mutex.years } + }, + methods:{ + select: function(event){ + let currentIndex = event.currentTarget.id.replace("year-","") + this.selected = currentIndex + this.$emit('selected',currentIndex) + } } } @@ -48,5 +56,23 @@ export default { } .card { min-width: 300px; + transition: box-shadow .3s; + +} + +.card:hover{ + cursor: pointer; + box-shadow: rgba(16, 95, 212, 0.35) 0px 5px 15px; +} + + + +.active{ + box-shadow: rgb(16, 94, 212) 0px 5px 15px; } +.active:hover{ + box-shadow: rgb(16, 94, 212) 0px 5px 15px; +} + + diff --git a/src/components/Mutex/MutexSpeakers.vue b/src/components/Mutex/MutexSpeakers.vue index 210e131..7f0e5d9 100644 --- a/src/components/Mutex/MutexSpeakers.vue +++ b/src/components/Mutex/MutexSpeakers.vue @@ -11,7 +11,7 @@
- +
{{speaker.details}}
@@ -21,55 +21,22 @@ diff --git a/src/components/activities/Activity.vue b/src/components/activities/Activity.vue index c126602..1ec9355 100644 --- a/src/components/activities/Activity.vue +++ b/src/components/activities/Activity.vue @@ -1,10 +1,9 @@ @@ -53,11 +52,12 @@ export default { background-size: cover; padding: 20px; border-radius: 5px; - height: 80vh; color: #002855; box-shadow: rgba(50, 50, 93, 0.25) 0px 6px 12px -2px, rgba(0, 0, 0, 0.3) 0px 3px 7px -3px; } + + .activity-duration { text-align: right; text-decoration-line: underline; diff --git a/src/components/committees/AboutUs.vue b/src/components/committees/AboutUs.vue index 4e1a59c..e2098be 100644 --- a/src/components/committees/AboutUs.vue +++ b/src/components/committees/AboutUs.vue @@ -1,7 +1,7 @@ diff --git a/src/views/RAS.vue b/src/views/RAS.vue index 1b0bb96..249f997 100644 --- a/src/views/RAS.vue +++ b/src/views/RAS.vue @@ -3,7 +3,6 @@ -
@@ -11,7 +10,6 @@ import Database from '/database/database'; import AboutUs from '@/components/committees/AboutUs'; import Carousel from '@/components/committees/Carousel'; -import contactus from '@/components/ContactUs/contactus'; import Team from '@/components/committees/Team'; export default{ @@ -20,7 +18,6 @@ export default{ 'about-us':AboutUs, 'carousel':Carousel, 'team':Team, - 'contact-us':contactus }, data(){