-
Notifications
You must be signed in to change notification settings - Fork 2
Quentin/page bda #62
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.
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
Closed
Closed
Quentin/page bda #62
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
a2beb6b
NPM: Installing bulma-timeline extension
joan-teriihoania 7d7e3d5
Adding Timeline components
joan-teriihoania ea1253c
Integrating Timeline component to Builder
joan-teriihoania ed73a8a
Providing structure.timeline.json
joan-teriihoania 5b62f6d
Removing unused computed variables
joan-teriihoania f0ce076
Converting date string properties to Date objet
joan-teriihoania 10cb8b6
Renaming options computed property to dateFormat
joan-teriihoania 8196964
Removing timeline in main page added for testing purposes [COMMITED B…
joan-teriihoania 4fa6496
Creating Carousel component
joan-teriihoania 4347319
Adding Carousel module in Builder
joan-teriihoania 5e2336a
Retrieving image from assets img folder
joan-teriihoania dfdb9bb
Adding param carousel in Carousel to pass slides
joan-teriihoania 0e2fd93
Adding template structure for Carousel component
joan-teriihoania cae3ee5
Adding clubs and description module to builder
d9fd8fb
Merge branch 'carousel' of https://github.com/BDE-Polytech-MTP/websit…
ffea611
Adding content to BDS page
b622328
Adding images in assets for BDS clubs
10b3b1d
Adding club and clubs components
5f459f8
Adding description component
e595ab2
Ajout des composants pour créer un trombinoscope
Alexandre-Fernique aeb39ee
Adding social component, social logos and updating bds page
22eb22e
Merge remote-tracking branch 'origin/Trombinoscope' into Trombinoscope
4d9478b
Merging Trombinoscope and page-bds
fccc89f
Updating bds page
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ | |
| :size="component.parallax.size" | ||
| :scrollTo="component.parallax.scrollTo" | ||
| /> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'article'" | ||
|
|
@@ -24,7 +25,7 @@ | |
| :picture="component.article.picture" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'timeline'" | ||
|
|
@@ -33,7 +34,16 @@ | |
| :items="component.timeline.items" | ||
| /> | ||
| </div> | ||
|
|
||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'carousel'" | ||
| > | ||
| <Carousel | ||
| :carousels="component.carousel.carousels" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'carousel'" | ||
|
|
@@ -97,13 +107,60 @@ | |
| :features="component.features.data" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'clubs'" | ||
| > | ||
| <Clubs | ||
| :clubs="component.clubs.clubs" | ||
| :color="component.clubs.color" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'description'" | ||
| > | ||
| <Description | ||
| :quotes="component.description.quotes" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'social'" | ||
| > | ||
| <Social | ||
| :facebook="component.social.facebook" | ||
| :instagram="component.social.instagram" | ||
| :snapchat="component.social.snapchat" | ||
| :tiktok="component.social.tiktok" | ||
| :mail="component.social.mail" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| class="background-gradient-lines" | ||
| v-else-if="typeOf(component) == 'trombinoscope'" | ||
| > | ||
| <Trombinoscope | ||
| :title="component.trombinoscope.title" | ||
| :membres="component.trombinoscope.membres" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| /> | ||
| </div> | ||
|
|
||
| <p v-else>-</p> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
|
|
||
| import SocialNetworks from '~/components/Social'; | ||
| import Trombinoscope from '~/components/Trombinoscope'; | ||
| export default { | ||
| components: { Trombinoscope, SocialNetworks }, | ||
| props: { | ||
| components: { type: Array, required: true, default: () => [] }, | ||
| }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <template> | ||
| <div class="card"> | ||
| <header class="card-header"> | ||
| <p class="card-header-title is-centered"> | ||
| {{poste}} | ||
| </p> | ||
| </header> | ||
| <div class="card-image"> | ||
| <div> | ||
| <p> | ||
| <strong>{{name}}</strong><br>{{ description }}<br> | ||
| <a v-if="url" :href="url">Lien: Facebook</a> </p> | ||
| </div> | ||
| <figure class="image is-2by3"> | ||
| <img v-if="picture" :src="require(`~/assets/img/bds/trombinoscope/${picture}`)" :alt="`${picture}`"> | ||
| </figure> | ||
| </div> | ||
| </div> | ||
|
|
||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props:{ | ||
| poste:{type:String ,required: false , default:"Job not found"}, | ||
| picture :{type:String, required: false,default:"logo.PNG" }, | ||
| url:{type:String,required:false}, | ||
| name:{type:String,required:true,default:"Name not found" }, | ||
| description:{type:String, required: false } | ||
|
|
||
| }, | ||
|
|
||
| }; | ||
|
|
||
| </script> | ||
|
|
||
| <style scoped> | ||
|
|
||
| .card-image:hover>div { | ||
| visibility: visible; | ||
| background: rgba(160, 160, 160, 0.9); | ||
| transition-duration: 0.6s; | ||
|
|
||
| } | ||
| .card-image:hover>div p{ | ||
| transform: translateY(0%); | ||
| transition-duration: 0.6s; | ||
| } | ||
| a{ | ||
| color: white; | ||
| text-decoration:underline; | ||
| } | ||
| .card-image div p{ | ||
| transform: translateY(80%); | ||
| margin: auto; | ||
| } | ||
| div .card-image div{ | ||
| position: absolute; | ||
| visibility: hidden; | ||
| display: flex; | ||
| font-size: x-large; | ||
| color:white; | ||
| text-align: center; | ||
| width: -webkit-fill-available; | ||
| height: -webkit-fill-available; | ||
| z-index:1; | ||
| } | ||
| p strong{ | ||
| color: white; | ||
| } | ||
| .card{ | ||
| box-shadow: 0 0 25px grey; | ||
| } | ||
|
|
||
| </style> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| <template> | ||
| <div class="card feature-card" :style="cardStyle2" > | ||
| <div class="card-header" :style="cardStyle1" > | ||
| <h5 class="card-header-title is-centered ">{{ title }}</h5> | ||
| </div> | ||
| <div class="card-content" :style="cardStyle2"> | ||
| <div class="media"> | ||
| <div class="media-left"> | ||
| <figure class="image is-128x128"> | ||
| <img :src="image" alt="Placeholder image"> | ||
| </figure> | ||
| </div> | ||
| <div class="media-content has-text-centered"> | ||
| <p class="subtitle is-4">Respo(s) :</p> | ||
| <p class="title is-6 five-lines-max">{{ directedBy }}</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="card-footer has-text-centered" :style="cardStyle2"> | ||
| <p class="card-footer-item"> Heure: {{ hour }}<br>Lieu: {{ location }}</p> | ||
| </div> | ||
|
|
||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: { | ||
| image: { type: String, required: true }, | ||
| title: { type: String, required: true }, | ||
| directedBy: { type: String, required: true }, | ||
| hour: { type: String, required: false }, | ||
| location: { type: String, required: false }, | ||
| color: {type: String, default: "rgb(0,156,221)" } | ||
| }, | ||
| computed: { | ||
| cardStyle1() { | ||
| return { | ||
| "background-color": this.color | ||
| }; | ||
| }, | ||
| cardStyle2() { | ||
| return { | ||
| "border-color": this.color | ||
| }; | ||
| } | ||
| } | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="css" scoped> | ||
|
|
||
| .card-header { | ||
| background-color: rgb(0,156,221); | ||
| } | ||
| .feature-card:hover { | ||
| transform: translateY(-10px); | ||
| transition: transform 0.1s ease-in-out; | ||
| -o-transition: transform 0.1s ease-in-out; | ||
| -moz-transition: transform 0.1s ease-in-out; | ||
| -webkit-transition: transform 0.1s ease-in-out; | ||
| box-shadow: 0 0 40px grey; | ||
| } | ||
| h5 { | ||
| color:white; | ||
| } | ||
|
|
||
| .card-content { | ||
| border-bottom:1px solid; | ||
| } | ||
| .card { | ||
| border:1px solid; | ||
|
|
||
| } | ||
| .five-lines-max { | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| display: -webkit-box; | ||
| -webkit-line-clamp: 5; /* number of lines to show */ | ||
| -webkit-box-orient: vertical; | ||
| } | ||
|
|
||
|
|
||
| </style> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| <template> | ||
| <section class="container"> | ||
| <article class="section is-medium"> | ||
| <p class="title has-text-centered" :style="headerColor">Découvrez nos clubs</p> | ||
| <br> | ||
| <div class="columns is-multiline"> | ||
| <div class="column is-one-third" v-for="club in computedClubs" v-bind:key="club.title"> | ||
| <Club | ||
| :title="club.title" | ||
| :image="club.image" | ||
| :directedBy="club.directedBy" | ||
| :hour="club.hour" | ||
| :location="club.location" | ||
| :color="club.color" | ||
| /> | ||
| </div> | ||
| </div> | ||
| </article> | ||
| </section> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: { | ||
| clubs: { type: Array, required: true }, | ||
| color: { type: String, default: "rgb(0,156,221)"} | ||
| }, | ||
| computed: { | ||
| computedClubs(){ | ||
| return this.clubs.map((e) => { | ||
| e.color = e.color ? e.color : this.color | ||
| return e | ||
| }) | ||
| }, | ||
| headerColor() { | ||
| return { | ||
| "background-color":this.color } | ||
| } | ||
| } | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="css" scoped> | ||
|
|
||
| .section { | ||
| padding-top:0px; | ||
| padding-bottom: 0px; | ||
| } | ||
|
|
||
| p { | ||
| color:white; | ||
| border-radius: 4px; | ||
| } | ||
| </style> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This mistake is present in #59 (see #59 (comment) and #59 (comment)) as well.
I will not be pointing out any errors that were reported previously and will only discuss it in the first PR.