From 6f76716620d1fc870eef5ff782945304ca386a05 Mon Sep 17 00:00:00 2001 From: ben9brooks Date: Thu, 29 Sep 2022 18:50:47 -0500 Subject: [PATCH 1/3] changed ACM Game link from gambling site to ACM Game --- apps/web/src/screens/HomePage/sections/Footer.tsx | 2 +- package-lock.json | 12 ++++++++++++ package.json | 4 +++- yarn.lock | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 package-lock.json diff --git a/apps/web/src/screens/HomePage/sections/Footer.tsx b/apps/web/src/screens/HomePage/sections/Footer.tsx index 9b5788a0..88e827ee 100644 --- a/apps/web/src/screens/HomePage/sections/Footer.tsx +++ b/apps/web/src/screens/HomePage/sections/Footer.tsx @@ -214,7 +214,7 @@ const Footer: React.FC<{}> = (): JSX.Element => { ACM Data diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..0409b4b1 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,12 @@ +{ + "name": "mstacm.org", + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "yarn": { + "version": "1.22.19", + "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz", + "integrity": "sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==" + } + } +} diff --git a/package.json b/package.json index 29b1d0a2..da4ccc73 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "lerna": "^3.17.0" }, "name": "mstacm.org", - "dependencies": {}, + "dependencies": { + "yarn": "^1.22.19" + }, "workspaces": { "packages": [ "apps/admin-web", diff --git a/yarn.lock b/yarn.lock index ffc82931..a406bd36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17512,6 +17512,11 @@ yargs@^16.0.3: y18n "^5.0.1" yargs-parser "^20.0.0" +yarn@^1.22.19: + version "1.22.19" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" + integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ== + zen-observable-ts@^0.8.21: version "0.8.21" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d" From dd2ad91088cbb714ed2e675c5f8aeb29cf8a9fe8 Mon Sep 17 00:00:00 2001 From: rswan018 Date: Thu, 20 Oct 2022 18:22:54 -0500 Subject: [PATCH 2/3] removed game link --- apps/web/src/screens/HomePage/sections/SIGs/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/screens/HomePage/sections/SIGs/index.tsx b/apps/web/src/screens/HomePage/sections/SIGs/index.tsx index d09ef1e5..a2dba146 100644 --- a/apps/web/src/screens/HomePage/sections/SIGs/index.tsx +++ b/apps/web/src/screens/HomePage/sections/SIGs/index.tsx @@ -95,7 +95,7 @@ const SIGsData: ISIG[] = [ logoLink: "arcade.png", logoLinkDark: "arcade-dark.png", name: "Game", - website: "https://discord.gg/RZCYUpT" + }, { color: "lime", @@ -106,7 +106,7 @@ const SIGsData: ISIG[] = [ logoLink: "grad.png", logoLinkDark: "grad-dark.png", name: "Grad", - website: "https://discord.gg/xWt5BVE" + }, ]; From 7e31bcbb32521a2d3e0b74793d9f731b9ca6621c Mon Sep 17 00:00:00 2001 From: ben9brooks Date: Thu, 20 Oct 2022 18:50:08 -0500 Subject: [PATCH 3/3] new fix --- package-lock.json | 12 ------------ package.json | 4 +--- yarn.lock | 5 ----- 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 0409b4b1..00000000 --- a/package-lock.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "mstacm.org", - "requires": true, - "lockfileVersion": 1, - "dependencies": { - "yarn": { - "version": "1.22.19", - "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz", - "integrity": "sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ==" - } - } -} diff --git a/package.json b/package.json index da4ccc73..29b1d0a2 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,7 @@ "lerna": "^3.17.0" }, "name": "mstacm.org", - "dependencies": { - "yarn": "^1.22.19" - }, + "dependencies": {}, "workspaces": { "packages": [ "apps/admin-web", diff --git a/yarn.lock b/yarn.lock index a406bd36..ffc82931 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17512,11 +17512,6 @@ yargs@^16.0.3: y18n "^5.0.1" yargs-parser "^20.0.0" -yarn@^1.22.19: - version "1.22.19" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.19.tgz#4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447" - integrity sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ== - zen-observable-ts@^0.8.21: version "0.8.21" resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d"