Skip to content

Commit a8ea872

Browse files
committed
Merge branch 'feature/support-repository-server' into feature/repository-server-admin-page
2 parents 3fb0114 + 9818e21 commit a8ea872

219 files changed

Lines changed: 1031 additions & 1662 deletions

File tree

Some content is hidden

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

components.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://shadcn-svelte.com/schema.json",
33
"tailwind": {
4-
"css": "src\\app.css",
4+
"css": "src/app.css",
55
"baseColor": "neutral"
66
},
77
"aliases": {

eslint.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ export default defineConfig(
3131
// typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.
3232
// see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors
3333
'no-undef': 'off',
34+
'no-control-regex': 'off',
35+
'no-misleading-character-class': 'off',
3436
'no-useless-assignment': 'warn',
3537
'svelte/no-unused-svelte-ignore': 'off',
3638
'@typescript-eslint/no-unused-vars': [

openapitools.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
33
"spaces": 2,
44
"generator-cli": {
5-
"version": "7.20.0",
5+
"version": "7.21.0",
66
"generators": {
77
"v1": {
88
"inputSpec": "https://api.openshock.dev/swagger/1/swagger.json",
@@ -12,6 +12,7 @@
1212
"supportsES6": true,
1313
"stringEnums": true,
1414
"withInterfaces": true,
15+
"withRequestOptsInInterface": false,
1516
"paramNaming": "camelCase",
1617
"enumPropertyNaming": "PascalCase",
1718
"modelPropertyNaming": "camelCase",
@@ -27,6 +28,7 @@
2728
"supportsES6": true,
2829
"stringEnums": true,
2930
"withInterfaces": true,
31+
"withRequestOptsInInterface": false,
3032
"paramNaming": "camelCase",
3133
"enumPropertyNaming": "PascalCase",
3234
"modelPropertyNaming": "camelCase",

scripts/update-shadcn.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ for dep in "${UNWANTED_DEPS[@]}"; do
5555
pnpm remove "$dep"
5656
fi
5757
done
58-
pnpm up --latest
5958

6059
# Format to reduce diff noise
6160
echo "Formatting..."
@@ -67,15 +66,15 @@ echo "Applying custom modifications..."
6766
# Sidebar: ease-in-out and duration-300
6867
sed -i 's/duration-200 ease-linear/duration-300 ease-in-out/g' "$UI_DIR/sidebar/sidebar.svelte"
6968

70-
# Sidebar submenu: ml-* instead of mx-*
69+
# Sidebar submenu: ml-* instead of mx-*, pl-* instead of px-*
7170
sed -i 's/mx-3\.5\(.*\)px-2\.5/ml-3.5\1pl-2.5/g' "$UI_DIR/sidebar/sidebar-menu-sub.svelte"
7271

7372
# Sonner: use color-scheme-state instead of mode-watcher
7473
sed -i "s|import { mode } from \"mode-watcher\";|import { colorScheme } from '\$lib/state/color-scheme-state.svelte';|" "$UI_DIR/sonner/sonner.svelte"
7574
sed -i 's|theme={mode\.current}|theme={colorScheme.value}|' "$UI_DIR/sonner/sonner.svelte"
7675

7776
# Slider: add cursor-w-resize to thumb
78-
sed -i 's/focus-visible:outline-hidden disabled:pointer/focus-visible:outline-hidden cursor-w-resize disabled:pointer/' "$UI_DIR/slider/slider.svelte"
77+
sed -i 's/select-none disabled:pointer/cursor-w-resize select-none disabled:pointer/' "$UI_DIR/slider/slider.svelte"
7978

8079
# Toggle group: suppress state_referenced_locally warnings
8180
sed -i 's/\tsetToggleGroupCtx/\t\/\/ svelte-ignore state_referenced_locally\n\tsetToggleGroupCtx/' "$UI_DIR/toggle-group/toggle-group.svelte"

src/app.css

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,3 +182,71 @@
182182
opacity: 0;
183183
}
184184
}
185+
186+
@custom-variant data-open {
187+
&:where([data-state='open']),
188+
&:where([data-open]:not([data-open='false'])) {
189+
@slot;
190+
}
191+
}
192+
193+
@custom-variant data-closed {
194+
&:where([data-state='closed']),
195+
&:where([data-closed]:not([data-closed='false'])) {
196+
@slot;
197+
}
198+
}
199+
200+
@custom-variant data-checked {
201+
&:where([data-state='checked']),
202+
&:where([data-checked]:not([data-checked='false'])) {
203+
@slot;
204+
}
205+
}
206+
207+
@custom-variant data-unchecked {
208+
&:where([data-state='unchecked']),
209+
&:where([data-unchecked]:not([data-unchecked='false'])) {
210+
@slot;
211+
}
212+
}
213+
214+
@custom-variant data-selected {
215+
&:where([data-selected]) {
216+
@slot;
217+
}
218+
}
219+
220+
@custom-variant data-disabled {
221+
&:where([data-disabled='true']),
222+
&:where([data-disabled]:not([data-disabled='false'])) {
223+
@slot;
224+
}
225+
}
226+
227+
@custom-variant data-active {
228+
&:where([data-state='active']),
229+
&:where([data-active]:not([data-active='false'])) {
230+
@slot;
231+
}
232+
}
233+
234+
@custom-variant data-horizontal {
235+
&:where([data-orientation='horizontal']) {
236+
@slot;
237+
}
238+
}
239+
240+
@custom-variant data-vertical {
241+
&:where([data-orientation='vertical']) {
242+
@slot;
243+
}
244+
}
245+
246+
@utility no-scrollbar {
247+
-ms-overflow-style: none;
248+
scrollbar-width: none;
249+
&::-webkit-scrollbar {
250+
display: none;
251+
}
252+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.20.0
1+
7.21.0

src/lib/api/internal/v1/apis/APITokensApi.ts

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,6 @@ export interface TokensReportTokensRequest {
6868
* @interface APITokensApiInterface
6969
*/
7070
export interface APITokensApiInterface {
71-
/**
72-
* Creates request options for tokenDeleteDeleteToken without sending the request
73-
* @param {string} tokenId
74-
* @throws {RequiredError}
75-
* @memberof APITokensApiInterface
76-
*/
77-
tokenDeleteDeleteTokenRequestOpts(requestParameters: TokenDeleteDeleteTokenRequest): Promise<runtime.RequestOpts>;
78-
7971
/**
8072
*
8173
* @summary Revoke a token
@@ -91,14 +83,6 @@ export interface APITokensApiInterface {
9183
*/
9284
tokenDeleteDeleteToken(tokenId: string, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
9385

94-
/**
95-
* Creates request options for tokensCreateToken without sending the request
96-
* @param {CreateTokenRequest} [createTokenRequest]
97-
* @throws {RequiredError}
98-
* @memberof APITokensApiInterface
99-
*/
100-
tokensCreateTokenRequestOpts(requestParameters: TokensCreateTokenRequest): Promise<runtime.RequestOpts>;
101-
10286
/**
10387
*
10488
* @summary Create a new token
@@ -114,15 +98,6 @@ export interface APITokensApiInterface {
11498
*/
11599
tokensCreateToken(createTokenRequest?: CreateTokenRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<TokenCreatedResponse>;
116100

117-
/**
118-
* Creates request options for tokensEditToken without sending the request
119-
* @param {string} tokenId
120-
* @param {EditTokenRequest} [editTokenRequest]
121-
* @throws {RequiredError}
122-
* @memberof APITokensApiInterface
123-
*/
124-
tokensEditTokenRequestOpts(requestParameters: TokensEditTokenRequest): Promise<runtime.RequestOpts>;
125-
126101
/**
127102
*
128103
* @summary Edit a token
@@ -139,14 +114,6 @@ export interface APITokensApiInterface {
139114
*/
140115
tokensEditToken(tokenId: string, editTokenRequest?: EditTokenRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
141116

142-
/**
143-
* Creates request options for tokensGetTokenById without sending the request
144-
* @param {string} tokenId
145-
* @throws {RequiredError}
146-
* @memberof APITokensApiInterface
147-
*/
148-
tokensGetTokenByIdRequestOpts(requestParameters: TokensGetTokenByIdRequest): Promise<runtime.RequestOpts>;
149-
150117
/**
151118
*
152119
* @summary Get a token by id
@@ -162,13 +129,6 @@ export interface APITokensApiInterface {
162129
*/
163130
tokensGetTokenById(tokenId: string, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<TokenResponse>;
164131

165-
/**
166-
* Creates request options for tokensListTokens without sending the request
167-
* @throws {RequiredError}
168-
* @memberof APITokensApiInterface
169-
*/
170-
tokensListTokensRequestOpts(): Promise<runtime.RequestOpts>;
171-
172132
/**
173133
*
174134
* @summary List all tokens for the current user
@@ -183,14 +143,6 @@ export interface APITokensApiInterface {
183143
*/
184144
tokensListTokens(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<TokenResponse>>;
185145

186-
/**
187-
* Creates request options for tokensReportTokens without sending the request
188-
* @param {ReportTokensRequest} [reportTokensRequest]
189-
* @throws {RequiredError}
190-
* @memberof APITokensApiInterface
191-
*/
192-
tokensReportTokensRequestOpts(requestParameters: TokensReportTokensRequest): Promise<runtime.RequestOpts>;
193-
194146
/**
195147
*
196148
* @summary Endpoint to delete potentially compromised api tokens
@@ -206,13 +158,6 @@ export interface APITokensApiInterface {
206158
*/
207159
tokensReportTokens(reportTokensRequest?: ReportTokensRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
208160

209-
/**
210-
* Creates request options for tokensSelfGetSelfToken without sending the request
211-
* @throws {RequiredError}
212-
* @memberof APITokensApiInterface
213-
*/
214-
tokensSelfGetSelfTokenRequestOpts(): Promise<runtime.RequestOpts>;
215-
216161
/**
217162
*
218163
* @summary Gets information about the current token used to access this endpoint

0 commit comments

Comments
 (0)