URL scheme adjustment

pull/106/head
Alex Kern 6 years ago
parent e0df231562
commit 8b1982648c

@ -8,7 +8,8 @@
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"homepage": "https://github.com/kern/filepizza", "homepage": "https://github.com/kern/filepizza",
"scripts": { "scripts": {
"start": "node ./dist/index.js", "start": "babel-node ./src/index.js",
"start:prod": "node ./dist/index.js",
"build": "babel src --ignore __tests__,__mocks__ --out-dir dist && webpack -p ./src/client && rm -rf dist/static && cp -R src/static dist/static" "build": "babel src --ignore __tests__,__mocks__ --out-dir dist && webpack -p ./src/client && rm -rf dist/static && cp -R src/static dist/static"
}, },
"repository": { "repository": {

@ -14,7 +14,7 @@ tokenGenerator.initWithWordList(toppings)
export function create(socket) { export function create(socket) {
return tokenGenerator.generate(TOKEN_OPTIONS).then((parts) => { return tokenGenerator.generate(TOKEN_OPTIONS).then((parts) => {
const token = parts.join('-') const token = parts.join('/')
let result = { let result = {
token: token, token: token,
socket: socket socket: socket

@ -3,7 +3,7 @@ var express = require('express')
var routes = module.exports = new express.Router() var routes = module.exports = new express.Router()
routes.get(/^\/([a-z]+-[a-z]+-[a-z]+-[a-z]+)$/, function (req, res, next) { routes.get(/^\/([a-z]+\/[a-z]+\/[a-z]+\/[a-z]+)$/, function (req, res, next) {
var uploader = db.find(req.params[0]) var uploader = db.find(req.params[0])
if (uploader) { if (uploader) {

@ -9,7 +9,7 @@ import ErrorPage from './components/ErrorPage'
export default ( export default (
<Route handler={App}> <Route handler={App}>
<DefaultRoute handler={UploadPage} /> <DefaultRoute handler={UploadPage} />
<Route name="download" path="/:a-:b-:c-:d" handler={DownloadPage} /> <Route name="download" path="/:a/:b/:c/:d" handler={DownloadPage} />
<Route name="error" path="error" handler={ErrorPage} /> <Route name="error" path="error" handler={ErrorPage} />
<NotFoundRoute handler={ErrorPage} /> <NotFoundRoute handler={ErrorPage} />
</Route> </Route>

Loading…
Cancel
Save