Commit 3ad9766f authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

Merge branch 'develop' into cluster-table-enhancements

parents 2e4c1472 e384c9cf

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ dev_deploy_job: 


  script:

    - sops --decrypt charts/hypo/values-cd.enc.yaml > charts/hypo/values-cd.yaml

    - python3 scripts/helm_update_etsi.py $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $DEV_TMF_API_IMAGE $DEV_SONATA_OSS_IMAGE $DEV_SONATA_CORE_IMAGE $DEV_PORTAL_CART_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_SONATA_HELM_IMAGE

    - python3 scripts/helm_update_etsi.py $CI_REGISTRY/$CI_PROJECT_PATH/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA $DEV_TMF_API_IMAGE $DEV_SONATA_OSS_IMAGE $DEV_SONATA_CORE_IMAGE $DEV_PORTAL_CART_IMAGE $DEV_TELEMETRY_IMAGE $DEV_PEERING_IMAGE $DEV_REGISTRY_IMAGE $DEV_FABRIC_IMAGE $DEV_SONATA_HELM_IMAGE $DEV_SERVICE_MONITOR_IMAGE

    - sops --encrypt --age $SOPS_AGE_KEY_PUBLIC charts/hypo/values-cd.yaml > charts/hypo/values-cd.enc.yaml

    - rm -f charts/hypo/values-cd.yaml ~/.sops-age-key.txt

    - git add charts/hypo/values-cd.enc.yaml

app/layout.tsx

+7 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ import React from 'react'; 


import { NextUIProvider } from '@nextui-org/react';

import type { Metadata } from 'next';

import { Roboto } from 'next/font/google';

import './globals.css';



export const metadata: Metadata = {
@@ -9,13 +10,18 @@ export const metadata: Metadata = { 
  description: 'HypO Portal',

};



const roboto = Roboto({

  subsets: ['latin'],

  weight: ['100', '300', '400', '500', '700', '900'],

});



export default function RootLayout({

  children,

}: Readonly<{

  children: React.ReactNode;

}>) {

  return (

    <html lang="en">

    <html lang="en" className={roboto.className}>

      <body>

        <NextUIProvider className="h-full">{children}</NextUIProvider>

      </body>