From e0b33043962b6f039723bd73311d966199cdc3bc Mon Sep 17 00:00:00 2001 From: jogt Date: Fri, 10 Nov 2023 16:03:05 +0100 Subject: [PATCH 1/4] Attempted fix for lint workflow --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77a6a2ce..e525046b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,7 @@ jobs: uses: actions/cache@v2 env: cache-name: cache-node-modules + NODE_OPTIONS: --openssl-legacy-provider with: path: ~/.npm key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} From 4abde171ea2a7dcf4885c0607e05244dcb8e3120 Mon Sep 17 00:00:00 2001 From: jogt Date: Fri, 10 Nov 2023 16:06:19 +0100 Subject: [PATCH 2/4] Moved node options from env to npmrc --- .github/workflows/ci.yml | 1 - .npmrc | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .npmrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e525046b..77a6a2ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: uses: actions/cache@v2 env: cache-name: cache-node-modules - NODE_OPTIONS: --openssl-legacy-provider with: path: ~/.npm key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..2b008da6 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +node-options="--openssl-legacy-provider" From a959cc02f6cce1735cca809f69d46de1c11d2ad0 Mon Sep 17 00:00:00 2001 From: jogt Date: Fri, 10 Nov 2023 16:13:33 +0100 Subject: [PATCH 3/4] Fixed linting problems --- src/common/components/Modal/ConfirmModal.tsx | 2 +- src/common/components/Modal/modal.less | 33 +++++----- src/core/components/Footer/ContactInfo.tsx | 66 +++++++++---------- src/pages/applications/index.tsx | 2 +- .../Settings/Calendar/calendar.less | 1 - 5 files changed, 51 insertions(+), 53 deletions(-) diff --git a/src/common/components/Modal/ConfirmModal.tsx b/src/common/components/Modal/ConfirmModal.tsx index b406df9e..57879582 100644 --- a/src/common/components/Modal/ConfirmModal.tsx +++ b/src/common/components/Modal/ConfirmModal.tsx @@ -1,5 +1,5 @@ import { Modal, Button } from '@dotkomonline/design-system'; -import { FC } from 'react'; +import React, { FC } from 'react'; import style from './modal.less'; interface ConfirmModalProps { diff --git a/src/common/components/Modal/modal.less b/src/common/components/Modal/modal.less index 669f7cfe..3c99c28a 100644 --- a/src/common/components/Modal/modal.less +++ b/src/common/components/Modal/modal.less @@ -1,25 +1,24 @@ .title { - font-size: 1.2rem; - font-weight: bold; - margin-bottom: 0.5rem; - + font-size: 1.2rem; + font-weight: bold; + margin-bottom: 0.5rem; } .message { - font-size: 1.1rem; + font-size: 1.1rem; } .buttonContainer { - display: flex; - flex-direction: row; - justify-content: center; - align-items: flex-end; - width: 100%; - gap: 0.5rem; - margin-top: 0.5rem; + display: flex; + flex-direction: row; + justify-content: center; + align-items: flex-end; + width: 100%; + gap: 0.5rem; + margin-top: 0.5rem; - & > button { - padding: 0.5rem 1.4rem; - min-width: 5rem; - } -} \ No newline at end of file + & > button { + padding: 0.5rem 1.4rem; + min-width: 5rem; + } +} diff --git a/src/core/components/Footer/ContactInfo.tsx b/src/core/components/Footer/ContactInfo.tsx index 1a7cc5bd..b18520bc 100644 --- a/src/core/components/Footer/ContactInfo.tsx +++ b/src/core/components/Footer/ContactInfo.tsx @@ -6,41 +6,41 @@ const ContactInfo = () => { //Update phone number whenever a new leader of Online is elected const contactTlf = '454 61 372'; return ( - <> -
-

Besøksadresse:

-

A-blokka, A4-137

-

Høgskoleringen 5

-

NTNU Gløshaugen

-
-
-

Kontaktinformasjon:

-

- 992 548 045 (OrgNr) -

- + <> +
+

Besøksadresse:

+

A-blokka, A4-137

+

Høgskoleringen 5

+

NTNU Gløshaugen

+
+
+

Kontaktinformasjon:

- kontakt@online.ntnu.no + 992 548 045 (OrgNr)

- - -

- okonomi@online.ntnu.no
-

- - -

- {contactTlf} -

- -
-
-

Post og faktura:

-

Online Linjeforening

-

Sem Sælands vei 9

-

7491 Trondheim

-
- + +

+ kontakt@online.ntnu.no +

+ + +

+ okonomi@online.ntnu.no
+

+ + +

+ {contactTlf} +

+ +
+
+

Post og faktura:

+

Online Linjeforening

+

Sem Sælands vei 9

+

7491 Trondheim

+
+ ); }; diff --git a/src/pages/applications/index.tsx b/src/pages/applications/index.tsx index ff979fc0..63d08e01 100644 --- a/src/pages/applications/index.tsx +++ b/src/pages/applications/index.tsx @@ -7,7 +7,7 @@ import style from '../../applications/committee.less'; const Committees: React.FC = () => { const [committees, setCommittees] = useState([]); - const applicationFormUrl = 'https://forms.gle/BpQfh42FXfC85tNd6' // updated for August 2023 + const applicationFormUrl = 'https://forms.gle/BpQfh42FXfC85tNd6'; // updated for August 2023 useEffect(() => { console.log('Running'); diff --git a/src/profile/components/Settings/Calendar/calendar.less b/src/profile/components/Settings/Calendar/calendar.less index 458420e0..3474bb6d 100644 --- a/src/profile/components/Settings/Calendar/calendar.less +++ b/src/profile/components/Settings/Calendar/calendar.less @@ -39,4 +39,3 @@ font-size: 1.1rem; margin-top: 1rem; } - From 1b45bf263852eee7d8ef66606d27242b6442a30a Mon Sep 17 00:00:00 2001 From: jogt Date: Fri, 10 Nov 2023 16:20:44 +0100 Subject: [PATCH 4/4] Fixed minor style problem --- src/events/components/DetailView/detail.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/events/components/DetailView/detail.less b/src/events/components/DetailView/detail.less index 3f6b0783..7636e576 100644 --- a/src/events/components/DetailView/detail.less +++ b/src/events/components/DetailView/detail.less @@ -4,6 +4,10 @@ @gap: 1rem; +.calendarButton > button { + width: 100%; +} + .container { display: grid; grid-template-columns: 5fr 2fr; @@ -169,7 +173,3 @@ .calendarButton { margin-top: 1em; } - -.calendarButton > button { - width: 100%; -}