From e537b89cae20ae786ee60b95339a17f568b93e37 Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 9 Feb 2025 16:49:14 -0500 Subject: [PATCH] Umami working --- package.json | 5 +--- packages/docusaurus/docs/07-roadmap.md | 10 +++---- packages/docusaurus/docusaurus.config.ts | 33 +++++++++++------------- packages/docusaurus/package.json | 1 + 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 4d7553b..ca44ab5 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,5 @@ }, "workspaces": [ "packages/*" - ], - "dependencies": { - "@dipakparmar/docusaurus-plugin-umami": "2.1.7" - } + ] } diff --git a/packages/docusaurus/docs/07-roadmap.md b/packages/docusaurus/docs/07-roadmap.md index 0967920..1c0004c 100644 --- a/packages/docusaurus/docs/07-roadmap.md +++ b/packages/docusaurus/docs/07-roadmap.md @@ -17,7 +17,7 @@ Are you experienced with authentication procedures and best practices? We would - [ ] Filter by site - [ ] Click "Show resources" on site dropdown which takes you to resources table with filter defined - [x] Transfer resource to different site -- [ ] Allow resource without a subdomain (use base domain) - limited to one resource per domain +- [x] Allow resource without a subdomain (use base domain) - limited to one resource per domain - [ ] Create temporary link from resource page - [ ] Show temporary links in table on resource page - [ ] Track temporary link usage and session count @@ -37,12 +37,12 @@ Are you experienced with authentication procedures and best practices? We would - [ ] Support for multiple domains - [ ] Set domain per organization - [ ] Would need to refactor auth to support cross-site cookies -- [ ] Support for running a resource at the root domain (without subdomain) - - [ ] Make this optional via a flag in the config +- [x] Support for running a resource at the root domain (without subdomain) + - [x] Make this optional via a flag in the config ### Authentication & Integration - [ ] Google, GitHub, etc. OAuth support -- [ ] Cache authentication in badger to speed up proxy requests +- [x] Cache authentication in badger to speed up proxy requests - [ ] Nicely formatted error pages for badger - [ ] Bearer token support for resources (useful for protecting APIs) - [ ] Auth token in headers or URL parameters (useful for APIs) @@ -76,4 +76,4 @@ Are you experienced with authentication procedures and best practices? We would ### SAAS -We intend at some point to provide Pangolin in a hosted offering with a healthy free tier and pricing competitive to generally available cloud VPS services. This way users who would like to use Pangolin - but don't want to manage their own VPS - can do so and help to fund future development. +We intend at some point to provide Pangolin in a hosted offering with a healthy free tier and pricing competitive to generally available cloud VPS services. This way users who would like to use Pangolin - but don't want to manage their own VPS - can do so and help to fund future development. \ No newline at end of file diff --git a/packages/docusaurus/docusaurus.config.ts b/packages/docusaurus/docusaurus.config.ts index 31317d0..9736b34 100644 --- a/packages/docusaurus/docusaurus.config.ts +++ b/packages/docusaurus/docusaurus.config.ts @@ -157,25 +157,22 @@ const config: Config = { prism: { theme: prismThemes.github, darkTheme: prismThemes.dracula - }, - - plugins: [ - [ - "@dipakparmar/docusaurus-plugin-umami", - /** @type {import('@dipakparmar/docusaurus-plugin-umami').Options} */ - { - websiteID: "d9a3a131-d2f4-4f8f-922b-80d668e96640", // Required - analyticsDomain: "umami.schwartznetwork.net", // Required - scriptName: "", // Optional - dataHostURL: "", // Optional - dataAutoTrack: true, // Optional - dataDoNotTrack: true, // Optional - dataCache: true, // Optional - dataDomains: "docs.fossorial.io" // comma separated list of domains, *Recommended* - } - ] + } + } satisfies Preset.ThemeConfig, + plugins: [ + [ + "@dipakparmar/docusaurus-plugin-umami", + /** @type {import('@dipakparmar/docusaurus-plugin-umami').Options} */ + { + websiteID: "d9a3a131-d2f4-4f8f-922b-80d668e96640", // Required + analyticsDomain: "umami.schwartznetwork.net", // Required + dataAutoTrack: false, // Optional + dataDoNotTrack: false, // Optional + dataCache: true, // Optional + dataDomains: "docs.fossorial.io" // comma separated list of domains, *Recommended* + } ] - } satisfies Preset.ThemeConfig + ] }; export default config; diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index 41dcf1a..cff7a51 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -15,6 +15,7 @@ "typecheck": "tsc" }, "dependencies": { + "@dipakparmar/docusaurus-plugin-umami": "2.1.7", "@docusaurus/core": "3.6.3", "@docusaurus/preset-classic": "3.6.3", "@mdx-js/react": "^3.0.0",