Skip to content

Commit

Permalink
Fjerning av komponenter (#1216)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
MagnusRom authored May 14, 2024
1 parent 4bc208b commit 2de053e
Show file tree
Hide file tree
Showing 62 changed files with 11,584 additions and 2,491 deletions.
7 changes: 0 additions & 7 deletions .dockerignore

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/bygg-og-deploy-storybook.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: Bygg og deploy storybook

on:
Expand Down Expand Up @@ -50,5 +49,5 @@ jobs:
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: dev-gcp
RESOURCE: .nais/nais-dev-gcp-storybook.yml
VAR: image=${{ needs.build.outputs.image }}
RESOURCE: nais/nais-dev-gcp-storybook.yaml
VAR: image=${{ needs.build.outputs.image }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@
/coverage
# production
/server/dist
/storybook-static
/dist
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

.idea/
.vscode

Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Ignore files:
*.yaml
*.yml
.github
dist
package-lock.json
Expand Down
19 changes: 19 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import type { StorybookConfig } from '@storybook/react-vite';

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-onboarding',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/react-vite',
options: {},
},
docs: {
autodocs: 'tag',
},
};
export default config;
17 changes: 17 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import type { Preview } from '@storybook/react';
import '@/index.less';
import '@navikt/ds-css';

const preview: Preview = {
parameters: {
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
3 changes: 3 additions & 0 deletions StorybookDockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM nginxinc/nginx-unprivileged:1.20-alpine
COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY ./storybook-static /usr/share/nginx/html
21 changes: 21 additions & 0 deletions nais/nais-dev-gcp-storybook.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: nais.io/v1alpha1
kind: Application
metadata:
name: tiltaksgjennomforing-storybook
namespace: arbeidsgiver
labels:
team: arbeidsgiver
spec:
image: {{ image }}
port: 8080
ingresses:
- https://tiltaksgjennomforing-storybook.intern.dev.nav.no
liveness:
path: /isAlive
initialDelay: 10
readiness:
path: /isReady
initialDelay: 10
replicas:
min: 1
max: 1
26 changes: 26 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
access_log off;

server {
listen 8080;
port_in_redirect off;
server_name localhost;

# Health check for NAIS
location = /isAlive {
return 200 "Application:UP";
add_header Content-Type text/plain;
}

# Readiness check for NAIS
location = /isReady {
return 200 "Application:READY";
add_header Content-Type text/plain;
}

location / {
# beholder default root slik at vi kan swappe ut med stock nginx
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ =404;
}
}
Loading

0 comments on commit 2de053e

Please sign in to comment.