Skip to content

Commit

Permalink
Merge pull request #436 from Dark-Matter-Labs/staging
Browse files Browse the repository at this point in the history 
Add new thema's to production
  • Loading branch information
@theocampbell
theocampbell committed Dec 21, 2023
2 parents 87ca03e + 0949909 commit 959750b
Show file tree
Hide file tree
Showing 33 changed files with 439 additions and 89 deletions.
13 changes: 8 additions & 5 deletions components/expertise-page/explination-text.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ export default function ExplinationText({ selected }) {
return (
<div className='sm:py-6 sm:ml-3 mt-5 mb-4 global-margin sm:m-0'>
{selected === 'beleid' && (
<p className='p-base'>Vooral geïnteresseerd in het stimuleren van houtbouw via beleid?</p>
<p className='p-base'>Vooral geïnteresseerd in instrumenten op het gebied van beleid?</p>
)}
{selected === 'inkoop' && (
<p className='p-base'>
Bekijk hoe je via tenders en aanbestedingen houtbouw kunt stimuleren.
Bekijk hoe je tenders en aanbestedingen kunt inzetten om circulariteit te bevorderen.
</p>
)}
{selected === 'grondpositie' && (
<p className='p-base'>
Ben je als overheid grondeigenaar? Bekijk de mogelijkheden om houtbouw af te dwingen.
Ben je als overheid grondeigenaar? Bekijk de mogelijkheden om dwingende instrumenten in te
zetten.
</p>
)}
{selected === 'subsidie' && (
<p className='p-base'>Bekijk hoe je via subsidies houtbouw kunt stimuleren.</p>
<p className='p-base'>Bekijk hoe je via subsidies circulariteit kunt stimuleren.</p>
)}
{selected === 'fiscaal' && (
<p className='p-base'>Bekijk hoe je via fiscale maatregelen houtbouw kunt stimuleren.</p>
<p className='p-base'>
Bekijk hoe je via fiscale maatregelen circulariteit kunt stimuleren.
</p>
)}
</div>
);
Expand Down
36 changes: 31 additions & 5 deletions components/instrument/instrument-header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ export default function InstrumentHeader({ data }) {
}
}

const [simpleThema, setSimpleThema] = useState();

useEffect(() => {
if (router.pathname.includes('meubels')) {
setSimpleThema(true);
} else {
setSimpleThema(false);
}
}, [router.pathname]);

