Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 16:34:02 +01:00
Code Issues Projects Releases Wiki Activity

UI V2 Build updates

Browse source
This commit is contained in:
Stash Dev 2019-03-15 15:46:47 -07:00
parent 66d2c5ca04
commit 81177847e3
6 changed files with 52 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -10,7 +10,7 @@ before_install:
- echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc - echo -e "machine github.com\n login $CI_USER_TOKEN" > ~/.netrc
- cd ui/v1 - cd ui/v1
- yarn install - yarn install
- ./node_modules/@angular/cli/bin/ng build --prod - yarn build
- cd ../.. - cd ../..
#- go get -v github.com/mgechev/revive #- go get -v github.com/mgechev/revive
script: script:

114
packrd/packed-packr.go
View file

File diff suppressed because one or more lines are too long

4
pkg/api/server.go
View file

@ -29,6 +29,7 @@ const httpsPort = "9999"
var certsBox *packr.Box var certsBox *packr.Box
var uiBox *packr.Box var uiBox *packr.Box
//var legacyUiBox *packr.Box
var setupUIBox *packr.Box var setupUIBox *packr.Box
func Start() { func Start() {
@ -38,7 +39,8 @@ func Start() {
//} //}
certsBox = packr.New("Cert Box", "../../certs") certsBox = packr.New("Cert Box", "../../certs")
uiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend") uiBox = packr.New("UI Box", "../../ui/v2/build")
//legacyUiBox = packr.New("UI Box", "../../ui/v1/dist/stash-frontend")
setupUIBox = packr.New("Setup UI Box", "../../ui/setup") setupUIBox = packr.New("Setup UI Box", "../../ui/setup")
r := chi.NewRouter() r := chi.NewRouter()

BIN
ui/v2/public/favicon.ico Executable file → Normal file
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

2
ui/v2/public/index.html
View file

@ -22,7 +22,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>Stash</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>

4
ui/v2/public/manifest.json
View file

@ -1,6 +1,6 @@
{ {
"short_name": "React App", "short_name": "Stash",
"name": "Create React App Sample", "name": "Stash: Porn Organizer",
"icons": [ "icons": [
{ {
"src": "favicon.ico", "src": "favicon.ico",