Skip to content
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.

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

Development #368

Merged
merged 64 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
815137c
remove login button
Thiemann96 Nov 28, 2023
9e4e2e1
adjust spotify and youtube embed
Nov 28, 2023
1a3b471
edit about page to fit on mobile
Nov 28, 2023
700a2af
adjust mobile on ourstory
Nov 28, 2023
e3dc2de
forcemount for tabs
Nov 28, 2023
727bf52
ts lints
Nov 28, 2023
9c46ede
adjust orientation and distances of containers
Nov 29, 2023
8963ac1
center welcome modal in gallery
Nov 29, 2023
f853bca
charity banner in all languages
Nov 29, 2023
bf43767
remove deepl tag
Nov 29, 2023
ad23f51
limit file size for media upload
Nov 29, 2023
1d4747b
remove 2nd play button in embed, translate for login
Nov 29, 2023
b5798ff
have navbar in foreground
Nov 29, 2023
e21e7b9
forcemount to prevent page refresh
Nov 29, 2023
e0d4802
fix udpated at translation
Nov 29, 2023
3bcba93
rounded about page
Nov 29, 2023
cdcab36
removed lint errors from charity banner
Nov 29, 2023
c284ff3
buidl errors
Nov 29, 2023
44fb5da
not showing slides
Nov 29, 2023
7cd512c
nwo right
Nov 29, 2023
ea054ac
adjust embed box
Nov 30, 2023
53a3845
adjust embeds
Nov 30, 2023
3f9e6d8
prevent marker double click
Dec 1, 2023
6baf186
updated sign in mail to bypass automatic p detection
Thiemann96 Jan 16, 2024
0995b96
new build
Thiemann96 Jan 16, 2024
570ded1
udpate build
Thiemann96 Jan 16, 2024
491375a
update build
Thiemann96 Jan 16, 2024
cf96c29
updated node
Thiemann96 Jan 16, 2024
0edd8fc
revert node update
Thiemann96 Jan 16, 2024
74e2cb7
Update lint.yml
Thiemann96 Jan 16, 2024
0d06386
Merge branch 'fix/login2.0' of https://github.com/reedu-reengineering…
Thiemann96 Jan 16, 2024
c17729a
update to node 20
Thiemann96 Jan 16, 2024
6a5da06
update packages
Thiemann96 Jan 16, 2024
7db08ea
changes to packae
Thiemann96 Jan 16, 2024
c317a01
update
Thiemann96 Jan 16, 2024
cfcf636
switched to resend for mail delivery
Thiemann96 Jan 18, 2024
ddbdb9c
Update .env.example
Thiemann96 Jan 18, 2024
30626ae
Update Dockerfile
Thiemann96 Jan 18, 2024
840f6ab
fix button not displayed in safari?
Feb 14, 2024
1481be2
change domain name
Thiemann96 Feb 16, 2024
8bfcc2b
change domain name
Thiemann96 Feb 16, 2024
d67f620
switched to gandi mail provider
Thiemann96 Feb 21, 2024
f29b981
fix for outlook safelinks?
Thiemann96 Feb 21, 2024
3f24eaa
post url to console
Thiemann96 Feb 21, 2024
6d3ac3e
removed sending mail for now
Thiemann96 Feb 21, 2024
f90cfa7
revert not sending mail
Thiemann96 Feb 21, 2024
2053dee
switching back to button in mails
Thiemann96 Feb 23, 2024
51e0e55
updated session time for tokens
Thiemann96 Feb 23, 2024
8bcc938
Merge branch 'fix/login2.0' into fix/login3.0
Thiemann96 Feb 27, 2024
16b2395
Merge pull request #366 from reedu-reengineering-education/fix/login3.0
Thiemann96 Feb 27, 2024
fa87087
Merge pull request #361 from reedu-reengineering-education/fix/login2.0
Thiemann96 Feb 27, 2024
282afe7
fixed logo not showing because of z index
Thiemann96 Feb 27, 2024
6d5092e
Merge pull request #369 from reedu-reengineering-education/fix/zeitge…
Thiemann96 Feb 27, 2024
10e1890
upgraded next to v14
Thiemann96 Feb 27, 2024
9423f3d
reverted back to sending json instead of res.send
Thiemann96 Feb 27, 2024
05445f6
loggin auth sessions
Thiemann96 Feb 28, 2024
65e432e
remove optimistic navigation
Thiemann96 Feb 28, 2024
084af27
retrigger build
Thiemann96 Feb 28, 2024
cf8df1b
prevent head reqeusts from expiring the link
Thiemann96 Feb 28, 2024
31d27f9
logging if head request is made
Thiemann96 Feb 28, 2024
58fcb9b
prevent bots and preview links from invalidating the link
Thiemann96 Feb 28, 2024
766781b
removed öpggers
Thiemann96 Feb 28, 2024
8b4bd3d
removed logs
Thiemann96 Mar 1, 2024
4976716
Merge pull request #371 from reedu-reengineering-education/upgrade/au…
Thiemann96 Mar 1, 2024
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
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ [email protected]
SMTP_PASS=securepass

# Comma seperated list of mapstories to add to gallery
GALLERY_STORIES='cliu2h3qt0003dvtwy09fn876'
GALLERY_STORIES='cliu2h3qt0003dvtwy09fn876'
RESEND_API_KEY=
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 16
node-version: 18

# ESLint and Prettier must be in `package.json`
- name: Install Node.js dependencies
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"typescript.enablePromptUseWorkspaceTsdk": true,
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"tailwindCSS.experimental.classRegex": [
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Install dependencies only when needed
FROM node:18-alpine AS deps
FROM node:20-alpine AS deps
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
Expand All @@ -15,7 +15,7 @@ RUN \


# Rebuild the source code only when needed
FROM node:18-alpine AS builder
FROM node:20-alpine AS builder
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .
Expand All @@ -32,10 +32,10 @@ ENV NEXT_TELEMETRY_DISABLED 1

# If using npm comment out above and use below instead
# RUN npm run build
RUN NEXT_PUBLIC_MAPBOX_TOKEN=APP_NEXT_PUBLIC_MAPBOX_TOKEN yarn build
RUN NEXT_PUBLIC_MAPBOX_TOKEN=APP_NEXT_PUBLIC_MAPBOX_TOKEN RESEND_API_KEY=APP_RESEND_API_KEY yarn build

# Production image, copy all the files and run next
FROM node:18-alpine AS runner
FROM node:20-alpine AS runner
WORKDIR /app

ENV NODE_ENV production
Expand Down Expand Up @@ -67,4 +67,4 @@ ENV PORT 3000

ENTRYPOINT [ "/app/entrypoint.sh" ]

CMD ["node", "server.js"]
CMD ["node", "server.js"]
11 changes: 8 additions & 3 deletions emails/sign-in.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { Button } from '@react-email/button'
import { Html } from '@react-email/html'
import * as React from 'react'
import { Tailwind } from '@react-email/tailwind'
Expand All @@ -7,7 +6,7 @@ import { Heading } from '@react-email/heading'
import { Text } from '@react-email/text'
import { Font } from '@react-email/font'
import { Container } from '@react-email/container'

import { Button } from '@react-email/button'
interface SignInProps {
url: string
}
Expand Down Expand Up @@ -41,11 +40,17 @@ export default function SignInEmail({ url }: SignInProps) {
Danke, dass Du Mapstories nutzen möchtest. Wir freuen uns sehr dich
dabei zu haben. Um Mapstories nutzen zu können, melde dich bitte an:
</Text>
Kopiere diesen Link in deinen Browser, um dich anzumelden / Copy this
link to sign in / Copia este enlace para iniciar sesión / Copiez ce
lien pour vous connecter:
<br />
<br />
<Button
className="bg-brand text-md mx-auto rounded-md px-4 py-2 font-medium text-white"
href={url}
>
Login
{' '}
Login{' '}
</Button>
</Container>
</Html>
Expand Down
2 changes: 1 addition & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
const nextConfig = {
experimental: {
appDir: true,
swcPlugins: [['next-superjson-plugin', {}]],
serverComponentsExternalPackages: ['resend'],
},
eslint: {
dirs: ['src', 'lib', 'hooks'],
Expand Down
Loading
Loading