From 8150720707aeb0e4265b0dc7458babcdc37778dc Mon Sep 17 00:00:00 2001 From: Alex Bigelow Date: Fri, 23 Feb 2024 16:37:15 -0700 Subject: [PATCH] Lots of cleanup --- .github/workflows/build.yml | 4 ++-- .gitignore | 8 -------- README.md | 16 ++++++++++++++++ _quarto.yml | 3 ++- about.qmd | 5 ----- components/randomAvatars.ojs | 12 +----------- data/{exampleFiles => }/people.json | 0 index.qmd | 18 ------------------ theme.scss | 28 +++++++++++++++------------- whoWeAre.qmd | 5 +++++ 10 files changed, 41 insertions(+), 58 deletions(-) delete mode 100644 about.qmd rename data/{exampleFiles => }/people.json (100%) create mode 100644 whoWeAre.qmd diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2c5d4f..0f0a6fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: - name: Update People Info 🙂 # This pulls the latest info about who is on which Github team run: | - mkdir data/semiSecretFiles && gh api graphql -f query=' + gh api graphql -f query=' query { organization(login: "resbazaz") { teams(first:100) { @@ -46,7 +46,7 @@ jobs: } } } - ' > data/semiSecretFiles/people.json + ' > data/people.json env: GITHUB_TOKEN: ${{ secrets.ORGANIZATION_READER }} diff --git a/.gitignore b/.gitignore index fd51925..991361f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,3 @@ .quarto _site /.quarto/ - -# semiSecretFiles aren't really secret; they're generated from public GitHub -# data when the website is built. Having a separate directory + only committing -# an example file to the repo is an effort to minimize access to the convenient -# list of detailed ResBaz participants' info. If you find development with -# example data annoying, you can manually download the auto-generated files from -# the published site -data/semiSecretFiles \ No newline at end of file diff --git a/README.md b/README.md index 52c2a7e..033c372 100644 --- a/README.md +++ b/README.md @@ -58,3 +58,19 @@ Be advised that `localData/people.json` in your local respository is just an exa ### Reconfiguring the site's infrastructure TODO: document `_quarto.yml` + +--- + +# TODO: finish and delete this stuff + +- Create Who We Are page + +- Decide what to do with the blog + +- Verify that new festival page links are still consistent + +- Copy code of conduct md from organization repo as part of build? + +- DONATE NOW button (stuff about our opencollective) + +- Actually include full instructions for editing + adding things in the README diff --git a/_quarto.yml b/_quarto.yml index 38d4387..e0fbf3a 100644 --- a/_quarto.yml +++ b/_quarto.yml @@ -9,7 +9,8 @@ website: left: - href: index.qmd text: Home - - about.qmd + - href: whoWeAre.qmd + text: Who We Are format: html: diff --git a/about.qmd b/about.qmd deleted file mode 100644 index 07c5e7f..0000000 --- a/about.qmd +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "About" ---- - -About this site diff --git a/components/randomAvatars.ojs b/components/randomAvatars.ojs index 4e2db9b..c38b78f 100644 --- a/components/randomAvatars.ojs +++ b/components/randomAvatars.ojs @@ -1,14 +1,4 @@ -/* -see .gitignore for the rationale behind semiSecretFiles -*/ -peopleFile = fetch('data/semiSecretFiles/people.json') - .then(response => { - if (response.status === 404) { - return fetch('data/exampleFiles/people.json'); - } - return response; - }) - .then(response => response.json()); +peopleFile = FileAttachment('data/people.json').json(); function randomAvatars(teamName) { const team = peopleFile.data.organization.teams.nodes.find( diff --git a/data/exampleFiles/people.json b/data/people.json similarity index 100% rename from data/exampleFiles/people.json rename to data/people.json diff --git a/index.qmd b/index.qmd index 44c701e..fac0907 100644 --- a/index.qmd +++ b/index.qmd @@ -121,21 +121,3 @@ Their aims are for UX enthusiasts of all levels to: - Connect with UXers in Tucson and beyond [More Info](https://uxua.arizona.edu/) - -## TODO: finish and delete this stuff - -- Create Who We Are page - -- Add Coffee & Code widget, create necessary Github teams, and point random avatar widgets to the correct team - -- Revisit fonts (do we really want that Raleway thing up in the corner? Match with new footer logo?) - -- Decide what to do with the blog - -- Verify that new festival page links are still consistent - -- Copy code of conduct md from organization repo as part of build? - -- DONATE NOW button (stuff about our opencollective) - -- Actually include full instructions for editing + adding things in the README diff --git a/theme.scss b/theme.scss index f3a33ec..5829121 100644 --- a/theme.scss +++ b/theme.scss @@ -46,13 +46,24 @@ $body-color: $gray-800 !default; // Fonts -// stylelint-disable-next-line value-keyword-case +$web-font-path: 'https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100;0,400;0,800;1,400&family=Alegreya+SC:wght@500&display=swap' !default; +@if $web-font-path { + @import url($web-font-path); +} + $font-family-sans-serif: 'Raleway', 'Calibri', 'Trebuchet MS', sans-serif !default; $font-family-serif: 'Alegreya SC', 'Georgia', 'Times New Roman', 'Times', serif !default; -.navbar-brand { - font-family: $font-family-serif; - font-weight: 500; +// Navbar + +.navbar { + .navbar-brand { + font-family: $font-family-serif; + font-weight: 500; + } + .navbar-nav .nav-link.active .menu-text { + color: $white; + } } // Tables @@ -60,15 +71,6 @@ $font-family-serif: 'Alegreya SC', 'Georgia', 'Times New Roman', 'Times', serif $table-dark-bg: $dark !default; $table-dark-border-color: darken($dark, 5%) !default; -/*-- scss:rules --*/ - -// Variables - -$web-font-path: 'https://fonts.googleapis.com/css2?family=Raleway:ital,wght@0,100;0,400;0,800;1,400&family=Alegreya+SC:wght@500&display=swap' !default; -@if $web-font-path { - @import url($web-font-path); -} - // Indicators .badge { diff --git a/whoWeAre.qmd b/whoWeAre.qmd new file mode 100644 index 0000000..328fc18 --- /dev/null +++ b/whoWeAre.qmd @@ -0,0 +1,5 @@ +--- +title: "Who We Are" +--- + +TODO \ No newline at end of file