Piteball
/
skolplattformen-backup
mirror of https://github.com/kolplattformen/skolplattformen.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: upgrade react and next to latest versions (WIP)

This commit is contained in:
Christian Landgren 2023-03-27 10:25:28 +02:00
parent 7e6222ef68
commit 364d02a7ad
19 changed files with 1550 additions and 1525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
LICENSE
View File

@ -2,180 +2,180 @@
Version 2.0, January 2004 Version 2.0, January 2004
http://www.apache.org/licenses/ http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions. 1. Definitions.
"License" shall mean the terms and conditions for use, reproduction, "License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document. and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by "Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License. the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all "Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition, control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the "control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity. outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity "You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License. exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications, "Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation including but not limited to software source code, documentation
source, and configuration files. source, and configuration files.
"Object" form shall mean any form resulting from mechanical "Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation, not limited to compiled object code, generated documentation,
and conversions to other media types. and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or "Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work copyright notice that is included in or attached to the work
(an example is provided in the Appendix below). (an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object "Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of, separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof. the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including "Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted" the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution." designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity "Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work. subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of 2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of, copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form. Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of 3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual, this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made, (except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work, use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s) Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate granted to You under this License for that Work shall terminate
as of the date such litigation is filed. as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the 4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You modifications, and in Source or Object form, provided that You
meet the following conditions: meet the following conditions:
(a) You must give any other recipients of the Work or (a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices (b) You must cause any modified files to carry prominent notices
stating that You changed the files; and stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works (c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work, attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of excluding those notices that do not pertain to any part of
the Derivative Works; and the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its (d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or, documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed that such additional attribution notices cannot be construed
as modifying the License. as modifying the License.
You may add Your own copyright statement to Your modifications and You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use, for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License. the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise, 5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions. this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions. with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade 6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor, names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file. origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or 7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS, Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License. risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory, 8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise, whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill, Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages. has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing 9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer, the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity, and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify, of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability. of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work. APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]" boilerplate notice, with the fields enclosed by brackets "[]"
@ -186,16 +186,16 @@
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. identification within third-party archives.
Copyright 2021 Not free beer AB Copyright 2023 Not free beer AB
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

59
README.md
View File

@ -19,33 +19,34 @@ The respective README files there contain more detailed descriptions.
## Contents ## Contents
* [Architecture](#architecture) - [Architecture](#architecture)
* [Apps](#apps) - [Apps](#apps)
* [skolplattformen](#skolplattformen) - [skolplattformen](#skolplattformen)
* [website](#website) - [website](#website)
* [Libs](#embedded-api) - [Libs](#embedded-api)
* [api](#api) - [api](#api)
* [api-skolplattformen](#api-skolplattformen) - [api-skolplattformen](#api-skolplattformen)
* [api-hjarntorget](#api-hjarntorget) - [api-hjarntorget](#api-hjarntorget)
* [api-vklass](#api-vklass) - [api-vklass](#api-vklass)
* [curriculum](#curriculum) - [curriculum](#curriculum)
* [hooks](#hooks) - [hooks](#hooks)
* [Getting started with development](#getting-started-with-development) - [Getting started with development](#getting-started-with-development)
* [iOS](#ios) - [iOS](#ios)
* [Android](#android) - [Android](#android)
* [Website](#website) - [Website](#website)
* [Tests](#tests) - [Tests](#tests)
* [Contributions](#contributions) - [Contributions](#contributions)
* [Money](#money) - [Money](#money)
* [Disclaimer](#disclaimer) - [Disclaimer](#disclaimer)
* [Contributors](#contributors) - [Contributors](#contributors)
* [License](#license) - [License](#license)
## Architecture ## Architecture
The project consists of several apps and libraries inside [a NX](https://nx.dev/) monorepo. The project consists of several apps and libraries inside [a NX](https://nx.dev/) monorepo.
### Apps ### Apps
/apps/ contains the application projects. This is the main entry point for a runnable application. /apps/ contains the application projects. This is the main entry point for a runnable application.
#### skolplattformen #### skolplattformen
@ -63,6 +64,7 @@ For more information, check out the [source code](apps/skolplattformen-app).
The code for the website at https://skolplattformen.org/. It's built using Next.js. The code for the website at https://skolplattformen.org/. It's built using Next.js.
For more information, check out the [source code](apps/website). For more information, check out the [source code](apps/website).
### Libs ### Libs
/libs/ contains the library projects. There are many different kinds of libraries, and each library defines its own external API so that boundaries between libraries remain clear. /libs/ contains the library projects. There are many different kinds of libraries, and each library defines its own external API so that boundaries between libraries remain clear.
@ -102,11 +104,13 @@ Check out the documentation [here](libs/hooks).
To clone and build the project, you first need to install [git](https://git-scm.com/), [node](https://nodejs.org/en/) and [yarn](https://classic.yarnpkg.com/lang/en/docs/install/). To clone and build the project, you first need to install [git](https://git-scm.com/), [node](https://nodejs.org/en/) and [yarn](https://classic.yarnpkg.com/lang/en/docs/install/).
Clone the repo with Clone the repo with
```bash ```bash
$ git clone https://github.com/kolplattformen/skolplattformen.git $ git clone https://github.com/kolplattformen/skolplattformen.git
``` ```
Install dependencies Install dependencies
```bash ```bash
cd skolplattformen && yarn cd skolplattformen && yarn
``` ```
@ -115,11 +119,12 @@ cd skolplattformen && yarn
If you wanna run the iOS app, you need to setup a couple of things first, we have a guide that will assist you in getting started with the iOS app. A Mac is required to build projects with native code for iOS so we do not have support for Linux / Windows. If you wanna run the iOS app, you need to setup a couple of things first, we have a guide that will assist you in getting started with the iOS app. A Mac is required to build projects with native code for iOS so we do not have support for Linux / Windows.
* [Mac OS](/docs/ios_mac.md) - [Mac OS](/docs/ios_mac.md)
If you already setup everything, you just need to run the following command in the project root: If you already setup everything, you just need to run the following command in the project root:
Start the iOS app Start the iOS app
``` ```
yarn run ios yarn run ios
``` ```
@ -128,9 +133,9 @@ yarn run ios
If you wanna run the Android app, you need to setup a couple of things first, we have created three different guides depending on your operating system. If you wanna run the Android app, you need to setup a couple of things first, we have created three different guides depending on your operating system.
* [Mac OS](/docs/android_mac.md) - [Mac OS](/docs/android_mac.md)
* [Windows](/docs/android_windows.md) - [Windows](/docs/android_windows.md)
* [Linux](/docs/android_linux.md) - [Linux](/docs/android_linux.md)
If you already setup everything, you just need to run the following command in the project root: If you already setup everything, you just need to run the following command in the project root:
@ -145,11 +150,13 @@ Documentation coming soon.
### Tests ### Tests
Run all tests Run all tests
``` ```
yarn run test yarn run test
``` ```
Run a specific test Run a specific test
``` ```
yarn run test:api-skolplattformen yarn run test:api-skolplattformen
``` ```
@ -194,7 +201,7 @@ If you're offended by this initiative, rest assured there is no reason to be —
## License ## License
Öppna skolplattformen is copyright 2020–2021 Not Free Beer AB. Öppna skolplattformen is copyright 2020–2023 Not Free Beer AB.
Licensed under the [Apache License, Version 2.0](LICENSE) (the "License"); you may use Öppna skolplattformen in compliance with the License. A copy of the License is included with this repository. Licensed under the [Apache License, Version 2.0](LICENSE) (the "License"); you may use Öppna skolplattformen in compliance with the License. A copy of the License is included with this repository.

3
apps/website/.babelrc
View File

@ -1,3 +0,0 @@
{
"presets": ["next/babel"]
}

BIN
apps/website/assets/pxm/banner squared.pxm Normal file
View File

Binary file not shown.

BIN
apps/website/assets/pxm/banner.pxm Normal file
View File

Binary file not shown.

20
apps/website/components/Banner.tsx
View File

@ -24,37 +24,37 @@ const Banner = () => {
<div className="pl-0 md:pl-4 xl:pl-0"> <div className="pl-0 md:pl-4 xl:pl-0">
<div className="hidden select-none lg:block"> <div className="hidden select-none lg:block">
<div> <div>
<img <Image
src={shape1} src={shape1}
alt="" alt=""
className="absolute left-64 top-8 motion-safe:animate-pulse" className="absolute left-64 top-8 motion-safe:animate-pulse"
/> />
<img <Image
src={shape2} src={shape2}
alt="" alt=""
className="absolute left-9 top-20 motion-safe:animate-pulse" className="absolute left-9 top-20 motion-safe:animate-pulse"
/> />
<img <Image
src={shape3} src={shape3}
alt="" alt=""
className="absolute left-48 top-18 motion-safe:animate-pulse" className="absolute left-48 top-18 motion-safe:animate-pulse"
/> />
<img <Image
src={shape4} src={shape4}
alt="" alt=""
className="absolute top-20 right-20 motion-safe:animate-bounce-slow" className="absolute top-20 right-20 motion-safe:animate-bounce-slow"
/> />
<img <Image
src={shape5} src={shape5}
alt="" alt=""
className="absolute top-1/2 left-1/2 motion-safe:animate-pulse" className="absolute top-1/2 left-1/2 motion-safe:animate-pulse"
/> />
<img <Image
src={shape6} src={shape6}
alt="" alt=""
className="absolute left-96 top-32 motion-safe:animate-bounce-slow" className="absolute left-96 top-32 motion-safe:animate-bounce-slow"
/> />
<img <Image
src={shape7} src={shape7}
alt="" alt=""
className="absolute bottom-48 right-8 motion-safe:animate-bounce-slow" className="absolute bottom-48 right-8 motion-safe:animate-bounce-slow"
@ -77,7 +77,7 @@ const Banner = () => {
href="https://apps.apple.com/se/app/%C3%B6ppna-skolplattformen-app/id1543853468" href="https://apps.apple.com/se/app/%C3%B6ppna-skolplattformen-app/id1543853468"
target="_blank" target="_blank"
> >
<img <Image
alt="Ladda ner i App Store" alt="Ladda ner i App Store"
src={appstore} src={appstore}
className="w-auto h-12" className="w-auto h-12"
@ -88,10 +88,10 @@ const Banner = () => {
href="https://play.google.com/store/apps/details?id=org.skolplattformen.app" href="https://play.google.com/store/apps/details?id=org.skolplattformen.app"
target="_blank" target="_blank"
> >
<img <Image
alt="Ladda ner i Google Play Store" alt="Ladda ner i Google Play Store"
src={playstore} src={playstore}
className="h-12" className="w-auto h-12"
/> />
</Link.External> </Link.External>
</p> </p>

8
apps/website/components/ButtonLink.tsx
View File

@ -2,7 +2,9 @@ import classNames from 'classnames'
import Link from 'next/link' import Link from 'next/link'
import { AnchorHTMLAttributes, DetailedHTMLProps } from 'react' import { AnchorHTMLAttributes, DetailedHTMLProps } from 'react'
type ButtonLinkProps = DetailedHTMLProps< type ButtonLinkProps = {
children: string
} & DetailedHTMLProps<
AnchorHTMLAttributes<HTMLAnchorElement>, AnchorHTMLAttributes<HTMLAnchorElement>,
HTMLAnchorElement HTMLAnchorElement
> >
@ -34,13 +36,13 @@ const ButtonLink: React.FC<ButtonLinkProps> = ({
} }
return ( return (
<Link href={href} passHref> <Link href={href} passHref legacyBehavior>
{inner} {inner}
</Link> </Link>
) )
} }
export const ButtonLinkPatreon: React.FC = ({ children }) => { export const ButtonLinkPatreon: React.FC<ButtonLinkProps> = ({ children }) => {
return ( return (
<ButtonLink <ButtonLink
href="https://www.patreon.com/oppnaskolplattformen" href="https://www.patreon.com/oppnaskolplattformen"

2
apps/website/components/Footer.tsx
View File

@ -76,7 +76,7 @@ const Footer = () => {
</div> </div>
<div className="py-8 text-center text-gray-500"> <div className="py-8 text-center text-gray-500">
<p>© copyright 2021 by Not free beer AB</p> <p>© Copyright 2023 by Not Free Beer AB</p>
</div> </div>
</footer> </footer>
) )

13
apps/website/components/Header.tsx
View File

@ -4,6 +4,7 @@ import React from 'react'
import NavLinks from './NavLinks' import NavLinks from './NavLinks'
import classnames from 'classnames' import classnames from 'classnames'
import Icon from './Icon' import Icon from './Icon'
import Image from 'next/image'
type UseMobileCallback = (ev: MediaQueryListEvent) => any type UseMobileCallback = (ev: MediaQueryListEvent) => any
@ -47,13 +48,11 @@ const HeaderHome = () => {
> >
<div className="flex items-center justify-between max-w-6xl px-5 py-4 mx-auto md:px-2"> <div className="flex items-center justify-between max-w-6xl px-5 py-4 mx-auto md:px-2">
<Link href="/"> <Link href="/">
<a> <Image
<img className="h-12 md:h-24"
className="h-12 md:h-24" src={headerLogo}
src={headerLogo} alt="Skolplattformen"
alt="Skolplattformen" />
/>
</a>
</Link> </Link>
<nav className="hidden md:block"> <nav className="hidden md:block">
<NavLinks /> <NavLinks />

10
apps/website/components/Layout.tsx
View File

@ -7,10 +7,7 @@ interface LayoutProps {
pageTitle: string pageTitle: string
} }
const Layout: React.FC<LayoutProps> = ({ const Layout: React.FC<LayoutProps> = ({ children, pageTitle }) => {
children,
pageTitle,
}) => {
return ( return (
<div> <div>
<Head> <Head>
@ -27,11 +24,6 @@ const Layout: React.FC<LayoutProps> = ({
<meta property="og:image" content={logo} /> <meta property="og:image" content={logo} />
<title>{pageTitle}</title> <title>{pageTitle}</title>
<link rel="shortcut icon" type="image/png" href={favImg} /> <link rel="shortcut icon" type="image/png" href={favImg} />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;500;600;700&display=swap"
rel="stylesheet"
/>
<script <script
async async
src={`https://www.googletagmanager.com/gtag/js?id=${GA_TRACKING_ID}`} src={`https://www.googletagmanager.com/gtag/js?id=${GA_TRACKING_ID}`}

14
apps/website/components/Link.tsx
View File

@ -5,13 +5,14 @@ interface LinkInternalProps {
href: string href: string
} }
const Internal: React.FC<LinkInternalProps> = ({ const Internal: React.FC<LinkInternalProps> = ({ href, children }) => {
href,
children,
}) => {
return ( return (
<Link href={href}> <Link
<a className="text-indigo-800 dark:text-indigo-400">{children}</a> legacyBehavior
href={href}
className="text-indigo-800 dark:text-indigo-400"
>
{children}
</Link> </Link>
) )
} }
@ -20,6 +21,7 @@ interface LinkExternalProps {
className?: string className?: string
href: string href: string
target?: string target?: string
children?: React.ReactNode | React.ReactNode[]
} }
const External: React.FC<LinkExternalProps> = ({ const External: React.FC<LinkExternalProps> = ({

4
apps/website/components/NavLinks.tsx
View File

@ -41,8 +41,8 @@ const NavLinks = ({ onClick }: NavLinksProps) => {
{children} {children}
</ScrollLink> </ScrollLink>
) : ( ) : (
<NavLink href={href}> <NavLink href={href} onClick={() => onClick?.()}>
<a onClick={() => onClick?.()}>{children}</a> {children}
</NavLink> </NavLink>
) )

1
apps/website/components/Section.tsx
View File

@ -4,6 +4,7 @@ interface SectionProps {
bg?: string bg?: string
id?: string id?: string
padding?: string padding?: string
children?: React.ReactNode | React.ReactNode[]
} }
const Section: React.FC<SectionProps> = ({ const Section: React.FC<SectionProps> = ({

1
apps/website/components/TimelineLatest.tsx
View File

@ -1,5 +1,4 @@
import ButtonLink from './ButtonLink' import ButtonLink from './ButtonLink'
import Timeline from './Timeline'
const TimelineLatest = () => { const TimelineLatest = () => {
return ( return (

18
apps/website/next-env.d.ts vendored
View File

@ -1,17 +1,5 @@
/// <reference types="next" /> /// <reference types="next" />
/// <reference types="next/types/global" /> /// <reference types="next/image-types/global" />
declare module '*.png' { // NOTE: This file should not be edited
const value: any // see https://nextjs.org/docs/basic-features/typescript for more information.
export = value
}
declare module '*.jpg' {
const value: any
export = value
}
declare module '*.svg' {
const value: any
export = value
}

3
apps/website/next.config.js
View File

@ -1,8 +1,5 @@
/* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-var-requires */
const withImages = require('next-images')
module.exports = { module.exports = {
...withImages(),
async redirects() { async redirects() {
return [ return [
{ {

14
apps/website/package.json
View File

@ -6,15 +6,15 @@
"dependencies": { "dependencies": {
"@types/classnames": "^2.2.11", "@types/classnames": "^2.2.11",
"classnames": "^2.3.1", "classnames": "^2.3.1",
"eslint-config-next": "^13.2.4",
"google-spreadsheet": "^3.1.15", "google-spreadsheet": "^3.1.15",
"next": "^10.1.3", "next": "^13.2.4",
"next-images": "^1.4.0", "react": "^18.2.0",
"react": "^17.0.2",
"react-countup": "^4.3.3", "react-countup": "^4.3.3",
"react-dom": "^17.0.2", "react-dom": "^18.2.0",
"react-id-swiper": "^4.0.0", "react-id-swiper": "^4.0.0",
"react-intl": "^5.15.8", "react-intl": "^6.3.2",
"react-scroll": "^1.8.2", "react-scroll": "^1.8.9",
"react-visibility-sensor": "^5.1.1", "react-visibility-sensor": "^5.1.1",
"sharp": "^0.28.1", "sharp": "^0.28.1",
"swiper": "6.1.1" "swiper": "6.1.1"
@ -37,7 +37,7 @@
"@types/google-spreadsheet": "^3.1.5", "@types/google-spreadsheet": "^3.1.5",
"@types/gtag.js": "^0.0.4", "@types/gtag.js": "^0.0.4",
"@types/jest": "^26.0.22", "@types/jest": "^26.0.22",
"@types/react": "^17.0.3", "@types/react": "^18.0.29",
"@types/react-scroll": "^1.8.2", "@types/react-scroll": "^1.8.2",
"@typescript-eslint/eslint-plugin": "^4.22.0", "@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0", "@typescript-eslint/parser": "^4.22.0",

12
apps/website/pages/_app.tsx
View File

@ -10,6 +10,13 @@ import { IntlProvider } from 'react-intl'
import { pageview } from '../components/gtag' import { pageview } from '../components/gtag'
import messages, { Languages } from '../content/locale/' import messages, { Languages } from '../content/locale/'
import { AppProps } from 'next/app' import { AppProps } from 'next/app'
import { Poppins } from 'next/font/google'
const poppins = Poppins({
weight: '400',
style: 'normal',
subsets: ['latin'],
})
export default function App({ Component, pageProps }: AppProps) { export default function App({ Component, pageProps }: AppProps) {
const router = useRouter() const router = useRouter()
@ -33,6 +40,11 @@ export default function App({ Component, pageProps }: AppProps) {
defaultLocale={defaultLocale} defaultLocale={defaultLocale}
messages={currentMessages} messages={currentMessages}
> >
<style jsx global>{`
html {
font-family: ${poppins.style.fontFamily};
}
`}</style>
<Layout pageTitle="Skolplattformen"> <Layout pageTitle="Skolplattformen">
<Header /> <Header />
<Component {...pageProps} /> <Component {...pageProps} />

2579
apps/website/yarn.lock
View File

File diff suppressed because it is too large Load Diff