Skip to content

Commit

Permalink
Misc. website updates (#482)
Browse files Browse the repository at this point in the history
This PR:
- removes the newsletter mentions on the website as well as the popup,
as the newsletter initiative isn't something we're planning to move
forward with this year
- fixes the duplicated 'tutoring' card on the main page and the services
page. These have been replaced with a locker rental card and a Cube menu
card respectively.
- (hopefully) fixes the Prettier Action version. It looks like Prettier
released `3.0.0` around the time the Action stopped working, so I'm
going to pin the version to `2.8.8`, the previous non-major version.

Force-merging since these issues have been around for a while and I'd
like to resolve them ASAP.
  • Loading branch information
kewbish authored Sep 10, 2023
1 parent 7a47cf5 commit b1e6ae9
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 76 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ jobs:
- name: Prettify code
uses: creyD/[email protected]
with:
prettier_version: "2.8.8"
prettier_options: --write **/*.+(js|html|css|json|md|yaml|yml)
prettier_plugins: prettier-plugin-go-template
prettier_plugins: "prettier-plugin-go-template"
github_token: ${{ secrets.GH_TOKEN }}
only_changed: True
12 changes: 5 additions & 7 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
"plugins": ["prettier-plugin-go-template"],
"trailingComma": "none",
"overrides": [
{
"files": [
"*.html"
],
"files": ["*.html"],
"options": {
"parser": "go-template",
"goTemplateBracketSpacing": true,
"bracketSameLine": true
}
},
{
"files": [
"*.js"
],
"files": ["*.js"],
"options": {
"trailingComma": "none",
"tabWidth": 2,
"printWidth": 120
}
}
]
}
}

29 changes: 0 additions & 29 deletions assets/js/newsletter.js

This file was deleted.

2 changes: 1 addition & 1 deletion content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ your interests to the department. For more events you may be interested in, plea
on our social media outlets.
<br/>

Join us on <a id="discord-serverhttpsdiscordggxf3wbydubf" href="https://discord.gg/xF3WbYDubF" target="_blank" rel="noreferrer">Discord</a> or <a href="https://www.instagram.com/ubc_csss" target="_blank" rel="noreferrer">Instagram</a> and sign up for our <a href="http://eepurl.com/h-QQ_z" target="_blank" rel="noreferrer">newsletter</a>!
Join us on <a id="discord-serverhttpsdiscordggxf3wbydubf" href="https://discord.gg/xF3WbYDubF" target="_blank" rel="noreferrer">Discord</a> or <a href="https://www.instagram.com/ubc_csss" target="_blank" rel="noreferrer">Instagram</a>!
1 change: 0 additions & 1 deletion content/about/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ We'll be publishing our events:
- here on our website (which also has an [RSS feed](/index.xml)),
- [Tweeting them](https://twitter.com/ubccsss),
- posting them on our [Facebook page](https://www.facebook.com/ubccsss/) and our [Instagram](https://www.instagram.com/ubc_csss/),
- sending updates [via our newsletter](http://eepurl.com/h-QQ_z),
- and including them in the weekly department emails.

### How can I volunteer for CSSS events?
Expand Down
4 changes: 2 additions & 2 deletions content/services/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ The UBC CSSS offers the following services.
{{</ card >}}
</div>
<div class="col-md-6 col-xl-4 mb-4 d-flex align-items-stretch">
{{< card title="Tutoring" href="/services/tutor" src="/files/tutor.jpg" >}}
We provide a place for tutors to advertise their availability and for students to find a tutor for Computer Science courses.
{{< card title="Cube Menu" href="/cube/menu" src="/files/chips.jpg" >}}
We provide cheap snacks, like chips, pizza, candy, and drinks, in the Cube.
{{</ card >}}
</div>
<!--<div class="col-md-6 col-xl-4 mb-4 d-flex align-items-stretch">
Expand Down
8 changes: 4 additions & 4 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,17 @@ <h5 class="card-title">
<div class="card w-100">
<img
class="card-img-top img-fluid"
src="https://d33wubrfki0l68.cloudfront.net/10e0ed0cbab83ecb5a61de3106d5fa309ae1b8b8/b3e32/files/tutor.jpg"
src="/files/lockers.jpg"
alt=""
width="348"
height="196" />
<div class="card-body">
<h5 class="card-title">
<a class="card-link" href="/services/tutor">Tutoring</a>
<a class="card-link" href="/cube/lockers">Locker Rentals</a>
</h5>
<p class="card-text">
We provide a place for tutors to advertise their availability
and for students to find a tutor for Computer Science courses.
We offer lockers in ICICS for rent at $15 per semester - the
cheapest rates at UBC.
</p>
</div>
</div>
Expand Down
28 changes: 0 additions & 28 deletions layouts/partials/newsletter.html

This file was deleted.

3 changes: 0 additions & 3 deletions themes/hugo-bootstrap-5/layouts/_default/baseof.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
</head>
<body>
{{ block "header" . }}{{ partial "header" . }}{{ end }}
{{ partial
"newsletter"
}}
{{ block "body" . }}
<div class="container">
<div class="row">
Expand Down

0 comments on commit b1e6ae9

Please sign in to comment.