Skip to content

Commit

Permalink
Lots of cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-r-bigelow committed Feb 23, 2024
1 parent 1a5b97b commit 8150720
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 58 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
}
}
}
' > data/semiSecretFiles/people.json
' > data/people.json
env:
GITHUB_TOKEN: ${{ secrets.ORGANIZATION_READER }}

Expand Down
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ website:
left:
- href: index.qmd
text: Home
- about.qmd
- href: whoWeAre.qmd
text: Who We Are

format:
html:
Expand Down
5 changes: 0 additions & 5 deletions about.qmd

This file was deleted.

12 changes: 1 addition & 11 deletions components/randomAvatars.ojs
Original file line number Diff line number Diff line change
@@ -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(
Expand Down
File renamed without changes.
18 changes: 0 additions & 18 deletions index.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 15 additions & 13 deletions theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,31 @@ $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

$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 {
Expand Down
5 changes: 5 additions & 0 deletions whoWeAre.qmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
title: "Who We Are"
---

TODO

0 comments on commit 8150720

Please sign in to comment.