Skip to content

Commit

Permalink
Merge pull request #1503 from ThatConference/next/feature
Browse files Browse the repository at this point in the history
Feature -> Production
  • Loading branch information
theClarkSell authored Dec 5, 2023
2 parents b13001a + 44c1180 commit 28ae9ca
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "that-us",
"version": "3.16.3",
"version": "3.16.4",
"description": "THAT.us website",
"main": "index.js",
"type": "module",
Expand Down
12 changes: 11 additions & 1 deletion src/_dataSources/api.that.tech/partner/queries.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@ import config from '$utils/config.public';
import { log } from '../utilities/error';

const { uniqBy } = lodash;
const levelSortOrder = ['PIONEER', 'EXPLORER', 'SCOUT', 'CUB', 'PATRON', 'MEDIA', 'CHARITY'];
const levelSortOrder = [
'PIONEER',
'EXPLORER',
'SCOUT',
'RANGER',
'TRAILBLAZER',
'CUB',
'PATRON',
'MEDIA',
'CHARITY'
];

const coreFieldsFragment = `
fragment coreFieldsFragment on Partner {
Expand Down
2 changes: 1 addition & 1 deletion src/app.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
<Level header="Scout Sponsors" partners={levels['SCOUT']} />
{/if}

{#if levels['RANGER']}
<Level header="Ranger Sponsors" partners={levels['RANGER']} />
{/if}

{#if levels['TRAILBLAZER']}
<Level header="TrailBlazer Sponsors" partners={levels['TRAILBLAZER']} />
{/if}

{#if levels['CUB']}
<Level header="Family Sponsors" partners={levels['CUB']} />
{/if}
Expand All @@ -49,7 +57,7 @@
{/if}

{#if levels['MEDIA']}
<Level header="Media Sponsors" partners={levels['MEDIA']} />
<Level header="Additional Sponsors and Partners" partners={levels['MEDIA']} />
{/if}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@
<Level header="Scout Sponsors" partners={levels['SCOUT']} />
{/if}

{#if levels['RANGER']}
<Level header="Ranger Sponsors" partners={levels['RANGER']} />
{/if}

{#if levels['TRAILBLAZER']}
<Level header="TrailBlazer Sponsors" partners={levels['TRAILBLAZER']} />
{/if}

{#if levels['CUB']}
<Level header="Family Sponsors" partners={levels['CUB']} />
{/if}
Expand All @@ -49,7 +57,7 @@
{/if}

{#if levels['MEDIA']}
<Level header="Media Sponsors" partners={levels['MEDIA']} />
<Level header="Additional Sponsors and Partners" partners={levels['MEDIA']} />
{/if}
</div>
</div>
Expand Down
10 changes: 9 additions & 1 deletion src/routes/partners/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@
<Level header="Scout Sponsors" partners={levels['SCOUT']} />
{/if}

{#if levels['RANGER']}
<Level header="Ranger Sponsors" partners={levels['RANGER']} />
{/if}

{#if levels['TRAILBLAZER']}
<Level header="TrailBlazer Sponsors" partners={levels['TRAILBLAZER']} />
{/if}

{#if levels['CUB']}
<Level header="Family Sponsors" partners={levels['CUB']} />
{/if}
Expand All @@ -57,7 +65,7 @@
{/if}

{#if levels['MEDIA']}
<Level header="Media Sponsors" partners={levels['MEDIA']} />
<Level header="Additional Sponsors and Partners" partners={levels['MEDIA']} />
{/if}
</div>
</div>
Expand Down
11 changes: 10 additions & 1 deletion src/routes/partners/job-board/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@
}))();
// find partners with jobs and deduplicate them.
const partnerLevelSort = ['PIONEER', 'EXPLORER', 'SCOUT', 'PATRON', 'CUB', 'MEDIA'];
const partnerLevelSort = [
'PIONEER',
'EXPLORER',
'SCOUT',
'RANGER',
'TRAILBLAZER',
'PATRON',
'CUB',
'MEDIA'
];
const partnerMap = new Map();
data.events.forEach((event) =>
event.partners.forEach((partner) => {
Expand Down

1 comment on commit 28ae9ca

@vercel
Copy link

@vercel vercel bot commented on 28ae9ca Dec 5, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.