Moved all server assets to subdirectory #55
This commit is contained in:
parent
53dfd1647a
commit
2cce8ded84
|
@ -2,7 +2,7 @@ assets/photos/*
|
|||
assets/thumbnails/*
|
||||
internal/photoprism/testdata/*
|
||||
frontend/node_modules/*
|
||||
assets/public/build/*
|
||||
assets/server/public/build/*
|
||||
Dockerfile
|
||||
/docker
|
||||
/photoprism
|
||||
|
|
6
Makefile
6
Makefile
|
@ -18,12 +18,10 @@ install: install-bin install-assets install-config
|
|||
install-bin:
|
||||
scripts/build.sh install /usr/local/bin/$(BINARY_NAME)
|
||||
install-assets:
|
||||
mkdir -p /srv/photoprism
|
||||
mkdir -p /srv/photoprism/photos
|
||||
mkdir -p /srv/photoprism/thumbnails
|
||||
cp -r assets/favicons /srv/photoprism
|
||||
cp -r assets/public /srv/photoprism
|
||||
cp -r assets/templates /srv/photoprism
|
||||
mkdir -p /srv/photoprism/database
|
||||
cp -r assets/server /srv/photoprism
|
||||
cp -r assets/tensorflow /srv/photoprism
|
||||
find /srv/photoprism -name '.*' -type f -delete
|
||||
install-config:
|
||||
|
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 510 KiB After Width: | Height: | Size: 510 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
@ -7,7 +7,7 @@ const webpack = require('webpack');
|
|||
const PATHS = {
|
||||
app: path.join(__dirname, 'src/app.js'),
|
||||
css: path.join(__dirname, 'css'),
|
||||
build: path.join(__dirname, '../assets/public/build'),
|
||||
build: path.join(__dirname, '../assets/server/public/build'),
|
||||
};
|
||||
|
||||
const cssPlugin = new ExtractTextPlugin({
|
||||
|
|
|
@ -217,22 +217,32 @@ func (c *Config) GetTensorFlowModelPath() string {
|
|||
return c.GetAssetsPath() + "/tensorflow"
|
||||
}
|
||||
|
||||
// GetTemplatesPath returns the templates path.
|
||||
// GetDatabasePath returns the database storage path (e.g. for SQLite or Bleve).
|
||||
func (c *Config) GetDatabasePath() string {
|
||||
return c.GetAssetsPath() + "/database"
|
||||
}
|
||||
|
||||
// GetServerAssetsPath returns the server assets path (public files, favicons, templates,...).
|
||||
func (c *Config) GetServerAssetsPath() string {
|
||||
return c.GetAssetsPath() + "/server"
|
||||
}
|
||||
|
||||
// GetTemplatesPath returns the server templates path.
|
||||
func (c *Config) GetTemplatesPath() string {
|
||||
return c.GetAssetsPath() + "/templates"
|
||||
return c.GetServerAssetsPath() + "/templates"
|
||||
}
|
||||
|
||||
// GetFaviconsPath returns the favicons path.
|
||||
func (c *Config) GetFaviconsPath() string {
|
||||
return c.GetAssetsPath() + "/favicons"
|
||||
return c.GetServerAssetsPath() + "/favicons"
|
||||
}
|
||||
|
||||
// GetPublicPath returns the public path.
|
||||
// GetPublicPath returns the public server path (//server/assets/*).
|
||||
func (c *Config) GetPublicPath() string {
|
||||
return c.GetAssetsPath() + "/public"
|
||||
return c.GetServerAssetsPath() + "/public"
|
||||
}
|
||||
|
||||
// GetPublicBuildPath returns the public build path.
|
||||
// GetPublicBuildPath returns the public build path (//server/assets/build/*).
|
||||
func (c *Config) GetPublicBuildPath() string {
|
||||
return c.GetPublicPath() + "/build"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user