Skip to content

Commit 056bb80

Browse files
filipslezaklabfilipslezaklab
authored
ui as module (#193)
* remove ui files from repo * add ui as an submodule * up update service response def
1 parent 9bf08f6 commit 056bb80

123 files changed

Lines changed: 36 additions & 5087 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.

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
[submodule "web/src/shared/defguard-ui"]
55
path = web/src/shared/defguard-ui
66
url = git@github.com:DefGuard/ui.git
7+
[submodule "webnext/src/shared/defguard-ui"]
8+
path = webnext/src/shared/defguard-ui
9+
url = git@github.com:DefGuard/ui.git

‎Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ FROM debian:13-slim AS runtime
4242
RUN apt-get update -y && \
4343
apt-get install --no-install-recommends -y ca-certificates && \
4444
rm -rf /var/lib/apt/lists/*
45+
# make sure we run latest patch for openssl and ssl lib
46+
RUN apt-get install -y --only-upgrade libssl3t64 openssl && \
47+
rm -rf /var/lib/apt/lists/*
4548
WORKDIR /app
4649
COPY --from=builder /build/bin/defguard-proxy .
4750
ENTRYPOINT ["./defguard-proxy"]

‎webnext/src/pages/ClientDownload/ClientDownloadPage.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { SizedBox } from '../../shared/defguard-ui/components/SizedBox/SizedBox'
2525
import { ThemeSpacing } from '../../shared/defguard-ui/types';
2626
import { isPresent } from '../../shared/defguard-ui/utils/isPresent';
2727
import { getClientArtifactsQueryOptions } from '../../shared/query/queryOptions';
28-
import { openVirtualLink } from '../../shared/utils/openVirtualLink';
28+
import { openClientLink } from '../../shared/utils/openVirtualLink';
2929
import androidIcon from './assets/android.png';
3030
import iosIcon from './assets/ios.png';
3131
import laptopIcon from './assets/laptop.png';
@@ -56,11 +56,11 @@ export const ClientDownloadPage = () => {
5656
items: [
5757
{
5858
text: 'Intel',
59-
onClick: () => openVirtualLink(pageData?.macos_amd64),
59+
onClick: () => openClientLink(pageData?.macos_amd64),
6060
},
6161
{
6262
text: 'ARM',
63-
onClick: () => openVirtualLink(pageData?.macos_arm64),
63+
onClick: () => openClientLink(pageData?.macos_arm64),
6464
},
6565
],
6666
},
@@ -75,12 +75,12 @@ export const ClientDownloadPage = () => {
7575
{
7676
icon: 'ubuntu',
7777
text: 'Ubuntu 24.04 ARM',
78-
onClick: () => openVirtualLink(pageData?.deb_arm64),
78+
onClick: () => openClientLink(pageData?.deb_arm64),
7979
},
8080
{
8181
icon: 'ubuntu',
8282
text: 'Ubuntu 24.04 AMD64',
83-
onClick: () => openVirtualLink(pageData?.deb_amd64),
83+
onClick: () => openClientLink(pageData?.deb_amd64),
8484
},
8585
],
8686
},
@@ -89,12 +89,12 @@ export const ClientDownloadPage = () => {
8989
{
9090
icon: 'debian',
9191
text: 'Ubuntu 22.04 / Debian 12&13 ARM',
92-
onClick: () => openVirtualLink(pageData?.deb_arm64),
92+
onClick: () => openClientLink(pageData?.deb_legacy_arm64),
9393
},
9494
{
9595
icon: 'debian',
9696
text: 'Ubuntu 22.04 / Debian 12&13 AMD64',
97-
onClick: () => openVirtualLink(pageData?.deb_amd64),
97+
onClick: () => openClientLink(pageData?.deb_legacy_amd64),
9898
},
9999
],
100100
},
@@ -103,12 +103,12 @@ export const ClientDownloadPage = () => {
103103
{
104104
icon: 'linux',
105105
text: 'RPM ARM',
106-
onClick: () => openVirtualLink(pageData?.rpm_arm64),
106+
onClick: () => openClientLink(pageData?.rpm_arm64),
107107
},
108108
{
109109
icon: 'linux',
110110
text: 'RPM AMD64',
111-
onClick: () => openVirtualLink(pageData?.rpm_amd64),
111+
onClick: () => openClientLink(pageData?.rpm_amd64),
112112
},
113113
],
114114
},
@@ -117,7 +117,7 @@ export const ClientDownloadPage = () => {
117117
{
118118
icon: 'arch-linux',
119119
text: 'Arch Linux',
120-
onClick: () => openVirtualLink(externalLink.client.desktop.linux.arch),
120+
onClick: () => openClientLink(externalLink.client.desktop.linux.arch),
121121
},
122122
],
123123
},

‎webnext/src/pages/enrollment/ConfigureClient/ConfigureClientPage.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import type { MenuItemsGroup } from '../../../shared/defguard-ui/components/Menu
2323
import { SizedBox } from '../../../shared/defguard-ui/components/SizedBox/SizedBox';
2424
import { ThemeSpacing } from '../../../shared/defguard-ui/types';
2525
import { getClientArtifactsQueryOptions } from '../../../shared/query/queryOptions';
26-
import { openVirtualLink } from '../../../shared/utils/openVirtualLink';
26+
import { openClientLink } from '../../../shared/utils/openVirtualLink';
2727

2828
export const ConfigureClientPage = () => {
2929
const pageData = useLoaderData({
@@ -45,12 +45,12 @@ export const ConfigureClientPage = () => {
4545
{
4646
icon: 'apple',
4747
text: 'Intel',
48-
onClick: () => openVirtualLink(clientLinks?.macos_amd64),
48+
onClick: () => openClientLink(clientLinks?.macos_amd64),
4949
},
5050
{
5151
icon: 'apple',
5252
text: 'ARM',
53-
onClick: () => openVirtualLink(clientLinks?.macos_arm64),
53+
onClick: () => openClientLink(clientLinks?.macos_arm64),
5454
},
5555
],
5656
},
@@ -68,12 +68,12 @@ export const ConfigureClientPage = () => {
6868
{
6969
icon: 'ubuntu',
7070
text: 'Ubuntu 24.04 ARM',
71-
onClick: () => openVirtualLink(clientLinks?.deb_arm64),
71+
onClick: () => openClientLink(clientLinks?.deb_arm64),
7272
},
7373
{
7474
icon: 'ubuntu',
7575
text: 'Ubuntu 24.04 AMD64',
76-
onClick: () => openVirtualLink(clientLinks?.deb_amd64),
76+
onClick: () => openClientLink(clientLinks?.deb_amd64),
7777
},
7878
],
7979
},
@@ -82,12 +82,12 @@ export const ConfigureClientPage = () => {
8282
{
8383
icon: 'debian',
8484
text: 'Ubuntu 22.04 / Debian 12&13 ARM',
85-
onClick: () => openVirtualLink(clientLinks?.deb_arm64),
85+
onClick: () => openClientLink(clientLinks?.deb_legacy_arm64),
8686
},
8787
{
8888
icon: 'debian',
8989
text: 'Ubuntu 22.04 / Debian 12&13 AMD64',
90-
onClick: () => openVirtualLink(clientLinks?.deb_amd64),
90+
onClick: () => openClientLink(clientLinks?.deb_legacy_amd64),
9191
},
9292
],
9393
},
@@ -96,12 +96,12 @@ export const ConfigureClientPage = () => {
9696
{
9797
icon: 'linux',
9898
text: 'RPM ARM',
99-
onClick: () => openVirtualLink(clientLinks?.rpm_arm64),
99+
onClick: () => openClientLink(clientLinks?.rpm_arm64),
100100
},
101101
{
102102
icon: 'linux',
103103
text: 'RPM AMD64',
104-
onClick: () => openVirtualLink(clientLinks?.rpm_amd64),
104+
onClick: () => openClientLink(clientLinks?.rpm_amd64),
105105
},
106106
],
107107
},
@@ -110,7 +110,7 @@ export const ConfigureClientPage = () => {
110110
{
111111
icon: 'arch-linux',
112112
text: 'Arch Linux',
113-
onClick: () => openVirtualLink(externalLink.client.desktop.linux.arch),
113+
onClick: () => openClientLink(externalLink.client.desktop.linux.arch),
114114
},
115115
],
116116
},

‎webnext/src/shared/api/update-service.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export type ClientVersionCheck = {
2020
windows_amd64?: string;
2121
deb_amd64?: string;
2222
deb_arm64?: string;
23+
deb_legacy_arm64?: string;
24+
deb_legacy_amd64?: string;
2325
rpm_amd64?: string;
2426
rpm_arm64?: string;
2527
macos_amd64?: string;

‎webnext/src/shared/defguard-ui‎

Submodule defguard-ui added at 8d02746

‎webnext/src/shared/defguard-ui/components/Avatar/Avatar.tsx‎

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

‎webnext/src/shared/defguard-ui/components/Avatar/style.scss‎

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

‎webnext/src/shared/defguard-ui/components/Avatar/types.ts‎

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

‎webnext/src/shared/defguard-ui/components/Badge/Badge.tsx‎

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

0 commit comments

Comments
 (0)