Skip to content

Commit 24ed492

Browse files
Revert "Merge branch 'colors-docs'" (#1089)
This reverts commit 623a1f2, reversing changes made to 56c1fb9.
1 parent 623a1f2 commit 24ed492

File tree

6 files changed

+29
-166
lines changed

6 files changed

+29
-166
lines changed

apps/docs/app/routeTree.gen.ts

Lines changed: 27 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ import { Route as rootRoute } from './routes/__root'
1414
import { Route as DocsImport } from './routes/_docs'
1515
import { Route as DocsIndexImport } from './routes/_docs/index'
1616
import { Route as StudioSplatImport } from './routes/studio/$'
17+
import { Route as DocsIkonerImport } from './routes/_docs/ikoner'
1718
import { Route as DocsKomponenterIndexImport } from './routes/_docs/komponenter/index'
18-
import { Route as DocsProfilIkonerImport } from './routes/_docs/profil/ikoner'
19-
import { Route as DocsProfilFargerImport } from './routes/_docs/profil/farger'
2019
import { Route as DocsKomponenterSlugImport } from './routes/_docs/komponenter/$slug'
2120

2221
// Create/Update Routes
@@ -38,21 +37,15 @@ const StudioSplatRoute = StudioSplatImport.update({
3837
getParentRoute: () => rootRoute,
3938
} as any)
4039

41-
const DocsKomponenterIndexRoute = DocsKomponenterIndexImport.update({
42-
id: '/komponenter/',
43-
path: '/komponenter/',
40+
const DocsIkonerRoute = DocsIkonerImport.update({
41+
id: '/ikoner',
42+
path: '/ikoner',
4443
getParentRoute: () => DocsRoute,
4544
} as any)
4645

47-
const DocsProfilIkonerRoute = DocsProfilIkonerImport.update({
48-
id: '/profil/ikoner',
49-
path: '/profil/ikoner',
50-
getParentRoute: () => DocsRoute,
51-
} as any)
52-
53-
const DocsProfilFargerRoute = DocsProfilFargerImport.update({
54-
id: '/profil/farger',
55-
path: '/profil/farger',
46+
const DocsKomponenterIndexRoute = DocsKomponenterIndexImport.update({
47+
id: '/komponenter/',
48+
path: '/komponenter/',
5649
getParentRoute: () => DocsRoute,
5750
} as any)
5851

@@ -73,6 +66,13 @@ declare module '@tanstack/react-router' {
7366
preLoaderRoute: typeof DocsImport
7467
parentRoute: typeof rootRoute
7568
}
69+
'/_docs/ikoner': {
70+
id: '/_docs/ikoner'
71+
path: '/ikoner'
72+
fullPath: '/ikoner'
73+
preLoaderRoute: typeof DocsIkonerImport
74+
parentRoute: typeof DocsImport
75+
}
7676
'/studio/$': {
7777
id: '/studio/$'
7878
path: '/studio/$'
@@ -94,20 +94,6 @@ declare module '@tanstack/react-router' {
9494
preLoaderRoute: typeof DocsKomponenterSlugImport
9595
parentRoute: typeof DocsImport
9696
}
97-
'/_docs/profil/farger': {
98-
id: '/_docs/profil/farger'
99-
path: '/profil/farger'
100-
fullPath: '/profil/farger'
101-
preLoaderRoute: typeof DocsProfilFargerImport
102-
parentRoute: typeof DocsImport
103-
}
104-
'/_docs/profil/ikoner': {
105-
id: '/_docs/profil/ikoner'
106-
path: '/profil/ikoner'
107-
fullPath: '/profil/ikoner'
108-
preLoaderRoute: typeof DocsProfilIkonerImport
109-
parentRoute: typeof DocsImport
110-
}
11197
'/_docs/komponenter/': {
11298
id: '/_docs/komponenter/'
11399
path: '/komponenter'
@@ -121,79 +107,66 @@ declare module '@tanstack/react-router' {
121107
// Create and export the route tree
122108

123109
interface DocsRouteChildren {
110+
DocsIkonerRoute: typeof DocsIkonerRoute
124111
DocsIndexRoute: typeof DocsIndexRoute
125112
DocsKomponenterSlugRoute: typeof DocsKomponenterSlugRoute
126-
DocsProfilFargerRoute: typeof DocsProfilFargerRoute
127-
DocsProfilIkonerRoute: typeof DocsProfilIkonerRoute
128113
DocsKomponenterIndexRoute: typeof DocsKomponenterIndexRoute
129114
}
130115

131116
const DocsRouteChildren: DocsRouteChildren = {
117+
DocsIkonerRoute: DocsIkonerRoute,
132118
DocsIndexRoute: DocsIndexRoute,
133119
DocsKomponenterSlugRoute: DocsKomponenterSlugRoute,
134-
DocsProfilFargerRoute: DocsProfilFargerRoute,
135-
DocsProfilIkonerRoute: DocsProfilIkonerRoute,
136120
DocsKomponenterIndexRoute: DocsKomponenterIndexRoute,
137121
}
138122

139123
const DocsRouteWithChildren = DocsRoute._addFileChildren(DocsRouteChildren)
140124

141125
export interface FileRoutesByFullPath {
142126
'': typeof DocsRouteWithChildren
127+
'/ikoner': typeof DocsIkonerRoute
143128
'/studio/$': typeof StudioSplatRoute
144129
'/': typeof DocsIndexRoute
145130
'/komponenter/$slug': typeof DocsKomponenterSlugRoute
146-
'/profil/farger': typeof DocsProfilFargerRoute
147-
'/profil/ikoner': typeof DocsProfilIkonerRoute
148131
'/komponenter': typeof DocsKomponenterIndexRoute
149132
}
150133

151134
export interface FileRoutesByTo {
135+
'/ikoner': typeof DocsIkonerRoute
152136
'/studio/$': typeof StudioSplatRoute
153137
'/': typeof DocsIndexRoute
154138
'/komponenter/$slug': typeof DocsKomponenterSlugRoute
155-
'/profil/farger': typeof DocsProfilFargerRoute
156-
'/profil/ikoner': typeof DocsProfilIkonerRoute
157139
'/komponenter': typeof DocsKomponenterIndexRoute
158140
}
159141

160142
export interface FileRoutesById {
161143
__root__: typeof rootRoute
162144
'/_docs': typeof DocsRouteWithChildren
145+
'/_docs/ikoner': typeof DocsIkonerRoute
163146
'/studio/$': typeof StudioSplatRoute
164147
'/_docs/': typeof DocsIndexRoute
165148
'/_docs/komponenter/$slug': typeof DocsKomponenterSlugRoute
166-
'/_docs/profil/farger': typeof DocsProfilFargerRoute
167-
'/_docs/profil/ikoner': typeof DocsProfilIkonerRoute
168149
'/_docs/komponenter/': typeof DocsKomponenterIndexRoute
169150
}
170151

171152
export interface FileRouteTypes {
172153
fileRoutesByFullPath: FileRoutesByFullPath
173154
fullPaths:
174155
| ''
156+
| '/ikoner'
175157
| '/studio/$'
176158
| '/'
177159
| '/komponenter/$slug'
178-
| '/profil/farger'
179-
| '/profil/ikoner'
180160
| '/komponenter'
181161
fileRoutesByTo: FileRoutesByTo
182-
to:
183-
| '/studio/$'
184-
| '/'
185-
| '/komponenter/$slug'
186-
| '/profil/farger'
187-
| '/profil/ikoner'
188-
| '/komponenter'
162+
to: '/ikoner' | '/studio/$' | '/' | '/komponenter/$slug' | '/komponenter'
189163
id:
190164
| '__root__'
191165
| '/_docs'
166+
| '/_docs/ikoner'
192167
| '/studio/$'
193168
| '/_docs/'
194169
| '/_docs/komponenter/$slug'
195-
| '/_docs/profil/farger'
196-
| '/_docs/profil/ikoner'
197170
| '/_docs/komponenter/'
198171
fileRoutesById: FileRoutesById
199172
}
@@ -225,13 +198,16 @@ export const routeTree = rootRoute
225198
"/_docs": {
226199
"filePath": "_docs.tsx",
227200
"children": [
201+
"/_docs/ikoner",
228202
"/_docs/",
229203
"/_docs/komponenter/$slug",
230-
"/_docs/profil/farger",
231-
"/_docs/profil/ikoner",
232204
"/_docs/komponenter/"
233205
]
234206
},
207+
"/_docs/ikoner": {
208+
"filePath": "_docs/ikoner.tsx",
209+
"parent": "/_docs"
210+
},
235211
"/studio/$": {
236212
"filePath": "studio/$.tsx"
237213
},
@@ -243,14 +219,6 @@ export const routeTree = rootRoute
243219
"filePath": "_docs/komponenter/$slug.tsx",
244220
"parent": "/_docs"
245221
},
246-
"/_docs/profil/farger": {
247-
"filePath": "_docs/profil/farger.tsx",
248-
"parent": "/_docs"
249-
},
250-
"/_docs/profil/ikoner": {
251-
"filePath": "_docs/profil/ikoner.tsx",
252-
"parent": "/_docs"
253-
},
254222
"/_docs/komponenter/": {
255223
"filePath": "_docs/komponenter/index.tsx",
256224
"parent": "/_docs"

apps/docs/app/routes/_docs/profil/ikoner.tsx renamed to apps/docs/app/routes/_docs/ikoner.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Box, Download, Figma, Github } from '@obosbbl/grunnmuren-icons-react';
33
import { Button, Card } from '@obosbbl/grunnmuren-react';
44
import { createFileRoute } from '@tanstack/react-router';
55

6-
export const Route = createFileRoute('/_docs/profil/ikoner')({
6+
export const Route = createFileRoute('/_docs/ikoner')({
77
component: Page,
88
head: () => ({
99
meta: [

apps/docs/app/routes/_docs/profil/farger.tsx

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

apps/docs/app/ui/main-nav.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ const mainNavItems = [
5353
title: 'Profil',
5454
subNavItems: [
5555
{
56-
to: '/profil/farger',
57-
title: 'Farger',
58-
},
59-
{
60-
to: '/profil/ikoner',
56+
to: '/ikoner',
6157
title: 'Ikoner',
6258
},
6359
],

apps/docs/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"@obosbbl/grunnmuren-icons-svg": "workspace:*",
2323
"@obosbbl/grunnmuren-react": "workspace:*",
2424
"@portabletext/react": "3.2.0",
25-
"@react-aria/utils": "3.25.1",
2625
"@sanity/client": "6.24.1",
2726
"@sanity/code-input": "5.1.2",
2827
"@sanity/vision": "3.68.3",

pnpm-lock.yaml

Lines changed: 0 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)