Skip to content

Commit

Permalink
2024Jun change
Browse files Browse the repository at this point in the history
  • Loading branch information
henryhuang committed Jun 30, 2024
1 parent 6997b45 commit 9bc5d09
Show file tree
Hide file tree
Showing 9 changed files with 96 additions and 30 deletions.
51 changes: 51 additions & 0 deletions largier-client/src/common/components/Footer/Footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { Grid, ListItem, ListIcon, ListContent, List } from 'semantic-ui-react';
import { I18n } from 'react-i18next';

import { licenseYear } from '../../../config.json';

export default () => (
(
<div>
<Grid className="page default-grid impressumSection" id="impressumAnchor">
<List>
<ListItem>
<ListContent><I18n>{t => t('contact')}</I18n></ListContent>
</ListItem>
<ListItem>
<ListContent />
</ListItem>
<ListItem>
<ListIcon name="user" />
<ListContent>Chantal Largier</ListContent>
</ListItem>
<ListItem>
<ListIcon name="marker" />
<ListContent>Bahnhofplatz 12</ListContent>
</ListItem>
<ListItem>
<ListIcon />
<ListContent>6440 Brunnen</ListContent>
</ListItem>
<ListItem>
<ListIcon name="mail" />
<ListContent>
<a href="mailto:[email protected]">[email protected]</a>
</ListContent>
</ListItem>
</List>
</Grid>
<Grid className="page default-grid">
<Grid.Row>
<Grid.Column textAlign="center">
<p>
<span>&copy;{licenseYear} chantallargier.com | </span>
<Link to="/admin" className="link">admin</Link>
</p>
</Grid.Column>
</Grid.Row>
</Grid>
</div>
)
);
4 changes: 3 additions & 1 deletion largier-client/src/common/components/Nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ export default () => (
<Menu.Item link onClick={() => scrollTo('bioAnchor')}>
<I18n>{t => t('bio')}</I18n>
</Menu.Item>
<Menu.Item link onClick={() => scrollTo('servicesAnchor')}>
<I18n>{t => t('services')}</I18n>
</Menu.Item>
<Menu.Item link onClick={() => scrollTo('concerts')}>
<I18n>{t => t('concerts')}</I18n>
</Menu.Item>
<Menu.Item link onClick={() => scrollTo('media')}>
<I18n>{t => t('media')}</I18n>
</Menu.Item>

</Menu>

</Grid.Column>
Expand Down
2 changes: 1 addition & 1 deletion largier-client/src/common/components/Slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function SamplePrevArrow(props) {
);
}

const audio1Src = 'https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/playlists/1388668324&color=%23ff5500&auto_play=true&hide_related=false&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true';
const audio1Src = 'https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/playlists/1388668324&color=%23ff5500&hide_related=false&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true';
const audioStyle = {
fontSize: 10,
color: '#cccccc',
Expand Down
2 changes: 1 addition & 1 deletion largier-client/src/config.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"licenseYear": 2022
"licenseYear": 2024
}
13 changes: 2 additions & 11 deletions largier-client/src/default/pages/Concerts.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Logo from '../../res/images/logoBlack.svg';

import i18n from '../../i18n';

import { licenseYear } from '../../config.json';
import Footer from '../../common/components/Footer/Footer';


const selectLanguage = (lng) => {
Expand Down Expand Up @@ -105,16 +105,7 @@ class Concerts extends Component {
</Grid.Column>
</Grid.Row>
</Grid>
<Grid className="page footer-grid">
<Grid.Row>
<Grid.Column textAlign="center">
<p>
<span>&copy;{licenseYear} chantallargier.com | </span>
<Link to="/admin">admin</Link>
</p>
</Grid.Column>
</Grid.Row>
</Grid>
<Footer />
</div>
);
}
Expand Down
32 changes: 18 additions & 14 deletions largier-client/src/default/pages/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { get } from '../../common/helpers/api';
import TopLeftLinks from '../../common/components/TopLeftLinks';
import TopRightLinks from '../../common/components/TopRightLinks';
import Nav from '../../common/components/Nav';
import Footer from '../../common/components/Footer/Footer';
import SimpleSlider from '../../common/components/Slider';
import ConcertImageContainer from './components/ConcertImageContainer';
// Resources
Expand All @@ -30,8 +31,6 @@ import InstagramIcon from '../../res/images/instagram.svg';

import i18n from '../../i18n';

import { licenseYear } from '../../config.json';

