Skip to content

Commit 2de053e

Browse files
authored
Fjerning av komponenter (#1216)
* fjernet DelLenke, SendVarselModal og OpprettelseFullfortVeileder * Fjernet opprettelseFullførtArbeidsgiver * Fjernet utfylles av * oppdaterte tekster * Lagt til Stoorbook for å lettere vise avtale statuser * lagt til Storybook i tiltaksgjennomforing * lagt til yml * oppdatert Arbeidsgiver statuser * oppdaterte tekster og fikset bygg feil * fikset og fjernet commentarer * fikset i tilbakemeldinger * fjernet test som ikke blir brukt * fjernet .dockerignore * lagt til yml i .prettierignore * lagt til nginx.conf * fjernet skrivefeil * Fikset litt på stories så flere av statusene blir tatt med * fikset litt på AvtaleStatuserVeileder * lagt på style prop på Innholdsboks * lagt til nye tekst endringer og litt styling
1 parent 4bc208b commit 2de053e

File tree

62 files changed

+11584
-2491
lines changed

Some content is hidden

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

62 files changed

+11584
-2491
lines changed

.dockerignore

-7
This file was deleted.

.github/workflows/bygg-og-deploy-storybook.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: Bygg og deploy storybook
32

43
on:
@@ -50,5 +49,5 @@ jobs:
5049
uses: nais/deploy/actions/deploy@v2
5150
env:
5251
CLUSTER: dev-gcp
53-
RESOURCE: .nais/nais-dev-gcp-storybook.yml
54-
VAR: image=${{ needs.build.outputs.image }}
52+
RESOURCE: nais/nais-dev-gcp-storybook.yaml
53+
VAR: image=${{ needs.build.outputs.image }}

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
/coverage
99
# production
1010
/server/dist
11+
/storybook-static
1112
/dist
1213
# misc
1314
.DS_Store
1415
.env.local
1516
.env.development.local
1617
.env.test.local
1718
.env.production.local
19+
1820
.idea/
1921
.vscode
2022

.prettierignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Ignore files:
22
*.yaml
3+
*.yml
34
.github
45
dist
56
package-lock.json

.storybook/main.ts

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import type { StorybookConfig } from '@storybook/react-vite';
2+
3+
const config: StorybookConfig = {
4+
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
5+
addons: [
6+
'@storybook/addon-links',
7+
'@storybook/addon-essentials',
8+
'@storybook/addon-onboarding',
9+
'@storybook/addon-interactions',
10+
],
11+
framework: {
12+
name: '@storybook/react-vite',
13+
options: {},
14+
},
15+
docs: {
16+
autodocs: 'tag',
17+
},
18+
};
19+
export default config;

.storybook/preview.ts

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import type { Preview } from '@storybook/react';
2+
import '@/index.less';
3+
import '@navikt/ds-css';
4+
5+
const preview: Preview = {
6+
parameters: {
7+
actions: { argTypesRegex: '^on[A-Z].*' },
8+
controls: {
9+
matchers: {
10+
color: /(background|color)$/i,
11+
date: /Date$/i,
12+
},
13+
},
14+
},
15+
};
16+
17+
export default preview;

StorybookDockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM nginxinc/nginx-unprivileged:1.20-alpine
2+
COPY nginx.conf /etc/nginx/conf.d/default.conf
3+
COPY ./storybook-static /usr/share/nginx/html

nais/nais-dev-gcp-storybook.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apiVersion: nais.io/v1alpha1
2+
kind: Application
3+
metadata:
4+
name: tiltaksgjennomforing-storybook
5+
namespace: arbeidsgiver
6+
labels:
7+
team: arbeidsgiver
8+
spec:
9+
image: {{ image }}
10+
port: 8080
11+
ingresses:
12+
- https://tiltaksgjennomforing-storybook.intern.dev.nav.no
13+
liveness:
14+
path: /isAlive
15+
initialDelay: 10
16+
readiness:
17+
path: /isReady
18+
initialDelay: 10
19+
replicas:
20+
min: 1
21+
max: 1

nginx.conf

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
access_log off;
2+
3+
server {
4+
listen 8080;
5+
port_in_redirect off;
6+
server_name localhost;
7+
8+
# Health check for NAIS
9+
location = /isAlive {
10+
return 200 "Application:UP";
11+
add_header Content-Type text/plain;
12+
}
13+
14+
# Readiness check for NAIS
15+
location = /isReady {
16+
return 200 "Application:READY";
17+
add_header Content-Type text/plain;
18+
}
19+
20+
location / {
21+
# beholder default root slik at vi kan swappe ut med stock nginx
22+
root /usr/share/nginx/html;
23+
index index.html index.htm;
24+
try_files $uri $uri/ =404;
25+
}
26+
}

0 commit comments

Comments
 (0)