Skip to content

Commit

Permalink
Feature/dont use shared link (#18)
Browse files Browse the repository at this point in the history
* use emmech admin in more places

* send feature to frontend

* disable button for none admin
  • Loading branch information
pontussjostedt authored Feb 11, 2025
1 parent 0d6375c commit 9104e51
Show file tree
Hide file tree
Showing 47 changed files with 433 additions and 213 deletions.
20 changes: 20 additions & 0 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,26 @@ services:
# volumes:
# - grafana-data:/var/lib/grafana

# pgadmin:
# container_name: pgadmin
# image: dpage/pgadmin4
# environment:
# PGADMIN_DEFAULT_EMAIL: [email protected]
# PGADMIN_DEFAULT_PASSWORD: admin
# PGADMIN_CONFIG_SERVER_MODE: 'False'
# PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED: 'False'
# PGADMIN_CONFIG_ENHANCED_COOKIE_PROTECTION: 'False'
# ports:
# - "5050:80"
# depends_on:
# - database
# volumes:
# - pgadmin-data:/var/lib/pgadmin
# logging:
# driver: "none"
# restart: always


volumes:
model-cache:
prometheus-data:
Expand Down
6 changes: 4 additions & 2 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
"clear_all_recent_searches": "Clear all recent searches",
"clear_message": "Clear message",
"clear_value": "Clear value",
"clockwise": "Сlockwise",
"clockwise": "Clockwise",
"close": "Close",
"collapse": "Collapse",
"collapse_all": "Collapse all",
Expand Down Expand Up @@ -882,6 +882,7 @@
"no_results_description": "Try a synonym or more general keyword",
"no_shared_albums_message": "Create an album to share photos and videos with people in your network",
"not_in_any_album": "Not in any album",
"not_published": "NotPublished",
"note_apply_storage_label_to_previously_uploaded assets": "Note: To apply the Storage Label to previously uploaded assets, run the",
"note_unlimited_quota": "Note: Enter 0 for unlimited quota",
"notes": "Notes",
Expand Down Expand Up @@ -972,6 +973,7 @@
"profile_picture_set": "Profile picture set.",
"public_album": "Public album",
"public_share": "Public Share",
"published": "Published",
"purchase_account_info": "Supporter",
"purchase_activated_subtitle": "Thank you for supporting Immich and open-source software",
"purchase_activated_time": "Activated on {date, date}",
Expand Down Expand Up @@ -1311,4 +1313,4 @@
"yes": "Yes",
"you_dont_have_any_shared_links": "You don't have any shared links",
"zoom_image": "Zoom Image"
}
}
13 changes: 10 additions & 3 deletions mobile/openapi/lib/api/albums_api.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion mobile/openapi/lib/model/album_response_dto.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion mobile/openapi/lib/model/session_response_dto.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion mobile/openapi/lib/model/user_admin_response_dto.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions open-api/immich-openapi-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,14 @@
"type": "string"
}
},
{
"name": "published",
"required": false,
"in": "query",
"schema": {
"type": "boolean"
}
},
{
"name": "shared",
"required": false,
Expand Down Expand Up @@ -7673,6 +7681,9 @@
"ownerId": {
"type": "string"
},
"published": {
"type": "boolean"
},
"shared": {
"type": "boolean"
},
Expand All @@ -7698,6 +7709,7 @@
"isActivityEnabled",
"owner",
"ownerId",
"published",
"shared",
"updatedAt"
],
Expand Down Expand Up @@ -11129,6 +11141,12 @@
"deviceType": {
"type": "string"
},
"features": {
"items": {
"type": "string"
},
"type": "array"
},
"id": {
"type": "string"
},
Expand All @@ -11141,6 +11159,7 @@
"current",
"deviceOS",
"deviceType",
"features",
"id",
"updatedAt"
],
Expand Down Expand Up @@ -12646,6 +12665,9 @@
"isAdmin": {
"type": "boolean"
},
"isEAdmin": {
"type": "boolean"
},
"license": {
"allOf": [
{
Expand Down
7 changes: 6 additions & 1 deletion open-api/typescript-sdk/src/fetch-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export type UserAdminResponseDto = {
email: string;
id: string;
isAdmin: boolean;
isEAdmin?: boolean;
license: (UserLicense) | null;
name: string;
oauthId: string;
Expand Down Expand Up @@ -291,6 +292,7 @@ export type AlbumResponseDto = {
order?: AssetOrder;
owner: UserResponseDto;
ownerId: string;
published: boolean;
shared: boolean;
startDate?: string;
updatedAt: string;
Expand Down Expand Up @@ -1011,6 +1013,7 @@ export type SessionResponseDto = {
current: boolean;
deviceOS: string;
deviceType: string;
features: string[];
id: string;
updatedAt: string;
};
Expand Down Expand Up @@ -1463,15 +1466,17 @@ export function restoreUserAdmin({ id }: {
method: "POST"
}));
}
export function getAllAlbums({ assetId, shared }: {
export function getAllAlbums({ assetId, published, shared }: {
assetId?: string;
published?: boolean;
shared?: boolean;
}, opts?: Oazapfts.RequestOpts) {
return oazapfts.ok(oazapfts.fetchJson<{
status: 200;
data: AlbumResponseDto[];
}>(`/albums${QS.query(QS.explode({
assetId,
published,
shared
}))}`, {
...opts
Expand Down
Loading

0 comments on commit 9104e51

Please sign in to comment.