Skip to content

Quentin/page bda#62

Closed
QuentinDesbrousses wants to merge 24 commits intomainfrom
quentin/page-bda
Closed

Quentin/page bda#62
QuentinDesbrousses wants to merge 24 commits intomainfrom
quentin/page-bda

Conversation

@QuentinDesbrousses
Copy link

update of bda page
upload of some pictures for future trombinoscope
(waiting for future information)

Copy link
Contributor

@joan-teriihoania joan-teriihoania left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR, just as #59, is based off of branches that have already been merged into the main branch creating different histories for the same commits.

I would recommend force pushing the main branch into this one (or wait for #59 to be merged before force pushing the merged result in here). I will let the author of both PR (@QuentinDesbrousses ) choose. As I'm not an expert at this sort of operation, @BrokenSwing should be the one to do it if possible.

Copy link
Contributor

@joan-teriihoania joan-teriihoania left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of the errors reported here come from PR #59.
As I've suggested earlier in #62 (review), this is something that can be quite easily fixed by waiting for #59 to be merged before force-pushing the main history here.

:instagram="component.social.instagram"
:snapchat="component.social.snapchat"
:tiktok="component.social.tiktok"
:mail="component.social.mail"
Copy link
Contributor

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.

>
<Trombinoscope
:title="component.trombinoscope.title"
:membres="component.trombinoscope.membres"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

facebook: { Type: String, required: false },
instagram: { Type: String, required: false },
snapchat: { Type: String, required: false },
tiktok: { Type: String, required: false },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:picture="membre.picture"
:poste="membre.poste"
:url="membre.url"
:description="membre.description"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The property name membre diverge from the Trombinoscope component merged in main. Please use English to standardize the code and rename to member instead of membre.

export default {
props:{
title:{type:String,required: false},
membres:{type:Array ,required:true }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The property name membres diverge from the Trombinoscope component merged in main. Please use English to standardize the code and rename to members instead of membres.

"trombinoscope": {
"id": "BDE",
"title": "Rejoins nous",
"membres":[
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The property name membres diverge from the Trombinoscope component merged in main. Please use English to standardize the code and rename to members instead of membres.

@QuentinDesbrousses QuentinDesbrousses deleted the quentin/page-bda branch September 20, 2021 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants