beenull/Cosmos-Server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update to 0.7.0-unstable9

Browse source
This commit is contained in:
Yann Stepienik 2023-06-14 12:58:13 +01:00
parent 02b1d50432
commit 2304d269d8
7 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/src/pages/market/listing.jsx
View file

@ -107,7 +107,7 @@ const MarketPage = () => {
const [showcase, setShowcase] = useState([]);
const theme = useTheme();
const isDark = theme.palette.mode === 'dark';
const { appName } = useParams();
const { appName, appStore } = useParams();
const backgroundStyle = isDark ? {
backgroundColor: 'rgb(0,0,0)',
@ -127,7 +127,7 @@ const MarketPage = () => {
let openedApp = null;
if (appName && Object.keys(apps).length > 0) {
openedApp = apps[Object.keys(apps)[0]].find((app) => app.name === appName);
openedApp = apps[appStore].find((app) => app.name === appName);
}
return <>
@ -227,6 +227,7 @@ const MarketPage = () => {
minHeight: 'calc(65vh - 80px)',
padding: '24px',
}}>
<h2>Applications</h2>
{(!apps || !Object.keys(apps).length) && <Box style={{
width: '100%',
height: '100%',
@ -241,13 +242,12 @@ const MarketPage = () => {
/>
</Box>}
<h2>Applications</h2>
{apps && Object.keys(apps).length > 0 && <Grid2 container spacing={{ xs: 1, sm: 1, md: 2 }}>
{apps[Object.keys(apps)[0]].map((app) => {
{Object.keys(apps).map(appstore => apps[appstore].map((app) => {
return <Grid2 style={{
...gridAnim,
cursor: 'pointer',
}} xs={12} sm={12} md={6} lg={4} xl={3} key={app.name} item><Link to={"/cosmos-ui/market-listing/" + app.name} style={{
}} xs={12} sm={12} md={6} lg={4} xl={3} key={app.name} item><Link to={"/cosmos-ui/market-listing/" + appstore + "/" + app.name} style={{
textDecoration: 'none',
}}>
<div key={app.name} style={appCardStyle(theme)}>
@ -271,7 +271,7 @@ const MarketPage = () => {
</Link>
</Grid2>
})}
}))}
</Grid2>}
</Stack>
</Stack>

6
client/src/pages/servapps/containers/docker-compose.jsx
View file

@ -34,6 +34,7 @@ import {version} from '../../../../../package.json';
import cmp from 'semver-compare';
import { HostnameChecker } from '../../../utils/routes';
import { CosmosContainerPicker } from '../../config/users/containerPicker';
import { randomString } from '../../../utils/indexs';
function checkIsOnline() {
API.isOnline().then((res) => {
@ -307,6 +308,11 @@ const DockerComposeImport = ({ refresh, dockerComposeInit, installerInit, defaul
ServiceName: serviceName,
Hostnames: hostnames,
Context: context,
Passwords: [
randomString(32),
randomString(32),
randomString(32)
]
});
const jsoned = JSON.parse(rendered);

2
client/src/routes/MainRoutes.jsx
View file

@ -92,7 +92,7 @@ const MainRoutes = {
element: <MarketPage />
},
{
path: '/cosmos-ui/market-listing/:appName',
path: '/cosmos-ui/market-listing/:appStore/:appName',
element: <MarketPage />
}
]

2
docker.arm64.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
VERSION=$(grep -o '\"version\": \"[^\"]*\"' package.json | sed 's/[^0-9.]//g')
VERSION=$(grep -o '\"version\": \"[^\"]*\"' package.json | sed 's/[^0-9a-z.-]//g')
LATEST="latest"
# if branch is unstable in git for circle ci

2
docker.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash
VERSION=$(grep -o '\"version\": \"[^\"]*\"' package.json | sed 's/[^0-9.]//g')
VERSION=$(grep -o '\"version\": \"[^\"]*\"' package.json | sed 's/[^0-9a-z.-]//g')
LATEST="latest"
# if branch is unstable in git for circle ci

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "cosmos-server",
"version": "0.7.0-unstable8",
"version": "0.7.0-unstable9",
"description": "",
"main": "test-server.js",
"bugs": {

8
src/market/update.go
View file

@ -44,8 +44,8 @@ func updateCache(w http.ResponseWriter, req *http.Request) error {
resp, err := http.Get(cachedMarket.Url)
if err != nil {
utils.Error("MarketUpdate: Error while fetching market" + cachedMarket.Url, err)
utils.HTTPError(w, "Market Get Error " + cachedMarket.Url, http.StatusInternalServerError, "MK001")
return err
// utils.HTTPError(w, "Market Get Error " + cachedMarket.Url, http.StatusInternalServerError, "MK001")
continue
}
defer resp.Body.Close()
@ -56,8 +56,8 @@ func updateCache(w http.ResponseWriter, req *http.Request) error {
if err != nil {
utils.Error("MarketUpdate: Error while parsing market" + cachedMarket.Url, err)
utils.HTTPError(w, "Market Get Error " + cachedMarket.Url, http.StatusInternalServerError, "MK003")
return err
// utils.HTTPError(w, "Market Get Error " + cachedMarket.Url, http.StatusInternalServerError, "MK003")
continue
}
cachedMarket.Results = result