[release] version 0.5.0-unstable20
This commit is contained in:
Yann Stepienik
parent
4beede621b
commit
0f46cff353
|
|
@ -15,7 +15,7 @@ const HomeBackground = () => {
|
|||
const theme = useTheme();
|
||||
return (
|
||||
<Box sx={{ position: 'fixed', float: 'left', overflow: 'hidden', zIndex: 0, top: 0, left: 0, right: 0, bottom: 0 }}>
|
||||
<img src={wallpaper} style={{ display:'inline'}} alt="Cosmos" width="100%" height="100%" />
|
||||
<img src={wallpaper} style={{ display: 'inline' }} alt="Cosmos" width="100%" height="100%" />
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
|
@ -31,8 +31,10 @@ const blockStyle = {
|
|||
|
||||
const HomePage = () => {
|
||||
const { routeName } = useParams();
|
||||
const [serveApps, setServeApps] = useState([]);
|
||||
const [config, setConfig] = useState(null);
|
||||
const [coStatus, setCoStatus] = useState(null);
|
||||
const [containers, setContainers] = useState(null);
|
||||
|
||||
const refreshStatus = () => {
|
||||
API.getStatus().then((res) => {
|
||||
|
|
@ -41,6 +43,9 @@ const HomePage = () => {
|
|||
}
|
||||
|
||||
const refreshConfig = () => {
|
||||
API.docker.list().then((res) => {
|
||||
setServeApps(res.data);
|
||||
});
|
||||
API.config.get().then((res) => {
|
||||
setConfig(res.data);
|
||||
});
|
||||
|
|
@ -85,7 +90,7 @@ const HomePage = () => {
|
|||
}
|
||||
`}
|
||||
</style>
|
||||
<Stack style={{zIndex: 2}} spacing={1}>
|
||||
<Stack style={{ zIndex: 2 }} spacing={1}>
|
||||
{coStatus && !coStatus.database && (
|
||||
<Alert severity="error">
|
||||
No Database is setup for Cosmos! User Management and Authentication will not work.<br />
|
||||
|
|
@ -119,22 +124,32 @@ const HomePage = () => {
|
|||
|
||||
{coStatus && !coStatus.docker && (
|
||||
<Alert severity="error">
|
||||
Docker is not connected! Please check your docker connection.<br/>
|
||||
Docker is not connected! Please check your docker connection.<br />
|
||||
Did you forget to add <pre>-v /var/run/docker.sock:/var/run/docker.sock</pre> to your docker run command?<br />
|
||||
if your docker daemon is running somewhere else, please add <pre>-e DOCKER_HOST=...</pre> to your docker run command.
|
||||
</Alert>
|
||||
)}
|
||||
</Stack>
|
||||
|
||||
<Grid2 container spacing={2} style={{zIndex: 2}}>
|
||||
{config && config.HTTPConfig.ProxyConfig.Routes.map((route) => {
|
||||
return <Grid2 item xs={12} sm={6} md={4} lg={3} xl={3} xxl={2} key={route.Name}>
|
||||
<Box className='app' style={{padding: 10, color: 'white', background: 'rgba(0,0,0,0.35)', borderRadius: 5}}>
|
||||
<Link to={getFullOrigin(route)} target="_blank" style={{textDecoration: 'none', color: 'white'}}>
|
||||
<Grid2 container spacing={2} style={{ zIndex: 2 }}>
|
||||
{config && serveApps && config.HTTPConfig.ProxyConfig.Routes.map((route) => {
|
||||
let skip = false;
|
||||
if(route.Mode == "SERVAPP") {
|
||||
const containerName = route.Target.split(':')[1].slice(2);
|
||||
console.log('try ' + containerName)
|
||||
const container = serveApps.find((c) => c.Names.includes('/' + containerName));
|
||||
console.log('found ' + container)
|
||||
if(container && container.State != "running") {
|
||||
skip = true
|
||||
}
|
||||
}
|
||||
return !skip && <Grid2 item xs={12} sm={6} md={4} lg={3} xl={3} xxl={2} key={route.Name}>
|
||||
<Box className='app' style={{ padding: 10, color: 'white', background: 'rgba(0,0,0,0.35)', borderRadius: 5 }}>
|
||||
<Link to={getFullOrigin(route)} target="_blank" style={{ textDecoration: 'none', color: 'white' }}>
|
||||
<Stack direction="row" spacing={2} alignItems="center">
|
||||
<img src={getFaviconURL(route)} width="64px" />
|
||||
|
||||
<div style={{width: '100%'}}>
|
||||
<div style={{ width: '100%' }}>
|
||||
<h3 style={blockStyle}>{route.Name}</h3>
|
||||
<p style={blockStyle}>{route.Description}</p>
|
||||
<p style={blockStyle}>{route.Target}</p>
|
||||
|
|
@ -147,9 +162,9 @@ const HomePage = () => {
|
|||
|
||||
{config && config.HTTPConfig.ProxyConfig.Routes.length === 0 && (
|
||||
<Grid2 item xs={12} sm={12} md={12} lg={12} xl={12}>
|
||||
<Box style={{padding: 10, color: 'white', background: 'rgba(0,0,0,0.35)', borderRadius: 5}}>
|
||||
<Box style={{ padding: 10, color: 'white', background: 'rgba(0,0,0,0.35)', borderRadius: 5 }}>
|
||||
<Stack direction="row" spacing={2} alignItems="center">
|
||||
<div style={{width: '100%'}}>
|
||||
<div style={{ width: '100%' }}>
|
||||
<h3 style={blockStyle}>No Apps</h3>
|
||||
<p style={blockStyle}>You have no apps configured. Please add some apps in the configuration panel.</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cosmos-server",
|
||||
"version": "0.5.0-unstable19",
|
||||
"version": "0.5.0-unstable20",
|
||||
"description": "",
|
||||
"main": "test-server.js",
|
||||
"bugs": {
|
||||
|
|
|
|||
79
src/icons.go
79
src/icons.go
|
|
@ -8,6 +8,7 @@ import (
|
|||
"os"
|
||||
"io/ioutil"
|
||||
"regexp"
|
||||
"path"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/azukaar/cosmos-server/src/utils"
|
||||
|
|
@ -21,22 +22,67 @@ type CachedImage struct {
|
|||
|
||||
var cache = make(map[string]CachedImage)
|
||||
|
||||
func ExtractFaviconMetaTag(html string) string {
|
||||
func ExtractFaviconMetaTag(filename string) string {
|
||||
// Read the contents of the file
|
||||
htmlBytes, err := ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
return "/favicon.ico"
|
||||
}
|
||||
html := string(htmlBytes)
|
||||
|
||||
// Regular expression pattern to match the favicon metatag
|
||||
pattern := `<link[^>]*rel="icon"[^>]*href="([^"]+)"[^>]*>`
|
||||
pattern := `<link[^>]*rel="icon"[^>]*(?:sizes="([^"]+)")?[^>]*href="([^"]+)"[^>]*>|<meta[^>]*name="msapplication-TileImage"[^>]*content="([^"]+)"[^>]*>`
|
||||
|
||||
// Compile the regular expression pattern
|
||||
regex := regexp.MustCompile(pattern)
|
||||
|
||||
// Find the first match in the HTML string
|
||||
match := regex.FindStringSubmatch(html)
|
||||
// Find all matches in the HTML string
|
||||
matches := regex.FindAllStringSubmatch(html, -1)
|
||||
|
||||
if len(match) > 1 {
|
||||
// Extract the URL from the matched metatag
|
||||
faviconURL := match[1]
|
||||
var faviconURL string
|
||||
|
||||
// Iterate over the matches to find the appropriate favicon
|
||||
for _, match := range matches {
|
||||
sizes := match[1]
|
||||
href := match[2]
|
||||
msAppTileImage := match[3]
|
||||
|
||||
// Check if the meta tag specifies msapplication-TileImage
|
||||
if msAppTileImage != "" {
|
||||
faviconURL = msAppTileImage
|
||||
break
|
||||
}
|
||||
|
||||
// Check if the sizes attribute contains 96x96
|
||||
if strings.Contains(sizes, "96x96") {
|
||||
faviconURL = href
|
||||
break
|
||||
}
|
||||
|
||||
// Check if the sizes attribute contains 64x64
|
||||
if strings.Contains(sizes, "64x64") {
|
||||
faviconURL = href
|
||||
continue
|
||||
}
|
||||
|
||||
// Check if the sizes attribute contains 32x32
|
||||
if strings.Contains(sizes, "32x32") {
|
||||
faviconURL = href
|
||||
continue
|
||||
}
|
||||
|
||||
// If no sizes specified, set faviconURL to the first match without sizes
|
||||
if faviconURL == "" && sizes == "" {
|
||||
faviconURL = href
|
||||
}
|
||||
}
|
||||
|
||||
// If a favicon URL is found, return it
|
||||
if faviconURL != "" {
|
||||
return faviconURL
|
||||
}
|
||||
|
||||
// Return an error if no favicon URL is found
|
||||
return "/favicon.ico"
|
||||
}
|
||||
|
||||
|
|
@ -119,10 +165,23 @@ func GetFavicon(w http.ResponseWriter, req *http.Request) {
|
|||
sendFallback(w)
|
||||
return
|
||||
}
|
||||
if !strings.HasPrefix(faviconURL, "/") {
|
||||
faviconURL = "/" + faviconURL
|
||||
}
|
||||
|
||||
if strings.HasPrefix(faviconURL, ".") {
|
||||
// Relative URL starting with "."
|
||||
// Resolve the relative URL based on the base URL
|
||||
baseURL := u.Scheme + "://" + u.Host
|
||||
faviconURL = baseURL + faviconURL[1:]
|
||||
} else if strings.HasPrefix(faviconURL, "/") {
|
||||
// Relative URL starting with "/"
|
||||
// Append the relative URL to the base URL
|
||||
faviconURL = u.Scheme + "://" + u.Host + faviconURL
|
||||
} else {
|
||||
// Relative URL without starting dot or slash
|
||||
// Construct the absolute URL based on the current page's URL path
|
||||
baseURL := u.Scheme + "://" + u.Host
|
||||
baseURLPath := path.Dir(u.Path)
|
||||
faviconURL = baseURL + baseURLPath + "/" + faviconURL
|
||||
}
|
||||
}
|
||||
|
||||
utils.Log("Favicon: " + faviconURL)
|
||||
|
|
|
|||
Loading…
Reference in a new issue