class Home extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -128,6 +127,19 @@ class Home extends Component {
{ /* CONCERTS */ }


<Grid className="page default-grid" id="servicesAnchor">
<div className="sectionTitle">
<h2 className="title"><I18n>{t => t('services')}</I18n></h2>
</div>
<div className="bioParagraph">
<p><I18n>{t => t('servicesText1')}</I18n></p>
<p><I18n>{t => t('servicesText2')}</I18n></p>
<p><I18n>{t => t('servicesText3')}</I18n></p>
<p><I18n>{t => t('servicesText4')}</I18n></p>
</div>
</Grid>


<Grid className="page default-grid concertsBlock" id="concerts">
<Grid.Row>
<Grid.Column>
Expand Down Expand Up @@ -163,16 +175,7 @@ class Home extends Component {
<SimpleSlider />
</div>

<Grid className="page default-grid">
<Grid.Row>
<Grid.Column textAlign="center">
<p>
<span>&copy;{licenseYear} chantallargier.com | </span>
<Link to="/admin" className="link">admin</Link>
</p>
</Grid.Column>
</Grid.Row>
</Grid>
<Footer />

<StructuredData
type="Person"
Expand All @@ -182,14 +185,15 @@ class Home extends Component {
gender: 'Female',
description: 'Swiss Pianist Chantal Largier is a talented, versatile and admired artist, who knows how to impress and fascinate the audience through her interpretation and a real passion for music. Her goal is to find the true spirit of music and to share it with her audience.',
jobTitle: 'Swiss Pianist',
url: 'http://www.chantallargier.com',
image: 'http://www.chantallargier.com/avatar.jpg',
url: 'https://www.chantallargier.com',
image: 'https://www.chantallargier.com/avatar.jpg',
sameAs: [
'https://www.facebook.com/Chantal-Largier-1713090868989087/',
'https://www.youtube.com/channel/UCTtRvi4HOBtmSqzJ-QrKOjQ',
],
}}
/>

</div>
);
}
Expand Down
4 changes: 4 additions & 0 deletions largier-client/src/default/pages/Home.less
Original file line number Diff line number Diff line change
Expand Up @@ -310,3 +310,7 @@ img.logo{
.link {
margin-top: 10px;
}

.impressumSection {
border-top: 1px solid var(--borderColor-muted, var(--color-border-muted))
}
9 changes: 8 additions & 1 deletion largier-client/src/i18n_translation/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
"past-concerts": "Vergangene",
"concerts": "Konzerte",
"media": "Medien",
"services": "Dienstleistungen",
"servicesText1": "Wünschst du dir Klaviermusik, die von tiefstem Herzen kommt und intuitiv nur für dich komponiert wird?",
"servicesText2": "Ein Klavierstück - kreiert nur für dich - oder deine Liebsten? Ich gehe auf deine persönlichen Wünsche, Träume, Visionen und Ideen ein. Gemeinsam besprechen und fühlen wir in welche Richtung deine Komposition erklingen könnte.",
"servicesText3": "Ich kreiere für dich deine „Seelenmelodie“, die dich immer wieder aufs Neue berühren wird. Sie darf dich: zum Fühlen bringen, an Mut erinnern, dein Herz öffnen, dich ans Besondere erinnern, deine Grenzen sprengen, dir Hoffnung und Glauben schenken, deine Geschichte ausdrücken...\n...und so vieles mehr!",
"servicesText4": "Ruft ein JA in dir, dann melde dich per E-Mail an mich. Wir vereinbaren einen unverbindlichen Zoom Call, um uns vorerst kennenzulernen und fühlen gemeinsam, wie es weiter gehen darf. Ich freue mich sehr auf dich! Es wäre mir eine Ehre für dich deine Seelenmelodie zu kreieren.",
"impressum": "Impressum",
"about": "Über mich",
"back": "Zurück"
"back": "Zurück",
"contact": "Kontakt"
}
9 changes: 8 additions & 1 deletion largier-client/src/i18n_translation/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@
"past-concerts": "Past",
"concerts": "Concerts",
"media": "Media",
"services": "Services",
"servicesText1": "Do you wish a piano composition just for you? A piano piece created intuitively from the bottom of my heart, just for you or your beloved ones?",
"servicesText2": "We speak about your wishes, your dreams, your visions and your ideas. Together we talk about how your composition may sound like. I create for you your \"melody of your soul\". Your composition may help you to feel, may give you courage, may help you to open your heart, may give you hope, may remind you of special moments in your life, may break your boundaries, may express your story of your life…. And so much more.",
"servicesText3": "If there is a YES in you, write me a DM. We arrange a Zoom call without obligation, to get to know each other and to feel how to continue.",
"servicesText4": "Looking forward to hearing from you! It will be my honor to create your melody of your soul.",
"impressum": "Impressum",
"about": "About",
"back": "Back"
"back": "Back",
"contact": "Contact"
}

0 comments on commit 9bc5d09

Please sign in to comment.