Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
kajetan-kazimierczak committed Aug 19, 2024
2 parents c2ae6db + a8281d4 commit ba333ca
Show file tree
Hide file tree
Showing 20 changed files with 352 additions and 67 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- main
paths-ignore:
- 'apps/website/**'

jobs:
build:
Expand Down
81 changes: 81 additions & 0 deletions .github/workflows/website-build-and-push-registry.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: Docker

# Build to docker registry. This will trigger an update event from the Kubernetes cluster

on:
push:
branches: [ "main" ]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]
paths:
- 'apps/website/**'

pull_request:
branches: [ "main" ]

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME: ${{ github.repository }}


jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

- run: |
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git config --global user.name "github-actions[bot]"
if [[ $GITHUB_REF == refs/tags/production* ]]; then
npm version major
elif [[ $GITHUB_REF == refs/tags/staging* ]]; then
npm version minor
else
npm version patch
fi
- name: 📝 Get Current Version
id: package-version
uses: martinbeentjes/npm-get-version-action@main

# Set up BuildKit Docker container builder to be able to build
# multi-platform images and export cache
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
with:
context: apps/website
push: ${{ github.event_name != 'pull_request' }}
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.package-version.outputs.current-version}},
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
cache-from: type=gha
cache-to: type=gha,mode=max
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [2.17.0](https://github.com/kolplattformen/skolplattformen/compare/v2.16.1...v2.17.0) (2024-04-29)


### Features

* 🎸 Added privacy policy for Öppna Elevappen on the site ([6eb6d3a](https://github.com/kolplattformen/skolplattformen/commit/6eb6d3a6e3b62d1ee1aabb46e6f514cc4ec909e8))

## [2.16.1](https://github.com/kolplattformen/skolplattformen/compare/v2.16.0...v2.16.1) (2024-04-09)


### Bug Fixes

* 🐛 Site moved to new url ([c93e27b](https://github.com/kolplattformen/skolplattformen/commit/c93e27bec05582be2c0b0e63ba5ab47b1688b8d8))

# [2.16.0](https://github.com/kolplattformen/skolplattformen/compare/v2.15.10...v2.16.0) (2023-11-02)


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ If you're offended by this initiative, rest assured there is no reason to be —

## License

Öppna skolplattformen is copyright 2020–2023 Not Free Beer AB.
Öppna skolplattformen is copyright 2020–2024 Not Free Beer AB.

Licensed under the [Apache License, Version 2.0](LICENSE) (the "License"); you may use Öppna skolplattformen in compliance with the License. A copy of the License is included with this repository.

Expand Down
5 changes: 2 additions & 3 deletions apps/skolplattformen-app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ android {
applicationId "com.oppna_skolplattformen_new.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion

versionCode 20002
versionName "3.0.8"
versionCode 20000
versionName "3.0.10"
}
signingConfigs {
debug {
Expand Down
2 changes: 1 addition & 1 deletion apps/skolplattformen-app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -801,4 +801,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 65fac31507ce363c84c5ab1cb333c7f711468d6a

COCOAPODS: 1.12.1
COCOAPODS: 1.14.2
4 changes: 2 additions & 2 deletions apps/skolplattformen-app/ios/app.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.8;
MARKETING_VERSION = 3.0.10;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -520,7 +520,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.0.8;
MARKETING_VERSION = 3.0.10;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
82 changes: 71 additions & 11 deletions apps/skolplattformen-app/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@
"noNewNewsItemsThisWeek": "No hay noticias nuevas esta semana.",
"backToChild": "Volver al niño",
"title": "Noticias de Skolplattformen",
"published": "Publicada"
"published": "Publicada",
"updated": "Actualizado",
"search": {
"placeholder": "Buscar en las noticias…"
}
},
"navigation": {
"notifications": "Notificaciones",
"news": "Noticias",
"calender": "Calendario",
"menu": "Menú"
"menu": "Menú",
"classmates": "Compañeros de clase"
},
"language": {
"changeLanguage": "Cambiar idioma",
Expand All @@ -25,20 +30,28 @@
"loading": "Cargando…",
"confirm": "Confirmar",
"title": "Öppna skolplattformen",
"cancel": "Anular"
"cancel": "Anular",
"tomorrow": "Mañana",
"logoutAndClearPersonalData": "Cierre la sesión y borre sus datos personales",
"logoutAndClearAllDataInclSettings": "Cierre la sesión y borre todos sus datos incluyendo sus configuraciones"
},
"children": {
"viewStatus": "Ver estado en skolplattformen.org",
"tryAgain": "Intentar otra vez",
"title": "Tus hijos",
"noKids_title": "Sin niños"
"noKids_title": "Sin niños",
"loadingErrorHeading": "¡Ahijoles!",
"loadingErrorInformationText": "La página no pudo ser cargada. Intente de nuevo o mire su estado actual en skolplattformen.org.",
"noKids_description": "No hay infantes registrados en la ciudad de Estocolmo con su número de identificación personal"
},
"calender": {
"showCalenderActions": "Mostrar acciones de calendario",
"saveToCalenderSuccess": "✔️ Guardado en el calendario",
"saveToCalenderError": "Algo salió mal",
"saveToCalender": "Guardar en calendario",
"approveAccessToCalender": "Tienes que aprobar el acceso a tu calendario"
"approveAccessToCalender": "Tienes que aprobar el acceso a tu calendario",
"emptyText": "No hay algo que mostrar",
"emptyHeadline": "El calendario está un poco vacío"
},
"auth": {
"words": {
Expand All @@ -60,8 +73,8 @@
"fast": "rápida",
"fun": "divertido"
},
"subtitle": "La alternativa {{word}}",
"placeholder_SocialSecurityNumber": "Tu personnummer",
"subtitle": "La alternativa de {{word}}",
"placeholder_SocialSecurityNumber": "Tu número de identidad personal",
"loginFailed": "No se pudo iniciar sesión. Vuelva a intentarlo.",
"chooseLoginMethod": "Elija el método de inicio de sesión",
"bankid": {
Expand All @@ -72,17 +85,27 @@
},
"loginAsTestUser": "Inicie sesión como usuario de pruebas",
"a11y_change_language": "Elija su idioma",
"a11y_image_two_boys": "Fotografia de dos personas mirando su telefono movil"
"a11y_image_two_boys": "Fotografia de dos personas mirando su telefono movil",
"chooseSchoolPlatform": "Elija la plataforma",
"a11y_clear_social_security_input_field": "Borrar el campo del número de identificación personal",
"loginSuccessful": "Se ha iniciado la sesión correctamente, cargando…",
"freja": {
"OpenManually": "Abrir Freja eID+ manualmente",
"OpenOnThisDevice": "Abrir Freja eID+ en este dispositivo",
"Waiting": "Esperando a Freja eID+…"
},
"a11y_select_login_method": "Seleccione el metodo para iniciar sesión"
},
"abscense": {
"title": "Informar ausencia",
"startTime": "hora de inicio",
"selectAbscenseStartTime": "Elige la hora de inicio",
"personalNumberMissing": "Falta el personnummer",
"invalidPersonalNumber": "El personnumer no es válido",
"personalNumberMissing": "Falta el número personal",
"invalidPersonalNumber": "Número personal inválido",
"entireDay": "Día completo",
"endTime": "hora de finalización",
"selectAbscenseEndTime": "Elige la hora de finalización"
"selectAbscenseEndTime": "Elige hora de finalización",
"childsPersonalNumber": "Numero de identificación del infante (personnummer)"
},
"abbrevations": {
"upperSecondarySchool": "Escuela Secundaria Obligatoria",
Expand All @@ -92,5 +115,42 @@
},
"notifications": {
"notificationTitle": "Notificación: {{message}} ({{dateCreated}})"
},
"contact": {
"home": "Dirección",
"email": "Correo electrónico",
"call": "Llamar",
"a11y_show_contact_info_button_label": "Mostrar información de contacto",
"a11y_show_contact_info_button_hint": "Muestra información de contacto",
"sms": "Mensaje de texto"
},
"settings": {
"language": "Idioma",
"useSystemTheme": "Use el aspecto claro/oscuro dispositivo",
"licenses": "Licencias",
"themeAuto": "Automático",
"appearance": "Diseño",
"theme": "Aspecto",
"settings": "Configuraciones"
},
"themes": {
"dark": "Oscuro",
"light": "Claro"
},
"menu": {
"emptyText": "No hay nada para esta semana",
"emptyHeadline": "El menu del almuerzo se ve algo vacio"
},
"classmates": {
"class": "Clase",
"child": "Infante",
"contactsForGuardiansFor": "Información de contacto de los tutores de"
},
"schedule": {
"gymBag": "Mochila de gimnasio",
"end": "Termina",
"start": "Inicia",
"lunch": "Almuerzo",
"week": "Semana"
}
}
21 changes: 16 additions & 5 deletions apps/skolplattformen-app/translations/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"socialSecurityNumber": "Burgerservicenummer",
"cancel": "Annuleren",
"logoutAndClearAllDataInclSettings": "Log uit en wis alle gegevens inclusief instellingen",
"logoutAndClearPersonalData": "Uitloggen en persoonlijke gegevens wissen"
"logoutAndClearPersonalData": "Uitloggen en persoonlijke gegevens wissen",
"tomorrow": "Morgen"
},
"auth": {
"placeholder_SocialSecurityNumber": "Jouw burgerservicenummer",
Expand Down Expand Up @@ -46,7 +47,14 @@
"a11y_select_login_method": "Selecteer de inlogmethode",
"a11y_clear_social_security_input_field": "Wis het veld voor het burgerservicenummer",
"a11y_image_two_boys": "Foto van twee mensen die naar hun mobiele telefoons kijken",
"a11y_change_language": "Selecteer je taal"
"a11y_change_language": "Selecteer je taal",
"chooseSchoolPlatform": "Platform kiezen",
"freja": {
"OpenManually": "Freja eID+ handmatig openen",
"Waiting": "Wachten op Freja eID+…",
"OpenOnThisDevice": "Freja eID+ openen op dit apparaat"
},
"loginSuccessful": "Inloggen gelukt, laden…"
},
"abbrevations": {
"preSchool": "Peuterschool",
Expand Down Expand Up @@ -98,7 +106,9 @@
"approveAccessToCalender": "Je moet de toegang tot je agenda goedkeuren",
"saveToCalenderError": "Er is iets fout gegaan",
"saveToCalenderSuccess": "✔️ Opgeslagen in kalender",
"saveToCalender": "Opslaan in kalender"
"saveToCalender": "Opslaan in kalender",
"emptyHeadline": "De kalender ziet er nogal leeg uit",
"emptyText": "Kon niets vinden om te laten zien"
},
"notifications": {
"notificationTitle": "Melding: {{message}} ({{dateCreated}})"
Expand All @@ -114,10 +124,11 @@
"end": "Eind",
"gymBag": "Sporttas",
"lunch": "Middageten",
"start": "Start"
"start": "Start",
"week": "Week"
},
"contact": {
"a11y_show_contact_info_button_hint": "Toon contactgegevens",
"a11y_show_contact_info_button_hint": "Toont contactgegevens",
"email": "E-mail",
"home": "Adres",
"call": "Telefoongesprek",
Expand Down
5 changes: 5 additions & 0 deletions apps/website/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ const Footer = () => {
Integritetspolicy
</Link.Internal>
</li>
<li>
<Link.Internal href="/integritetspolicy-elevapp">
Integritetspolicy ElevApp
</Link.Internal>
</li>
<li>
<Link.Internal href="/qa">Frågor och svar</Link.Internal>
</li>
Expand Down
Loading

0 comments on commit ba333ca

Please sign in to comment.