Skip to content

Commit 6f129a0

Browse files
committed
copy in the rest
1 parent b431db5 commit 6f129a0

File tree

141 files changed

+4728
-10094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+4728
-10094
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Dockerfile
77
.git
88
.gitignore
99
.npmrc
10+
.next

.eslintrc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ rules:
2828
"@typescript-eslint/no-unused-vars": ["warn"]
2929
no-unused-vars: "off"
3030
react/prop-types: "off"
31-
"@typescript-eslint/no-use-before-define": ["error"]
3231
"react/jsx-filename-extension":
3332
- 2
3433
- "extensions":

.yarnclean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ powered-test
88
docs
99
doc
1010
website
11-
images
11+
# images
1212
assets
1313

1414
# examples

Dockerfile

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
1-
FROM node:16-buster AS deps
2-
1+
FROM node:18-alpine AS deps
2+
RUN apk add --no-cache libc6-compat
33
WORKDIR /app
44

55
COPY package.json yarn.lock ./
6+
RUN yarn install
67

7-
RUN yarn install --frozen-lockfile --production=false
8-
9-
FROM node:16-buster AS builder
10-
8+
FROM node:18-alpine AS builder
119
WORKDIR /app
12-
1310
COPY --from=deps /app/node_modules ./node_modules
1411
COPY . .
1512

16-
ENV NEXT_PUBLIC_ENV=production
17-
RUN yarn build
13+
ENV NEXT_TELEMETRY_DISABLED 1
14+
ENV NEXT_PUBLIC_ENV production
1815

19-
FROM node:16-buster
16+
RUN yarn build
2017

18+
FROM node:18-alpine AS runner
2119
WORKDIR /app
2220

2321
ENV NODE_ENV production
24-
ENV NEXT_PUBLIC_ENV production
2522

26-
COPY --from=deps /app/node_modules ./node_modules
27-
COPY --from=builder /app/.next ./.next
28-
COPY --from=builder /app/public ./public
23+
RUN addgroup --system --gid 1001 nodejs
24+
RUN adduser --system --uid 1001 nextjs
25+
26+
COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
27+
COPY --from=builder /app/node_modules ./node_modules
2928
COPY --from=builder /app/package.json ./package.json
3029

31-
CMD yarn run start
30+
USER nextjs
31+
32+
EXPOSE 3000
33+
34+
ENV PORT 3000
35+
36+
CMD ["npm", "start"]

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Frikanalen web frontend
22

3-
This is an attempt to make a snapshot of the repo in 2021 in order to build a frontend package.
3+
![Build frontend package](https://github.com/Frikanalen/frikanalen/workflows/Build%20frontend%20package/badge.svg)
4+
5+
This is the new frontend, for the old backend. The new one is at Frikanalen/frontend.
46

57
It can be reached at frikanalen.no.
68

@@ -10,7 +12,7 @@ First, install the dependencies (obviously this requires yarn)
1012

1113
`yarn install`
1214

13-
Then there are two profiles to choose from; either
15+
Then there are two profiles to choose from; either
1416

15-
* `yarn run dev` - if you are using a local Django instance (in which case it will expect to find it at `localhost:8080`), or
16-
* `yarn run staging` - to run the frontend against the production backend API.
17+
- `yarn run dev` - if you are using a local Django instance (in which case it will expect to find it at `localhost:8080`), or
18+
- `yarn run staging` - to run the frontend against the production backend API.

components/ATEMPanel.tsx

Lines changed: 0 additions & 86 deletions
This file was deleted.

components/LiveVideoPlayer.jsx

Lines changed: 0 additions & 42 deletions
This file was deleted.

components/MonitoringStream.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

components/ScheduleInfo.module.sass

Lines changed: 0 additions & 15 deletions
This file was deleted.

components/ScheduleInfo.tsx

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)