Commit 42838a63 authored by Alex Kakiris's avatar Alex Kakiris
Browse files

Merge branch 'chore/footer-and-menu-order' into 'dev' 

Show only OpenCAPIF in the footer and list providers before invokers

See merge request !9
parents 2d25fc4c 317e3fed

capif_frontend/src/@core/layouts/components/shared-components/footer/FooterContent.js

+5 −29
Changes for capif_frontend/src/@core/layouts/components/shared-components/footer/FooterContent.js: 5 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -5,44 +5,20 @@ import Link from 'next/link' 
import Box from '@mui/material/Box'

import { styled } from '@mui/material/styles'

import Typography from '@mui/material/Typography'

import useMediaQuery from '@mui/material/useMediaQuery'

import AnalyticsTotalEarning from 'src/views/dashboards/analytics/AnalyticsTotalEarning'



const LinkStyled = styled(Link)(({ theme }) => ({

  textDecoration: 'none',

  color: theme.palette.primary.main

}))



const FooterContent = () => {

  // ** Var

  const hidden = useMediaQuery(theme => theme.breakpoints.down('md'))



  return (

    <Box sx={{ display: 'flex', flexWrap: 'wrap', alignItems: 'center', justifyContent: 'space-between' }}>

      <Typography sx={{ mr: 2 }}>

        <LinkStyled target='_blank' href='https://www.telefonica.com/'>

          Telefónica

        </LinkStyled>

        {` © ${new Date().getFullYear()}`}

      </Typography>

      {/* Elemento central */}

      {/* <Box sx={{ display: 'flex', alignItems: 'center', marginRight: 8 }}>

        <img src='/images/6g-sandbox.png' alt='logo' width='60' height='30' />

        <Typography sx={{ marginLeft: 2 }}>

          <LinkStyled target='_blank' href='https://6g-sandbox.eu/'>

            6G Sandbox

          </LinkStyled>

        </Typography>

      </Box> */}

      {hidden ? null : (

        <Box sx={{ display: 'flex', flexWrap: 'wrap', alignItems: 'center', '& :not(:last-child)': { mr: 4 } }}>

          <LinkStyled target='_blank' href='https://ocf.etsi.org/'>

const FooterContent = () => (

  <Box sx={{ display: 'flex', alignItems: 'center' }}>

    <Typography>

      <LinkStyled target='_blank' rel='noopener noreferrer' href='https://ocf.etsi.org/'>

        OpenCAPIF

      </LinkStyled>

        </Box>

      )}

    </Typography>

  </Box>

)

}



export default FooterContent
 
 No newline at end of file

capif_frontend/src/navigation/vertical/index.js

+6 −6
Changes for capif_frontend/src/navigation/vertical/index.js: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ const navigation = () => { 
      subject: 'user-area'

    },

    {

      title: 'Invokers',

      icon: 'mdi:account-group-outline',

      path: '/me/invokers',

      title: 'Providers',

      icon: 'mdi:server',

      path: '/me/providers',

      action: 'read',

      subject: 'user-area'

    },

    {

      title: 'Providers',

      icon: 'mdi:server',

      path: '/me/providers',

      title: 'Invokers',

      icon: 'mdi:account-group-outline',

      path: '/me/invokers',

      action: 'read',

      subject: 'user-area'

    },