return (
<>
{/* Not sticky */}
Expand Down Expand Up @@ -62,7 +72,7 @@ export default function InstrumentHeader({ data }) {
</Tag>
</Link>

{data?.measure?.beleid === true && (
{data?.measure?.beleid === true && simpleThema === false && (
<Link
href={`/${data?.measure?.transitionAgenda}/${data?.measure?.thema}/categorie`}
onClick={() => setCategorie('beleid')}
Expand All @@ -72,7 +82,10 @@ export default function InstrumentHeader({ data }) {
</Tag>
</Link>
)}
{data?.measure?.inkoop === true && (
{data?.measure?.beleid === true && simpleThema === true && (
<Tag classes='bg-green-300 text-green-800 mr-2'>Beleid</Tag>
)}
{data?.measure?.inkoop === true && simpleThema === false && (
<Link
href={`/${data?.measure?.transitionAgenda}/${data?.measure?.thema}/categorie`}
onClick={() => setCategorie('inkoop')}
Expand All @@ -82,7 +95,11 @@ export default function InstrumentHeader({ data }) {
</Tag>
</Link>
)}
{data?.measure?.grondpositie === true && (
{data?.measure?.inkoop === true && simpleThema === true && (
<Tag classes='bg-green-300 text-green-800 mr-2'>Inkoop</Tag>
)}

{data?.measure?.grondpositie === true && simpleThema === false && (
<Link
href={`/${data?.measure?.transitionAgenda}/${data?.measure?.thema}/categorie`}
onClick={() => setCategorie('grondpositie')}
Expand All @@ -92,8 +109,11 @@ export default function InstrumentHeader({ data }) {
</Tag>
</Link>
)}
{data?.measure?.grondpositie === true && simpleThema === true && (
<Tag classes='bg-green-300 text-green-800 mr-2'>Grondpositie</Tag>
)}

{data?.measure?.subsidie === true && (
{data?.measure?.subsidie === true && simpleThema === false && (
<Link
href={`/${data?.measure?.transitionAgenda}/${data?.measure?.thema}/categorie`}
onClick={() => setCategorie('subsidie')}
Expand All @@ -103,7 +123,10 @@ export default function InstrumentHeader({ data }) {
</Tag>
</Link>
)}
{data?.measure?.fiscaal === true && (
{data?.measure?.subsidie === true && simpleThema === true && (
<Tag classes='bg-green-300 text-green-800 mr-2'>Subsidie</Tag>
)}
{data?.measure?.fiscaal === true && simpleThema === false && (
<Link
href={`/${data?.measure?.transitionAgenda}/${data?.measure?.thema}/categorie`}
onClick={() => setCategorie('fiscaal')}
Expand All @@ -113,6 +136,9 @@ export default function InstrumentHeader({ data }) {
</Tag>
</Link>
)}
{data?.measure?.fiscaal === true && simpleThema === true && (
<Tag classes='bg-green-300 text-green-800 mr-2'>Fiscaal</Tag>
)}
</div>
<div className='max-w-4xl flex justify-start overflow-hidden'>
<h1 className='justify-self-start p-5xl-semibold sm:p-7xl-bold lg:block mt-1 text-grey-100 pb-1'>
Expand Down
11 changes: 8 additions & 3 deletions components/instrument/instrument-links-dropdown.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@ const links = {
'/maakindustrie/windturbines/overheidsbevoegdheid',
],
matrasketen: [
'/consumenten-goederen/matrasketen/categorie',
'/consumenten-goederen/matrasketen/instrumenten',
'/consumenten-goederen/matrasketen/overheidsbevoegdheid',
'/consumptie-goederen/matrasketen/categorie',
'/consumptie-goederen/matrasketen/instrumenten',
'/consumptie-goederen/matrasketen/overheidsbevoegdheid',
],
voedselverspilling: [
'/biomassa-en-voedsel/voedselverspilling/categorie',
'/biomassa-en-voedsel/voedselverspilling/instrumenten',
'/biomassa-en-voedsel/voedselverspilling/overheidsbevoegdheid',
],
};

Expand Down
4 changes: 2 additions & 2 deletions components/layouts/simple-thema-layout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import InstrumentMetaData from '../instrument/instrument-metadata';
import ThemePageHeader from '@/components/theme-page/theme-page-header';
import ThemePageHeaderMobile from '../theme-page/theme-page-header-mobile';

export default function SimpleThemaLayout({ instruments, numberOfLaws, ...props }) {
export default function SimpleThemaLayout({ instruments, numberOfLaws, subheading, ...props }) {
const themaData = props.thema;
return (
<>
Expand All @@ -16,7 +16,7 @@ export default function SimpleThemaLayout({ instruments, numberOfLaws, ...props
<div className='global-margin'>
<div className='max-w-[830px] mb-10'>
<h2 className='p-5xl-semibold pb-4 pt-7'>
Top {numberOfLaws} instrumenten voor plastic in de bouw
Top {numberOfLaws} {subheading}
</h2>
<p>{themaData?.introText}</p>
</div>
Expand Down
33 changes: 33 additions & 0 deletions components/layouts/welke-layout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,39 @@ export default function WelkeLayout({ ...props }) {
</>
)}

{props.thema === 'voedselverspilling' && (
<>
{/* All regions = */}
<div className='absolute bottom-[8%] right-[50%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[50%] right-[45%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[33%] right-[45%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[92%] right-[46%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[90%] right-[50%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[12%] right-[44%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[14%] right-[53%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[22%] right-[45%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[24%] right-[52%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[36%] right-[46%] h-3 w-3 rounded-full bg-white'></div>

{/* National = 2 */}
<div className='absolute bottom-[90%] right-[30%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[80%] right-[70%] h-3 w-3 rounded-full bg-white'></div>

{/* Provincial = 2 */}
<div className='absolute bottom-[55%] right-[20%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[60%] right-[80%] h-3 w-3 rounded-full bg-white'></div>
{/* Local = 8 */}
<div className='absolute bottom-[20%] right-[65%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[35%] right-[70%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[15%] right-[60%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[30%] right-[25%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[45%] right-[33%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[15%] right-[33%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[45%] right-[65%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[30%] right-[38%] h-3 w-3 rounded-full bg-white'></div>
</>
)}

{/* ALL Regions
<div className='absolute bottom-[8%] right-[50%] h-3 w-3 rounded-full bg-white'></div>
<div className='absolute bottom-[50%] right-[45%] h-3 w-3 rounded-full bg-white'></div>
Expand Down
9 changes: 5 additions & 4 deletions components/nav/footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ const navigation = {
{ name: 'Cookies', href: '/cookie-info', className: '' },
],
thema: [
{ name: 'Houtbouw stimuleren', slug: '/bouw/houtbouw' },
{ name: 'Circulaire windturbines', slug: '/maakindustrie/windturbines' },
{ name: 'Circulaire matrasketen', slug: '/consumptie-goederen/matrasketen' },
// { name: 'Plastic in de bouw', slug: '/kunststoffen/plastic-in-de-bouw' },
{ name: 'Voedselverspilling', slug: '/biomassa-en-voedsel/voedselverspilling' },
{ name: 'Meubels', slug: '/consumptie-goederen/meubels' },
{ name: 'Houtbouw', slug: '/bouw/houtbouw' },
{ name: 'Windturbines', slug: '/maakindustrie/windturbines' },
{ name: 'Matrasketen', slug: '/consumptie-goederen/matrasketen' },
],
};

Expand Down
44 changes: 16 additions & 28 deletions components/nav/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,19 @@ const defaultOptions = {
},
};

const bouwThemas = [{ name: 'Houtbouw stimuleren', url: '/bouw/houtbouw' }];

// const voedselThemas = [ {name: '', url:''} ]
const bouwThemas = [{ name: 'Houtbouw', url: '/bouw/houtbouw' }];

const consumptiegoederenThemas = [
{ name: 'Circulaire matrasketen', url: '/consumptie-goederen/matrasketen' },
{ name: 'Matrasketen', url: '/consumptie-goederen/matrasketen' },
{ name: 'Meubels', url: '/consumptie-goederen/meubels' },
];

const maakindustrieThemas = [
{ name: 'Circulaire windturbines', url: '/maakindustrie/windturbines' },
{ name: 'Windturbines', url: '/maakindustrie/windturbines' },
];

const biomassaEnVoedselThemas = [
{ name: 'Voedselverspilling', url: '/biomassa-en-voedsel/voedselverspilling' },
];

{
Expand Down Expand Up @@ -361,10 +364,10 @@ export default function Nav3(props) {
transitionAgenda='Consumptiegoederen'
themas={consumptiegoederenThemas}
/>

<li className='p-base-semibold text-green-800 py-6 border-b opacity-75'>
Voedsel en biomassa
</li>
<MobileDisclosure
transitionAgenda='Voedsel en biomassa'
themas={biomassaEnVoedselThemas}
/>
<MobileDisclosure
transitionAgenda='Maakindustrie'
themas={maakindustrieThemas}
Expand Down Expand Up @@ -500,25 +503,10 @@ export default function Nav3(props) {
transitionAgenda='Consumptiegoederen'
themas={consumptiegoederenThemas}
/>
{/* Temp card as there is no themas in this transition agenda */}
<div
className={`${
router.pathname === '/'
? 'bg-green-600 text-gray-100 opacity-80'
: 'bg-grey-100 text-green-800 text-opacity-75'
} w-full flex flex-col pl-3 lg:pl-6 pt-8 pr-2`}
>
<div className='p-lg-semibold '>Voedsel en biomassa</div>
<div className=''>
<div
className={`${
router.pathname === '/' ? 'text-gray-100' : 'text-gray-600'
} p-xs mt-2 italic`}
>
Thema’s voor deze productketen volgen binnenkort
</div>
</div>
</div>
<DesktopNavCard
transitionAgenda='Voedsel en biomassa'
themas={biomassaEnVoedselThemas}
/>
<DesktopNavCard
transitionAgenda='Maakindustrie'
themas={maakindustrieThemas}
Expand Down
11 changes: 6 additions & 5 deletions components/policy-list.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default function PolicyList(props) {
if (props.data) {
lawData = props.data;
}

return (
<>
{lawData.map((law) => (
Expand All @@ -18,12 +17,14 @@ export default function PolicyList(props) {
<div className='block sm:ml-0 mb-10 sm:mb-8 md:max-w-[760px]'>
<div className='flex justify-start items-center -ml-1'>
{/* Expertise Tag */}
{law?.beleid === true && <Tag classes='bg-green-500 text-gray-100'>Beleid</Tag>}
{law?.inkoop === true && <Tag classes='bg-green-500 text-gray-100'>Inkoop</Tag>}
{law?.beleid === true && <Tag classes='bg-green-500 text-gray-100 mr-2'>Beleid</Tag>}
{law?.inkoop === true && <Tag classes='bg-green-500 text-gray-100 mr-2'>Inkoop</Tag>}
{law?.grondpositie === true && (
<Tag classes='bg-green-500 text-gray-100'>Grondpositie</Tag>
<Tag classes='bg-green-500 text-gray-100 mr-2'>Grondpositie</Tag>
)}
{law?.subsidie === true && (
<Tag classes='bg-green-500 text-gray-100 mr-2'>Subsidie</Tag>
)}
{law?.subsidie === true && <Tag classes='bg-green-500 text-gray-100'>Subsidie</Tag>}
{law?.fiscaal === true && <Tag classes='bg-green-500 text-gray-100'>Fiscaal</Tag>}
</div>

Expand Down
2 changes: 1 addition & 1 deletion components/section-types-list.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default function SectionTypes({ themaCards }) {
<div className='flex items-center justify-start'>
<div className='h-24 w-24 relative'>
<Image
src={urlFor(thema?.mobImage).url()}
src={urlFor(thema?.mobileCardImage).url()}
alt={thema?.themaName + 'image'}
fill
className='rounded-cl object-cover'
Expand Down
10 changes: 5 additions & 5 deletions components/theme-page/section-bottom-theme-index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ export default function ThemeBottomSection({ props }) {
<div className='flex justify-start items-center -ml-1'>
{/* Expertise Tag */}
{measure?.beleid === true && (
<Tag classes='bg-green-500 text-gray-100'>Beleid</Tag>
<Tag classes='bg-green-500 text-gray-100 mr-2'>Beleid</Tag>
)}
{measure?.inkoop === true && (
<Tag classes='bg-green-500 text-gray-100'>Inkoop</Tag>
<Tag classes='bg-green-500 text-gray-100 mr-2'>Inkoop</Tag>
)}
{measure?.grondpositie === true && (
<Tag classes='bg-green-500 text-gray-100'>Grondpositie</Tag>
<Tag classes='bg-green-500 text-gray-100 mr-2'>Grondpositie</Tag>
)}
{measure?.subsidie === true && (
<Tag classes='bg-green-500 text-gray-100'>Subsidie</Tag>
<Tag classes='bg-green-500 text-gray-100 mr-2'>Subsidie</Tag>
)}
{measure?.fiscaal === true && (
<Tag classes='bg-green-500 text-gray-100'>Fiscaal</Tag>
<Tag classes='bg-green-500 text-gray-100 mr-2'>Fiscaal</Tag>
)}
</div>

Expand Down
Loading

1 comment on commit 959750b

@vercel
Copy link

@vercel vercel bot commented on 959750b Dec 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

circulaw – ./

circulaw-dark-matter-labs.vercel.app
circulaw.nl
circulaw-git-main-dark-matter-labs.vercel.app
www.circulaw.nl

Please sign in to comment.