Skip to content

Commit

Permalink
Merge pull request #19 from vertex-center/feature/new-components
Browse files Browse the repository at this point in the history 
Use new components from @vertex-center/components
  • Loading branch information
@quentinguidee
quentinguidee authored Nov 9, 2023
2 parents ce841aa + 500e60e commit ddf2d73
Show file tree
Hide file tree
Showing 30 changed files with 445 additions and 669 deletions.
18 changes: 9 additions & 9 deletions package-lock.json
View file

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

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@testing-library/user-event": "^13.5.0",
"@types/byte-size": "^8.1.0",
"@types/uuid": "^9.0.1",
"@vertex-center/components": "^0.3.1",
"@vertex-center/components": "^0.4.0",
"axios": "^1.3.4",
"byte-size": "^8.1.1",
"immer": "^10.0.3",
Expand Down
256 changes: 132 additions & 124 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,130 +47,138 @@ function App() {
<ReactQueryDevtools initialIsOpen={false} />
<HashRouter>
<Header />
<div className="appContent">
<Routes>
<Route
path="/"
element={<Navigate to="/app/vx-containers" />}
index
/>
<Route
path="/app/vx-containers"
element={<ContainersApp />}
/>
<Route
path="/app/vx-containers/add"
element={<ContainersStore />}
/>
<Route
path="/app/vx-devtools-service-editor"
element={<ServiceEditor />}
/>
<Route path="/app/vx-sql" element={<SqlApp />}>
<Route
path="/app/vx-sql/install"
element={<SqlInstaller />}
/>
<Route
path="/app/vx-sql/db/:uuid"
element={<SqlDatabase />}
/>
</Route>
<Route
path="/app/vx-monitoring"
element={<MonitoringApp />}
>
<Route
path="/app/vx-monitoring/metrics"
element={<MetricsList />}
/>
<Route
path="/app/vx-monitoring/prometheus"
element={<Prometheus />}
/>
<Route
path="/app/vx-monitoring/grafana"
element={<Grafana />}
/>
</Route>
<Route
path="/app/vx-tunnels"
element={<TunnelsApp />}
>
<Route
path="/app/vx-tunnels/cloudflare"
element={<CloudflareTunnels />}
/>
</Route>
<Route
path="/app/vx-reverse-proxy"
element={<ReverseProxyApp />}
>
<Route
path="/app/vx-reverse-proxy/vertex"
element={<VertexReverseProxy />}
/>
</Route>
<Route
path="/app/vx-containers/:uuid/"
element={<ContainerDetails />}
>
<Route
path="/app/vx-containers/:uuid/home"
element={<ContainerHome />}
/>
<Route
path="/app/vx-containers/:uuid/docker"
element={<ContainerDocker />}
/>
<Route
path="/app/vx-containers/:uuid/logs"
element={<ContainerLogs />}
/>
<Route
path="/app/vx-containers/:uuid/environment"
element={<ContainerEnv />}
/>
<Route
path="/app/vx-containers/:uuid/database"
element={<ContainerDetailsDatabase />}
/>
<Route
path="/app/vx-containers/:uuid/update"
element={<ContainerUpdate />}
/>
<Route
path="/app/vx-containers/:uuid/settings"
element={<ContainerSettings />}
/>
</Route>
<Route path="/settings" element={<SettingsApp />}>
<Route
path="/settings/theme"
element={<SettingsTheme />}
/>
<Route
path="/settings/notifications"
element={<SettingsNotifications />}
/>
<Route
path="/settings/hardware"
element={<SettingsHardware />}
/>
<Route
path="/settings/security"
element={<SettingsSecurity />}
/>
<Route
path="/settings/updates"
element={<SettingsUpdates />}
/>
<Route
path="/settings/about"
element={<SettingsAbout />}
/>
</Route>
</Routes>
<div className="app-main">
<div className="app-sidebar" />
<div className="app-content">
<Routes>
<Route
path="/"
element={
<Navigate to="/app/vx-containers" />
}
index
/>
<Route
path="/app/vx-containers"
element={<ContainersApp />}
/>
<Route
path="/app/vx-containers/add"
element={<ContainersStore />}
/>
<Route
path="/app/vx-devtools-service-editor"
element={<ServiceEditor />}
/>
<Route path="/app/vx-sql" element={<SqlApp />}>
<Route
path="/app/vx-sql/install"
element={<SqlInstaller />}
/>
<Route
path="/app/vx-sql/db/:uuid"
element={<SqlDatabase />}
/>
</Route>
<Route
path="/app/vx-monitoring"
element={<MonitoringApp />}
>
<Route
path="/app/vx-monitoring/metrics"
element={<MetricsList />}
/>
<Route
path="/app/vx-monitoring/prometheus"
element={<Prometheus />}
/>
<Route
path="/app/vx-monitoring/grafana"
element={<Grafana />}
/>
</Route>
<Route
path="/app/vx-tunnels"
element={<TunnelsApp />}
>
<Route
path="/app/vx-tunnels/cloudflare"
element={<CloudflareTunnels />}
/>
</Route>
<Route
path="/app/vx-reverse-proxy"
element={<ReverseProxyApp />}
>
<Route
path="/app/vx-reverse-proxy/vertex"
element={<VertexReverseProxy />}
/>
</Route>
<Route
path="/app/vx-containers/:uuid/"
element={<ContainerDetails />}
>
<Route
path="/app/vx-containers/:uuid/home"
element={<ContainerHome />}
/>
<Route
path="/app/vx-containers/:uuid/docker"
element={<ContainerDocker />}
/>
<Route
path="/app/vx-containers/:uuid/logs"
element={<ContainerLogs />}
/>
<Route
path="/app/vx-containers/:uuid/environment"
element={<ContainerEnv />}
/>
<Route
path="/app/vx-containers/:uuid/database"
element={<ContainerDetailsDatabase />}
/>
<Route
path="/app/vx-containers/:uuid/update"
element={<ContainerUpdate />}
/>
<Route
path="/app/vx-containers/:uuid/settings"
element={<ContainerSettings />}
/>
</Route>
<Route
path="/settings"
element={<SettingsApp />}
>
<Route
path="/settings/theme"
element={<SettingsTheme />}
/>
<Route
path="/settings/notifications"
element={<SettingsNotifications />}
/>
<Route
path="/settings/hardware"
element={<SettingsHardware />}
/>
<Route
path="/settings/security"
element={<SettingsSecurity />}
/>
<Route
path="/settings/updates"
element={<SettingsUpdates />}
/>
<Route
path="/settings/about"
element={<SettingsAbout />}
/>
</Route>
</Routes>
</div>
</div>
<Dock />
</HashRouter>
Expand Down
13 changes: 2 additions & 11 deletions src/apps/Containers/pages/Container/Container.module.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
align-items: stretch

.container
padding: 10px 20px 10px

@include dimensions.extra-small-or-less
padding: 10px 10px 10px
margin: 0 15px 20px

.content
display: flex
Expand All @@ -27,11 +24,5 @@
overflow: auto
gap: 20px
width: 100%
padding: 20px 0
max-height: calc(100vh - 330px)

& > *
margin: 0 20px

@include dimensions.extra-small-or-less
margin: 0 10px
padding: 0 15px
Loading

0 comments on commit ddf2d73

Please sign in to comment.