diff --git a/api/src/main/kotlin/com/andr3h3nriqu3s/applications/ApplicationsController.kt b/api/src/main/kotlin/com/andr3h3nriqu3s/applications/ApplicationsController.kt index 559f5b9..fd18bde 100644 --- a/api/src/main/kotlin/com/andr3h3nriqu3s/applications/ApplicationsController.kt +++ b/api/src/main/kotlin/com/andr3h3nriqu3s/applications/ApplicationsController.kt @@ -52,6 +52,8 @@ data class Application( var create_time: String, var simple_url: String, var job_level: String, + var inperson_type: String, + var location: String, var flairs: List, var events: List, var urls: List, @@ -73,6 +75,8 @@ data class Application( rs.getString("create_time"), rs.getString("simple_url"), rs.getString("job_level"), + rs.getString("inperson_type"), + rs.getString("location"), emptyList(), emptyList(), emptyList(), @@ -155,6 +159,8 @@ class ApplicationsController( "", "", "", + "", + "", emptyList(), emptyList(), emptyList(), @@ -511,6 +517,8 @@ class ApplicationService( "", if (elm.contains("linkedin")) elm.split("?")[0] else "", "", + "", + "", emptyList(), emptyList(), emptyList(), @@ -533,7 +541,7 @@ class ApplicationService( // Create time is auto created by the database db.update( - "insert into applications (id, url, title, user_id, extra_data, payrange, status_id, company, recruiter, message, agency, simple_url, job_level) values (?,?,?,?,?,?,?,?,?,?,?,?,?);", + "insert into applications (id, url, title, user_id, extra_data, payrange, status_id, company, recruiter, message, agency, simple_url, job_level, inperson_type, location) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);", application.id, application.url, application.title, @@ -547,6 +555,8 @@ class ApplicationService( application.agency, application.simple_url, application.job_level, + application.inperson_type, + application.location, ) eventService.create(application.id, EventType.Creation) @@ -594,7 +604,7 @@ class ApplicationService( public fun update(application: Application): Application { // I don't want ot update create_time db.update( - "update applications set url=?, title=?, user_id=?, extra_data=?, payrange=?, company=?, recruiter=?, message=?, agency=?, simple_url=?, job_level=? where id=?", + "update applications set url=?, title=?, user_id=?, extra_data=?, payrange=?, company=?, recruiter=?, message=?, agency=?, simple_url=?, job_level=?, inperson_type=?, location=? where id=?", application.url, application.title, application.user_id, @@ -606,6 +616,8 @@ class ApplicationService( application.agency, application.simple_url, application.job_level, + application.inperson_type, + application.location, application.id, ) return application diff --git a/api/src/main/resources/schema.sql b/api/src/main/resources/schema.sql index 02491b5..a289045 100644 --- a/api/src/main/resources/schema.sql +++ b/api/src/main/resources/schema.sql @@ -19,6 +19,9 @@ create table if not exists applications ( user_id text, extra_data text, job_level text default '', + -- remote - hyrbrid - in-person + inperson_type text default '', + location text default '', status_id text default null, agency boolean default false, create_time timestamp default now () diff --git a/extensions/definitions.js b/extensions/definitions.js index 0b66bc6..1bea184 100644 --- a/extensions/definitions.js +++ b/extensions/definitions.js @@ -15,9 +15,13 @@ browser.runtime.onMessage.addListener((message) => { Object.values(document.querySelector('button[class="job-details-preferences-and-skills"]')?.children ?? []).find(a => a.innerText.match(/\d/) && !a.innerText.match('skill'))?.innerText ?? ''; + const inperson_type = (Object.values(document.querySelector('button[class="job-details-preferences-and-skills"]')?.children).find(a => a.innerText.match(/hybrid|remote|on-site/i))?.innerText?.split('\n') ?? [])[0]?.trim() ?? '' + + const location = document.querySelector('div[class^="job-details-jobs-unified-top-card__primary-description-container"]')?.children[0]?.children[0]?.innerText ?? '' + const description = document.querySelector('article').textContent; - browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description }); + browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description, location, inperson_type }); return; } // Ignore everything that is no glassdoor @@ -32,12 +36,14 @@ browser.runtime.onMessage.addListener((message) => { let money = document.querySelectorAll('div[class^="SalaryEstimate_salaryRange"]')?.[0]?.innerText ?? ''; + const location = document.querySelector('div[data-test="location"]')?.innerText ?? ''; + const moneySectionNode = document.querySelector('section>section'); if (moneySectionNode && ["Base pay range", "Base pay"].includes(moneySectionNode.querySelector('h2')?.textContent)) { money = moneySectionNode.querySelector("div>div>div").children[1]?.textContent ?? '' } - browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description }); + browser.runtime.sendMessage({ type: "GOT_INFO_R", company, jobTitle, money, description, location, inperson_type: '' }); } else if (message.type === "GOT_INFO_R") { window.postMessage(message); } diff --git a/site/src/lib/ApplicationsStore.svelte.ts b/site/src/lib/ApplicationsStore.svelte.ts index 4a43f2b..f9cf8f7 100644 --- a/site/src/lib/ApplicationsStore.svelte.ts +++ b/site/src/lib/ApplicationsStore.svelte.ts @@ -34,6 +34,8 @@ export type Application = { create_time: string; status_history: string; job_level: string; + location: string; + inperson_type: string; flairs: Flair[]; events: ApplicationEvent[]; urls: string[]; diff --git a/site/src/lib/InplaceDialog.svelte b/site/src/lib/InplaceDialog.svelte index b76c280..7130e56 100644 --- a/site/src/lib/InplaceDialog.svelte +++ b/site/src/lib/InplaceDialog.svelte @@ -15,10 +15,11 @@ let open = $state(false); let ref: HTMLDivElement; + let btn: HTMLButtonElement; function callOutside(e: MouseEvent) { if (!ref) return; - if (!ref.contains(e.target as any)) return; + if (ref.contains(e.target as any) || btn.contains(e.target as any)) return; open = false; } @@ -31,7 +32,7 @@
- {#if open} diff --git a/site/src/routes/cv/+page.svelte b/site/src/routes/cv/+page.svelte index 57ce131..c51f601 100644 --- a/site/src/routes/cv/+page.svelte +++ b/site/src/routes/cv/+page.svelte @@ -328,8 +328,8 @@
-

BCompSc with First Class Honours @ University of Surrey

-
+

BSc Computer Science @ University of Surrey

+

July 2020 - June 2024

diff --git a/site/src/routes/graphs/+page.svelte b/site/src/routes/graphs/+page.svelte index 4b81ee5..2731241 100644 --- a/site/src/routes/graphs/+page.svelte +++ b/site/src/routes/graphs/+page.svelte @@ -212,6 +212,71 @@ {} as Record )} /> + { + const l = item.location === '' ? 'Unknown' : item.location; + if (acc[l]) { + acc[l] += 1; + } else { + acc[l] = 1; + } + return acc; + }, + {} as Record + )} + /> + { + const l = + item.inperson_type === '' ? 'Unknown' : item.inperson_type; + if (acc[l]) { + acc[l] += 1; + } else { + acc[l] = 1; + } + return acc; + }, + {} as Record + )} + /> + { + const job_level = a.job_level ? a.job_level : 'Unknown'; + if (acc[job_level]) { + acc[job_level] += 1; + } else { + acc[job_level] = 1; + } + return acc; + }, + {} as Record + )} + sensitivity={0.02} + /> + { + const i = a.agency ? 'Agency' : 'Direct'; + if (acc[i]) { + acc[i] += 1; + } else { + acc[i] = 1; + } + return acc; + }, + {} as Record + )} + sensitivity={0.02} + />
{#if flairStats !== 'loading'}
@@ -223,22 +288,6 @@ {/each}
- { - const job_level = a.job_level ? a.job_level : 'Unknown'; - if (acc[job_level]) { - acc[job_level] += 1; - } else { - acc[job_level] = 1; - } - return acc; - }, - {} as Record - )} - sensitivity={0.02} - />
{/if}
diff --git a/site/src/routes/graphs/Pie.svelte b/site/src/routes/graphs/Pie.svelte index 69e76a6..92a2095 100644 --- a/site/src/routes/graphs/Pie.svelte +++ b/site/src/routes/graphs/Pie.svelte @@ -45,9 +45,9 @@ dataf.push({ value: otherSum, name: 'Other', - title: other + title: `Other: ${otherSum}\n${other .toSorted((a, b) => b.value - a.value) - .reduce((acc, a) => `${acc}${a.name}: ${a.value}\n`, '') + .reduce((acc, a) => `${acc}${a.name}: ${a.value}\n`, '')}` }); } diff --git a/site/src/routes/work-area/SearchApplication.svelte b/site/src/routes/work-area/SearchApplication.svelte index b848c4b..85a1444 100644 --- a/site/src/routes/work-area/SearchApplication.svelte +++ b/site/src/routes/work-area/SearchApplication.svelte @@ -11,8 +11,11 @@ onreload: (item: Application) => void; } = $props(); + const JobLevels = ['intern', 'entry', 'junior', 'mid', 'senior', 'staff', 'lead', 'none']; + let filter = $state(''); let filterStatus: string[] = $state([]); + let jobLevels: string[] = $state([]); let advFilters = $state(false); type ExtraFilterType = @@ -62,6 +65,11 @@ return false; } + const temp = jobLevels.map((a) => (a === 'none' ? '' : a)); + if (temp.length !== 0 && !temp.includes(i.job_level ?? '')) { + return false; + } + if (!filter) { return true; } @@ -128,9 +136,10 @@
{#if advFilters} -
+
{#snippet buttonChildren()} Status @@ -150,6 +159,26 @@ {/each}
+ + {#snippet buttonChildren()} + Job Level + {/snippet} +
+ {#each JobLevels.filter((a) => !jobLevels.includes(a)) as jobLevel} + + {/each} +
+

Filters

@@ -163,6 +192,16 @@ {node.name} {/each} + {#each jobLevels.filter((a) => jobLevels.includes(a)) as jobLevel} + + {/each} {#each extraFiltersToDisplay as filter} {#if filter.type === 'name'} -
- + +
+
{#if !derivedItem.simple_url || showExtraData}
@@ -317,23 +355,47 @@
{/if} -
- - -
+
+
+ + +
+
+ + +
+
+ + +
+
Tags