diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f517f3a..0ce11dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,11 @@ on: push: branches: - feature/* - - release/* + - main + - main-* + +env: + PUBLISH_BRANCH: main jobs: build: @@ -26,11 +30,24 @@ jobs: publish: runs-on: ubuntu-latest needs: build - if: steps: + + - name: Extract branch name + id: extract_branch + shell: bash + run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + + - name: Check publish branch information + id: check_publish + run: | + echo "Branch name is ${{ steps.extract_branch.outputs.branch }}" + echo "Publish branch name is $PUBLISH_BRANCH" + echo "Current branch should be published: ${{ env.PUBLISH_BRANCH == steps.extract_branch.outputs.branch }}" + echo "publish=${{ env.PUBLISH_BRANCH == steps.extract_branch.outputs.branch }}" >> $GITHUB_OUTPUT + - name: Publish uses: nogsantos/scp-deploy@master - if: contains(github.ref, 'refs/heads/release') + if: ${{ steps.check_publish.outputs.publish == 'true' }} with: src: ./largier-server/target/largier-run.jar host: ${{ secrets.DEPLOY_HOST }} diff --git a/Dev/README.md b/Dev/README.md new file mode 100644 index 0000000..0fa37a6 --- /dev/null +++ b/Dev/README.md @@ -0,0 +1,32 @@ +# Local + +## DB + +- download h2 https://www.h2database.com/html/download.html + + > Version 2.1.214 + +- Run h2 in local, use jdbc url: + + ``` + jdbc:h2:{REAL_LOCATION}/largierj/db + ``` + +- use username sa and password password + +- Run schema.sql and data.sql +- Disconnect H2 console + +## Spring + +- Set environment parameter in run configuration + + ``` + SPRING_PROFILES_ACTIVE=dev + ``` + +- Run LargierJApplication with param: + + ``` + -Dspring.config.additional-location={REAL_LOCATION}/largierj/largier-server/src/main/resources/application-dev.yml -Dspring.profiles.active=dev + ``` \ No newline at end of file diff --git a/largier-client/pom.xml b/largier-client/pom.xml index 32452db..aa44957 100644 --- a/largier-client/pom.xml +++ b/largier-client/pom.xml @@ -28,6 +28,16 @@ install-node-and-npm + + npm config + + npm + + generate-resources + + config set strict-ssl false + + npm install diff --git a/largier-client/src/common/components/Footer/Footer.js b/largier-client/src/common/components/Footer/Footer.js new file mode 100644 index 0000000..31bc87c --- /dev/null +++ b/largier-client/src/common/components/Footer/Footer.js @@ -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 () => ( + ( +
+ + + + {t => t('contact')} + + + + + + + Chantal Largier + + + + Bahnhofplatz 12 + + + + 6440 Brunnen + + + + + info@chantallargier.com + + + + + + + +

+ ©{licenseYear} chantallargier.com | + admin +

+
+
+
+
+ ) +); diff --git a/largier-client/src/common/components/Nav.js b/largier-client/src/common/components/Nav.js index 45909ea..0b4d852 100644 --- a/largier-client/src/common/components/Nav.js +++ b/largier-client/src/common/components/Nav.js @@ -25,13 +25,15 @@ export default () => ( scrollTo('bioAnchor')}> {t => t('bio')} + scrollTo('servicesAnchor')}> + {t => t('services')} + scrollTo('concerts')}> {t => t('concerts')} scrollTo('media')}> {t => t('media')} - diff --git a/largier-client/src/common/components/Slider.js b/largier-client/src/common/components/Slider.js index 229696b..259e79d 100644 --- a/largier-client/src/common/components/Slider.js +++ b/largier-client/src/common/components/Slider.js @@ -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', diff --git a/largier-client/src/config.json b/largier-client/src/config.json index 439a183..5ee9fdc 100644 --- a/largier-client/src/config.json +++ b/largier-client/src/config.json @@ -1,3 +1,3 @@ { - "licenseYear": 2022 + "licenseYear": 2024 } diff --git a/largier-client/src/default/pages/Concerts.js b/largier-client/src/default/pages/Concerts.js index 1c2e879..374e4f7 100644 --- a/largier-client/src/default/pages/Concerts.js +++ b/largier-client/src/default/pages/Concerts.js @@ -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) => { @@ -105,16 +105,7 @@ class Concerts extends Component { - - - -

- ©{licenseYear} chantallargier.com | - admin -

-
-
-
+