Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "web/src/shared/defguard-ui"]
path = web/src/shared/defguard-ui
url = git@github.com:DefGuard/ui.git
[submodule "webnext/src/shared/defguard-ui"]
path = webnext/src/shared/defguard-ui
url = git@github.com:DefGuard/ui.git
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ FROM debian:13-slim AS runtime
RUN apt-get update -y && \
apt-get install --no-install-recommends -y ca-certificates && \
rm -rf /var/lib/apt/lists/*
# make sure we run latest patch for openssl and ssl lib
RUN apt-get install -y --only-upgrade libssl3t64 openssl && \
rm -rf /var/lib/apt/lists/*
WORKDIR /app
COPY --from=builder /build/bin/defguard-proxy .
ENTRYPOINT ["./defguard-proxy"]
20 changes: 10 additions & 10 deletions webnext/src/pages/ClientDownload/ClientDownloadPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { SizedBox } from '../../shared/defguard-ui/components/SizedBox/SizedBox'
import { ThemeSpacing } from '../../shared/defguard-ui/types';
import { isPresent } from '../../shared/defguard-ui/utils/isPresent';
import { getClientArtifactsQueryOptions } from '../../shared/query/queryOptions';
import { openVirtualLink } from '../../shared/utils/openVirtualLink';
import { openClientLink } from '../../shared/utils/openVirtualLink';
import androidIcon from './assets/android.png';
import iosIcon from './assets/ios.png';
import laptopIcon from './assets/laptop.png';
Expand Down Expand Up @@ -56,11 +56,11 @@ export const ClientDownloadPage = () => {
items: [
{
text: 'Intel',
onClick: () => openVirtualLink(pageData?.macos_amd64),
onClick: () => openClientLink(pageData?.macos_amd64),
},
{
text: 'ARM',
onClick: () => openVirtualLink(pageData?.macos_arm64),
onClick: () => openClientLink(pageData?.macos_arm64),
},
],
},
Expand All @@ -75,12 +75,12 @@ export const ClientDownloadPage = () => {
{
icon: 'ubuntu',
text: 'Ubuntu 24.04 ARM',
onClick: () => openVirtualLink(pageData?.deb_arm64),
onClick: () => openClientLink(pageData?.deb_arm64),
},
{
icon: 'ubuntu',
text: 'Ubuntu 24.04 AMD64',
onClick: () => openVirtualLink(pageData?.deb_amd64),
onClick: () => openClientLink(pageData?.deb_amd64),
},
],
},
Expand All @@ -89,12 +89,12 @@ export const ClientDownloadPage = () => {
{
icon: 'debian',
text: 'Ubuntu 22.04 / Debian 12&13 ARM',
onClick: () => openVirtualLink(pageData?.deb_arm64),
onClick: () => openClientLink(pageData?.deb_legacy_arm64),
},
{
icon: 'debian',
text: 'Ubuntu 22.04 / Debian 12&13 AMD64',
onClick: () => openVirtualLink(pageData?.deb_amd64),
onClick: () => openClientLink(pageData?.deb_legacy_amd64),
},
],
},
Expand All @@ -103,12 +103,12 @@ export const ClientDownloadPage = () => {
{
icon: 'linux',
text: 'RPM ARM',
onClick: () => openVirtualLink(pageData?.rpm_arm64),
onClick: () => openClientLink(pageData?.rpm_arm64),
},
{
icon: 'linux',
text: 'RPM AMD64',
onClick: () => openVirtualLink(pageData?.rpm_amd64),
onClick: () => openClientLink(pageData?.rpm_amd64),
},
],
},
Expand All @@ -117,7 +117,7 @@ export const ClientDownloadPage = () => {
{
icon: 'arch-linux',
text: 'Arch Linux',
onClick: () => openVirtualLink(externalLink.client.desktop.linux.arch),
onClick: () => openClientLink(externalLink.client.desktop.linux.arch),
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import type { MenuItemsGroup } from '../../../shared/defguard-ui/components/Menu
import { SizedBox } from '../../../shared/defguard-ui/components/SizedBox/SizedBox';
import { ThemeSpacing } from '../../../shared/defguard-ui/types';
import { getClientArtifactsQueryOptions } from '../../../shared/query/queryOptions';
import { openVirtualLink } from '../../../shared/utils/openVirtualLink';
import { openClientLink } from '../../../shared/utils/openVirtualLink';

export const ConfigureClientPage = () => {
const pageData = useLoaderData({
Expand All @@ -45,12 +45,12 @@ export const ConfigureClientPage = () => {
{
icon: 'apple',
text: 'Intel',
onClick: () => openVirtualLink(clientLinks?.macos_amd64),
onClick: () => openClientLink(clientLinks?.macos_amd64),
},
{
icon: 'apple',
text: 'ARM',
onClick: () => openVirtualLink(clientLinks?.macos_arm64),
onClick: () => openClientLink(clientLinks?.macos_arm64),
},
],
},
Expand All @@ -68,12 +68,12 @@ export const ConfigureClientPage = () => {
{
icon: 'ubuntu',
text: 'Ubuntu 24.04 ARM',
onClick: () => openVirtualLink(clientLinks?.deb_arm64),
onClick: () => openClientLink(clientLinks?.deb_arm64),
},
{
icon: 'ubuntu',
text: 'Ubuntu 24.04 AMD64',
onClick: () => openVirtualLink(clientLinks?.deb_amd64),
onClick: () => openClientLink(clientLinks?.deb_amd64),
},
],
},
Expand All @@ -82,12 +82,12 @@ export const ConfigureClientPage = () => {
{
icon: 'debian',
text: 'Ubuntu 22.04 / Debian 12&13 ARM',
onClick: () => openVirtualLink(clientLinks?.deb_arm64),
onClick: () => openClientLink(clientLinks?.deb_legacy_arm64),
},
{
icon: 'debian',
text: 'Ubuntu 22.04 / Debian 12&13 AMD64',
onClick: () => openVirtualLink(clientLinks?.deb_amd64),
onClick: () => openClientLink(clientLinks?.deb_legacy_amd64),
},
],
},
Expand All @@ -96,12 +96,12 @@ export const ConfigureClientPage = () => {
{
icon: 'linux',
text: 'RPM ARM',
onClick: () => openVirtualLink(clientLinks?.rpm_arm64),
onClick: () => openClientLink(clientLinks?.rpm_arm64),
},
{
icon: 'linux',
text: 'RPM AMD64',
onClick: () => openVirtualLink(clientLinks?.rpm_amd64),
onClick: () => openClientLink(clientLinks?.rpm_amd64),
},
],
},
Expand All @@ -110,7 +110,7 @@ export const ConfigureClientPage = () => {
{
icon: 'arch-linux',
text: 'Arch Linux',
onClick: () => openVirtualLink(externalLink.client.desktop.linux.arch),
onClick: () => openClientLink(externalLink.client.desktop.linux.arch),
},
],
},
Expand Down
2 changes: 2 additions & 0 deletions webnext/src/shared/api/update-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export type ClientVersionCheck = {
windows_amd64?: string;
deb_amd64?: string;
deb_arm64?: string;
deb_legacy_arm64?: string;
deb_legacy_amd64?: string;
rpm_amd64?: string;
rpm_arm64?: string;
macos_amd64?: string;
Expand Down
1 change: 1 addition & 0 deletions webnext/src/shared/defguard-ui
Submodule defguard-ui added at 8d0274
46 changes: 0 additions & 46 deletions webnext/src/shared/defguard-ui/components/Avatar/Avatar.tsx

This file was deleted.

47 changes: 0 additions & 47 deletions webnext/src/shared/defguard-ui/components/Avatar/style.scss

This file was deleted.

7 changes: 0 additions & 7 deletions webnext/src/shared/defguard-ui/components/Avatar/types.ts

This file was deleted.

37 changes: 0 additions & 37 deletions webnext/src/shared/defguard-ui/components/Badge/Badge.tsx

This file was deleted.

68 changes: 0 additions & 68 deletions webnext/src/shared/defguard-ui/components/Badge/style.scss

This file was deleted.

Loading