From 82110e99ebdc9ba646a57b88c8348132ff59c13c Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Tue, 11 Feb 2025 00:58:57 +0000 Subject: [PATCH] Project format --- docker-compose.yaml | 324 +++++++++++++-------------- src/lib/components/Link.svelte | 6 +- src/lib/navigation.js | 4 +- src/lib/styles/NavigationFooter.scss | 112 ++++----- src/lib/styles/NavigationHeader.scss | 106 ++++----- src/lib/styles/styles.css | 6 +- src/routes/InfoScroll.svelte | 62 ++--- src/routes/Splash.svelte | 20 +- src/routes/contact/+page.svelte | 15 +- 9 files changed, 315 insertions(+), 340 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 08a24f8..c17fdb3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -27,195 +27,195 @@ services: labels: - "io.containers.autoupdate=registry" invenio-rdm: - image: ghcr.io/front-matter/invenio-rdm-starter:latest - networks: - - am-d-model-network - pull_policy: if_not_present - volumes: - - uploaded_data:/opt/invenio/var/instance/data - - archived_data:/opt/invenio/var/instance/archive - environment: - # Flask - - INVENIO_APP_ALLOWED_HOSTS=${INVENIO_APP_ALLOWED_HOSTS:-['0.0.0.0', 'localhost', '127.0.0.1']} + image: ghcr.io/front-matter/invenio-rdm-starter:latest + networks: + - am-d-model-network + pull_policy: if_not_present + volumes: + - uploaded_data:/opt/invenio/var/instance/data + - archived_data:/opt/invenio/var/instance/archive + environment: + # Flask + - INVENIO_APP_ALLOWED_HOSTS=${INVENIO_APP_ALLOWED_HOSTS:-['0.0.0.0', 'localhost', '127.0.0.1']} - # Flask-SQLAlchemy - - INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://${POSTGRES_USER:-inveniordm}:${POSTGRES_PASSWORD:-inveniordm}@db/${POSTGRES_DB:-inveniordm} + # Flask-SQLAlchemy + - INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://${POSTGRES_USER:-inveniordm}:${POSTGRES_PASSWORD:-inveniordm}@db/${POSTGRES_DB:-inveniordm} - # Flask-Babel - - INVENIO_BABEL_DEFAULT_LOCALE=${INVENIO_BABEL_DEFAULT_LOCALE:-en} - - INVENIO_BABEL_DEFAULT_TIMEZONE=${INVENIO_BABEL_DEFAULT_TIMEZONE:-UTC} + # Flask-Babel + - INVENIO_BABEL_DEFAULT_LOCALE=${INVENIO_BABEL_DEFAULT_LOCALE:-en} + - INVENIO_BABEL_DEFAULT_TIMEZONE=${INVENIO_BABEL_DEFAULT_TIMEZONE:-UTC} - # Invenio-App - - INVENIO_CACHE_TYPE=${INVENIO_CACHE_TYPE:-redis} - - INVENIO_CACHE_REDIS_URL=${INVENIO_CACHE_REDIS_URL:-redis://cache:6379/0} - - INVENIO_ACCOUNTS_SESSION_REDIS_URL=${INVENIO_ACCOUNTS_SESSION_REDIS_URL:-redis://cache:6379/1} - - INVENIO_CELERY_RESULT_BACKEND=${INVENIO_CELERY_RESULT_BACKEND:-redis://cache:6379/2} - - INVENIO_RATELIMIT_STORAGE_URL=${INVENIO_RATELIMIT_STORAGE_URL:-redis://cache:6379/3} - - INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=${INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL:-redis://cache:6379/4} - - INVENIO_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} - - INVENIO_CELERY_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} + # Invenio-App + - INVENIO_CACHE_TYPE=${INVENIO_CACHE_TYPE:-redis} + - INVENIO_CACHE_REDIS_URL=${INVENIO_CACHE_REDIS_URL:-redis://cache:6379/0} + - INVENIO_ACCOUNTS_SESSION_REDIS_URL=${INVENIO_ACCOUNTS_SESSION_REDIS_URL:-redis://cache:6379/1} + - INVENIO_CELERY_RESULT_BACKEND=${INVENIO_CELERY_RESULT_BACKEND:-redis://cache:6379/2} + - INVENIO_RATELIMIT_STORAGE_URL=${INVENIO_RATELIMIT_STORAGE_URL:-redis://cache:6379/3} + - INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=${INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL:-redis://cache:6379/4} + - INVENIO_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} + - INVENIO_CELERY_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} - - INVENIO_WSGI_PROXIES=4 - - INVENIO_SECRET_KEY=${INVENIO_SECRET_KEY:-changeme} + - INVENIO_WSGI_PROXIES=4 + - INVENIO_SECRET_KEY=${INVENIO_SECRET_KEY:-changeme} - # Invenio-I18N - # TODO: fix tuple parsing - # - INVENIO_I18N_LANGUAGES=${INVENIO_I18N_LANGUAGES:-'[("de", _("German"))]'} + # Invenio-I18N + # TODO: fix tuple parsing + # - INVENIO_I18N_LANGUAGES=${INVENIO_I18N_LANGUAGES:-'[("de", _("German"))]'} - # Invenio-Theme - - INVENIO_THEME_LOGO=${INVENIO_THEME_LOGO:-images/invenio-rdm-white.svg} - - INVENIO_THEME_SITENAME=${INVENIO_THEME_SITENAME:-InvenioRDM Starter} - - INVENIO_THEME_FRONTPAGE_TITLE=${INVENIO_THEME_FRONTPAGE_TITLE:-InvenioRDM Starter} - - INVENIO_THEME_FRONTPAGE_SUBTITLE=${INVENIO_THEME_FRONTPAGE_SUBTITLE:-A starter project for the turn-key research data management repository.} - - INVENIO_THEME_SHOW_FRONTPAGE_INTRO_SECTION=False + # Invenio-Theme + - INVENIO_THEME_LOGO=${INVENIO_THEME_LOGO:-images/invenio-rdm-white.svg} + - INVENIO_THEME_SITENAME=${INVENIO_THEME_SITENAME:-InvenioRDM Starter} + - INVENIO_THEME_FRONTPAGE_TITLE=${INVENIO_THEME_FRONTPAGE_TITLE:-InvenioRDM Starter} + - INVENIO_THEME_FRONTPAGE_SUBTITLE=${INVENIO_THEME_FRONTPAGE_SUBTITLE:-A starter project for the turn-key research data management repository.} + - INVENIO_THEME_SHOW_FRONTPAGE_INTRO_SECTION=False - # Invenio-Records-Resources - - INVENIO_SITE_UI_URL=${INVENIO_SITE_UI_URL:-https://localhost} - - INVENIO_SITE_API_URL=${INVENIO_SITE_API_URL:-https://localhost/api} + # Invenio-Records-Resources + - INVENIO_SITE_UI_URL=${INVENIO_SITE_UI_URL:-https://localhost} + - INVENIO_SITE_API_URL=${INVENIO_SITE_API_URL:-https://localhost/api} - # Invenio-RDM-Records - - INVENIO_DATACITE_ENABLED=${INVENIO_DATACITE_ENABLED:-False} - - INVENIO_DATACITE_USERNAME=${INVENIO_DATACITE_USERNAME:-} - - INVENIO_DATACITE_PASSWORD=${INVENIO_DATACITE_PASSWORD:-} - - INVENIO_DATACITE_PREFIX=${INVENIO_DATACITE_PREFIX:-} - - INVENIO_DATACITE_TEST_MODE=${INVENIO_DATACITE_TEST_MODE:-True} - - INVENIO_DATACITE_DATACENTER_SYMBOL=${INVENIO_DATACITE_DATACENTER_SYMBOL:-} + # Invenio-RDM-Records + - INVENIO_DATACITE_ENABLED=${INVENIO_DATACITE_ENABLED:-False} + - INVENIO_DATACITE_USERNAME=${INVENIO_DATACITE_USERNAME:-} + - INVENIO_DATACITE_PASSWORD=${INVENIO_DATACITE_PASSWORD:-} + - INVENIO_DATACITE_PREFIX=${INVENIO_DATACITE_PREFIX:-} + - INVENIO_DATACITE_TEST_MODE=${INVENIO_DATACITE_TEST_MODE:-True} + - INVENIO_DATACITE_DATACENTER_SYMBOL=${INVENIO_DATACITE_DATACENTER_SYMBOL:-} - - INVENIO_RDM_ALLOW_METADATA_ONLY_RECORDS=${INVENIO_RDM_ALLOW_METADATA_ONLY_RECORDS:-True} - - INVENIO_RDM_ALLOW_RESTRICTED_RECORDS=${INVENIO_RDM_ALLOW_RESTRICTED_RECORDS:-True} - - INVENIO_RDM_ALLOW_EXTERNAL_DOI_VERSIONING=${INVENIO_RDM_ALLOW_EXTERNAL_DOI_VERSIONING:-True} + - INVENIO_RDM_ALLOW_METADATA_ONLY_RECORDS=${INVENIO_RDM_ALLOW_METADATA_ONLY_RECORDS:-True} + - INVENIO_RDM_ALLOW_RESTRICTED_RECORDS=${INVENIO_RDM_ALLOW_RESTRICTED_RECORDS:-True} + - INVENIO_RDM_ALLOW_EXTERNAL_DOI_VERSIONING=${INVENIO_RDM_ALLOW_EXTERNAL_DOI_VERSIONING:-True} - - INVENIO_RDM_CITATION_STYLES_DEFAULT=${INVENIO_RDM_CITATION_STYLES_DEFAULT:-apa} - - INVENIO_SECURITY_EMAIL_SENDER=${INVENIO_SECURITY_EMAIL_SENDER:-} - # TODO: fix tuple parsing - # - INVENIO_RDM_CITATION_STYLES=${INVENIO_RDM_CITATION_STYLES:-"[('apa', 'APA'), ('chicago-note-bibliography', 'Chicago'), ('harvard-cite-them-right', 'Harvard')]"} + - INVENIO_RDM_CITATION_STYLES_DEFAULT=${INVENIO_RDM_CITATION_STYLES_DEFAULT:-apa} + - INVENIO_SECURITY_EMAIL_SENDER=${INVENIO_SECURITY_EMAIL_SENDER:-} + # TODO: fix tuple parsing + # - INVENIO_RDM_CITATION_STYLES=${INVENIO_RDM_CITATION_STYLES:-"[('apa', 'APA'), ('chicago-note-bibliography', 'Chicago'), ('harvard-cite-them-right', 'Harvard')]"} - # Invenio-Accounts - - INVENIO_ACCOUNTS_LOCAL_LOGIN_ENABLED=${INVENIO_ACCOUNTS_LOCAL_LOGIN_ENABLED:-True} - - INVENIO_GITHUB_APP_CREDENTIALS=${INVENIO_GITHUB_APP_CREDENTIALS:-} + # Invenio-Accounts + - INVENIO_ACCOUNTS_LOCAL_LOGIN_ENABLED=${INVENIO_ACCOUNTS_LOCAL_LOGIN_ENABLED:-True} + - INVENIO_GITHUB_APP_CREDENTIALS=${INVENIO_GITHUB_APP_CREDENTIALS:-} - # OAI-PMH - - INVENIO_OAISERVER_ID_PREFIX=${OAISERVER_ID_PREFIX:-invenio-rdm} + # OAI-PMH + - INVENIO_OAISERVER_ID_PREFIX=${OAISERVER_ID_PREFIX:-invenio-rdm} - # Invenio-Files-REST - - INVENIO_FILES_REST_STORAGE_FACTORY=invenio_s3.s3fs_storage_factory + # Invenio-Files-REST + - INVENIO_FILES_REST_STORAGE_FACTORY=invenio_s3.s3fs_storage_factory - # Invenio-S3 - - INVENIO_S3_ENDPOINT_URL=${INVENIO_S3_ENDPOINT_URL:-} - - INVENIO_S3_ACCESS_KEY_ID=${INVENIO_S3_ACCESS_KEY_ID:-} - - INVENIO_S3_SECRET_ACCESS_KEY=${INVENIO_S3_SECRET_ACCESS_KEY:-} - - INVENIO_S3_BUCKET_NAME=${INVENIO_S3_BUCKET_NAME:-} + # Invenio-S3 + - INVENIO_S3_ENDPOINT_URL=${INVENIO_S3_ENDPOINT_URL:-} + - INVENIO_S3_ACCESS_KEY_ID=${INVENIO_S3_ACCESS_KEY_ID:-} + - INVENIO_S3_SECRET_ACCESS_KEY=${INVENIO_S3_SECRET_ACCESS_KEY:-} + - INVENIO_S3_BUCKET_NAME=${INVENIO_S3_BUCKET_NAME:-} - # Invenio-Search - - INVENIO_SEARCH_HOSTS=${INVENIO_SEARCH_HOSTS:-['search:9200']} - - INVENIO_SEARCH_INDEX_PREFIX=${INVENIO_SEARCH_INDEX_PREFIX:-invenio-rdm-} + # Invenio-Search + - INVENIO_SEARCH_HOSTS=${INVENIO_SEARCH_HOSTS:-['search:9200']} + - INVENIO_SEARCH_INDEX_PREFIX=${INVENIO_SEARCH_INDEX_PREFIX:-invenio-rdm-} - # Logging - - INVENIO_LOGGING_CONSOLE_LEVEL=${INVENIO_LOGGING_CONSOLE_LEVEL:-WARNING} - depends_on: - search: - condition: service_started - cache: - condition: service_started - db: - condition: service_started + # Logging + - INVENIO_LOGGING_CONSOLE_LEVEL=${INVENIO_LOGGING_CONSOLE_LEVEL:-WARNING} + depends_on: + search: + condition: service_started + cache: + condition: service_started + db: + condition: service_started worker: - command: "celery -A invenio_app.celery worker --beat --events --loglevel=WARNING" - networks: - - am-d-model-network - image: ghcr.io/front-matter/invenio-rdm-starter:latest - pull_policy: if_not_present - volumes: - - uploaded_data:/opt/invenio/var/instance/data - environment: - - INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://${POSTGRES_USER:-inveniordm}:${POSTGRES_PASSWORD:-inveniordm}@db/${POSTGRES_DB:-inveniordm} - - INVENIO_SEARCH_HOSTS=${INVENIO_SEARCH_HOSTS:-['search:9200']} - - INVENIO_SEARCH_INDEX_PREFIX=${INVENIO_SEARCH_INDEX_PREFIX:-invenio-rdm-} + command: "celery -A invenio_app.celery worker --beat --events --loglevel=WARNING" + networks: + - am-d-model-network + image: ghcr.io/front-matter/invenio-rdm-starter:latest + pull_policy: if_not_present + volumes: + - uploaded_data:/opt/invenio/var/instance/data + environment: + - INVENIO_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://${POSTGRES_USER:-inveniordm}:${POSTGRES_PASSWORD:-inveniordm}@db/${POSTGRES_DB:-inveniordm} + - INVENIO_SEARCH_HOSTS=${INVENIO_SEARCH_HOSTS:-['search:9200']} + - INVENIO_SEARCH_INDEX_PREFIX=${INVENIO_SEARCH_INDEX_PREFIX:-invenio-rdm-} - - INVENIO_CACHE_TYPE=${INVENIO_CACHE_TYPE:-redis} - - INVENIO_CACHE_REDIS_URL=${INVENIO_CACHE_REDIS_URL:-redis://cache:6379/0} - - INVENIO_ACCOUNTS_SESSION_REDIS_URL=${INVENIO_ACCOUNTS_SESSION_REDIS_URL:-redis://cache:6379/1} - - INVENIO_CELERY_RESULT_BACKEND=${INVENIO_CELERY_RESULT_BACKEND:-redis://cache:6379/2} - - INVENIO_RATELIMIT_STORAGE_URL=${INVENIO_RATELIMIT_STORAGE_URL:-redis://cache:6379/3} - - INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=${INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL:-redis://cache:6379/4} - - INVENIO_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} - - INVENIO_CELERY_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} + - INVENIO_CACHE_TYPE=${INVENIO_CACHE_TYPE:-redis} + - INVENIO_CACHE_REDIS_URL=${INVENIO_CACHE_REDIS_URL:-redis://cache:6379/0} + - INVENIO_ACCOUNTS_SESSION_REDIS_URL=${INVENIO_ACCOUNTS_SESSION_REDIS_URL:-redis://cache:6379/1} + - INVENIO_CELERY_RESULT_BACKEND=${INVENIO_CELERY_RESULT_BACKEND:-redis://cache:6379/2} + - INVENIO_RATELIMIT_STORAGE_URL=${INVENIO_RATELIMIT_STORAGE_URL:-redis://cache:6379/3} + - INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL=${INVENIO_COMMUNITIES_IDENTITIES_CACHE_REDIS_URL:-redis://cache:6379/4} + - INVENIO_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} + - INVENIO_CELERY_BROKER_URL=${INVENIO_BROKER_URL:-redis://cache:6379/5} - - INVENIO_MAIL_SUPPRESS_SEND=${INVENIO_MAIL_SUPPRESS_SEND:-True} - - INVENIO_MAIL_SERVER=${INVENIO_MAIL_SERVER:-smtp.gmail.com} - - INVENIO_MAIL_PORT=${INVENIO_MAIL_PORT:-465} - - INVENIO_MAIL_USERNAME=${INVENIO_MAIL_USERNAME:-info} - - INVENIO_MAIL_PASSWORD=${INVENIO_MAIL_PASSWORD:-changeme} - - INVENIO_MAIL_USE_SSL=${INVENIO_MAIL_USE_SSL:-True} + - INVENIO_MAIL_SUPPRESS_SEND=${INVENIO_MAIL_SUPPRESS_SEND:-True} + - INVENIO_MAIL_SERVER=${INVENIO_MAIL_SERVER:-smtp.gmail.com} + - INVENIO_MAIL_PORT=${INVENIO_MAIL_PORT:-465} + - INVENIO_MAIL_USERNAME=${INVENIO_MAIL_USERNAME:-info} + - INVENIO_MAIL_PASSWORD=${INVENIO_MAIL_PASSWORD:-changeme} + - INVENIO_MAIL_USE_SSL=${INVENIO_MAIL_USE_SSL:-True} - # Invenio-Files-REST - - INVENIO_FILES_REST_STORAGE_FACTORY=${INVENIO_FILES_REST_STORAGE_FACTORY:-invenio_s3.s3fs_storage_factory} + # Invenio-Files-REST + - INVENIO_FILES_REST_STORAGE_FACTORY=${INVENIO_FILES_REST_STORAGE_FACTORY:-invenio_s3.s3fs_storage_factory} - # Invenio-S3 - - INVENIO_S3_ENDPOINT_URL=${INVENIO_S3_ENDPOINT_URL:-} - - INVENIO_S3_ACCESS_KEY_ID=${INVENIO_S3_ACCESS_KEY_ID:-} - - INVENIO_S3_SECRET_ACCESS_KEY=${INVENIO_S3_SECRET_ACCESS_KEY:-} - - INVENIO_S3_BUCKET_NAME=${INVENIO_S3_BUCKET_NAME:-} - depends_on: - search: - condition: service_started - cache: - condition: service_started - db: - condition: service_started + # Invenio-S3 + - INVENIO_S3_ENDPOINT_URL=${INVENIO_S3_ENDPOINT_URL:-} + - INVENIO_S3_ACCESS_KEY_ID=${INVENIO_S3_ACCESS_KEY_ID:-} + - INVENIO_S3_SECRET_ACCESS_KEY=${INVENIO_S3_SECRET_ACCESS_KEY:-} + - INVENIO_S3_BUCKET_NAME=${INVENIO_S3_BUCKET_NAME:-} + depends_on: + search: + condition: service_started + cache: + condition: service_started + db: + condition: service_started cache: - image: valkey/valkey:7.2.5-bookworm - networks: - - am-d-model-network - restart: "unless-stopped" - volumes: - - "valkey_data:/data" - ports: - - "6379:6379" + image: valkey/valkey:7.2.5-bookworm + networks: + - am-d-model-network + restart: "unless-stopped" + volumes: + - "valkey_data:/data" + ports: + - "6379:6379" db: - image: postgres:16.4-bookworm - networks: - - am-d-model-network - restart: "unless-stopped" - environment: - - POSTGRES_USER=${POSTGRES_USER:-inveniordm} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-inveniordm} - - POSTGRES_DB=${POSTGRES_DB:-inveniordm} - volumes: - - "postgres_data:/var/lib/postgresql/data" - ports: - - 5432:5432 + image: postgres:16.4-bookworm + networks: + - am-d-model-network + restart: "unless-stopped" + environment: + - POSTGRES_USER=${POSTGRES_USER:-inveniordm} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-inveniordm} + - POSTGRES_DB=${POSTGRES_DB:-inveniordm} + volumes: + - "postgres_data:/var/lib/postgresql/data" + ports: + - 5432:5432 search: - image: opensearchproject/opensearch:2.12.0 - networks: - - am-d-model-network - restart: "unless-stopped" - environment: - - bootstrap.memory_lock=true - - OPENSEARCH_JAVA_OPTS=-Xms256m -Xmx256m - - DISABLE_INSTALL_DEMO_CONFIG=true - - DISABLE_SECURITY_PLUGIN=true - - discovery.type=single-node - ulimits: - memlock: - soft: -1 - hard: -1 - nofile: - soft: 65536 - hard: 65536 - mem_limit: 1g - ports: - - "9200:9200" - - "9600:9600" + image: opensearchproject/opensearch:2.12.0 + networks: + - am-d-model-network + restart: "unless-stopped" + environment: + - bootstrap.memory_lock=true + - OPENSEARCH_JAVA_OPTS=-Xms256m -Xmx256m + - DISABLE_INSTALL_DEMO_CONFIG=true + - DISABLE_SECURITY_PLUGIN=true + - discovery.type=single-node + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 65536 + hard: 65536 + mem_limit: 1g + ports: + - "9200:9200" + - "9600:9600" networks: am-d-model-network: name: am-d-model-network volumes: - app_data: - uploaded_data: - archived_data: - postgres_data: - valkey_data: - caddy_data: + app_data: + uploaded_data: + archived_data: + postgres_data: + valkey_data: + caddy_data: diff --git a/src/lib/components/Link.svelte b/src/lib/components/Link.svelte index 4a80736..4e2d74e 100644 --- a/src/lib/components/Link.svelte +++ b/src/lib/components/Link.svelte @@ -4,11 +4,7 @@ export let hotkey = ""; function handleKeypress(event) { - if ( - event.key === hotkey || - event.key === "Enter" || - event.key === " " - ) { + if (event.key === hotkey || event.key === "Enter" || event.key === " ") { event.preventDefault(); redirectFunc(); } diff --git a/src/lib/navigation.js b/src/lib/navigation.js index cb392f1..c5bd266 100644 --- a/src/lib/navigation.js +++ b/src/lib/navigation.js @@ -5,7 +5,9 @@ export const navigation = { toHome: () => goto("/"), toAbout: () => goto("/about"), toContact: () => goto("/contact"), - toRepository: () => { window.location.href = "https://invenio.am-d-model.eu/" }, + toRepository: () => { + window.location.href = "https://invenio.am-d-model.eu/"; + }, to404: () => { throw error(404, "Page not found"); }, diff --git a/src/lib/styles/NavigationFooter.scss b/src/lib/styles/NavigationFooter.scss index 8b0330b..1a0af32 100644 --- a/src/lib/styles/NavigationFooter.scss +++ b/src/lib/styles/NavigationFooter.scss @@ -1,96 +1,96 @@ .navigation-footer { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: space-between; - background: #ffffff; - width: 100%; - height: 240px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + background: #ffffff; + width: 100%; + height: 240px; } .navigation-footer-column { - display: flex; - flex-direction: column; - flex-wrap: wrap; - position: relative; - height: 100%; - width: 33%; - padding: 32px; - justify-content: center; + display: flex; + flex-direction: column; + flex-wrap: wrap; + position: relative; + height: 100%; + width: 33%; + padding: 32px; + justify-content: center; } .navigation-footer-logo-link { - max-width: 180px; - padding-left: 24px; + max-width: 180px; + padding-left: 24px; } .navigation-footer-logo { - height: 180px; - max-width: 180px; - width: auto; + height: 180px; + max-width: 180px; + width: auto; } .navigation-footer-column-left { - @extend .navigation-footer-column; - justify-content: space-between; + @extend .navigation-footer-column; + justify-content: space-between; } .navigation-footer-column-mid { - @extend .navigation-footer-column; - align-items: center; + @extend .navigation-footer-column; + align-items: center; } .navigation-footer-column-right { - @extend .navigation-footer-column; - align-items: center; + @extend .navigation-footer-column; + align-items: center; } .navigation-footer-site-name { - color: #000000; - text-align: left; - font-family: "Assistant", sans-serif; - font-size: 24px; - position: relative; - padding: 8px; + color: #000000; + text-align: left; + font-family: "Assistant", sans-serif; + font-size: 24px; + position: relative; + padding: 8px; } .navigation-footer-topic-column { - display: flex; - flex-direction: column; - flex-wrap: wrap; - position: relative; + display: flex; + flex-direction: column; + flex-wrap: wrap; + position: relative; } .navigation-footer-topic { - color: #000000; - font-family: "Assistant", sans-serif; - font-size: 28px; - font-weight: 600; - position: relative; + color: #000000; + font-family: "Assistant", sans-serif; + font-size: 28px; + font-weight: 600; + position: relative; } .navigation-footer-link { - color: #454545; - font-family: "Assistant", sans-serif; - font-size: 24px; - text-decoration: underline; - position: relative; + color: #454545; + font-family: "Assistant", sans-serif; + font-size: 24px; + text-decoration: underline; + position: relative; } .navigation-footer-social-icon { - width: 24px; - height: 24px; - position: relative; + width: 24px; + height: 24px; + position: relative; } .navigation-footer-social-media { - // display: flex; # temporarily disable - display: none; - flex-direction: row; - gap: var(--spacing-xs, 8px); - align-items: flex-start; - justify-content: flex-start; - position: relative; + // display: flex; # temporarily disable + display: none; + flex-direction: row; + gap: var(--spacing-xs, 8px); + align-items: flex-start; + justify-content: flex-start; + position: relative; } .navigation-footer-buttons-icon { diff --git a/src/lib/styles/NavigationHeader.scss b/src/lib/styles/NavigationHeader.scss index eea1d7b..fd468b7 100644 --- a/src/lib/styles/NavigationHeader.scss +++ b/src/lib/styles/NavigationHeader.scss @@ -1,88 +1,88 @@ .navigation-header { - display: flex; - flex-direction: row-reverse; - width: 100%; - justify-content: space-between; + display: flex; + flex-direction: row-reverse; + width: 100%; + justify-content: space-between; } .navigation-header { - position: relative; - height: 128px; - width: 100%; - padding-bottom: 120px; + position: relative; + height: 128px; + width: 100%; + padding-bottom: 120px; } .navigation-header-items { - gap: 48px; - align-items: center; - position: relative; - padding-top: 28px; - padding-right: 96px; - padding-left: 32px; + gap: 48px; + align-items: center; + position: relative; + padding-top: 28px; + padding-right: 96px; + padding-left: 32px; } .navigation-header-link { - color: #000000; - font-family: var(--navigation-header-font-family); - text-align: left; - font-size: var(--navigation-header-font-size); - position: relative; - display: flex; - align-items: center; - justify-content: flex-start; + color: #000000; + font-family: var(--navigation-header-font-family); + text-align: left; + font-size: var(--navigation-header-font-size); + position: relative; + display: flex; + align-items: center; + justify-content: flex-start; } .navigation-header-button { - background: #000000; - border-radius: 8px; - padding: 14px 24px 14px 24px; - display: flex; - flex-direction: row; - gap: 8px; - align-items: center; - justify-content: center; - flex-shrink: 0; - position: relative; - box-shadow: var(--button-shadow-box-shadow, 0px 1px 2px 0px rgba(0, 0, 0, 0.05)); + background: #000000; + border-radius: 8px; + padding: 14px 24px 14px 24px; + display: flex; + flex-direction: row; + gap: 8px; + align-items: center; + justify-content: center; + flex-shrink: 0; + position: relative; + box-shadow: var(--button-shadow-box-shadow, 0px 1px 2px 0px rgba(0, 0, 0, 0.05)); } .navigation-header-button-text { - @extend .navigation-header-link; - color: var(--cpalettecomplimentary); - text-decoration: none; + @extend .navigation-header-link; + color: var(--cpalettecomplimentary); + text-decoration: none; } .navigation-header-logo-link { - @extend .navigation-header-items; - min-width: 128px; + @extend .navigation-header-items; + min-width: 128px; } .navigation-header-logo { - height: 128px; - width: auto; - max-width: 128px; + height: 128px; + width: auto; + max-width: 128px; } .navigation-header-logo { - height: 128px; - width: auto; - padding-left: 28px; + height: 128px; + width: auto; + padding-left: 28px; } .flexrow-right { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-end; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-end; } .flexrow-left { - @extend .flexrow-right; - justify-content: flex-start; + @extend .flexrow-right; + justify-content: flex-start; } @media (max-width: 750px) { - .navigation-header-items { - display: none; - } + .navigation-header-items { + display: none; + } } diff --git a/src/lib/styles/styles.css b/src/lib/styles/styles.css index 9d9ee23..4dafd7d 100644 --- a/src/lib/styles/styles.css +++ b/src/lib/styles/styles.css @@ -25,11 +25,11 @@ ul { list-style-position: inside; margin: 0; padding: 0; - font-size: 18pt + font-size: 18pt; } li { - padding-bottom: 24px + padding-bottom: 24px; } h1 { @@ -51,7 +51,7 @@ label { h3 { font-family: "Assistant"; font-style: italic; - color: #B6B6B6; + color: #b6b6b6; font-size: 24pt; padding-bottom: 2px; line-height: 1.5; diff --git a/src/routes/InfoScroll.svelte b/src/routes/InfoScroll.svelte index 39f5cb1..2fd7195 100644 --- a/src/routes/InfoScroll.svelte +++ b/src/routes/InfoScroll.svelte @@ -18,25 +18,22 @@
Experienced Research Teams
- Our collaboration is comprised of expert L-PBF researchers - with years of experience in the field. + Our collaboration is comprised of expert L-PBF researchers with years of + experience in the field.
International Excellence
- AM-D-Model contributors include scientists and engineers - from respected research institutions across Europe. + AM-D-Model contributors include scientists and engineers from respected research + institutions across Europe.
-
- Backed by Research Associations -
+
Backed by Research Associations
- AM-D-Model is supported and funded by ESAFORM, a globally - recognized association of research leaders in additive - manufacturing. + AM-D-Model is supported and funded by ESAFORM, a globally recognized association + of research leaders in additive manufacturing.
@@ -54,28 +51,22 @@
Building the Future of L-PBF
- AM-D-Model aims to provide a key cornerstone for the future - of L-PBF research: a universal benchmark for process - modelling. + AM-D-Model aims to provide a key cornerstone for the future of L-PBF research: a + universal benchmark for process modelling.
-
- Community Focused Data Management -
+
Community Focused Data Management
- We aim to provide a blueprint for future big data AM - projects, working with contributors to ensure this - benchmarking dataset is managed responsibly. + We aim to provide a blueprint for future big data AM projects, working with + contributors to ensure this benchmarking dataset is managed responsibly.
-
- Data Science, as a Core Discipline -
+
Data Science, as a Core Discipline
- Our team includes expert data scientists, responsible for - managing data contributions and maximizing data impact. + Our team includes expert data scientists, responsible for managing data + contributions and maximizing data impact.
@@ -93,28 +84,23 @@
FAIR, Transparent, and Open
- The AM-D-Model benchmark project is designed with open - science in mind, following FAIR principles of transparency - and openness. + The AM-D-Model benchmark project is designed with open science in mind, + following FAIR principles of transparency and openness.
-
- Visibility, Accessibility and Impact -
+
Visibility, Accessibility and Impact
- By making these results open, we believe that visibility and - accessibility will maximize their impact on the L-PBF field. + By making these results open, we believe that visibility and accessibility will + maximize their impact on the L-PBF field.
-
- Serving the Research Community -
+
Serving the Research Community
- We aim to contribute to the L-PBF research community by - providing a universally accessible benchmark similar to - those driving other cutting-edge research fields. + We aim to contribute to the L-PBF research community by providing a universally + accessible benchmark similar to those driving other cutting-edge research + fields.
diff --git a/src/routes/Splash.svelte b/src/routes/Splash.svelte index e9cf263..e707ead 100644 --- a/src/routes/Splash.svelte +++ b/src/routes/Splash.svelte @@ -7,19 +7,15 @@
-
- Benchmarking the future of metal 3d printing -
+
Benchmarking the future of metal 3d printing
- AM-D-Model is an ESAFORM benchmark project aiming to create the data - that will drive the future of Laser Powder-Bed-Fusion (L-PBF) - research and innovation. By connecting an international network of - collaborators AM-D-Model will create a comprehensive, open L-PBF - benchmark dataset. As part of our commitment to open science, this - dataset will be openly shared with the research community. Our goal - is to create a universal benchmark for the L-PBF community, sparking - the collaboration and innovation that will build the future of this - technology. + AM-D-Model is an ESAFORM benchmark project aiming to create the data that will drive the + future of Laser Powder-Bed-Fusion (L-PBF) research and innovation. By connecting an + international network of collaborators AM-D-Model will create a comprehensive, open + L-PBF benchmark dataset. As part of our commitment to open science, this dataset will be + openly shared with the research community. Our goal is to create a universal benchmark + for the L-PBF community, sparking the collaboration and innovation that will build the + future of this technology.