Skip to content

Commit 47a50d1

Browse files
stampaaaronstampaaaron
committed
Merge remote-tracking branch 'origin/develop' into 89-add-strenghts-page
2 parents 27effd2 + b8cb581 commit 47a50d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+4691
-2799
lines changed

‎.github/workflows/continuous-integration.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: Continuous Integration
22

3-
on: pull_request
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
push:
8+
branches:
9+
- develop
410

511
jobs:
612
check:
@@ -27,5 +33,8 @@ jobs:
2733
- name: Run tests
2834
run: yarn test
2935

36+
- name: Submit coverage
37+
uses: codecov/codecov-action@v3
38+
3039
- name: Try to build
3140
run: yarn build

‎.vscode/launch.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"args": [
1010
"develop"
1111
],
12-
"runtimeArgs": [
13-
"--nolazy"
14-
],
1512
"console": "integratedTerminal"
1613
},
1714
{
@@ -22,9 +19,6 @@
2219
"args": [
2320
"build"
2421
],
25-
"runtimeArgs": [
26-
"--nolazy"
27-
],
2822
"console": "integratedTerminal"
2923
}
3024
]

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"i18n-ally.displayLanguage": "de-CH",
3131
"cSpell.words": [
3232
"Europastrasse",
33+
"frontmatter",
3334
"gatsby",
3435
"Glattbrugg",
3536
"openscript"

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ This project is based on [gatsby-starter-dogmatism](https://github.com/openscrip
88
1. **Install** the projects dependencies with `yarn install`.
99
1. **Run** the project with `yarn develop`.
1010

11+
## Development
12+
13+
- Enable Gatsby SSR during development with the `DEV_SSR` flag in the `gatsby-config.ts`. Be aware that `loadPageDataSync()` isn't implemented for development, so not everything will be run.
14+
- see https://github.com/gatsbyjs/gatsby/issues/36675
15+
- Serve build locally with `cd public && python -m http.server 9000` on port 9000.
16+
1117
## License
1218

1319
All content (text, images, photos, illustrations and other media) as well as the brand is the property of openscript Ltd. (CH). The software which is utilized to generate the website is licensed as stated in the [LICENSE](./LICENSE) file. Additionally the following licenses are applied:

‎__mock__/file-mock.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = 'test-file-stub';

‎__mock__/gatsby.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
const React = require('react');
2+
const gatsby = jest.requireActual('gatsby');
3+
4+
module.exports = {
5+
...gatsby,
6+
graphql: jest.fn(),
7+
Link: jest.fn().mockImplementation(
8+
// these props are invalid for an `a` tag
9+
({ activeClassName, activeStyle, getProps, innerRef, partiallyActive, ref, replace, to, ...rest }) =>
10+
React.createElement('a', {
11+
...rest,
12+
href: to,
13+
})
14+
),
15+
Slice: jest.fn().mockImplementation(({ alias, ...rest }) =>
16+
React.createElement('div', {
17+
...rest,
18+
'data-test-slice-alias': alias,
19+
})
20+
),
21+
useStaticQuery: jest.fn(),
22+
};

‎content/data/pages/imprint.de.mdx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
---
22
title: Impressum
3+
description: Alle Angaben zum Eigentümer dieser Seite, sowie die Haftungserklärung und Hinweise zu den erhobenen Daten.
34
---
45

5-
## Impressum
6+
# Impressum
67

7-
### Eigentümer
8+
## Eigentümer
89

910
Unterhalb sind die Angaben zur Identität des Eigentümers nach [UWG Artikel 3](http://www.admin.ch/opc/de/classified-compilation/19860391/index.html#a3) zu finden.
1011

1112
openscript GmbH\
1213
Europa-Strasse 30\
1314
8152 Glattbrugg
1415

15-
### Haftungserklärung
16+
## Haftungserklärung
1617

1718
Haftungsansprüche gegenüber dem Eigentümer und den Autoren von [openscript.ch](https://openscript.ch), die sich auf Schäden welcher Art auch immer beziehen, welche durch die Nutzung oder Nichtnutzung der angebotenen Informationen und Datensätzen bzw. durch die Nutzung fehlerhafter oder unvollständiger Informationen verursacht wurden, sind grundsätzlich ausgeschlossen!
1819

1920
Die platzierten Angebote sind alle unverbindlich. Der Eigentümer behält sich das Recht vor, Teile der Seite oder das gesamte Angebot ohne Ankündigung zu ändern, zu ergänzen oder zu löschen.
2021

2122
Verweise zu Inhalte Dritter liegen ausserhalb des Verantwortungsbereichs. Die Verantwortung wird in jedem Fall abgelehnt.
2223

23-
### Datenschutz
24+
## Datenschutz
2425

2526
Aufgrund gesetzlicher Vorgaben sind wir in bestimmten Fällen verpflichtet, Ihre personenbezogenen Daten an Dritte weiterzugeben. Dies ist zum Beispiel der Fall, wenn der Verdacht einer Straftat oder des Missbrauchs dieser Webseite vorliegt. Wir werden Ihre Daten nur auf Grund eines richterlichen Beschlusses an die Strafverfolungsbehörden weitergeben. Falls es jedoch in unserem eigenen Interesse liegt, dass ein Missbrauch aufgeklärt wird, weil die Nutzer oder der Seitenbetreiber selbst zu den Geschädigten gehören, kann auch auf die richterliche Anordnung verzichtet werden.
2627

‎content/data/pages/imprint.en.mdx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
---
22
title: Imprint
3+
description: All information about the owner of this site, as well as the liability statement and notes about the data collected.
34
---
45

5-
## Imprint
6+
# Imprint
67

7-
### Owner
8+
## Owner
89

910
The identity of the owner, according to [UWG Art. 3](http://www.admin.ch/opc/de/classified-compilation/19860391/index.html#a3) is stated below.
1011

1112
openscript GmbH\
1213
Europa-Strasse 30\
1314
8152 Glattbrugg
1415

15-
### Limitation of liability
16+
## Limitation of liability
1617

1718
All liability of the owner and the other authors for direct, indirect or secondary damage suffered as a result of access to the elements of openscript.ch or to use of that site or as a consequence of impossibility of access to or use thereof or links to other websites, is hereby declined.
1819

1920
All offers are without obligation. The owner reserves the right to change or delete, parts or the whole offer, at any time.
2021

2122
The [openscript.ch](https://openscript.ch) website contains links to content maintained by third parties, which are outside our area of responsibility. Any responsibility is declined.
2223

23-
### Data protection
24+
## Data protection
2425

2526
Due to legal requirements, we are obliged in certain cases to pass on your personal data to third parties. This is the case, for example, if there is suspicion of a criminal offense or misuse of this website. We will only pass on your data to law enforcement authorities on the basis of a court order. However, if it is in our own interest that an abuse is cleared up because the users or the website operator themselves are among the injured parties, the judicial order can also be waived.
2627

‎content/i18n/de-CH.json

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,36 @@
2020
"menu.toThePresent": "In die Gegenwart",
2121
"menu.togetherAhead": "Trete in Kontakt, um gemeinsam die Zukunft zu gestalten.",
2222
"menu.values": "Werte",
23-
"page.collaboration.title": "Zusammenarbeit",
24-
"page.formation.title": "Entstehung",
23+
"page.404.html.meta.description": "Leider wurde die gesuchte Seite nicht gefunden.",
24+
"page.404.html.meta.title": "Seite nicht gefunden",
25+
"page.404.meta.description": "Leider wurde die gesuchte Seite nicht gefunden.",
26+
"page.404.meta.title": "Seite nicht gefunden",
27+
"page.future.collaboration.meta.description": "Ein spannendes Projekt, welches du mit uns besprechen möchtest?",
28+
"page.future.collaboration.meta.title": "Zusammenarbeit",
29+
"page.future.meta.description": "Über die Möglichkeit mit uns spannende Informatikprojekte oder Schulungen umzusetzen, kann hier mehr in Erfahrung gebracht werden.",
30+
"page.future.meta.title": "Zukunft",
31+
"page.future.participation.meta.description": "Bei uns gibt es keine normalen Jobs.",
32+
"page.future.participation.meta.title": "Mitarbeit",
33+
"page.future.services.meta.description": "Was wir tun, erfährst du hier.",
34+
"page.future.services.meta.title": "Dienstleistungen",
35+
"page.index.meta.description": "Gefährten für Abenteuer in der Welt von Bits und Bytes.",
36+
"page.index.meta.title": "Companions for your next software project?",
2537
"page.not-found.action": "Zur Startseite",
2638
"page.not-found.content": "Leider konnte die angeforderte Seite nicht gefunden werden.",
27-
"page.not-found.title": "Seite nicht gefunden",
28-
"page.participation.title": "Mitarbeit",
29-
"page.references.title": "Referenzen",
30-
"page.services.title": "Dienstleistungen",
31-
"page.strengths.title": "Stärken",
32-
"page.team.title": "Team",
33-
"page.values.title": "Werte"
39+
"page.not-found.meta.title": "Seite nicht gefunden",
40+
"page.past.formation.meta.description": "Unser Werdegang ist auf dieser Seite beschreiben.",
41+
"page.past.formation.meta.title": "Entstehung und Ereignisse",
42+
"page.past.meta.description": "Erfahre mehr über unsere Entstehungsgeschichte und umgesetzten Projekte.",
43+
"page.past.meta.title": "Unsere Vergangenheit",
44+
"page.past.references.meta.description": "Erfahre mehr mit zu den Projekten, welche wir auf die Beine gestellt haben oder noch daran arbeiten.",
45+
"page.past.references.meta.title": "Referenzen",
46+
"page.present.meta.description": "Erfahre mehr darüber wer wir sind und was wir tun.",
47+
"page.present.meta.title": "Was wir gegenwärtig tun",
48+
"page.present.strengths.meta.description": "Die Stärken und Fähigkeiten, welche uns aus machen.",
49+
"page.present.strengths.meta.title": "Stärken",
50+
"page.present.team.meta.description": "Alles darüber, wer wir sind.",
51+
"page.present.team.meta.title": "Team",
52+
"page.present.values.meta.description": "Wir orientieren uns nach wenigen fixen Werten, welche hier beschrieben sind.",
53+
"page.present.values.meta.title": "Mehr über unsere Werte",
54+
"site.meta.title": "openscript GmbH"
3455
}

‎content/i18n/en-US.json

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"menu.formation": "Formation",
99
"menu.future": "Future",
1010
"menu.imprint": "Imprint",
11-
"menu.jobs": "Jobs",
1211
"menu.participation": "Participation",
1312
"menu.past": "Past",
1413
"menu.present": "Present",
@@ -21,15 +20,36 @@
2120
"menu.toThePresent": "To the present",
2221
"menu.togetherAhead": "Get in touch, to shape the future together.",
2322
"menu.values": "Values",
24-
"page.collaboration.title": "Collaboration",
25-
"page.formation.title": "Formation",
23+
"page.404.html.meta.description": "Unfortunately, the page you were looking for was not found.",
24+
"page.404.html.meta.title": "Page not found",
25+
"page.404.meta.description": "Unfortunately, the page you were looking for was not found.",
26+
"page.404.meta.title": "Page not found",
27+
"page.future.collaboration.meta.description": "An exciting project that you would like to discuss with us?",
28+
"page.future.collaboration.meta.title": "Collaboration",
29+
"page.future.meta.description": "Here you can find out more about the possibility of implementing exciting IT projects or training courses with us.",
30+
"page.future.meta.title": "future",
31+
"page.future.participation.meta.description": "We don't have normal jobs.",
32+
"page.future.participation.meta.title": "Participation",
33+
"page.future.services.meta.description": "You can find out what we do here.",
34+
"page.future.services.meta.title": "Services",
35+
"page.index.meta.description": "Companions for adventures in the world of bits and bytes.",
36+
"page.index.meta.title": "Home",
2637
"page.not-found.action": "To the home page",
2738
"page.not-found.content": "Unfortunately the requested page couldn't be found.",
28-
"page.not-found.title": "Page not found",
29-
"page.participation.title": "Participation",
30-
"page.references.title": "References",
31-
"page.services.title": "Services",
32-
"page.strengths.title": "Strengths",
33-
"page.team.title": "Team",
34-
"page.values.title": "Values"
39+
"page.not-found.meta.title": "Page not found",
40+
"page.past.formation.meta.description": "Our career is described on this page.",
41+
"page.past.formation.meta.title": "Genesis and events",
42+
"page.past.meta.description": "Find out more about our history and implemented projects.",
43+
"page.past.meta.title": "Our past",
44+
"page.past.references.meta.description": "Find out more about the projects we have set up or are still working on.",
45+
"page.past.references.meta.title": "References",
46+
"page.present.meta.description": "Find out more about who we are and what we do.",
47+
"page.present.meta.title": "What we are currently doing",
48+
"page.present.strengths.meta.description": "The strengths and skills that make us special.",
49+
"page.present.strengths.meta.title": "Strengths",
50+
"page.present.team.meta.description": "Everything about who we are.",
51+
"page.present.team.meta.title": "team",
52+
"page.present.values.meta.description": "We are guided by a few fixed values, which are described here.",
53+
"page.present.values.meta.title": "More about our values",
54+
"site.meta.title": "openscript Ltd."
3555
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy