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.

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

update website dependencies #16

Merged
merged 2 commits into from
May 30, 2023
Merged

update website dependencies #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
187486a
update website dependencies
Taldrain May 27, 2023
932e1d1
Merge branch 'master' into update-website-dependencies
Taldrain May 30, 2023
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
1 change: 1 addition & 0 deletions website/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/hydrogen
2 changes: 1 addition & 1 deletion website/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# base node image
FROM node:16-bullseye-slim as base
FROM node:18-bullseye-slim as base

# Install openssl for Prisma
RUN apt-get update && apt-get install -y openssl
Expand Down
22 changes: 0 additions & 22 deletions website/app/entry.client.tsx
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions website/app/entry.server.tsx
View file
Open in desktop

This file was deleted.

16 changes: 7 additions & 9 deletions website/app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
import type { MetaFunction, LinksFunction } from "@remix-run/node";
import type { LinksFunction } from "@remix-run/node";
import {
Links,
LiveReload,
Meta,
Outlet,
Scripts,
ScrollRestoration,
} from "@remix-run/react";

import styles from "./tailwind.css";

export const meta: MetaFunction = () => ({
charset: "utf-8",
title: "Sopic",
viewport: "width=device-width,initial-scale=1",
});

export const links: LinksFunction = () => [
{ rel: "stylesheet", href: styles },
];
Expand All @@ -24,7 +17,12 @@ export default function App() {
return (
<html lang="en">
<head>
<Meta />
<title>Sopic</title>
<meta charSet="utf-8" />
<meta
name="viewport"
content="width=device-width,initial-scale=1"
/>
<Links />
</head>
<body>
Expand Down
37 changes: 19 additions & 18 deletions website/fly.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
# fly.toml file generated for sopic on 2023-02-23T00:10:43+01:00
# fly.toml app configuration file generated for sopic on 2023-05-26T22:58:27+02:00
#
# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
#

app = "sopic"
primary_region = "cdg"
kill_signal = "SIGINT"
kill_timeout = 5
processes = []

[env]
PORT = "8080"
kill_timeout = "5s"

[experimental]
auto_rollback = true

[env]
PORT = "8080"

[[services]]
http_checks = []
protocol = "tcp"
internal_port = 8080
processes = ["app"]
protocol = "tcp"
script_checks = []
[services.concurrency]
hard_limit = 25
soft_limit = 20
type = "connections"

[[services.ports]]
force_https = true
handlers = ["http"]
port = 80
handlers = ["http"]
force_https = true

[[services.ports]]
handlers = ["tls", "http"]
port = 443
handlers = ["tls", "http"]
[services.concurrency]
type = "connections"
hard_limit = 25
soft_limit = 20

[[services.tcp_checks]]
grace_period = "1s"
interval = "15s"
restart_limit = 0
timeout = "2s"
grace_period = "1s"
restart_limit = 0
Loading