Merge branch 'GREG-98-landing-page' into 'master'
Greg 98 landing page See merge request !146
Showing
- frontend/public/locales/en/common.json 5 additions, 0 deletionsfrontend/public/locales/en/common.json
- frontend/public/locales/nb/common.json 4 additions, 0 deletionsfrontend/public/locales/nb/common.json
- frontend/public/locales/nn/common.json 4 additions, 0 deletionsfrontend/public/locales/nn/common.json
- frontend/src/components/debug/index.tsx 22 additions, 2 deletionsfrontend/src/components/debug/index.tsx
- frontend/src/components/roleLine/index.tsx 61 additions, 0 deletionsfrontend/src/components/roleLine/index.tsx
- frontend/src/contexts/userContext.ts 15 additions, 8 deletionsfrontend/src/contexts/userContext.ts
- frontend/src/interfaces/index.ts 15 additions, 0 deletionsfrontend/src/interfaces/index.ts
- frontend/src/providers/userProvider.tsx 58 additions, 3 deletionsfrontend/src/providers/userProvider.tsx
- frontend/src/routes/frontpage/index.tsx 2 additions, 29 deletionsfrontend/src/routes/frontpage/index.tsx
- frontend/src/routes/index.tsx 8 additions, 7 deletionsfrontend/src/routes/index.tsx
- frontend/src/routes/landing/index.tsx 109 additions, 0 deletionsfrontend/src/routes/landing/index.tsx
- frontend/src/routes/sponsor/guest/guestInfo/index.tsx 2 additions, 34 deletionsfrontend/src/routes/sponsor/guest/guestInfo/index.tsx
- gregui/api/views/userinfo.py 25 additions, 15 deletionsgregui/api/views/userinfo.py
Loading
Please register or sign in to comment