Skip to content

fix: update ddmal.music.mcgill.ca to ddmal.ca #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yinanazhou merged 3 commits into from
May 26, 2025
Merged

fix: update ddmal.music.mcgill.ca to ddmal.ca #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba3bc7
fix: update ddmal.music.mcgill.ca to ddmal.ca
yinanazhou May 26, 2025
9c52895
chore: update `prettier` & reformat
yinanazhou May 26, 2025
a5de960
build: remove `cache-loader` & use `webpack@5` built-in caching
yinanazhou May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions assets/css/default-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ body {
padding: 0;
overflow-x: hidden;
overflow-y: scroll;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
font-weight: 300;
}
a {
Expand Down
8 changes: 2 additions & 6 deletions assets/template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<nav class="navbar is-light">
<div class="navbar-brand">
<!-- Image src attributes are ste programatically because paths are not the same in dev and prod -->
<a class="navbar-home-btn" id="home-link" href="./index.html">
<a class="navbar-home-btn" id="home-link" href="./">
<img id="cress-main-icon" />
</a>
<a
Expand Down Expand Up @@ -62,11 +62,7 @@
<div class="navbar-btn-text">Help</div>
</div>
<div class="navbar-dropdown">
<a
class="navbar-dropdown-item"
href="//ddmal.music.mcgill.ca"
target="_blank"
>
<a class="navbar-dropdown-item" href="//ddmal.ca" target="_blank">
DDMAL
<img class="external-link-icon" />
</a>
Expand Down
4 changes: 2 additions & 2 deletions deployment/server/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<div class="navbar-section">
<div class="navbar-content-container">
<div class="cress-content-wrapper">
<a class="navbar-btn" id="home-link">
<a class="navbar-btn" id="home-link" href="./">
<!-- Image src attributes are ste programatically because paths are not the same in dev and prod -->
<img id="cress-main-icon" src="favicon.png" />
</a>
</div>

<div class="cress-content-wrapper">
<a href="https://ddmal.music.mcgill.ca/">
<a href="https://ddmal.ca/">
<div class="navbar-link">DDMAL</div>
</a>
<a href="https://github.com/DDMAL/Cress/wiki">
Expand Down
14 changes: 4 additions & 10 deletions deployment/server/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<div class="navbar-section">
<div class="navbar-content-container">
<div class="cress-content-wrapper">
<a class="navbar-btn" id="home-link" href="./index.html">
<a class="navbar-btn" id="home-link" href="./">
<img id="cress-main-icon" src="favicon.png" />
</a>
</div>

<div class="cress-content-wrapper">
<a href="https://ddmal.music.mcgill.ca/">
<a href="https://ddmal.ca/">
<div class="navbar-link">DDMAL</div>
</a>
<a href="https://github.com/DDMAL/Cress/wiki">
Expand Down Expand Up @@ -131,11 +131,7 @@
target="_blank"
class="mcgill"
></a>
<a
href="http://ddmal.music.mcgill.ca/"
target="_blank"
class="ddmal"
></a>
<a href="http://ddmal.ca/" target="_blank" class="ddmal"></a>
<a
href="http://www.cirmmt.org"
target="_blank"
Expand Down Expand Up @@ -182,9 +178,7 @@
<div class="footer-subsection" id="footer-right">
<div class="footer-text">
Cress is developed at
<a class="footer-link" href="https://ddmal.music.mcgill.ca/"
>DDMAL</a
>
<a class="footer-link" href="https://ddmal.ca/">DDMAL</a>
and is part of the
<a class="footer-link" href="https://simssa.ca/">SIMSSA</a>
project.
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"repository": "https://github.com/DDMAL/Cress.git",
"author": {
"name": "DDMAL",
"url": "https://ddmal.music.mcgill.ca"
"url": "https://ddmal.ca"
},
"contributors": [
{
Expand All @@ -33,13 +33,12 @@
"@types/papaparse": "^5.3.14",
"@types/pouchdb": "^6.4.2",
"@types/webpack": "^5.28.5",
"cache-loader": "^4.1.0",
"csvtojson": "^2.0.10",
"eslint": "^9.6.0",
"node-polyfill-webpack-plugin": "^4.0.0",
"papaparse": "^5.4.1",
"pouchdb-core": "^9.0.0",
"prettier": "^3.3.2",
"prettier": "^3.5.3",
"ts-loader": "9.5.1",
"typescript": "^5.5.3",
"webpack": "5.92.1",
Expand Down
5 changes: 4 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ module.exports = {
filename: '[name].js',
},
devtool: 'inline-source-map',
cache: {
type: 'filesystem', // Enables persistent caching
},
module: {
rules: [
{
test: /\.tsx?$/,
use: ['cache-loader', 'ts-loader'],
use: ['ts-loader'],
exclude: /node_modules/,
},
{
Expand Down
4 changes: 2 additions & 2 deletions webpack.pages-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = {
rules: [
{
test: /\.tsx?$/,
use: ['cache-loader', 'ts-loader'],
use: ['ts-loader'],
exclude: /node_modules/,
},
{
Expand All @@ -38,7 +38,7 @@ module.exports = {
plugins: [
new NodePolyfillPlugin(),
new webpack.DefinePlugin({
__LINK_LOCATION__: JSON.stringify('https://ddmal.music.mcgill.ca/Cress/'),
__LINK_LOCATION__: JSON.stringify('https://ddmal.ca/Cress/'),
__ASSET_PREFIX__: JSON.stringify('/Cress/Cress-gh/'),
}),
],
Expand Down
96 changes: 9 additions & 87 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz"
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==

"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
"@types/json-schema@*", "@types/json-schema@^7.0.8":
version "7.0.15"
resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz"
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
Expand Down Expand Up @@ -818,11 +818,6 @@ big-integer@^1.6.17:
resolved "https://registry.npmjs.org/big-integer/-/big-integer-1.6.52.tgz"
integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==

big.js@^5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==

bignumber.js@^8.0.1:
version "8.1.1"
resolved "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz"
Expand Down Expand Up @@ -979,11 +974,6 @@ buffer-indexof-polyfill@~1.0.0:
resolved "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz"
integrity sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==

buffer-json@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23"
integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==

buffer-xor@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
Expand Down Expand Up @@ -1015,18 +1005,6 @@ builtin-status-codes@^3.0.0:
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==

cache-loader@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz#9948cae353aec0a1fcb1eafda2300816ec85387e"
integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==
dependencies:
buffer-json "^2.0.0"
find-cache-dir "^3.0.0"
loader-utils "^1.2.3"
mkdirp "^0.5.1"
neo-async "^2.6.1"
schema-utils "^2.0.0"

call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7:
version "1.0.7"
resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"
Expand Down Expand Up @@ -1124,11 +1102,6 @@ commander@^2.20.0:
resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==

commondir@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==

compress-commons@^4.1.2:
version "4.1.2"
resolved "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz"
Expand Down Expand Up @@ -1367,11 +1340,6 @@ elliptic@^6.5.3, elliptic@^6.5.5:
minimalistic-assert "^1.0.1"
minimalistic-crypto-utils "^1.0.1"

emojis-list@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==

encoding-down@^6.3.0:
version "6.3.0"
resolved "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz"
Expand Down Expand Up @@ -1655,15 +1623,6 @@ fill-range@^7.0.1:
dependencies:
to-regex-range "^5.0.1"

find-cache-dir@^3.0.0:
version "3.3.2"
resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
dependencies:
commondir "^1.0.1"
make-dir "^3.0.2"
pkg-dir "^4.1.0"

find-up@^4.0.0:
version "4.1.0"
resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
Expand Down Expand Up @@ -2128,13 +2087,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==

json5@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
dependencies:
minimist "^1.2.0"

jszip@^3.10.1, jszip@^3.7.1:
version "3.10.1"
resolved "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz"
Expand Down Expand Up @@ -2299,15 +2251,6 @@ loader-runner@^4.2.0:
resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==

loader-utils@^1.2.3:
version "1.4.2"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
dependencies:
big.js "^5.2.2"
emojis-list "^3.0.0"
json5 "^1.0.1"

locate-path@^5.0.0:
version "5.0.0"
resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
Expand Down Expand Up @@ -2418,13 +2361,6 @@ ltgt@2.2.1, ltgt@^2.1.2:
resolved "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz"
integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==

make-dir@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
dependencies:
semver "^6.0.0"

mammoth@^1.8.0:
version "1.8.0"
resolved "https://registry.npmjs.org/mammoth/-/mammoth-1.8.0.tgz"
Expand Down Expand Up @@ -2512,12 +2448,12 @@ minimatch@^5.1.0:
dependencies:
brace-expansion "^2.0.1"

minimist@^1.2.0, minimist@^1.2.6:
minimist@^1.2.6:
version "1.2.8"
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==

"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.6:
"mkdirp@>=0.5 0", mkdirp@^0.5.6:
version "0.5.6"
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
Expand Down Expand Up @@ -2549,7 +2485,7 @@ natural-compare@^1.4.0:
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==

neo-async@^2.6.1, neo-async@^2.6.2:
neo-async@^2.6.2:
version "2.6.2"
resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
Expand Down Expand Up @@ -2793,7 +2729,7 @@ pikaday@1.8.2:
resolved "https://registry.npmjs.org/pikaday/-/pikaday-1.8.2.tgz"
integrity sha512-TNtsE+34BIax3WtkB/qqu5uepV1McKYEgvL3kWzU7aqPCpMEN6rBF3AOwu4WCwAealWlBGobXny/9kJb49C1ew==

pkg-dir@^4.1.0, pkg-dir@^4.2.0:
pkg-dir@^4.2.0:
version "4.2.0"
resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
Expand Down Expand Up @@ -2915,10 +2851,10 @@ prelude-ls@^1.2.1:
resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==

prettier@^3.3.2:
version "3.3.2"
resolved "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz"
integrity sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==
prettier@^3.5.3:
version "3.5.3"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5"
integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==

process-nextick-args@~2.0.0:
version "2.0.1"
Expand Down Expand Up @@ -3153,15 +3089,6 @@ saxes@^5.0.1:
dependencies:
xmlchars "^2.2.0"

schema-utils@^2.0.0:
version "2.7.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
dependencies:
"@types/json-schema" "^7.0.5"
ajv "^6.12.4"
ajv-keywords "^3.5.2"

schema-utils@^3.1.1, schema-utils@^3.2.0:
version "3.3.0"
resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"
Expand All @@ -3176,11 +3103,6 @@ secure-compare@3.0.1:
resolved "https://registry.npmjs.org/secure-compare/-/secure-compare-3.0.1.tgz"
integrity sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==

semver@^6.0.0:
version "6.3.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

semver@^7.3.4:
version "7.6.0"
resolved "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz"
Expand Down