Merge branch 'develop'
This commit is contained in:
commit
3a384a51bd
3
.gitignore
vendored
3
.gitignore
vendored
@ -5,3 +5,6 @@ dist
|
||||
yarn-error.log
|
||||
storage/tmp
|
||||
storage/uploads
|
||||
|
||||
config/local.*
|
||||
src/package.json
|
||||
|
||||
@ -6,9 +6,10 @@ $secondaryForeground: $primaryForeground;
|
||||
$backgroundColor: darken($primary, 4%);
|
||||
$defaultTextColor: #ffffff;
|
||||
|
||||
$headerBackground: darken($primary, 7.5%);
|
||||
$footerBackground: lighten($headerBackground, 1%);
|
||||
$panelBackground: lighten($headerBackground, 1%);
|
||||
$headerBackground: transparent;
|
||||
$headerContainer: true;
|
||||
$footerBackground: transparent;
|
||||
$panelBackground: darken($backgroundColor, 3.2%);
|
||||
$inputBackground: darken($panelBackground, 4%);
|
||||
|
||||
$info: #4499ff;
|
||||
@ -28,4 +29,5 @@ $errorText: darken($error, 30%);
|
||||
$errorColor: desaturate($errorText, 50%);
|
||||
|
||||
// Responsivity
|
||||
$mobileThreshold: 632px;
|
||||
$mobileThreshold: 850px;
|
||||
$desktopThreshold: 940px;
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
@import "vars";
|
||||
@import 'fonts';
|
||||
@import "responsivity_tools";
|
||||
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
@ -69,21 +70,31 @@ body {
|
||||
body > header {
|
||||
z-index: 50;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-direction: row-reverse;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
$headerHeight: 64px;
|
||||
height: $headerHeight;
|
||||
line-height: $headerHeight;
|
||||
|
||||
background-color: $headerBackground;
|
||||
background: $headerBackground;
|
||||
|
||||
@if $headerContainer {
|
||||
@include container;
|
||||
}
|
||||
|
||||
@media (max-width: $mobileThreshold) {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.logo {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
|
||||
padding: 0 24px 0 16px;
|
||||
font-size: 32px;
|
||||
padding: 0 16px 0 8px;
|
||||
font-size: 24px;
|
||||
color: $defaultTextColor;
|
||||
|
||||
&:hover {
|
||||
@ -91,34 +102,48 @@ body > header {
|
||||
}
|
||||
|
||||
img {
|
||||
width: $headerHeight;
|
||||
height: $headerHeight;
|
||||
margin-right: 16px;
|
||||
width: initial;
|
||||
height: calc(#{$headerHeight} - 16px);
|
||||
margin-right: 8px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
|
||||
nav {
|
||||
ul {
|
||||
> ul {
|
||||
position: fixed;
|
||||
z-index: -1;
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: 100%;
|
||||
transform: translateX(-100%);
|
||||
transition: transform ease-out 150ms;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-direction: column;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
padding: $headerHeight 8px 8px;
|
||||
|
||||
font-size: 20px;
|
||||
|
||||
background: $panelBackground;
|
||||
|
||||
li {
|
||||
position: relative;
|
||||
list-style: none;
|
||||
margin-top: 8px;
|
||||
|
||||
a, button {
|
||||
position: relative;
|
||||
height: 64px;
|
||||
margin: 0;
|
||||
padding: 0 24px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
height: auto;
|
||||
padding: 8px;
|
||||
|
||||
border-radius: 3px;
|
||||
|
||||
&:hover, &:active {
|
||||
&:not(button) {
|
||||
@ -127,13 +152,40 @@ body > header {
|
||||
}
|
||||
|
||||
.feather {
|
||||
--icon-size: 24px;
|
||||
--icon-size: 16px;
|
||||
}
|
||||
|
||||
.tip {
|
||||
position: static;
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
display: block;
|
||||
height: auto;
|
||||
margin-left: 8px;
|
||||
padding: 0 0 0 4px;
|
||||
transform: none;
|
||||
|
||||
font-size: 16px;
|
||||
line-height: 16px;
|
||||
|
||||
color: inherit;
|
||||
text-transform: uppercase;
|
||||
font-weight: inherit;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.tip {
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
transition: opacity ease-out 100ms;
|
||||
transition-delay: 150ms;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
margin: 8px;
|
||||
padding: 24px;
|
||||
margin: 0;
|
||||
height: 32px;
|
||||
|
||||
.feather {
|
||||
@ -158,45 +210,27 @@ body > header {
|
||||
}
|
||||
|
||||
.dropdown {
|
||||
position: absolute;
|
||||
z-index: -1;
|
||||
top: 100%;
|
||||
right: 0;
|
||||
|
||||
white-space: nowrap;
|
||||
background: $headerBackground;
|
||||
border-radius: 0 0 3px 3px;
|
||||
|
||||
a {
|
||||
padding: 0 8px;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover .dropdown {
|
||||
position: initial;
|
||||
display: block;
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
> li:not(:first-child) {
|
||||
border-top: 1px solid transparentize($defaultTextColor, 0.8);
|
||||
padding-top: 8px;
|
||||
}
|
||||
|
||||
&.open {
|
||||
transform: translateX(0%);
|
||||
box-shadow: 0 0 5px darken($panelBackground, 20%);
|
||||
}
|
||||
}
|
||||
|
||||
#menu-button {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: $mobileThreshold) {
|
||||
flex-direction: row-reverse;
|
||||
|
||||
.logo {
|
||||
padding: 0 16px 0 8px;
|
||||
font-size: 24px;
|
||||
|
||||
img {
|
||||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
nav {
|
||||
#menu-button {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
display: block;
|
||||
margin: 0;
|
||||
padding: 0 16px;
|
||||
@ -212,46 +246,32 @@ body > header {
|
||||
}
|
||||
}
|
||||
|
||||
> ul {
|
||||
flex-direction: column;
|
||||
position: absolute;
|
||||
z-index: 10;
|
||||
left: 0;
|
||||
transform: translateX(-100%);
|
||||
transition: transform ease-out 150ms;
|
||||
|
||||
background-color: $headerBackground;
|
||||
|
||||
&.open {
|
||||
transform: translateX(0%);
|
||||
}
|
||||
|
||||
li {
|
||||
a, button {
|
||||
.tip {
|
||||
display: block;
|
||||
margin-left: 8px;
|
||||
text-transform: inherit;
|
||||
font-weight: inherit;
|
||||
}
|
||||
}
|
||||
|
||||
.dropdown {
|
||||
position: initial;
|
||||
display: block;
|
||||
padding-left: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
hr {
|
||||
border: 0;
|
||||
border-bottom: 1px solid $defaultTextColor;
|
||||
opacity: 0.2;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: $mobileThreshold) {
|
||||
nav ul li {
|
||||
a, button, .button {
|
||||
@include tip;
|
||||
flex-direction: row;
|
||||
|
||||
nav {
|
||||
#menu-button {
|
||||
display: none;
|
||||
}
|
||||
|
||||
ul {
|
||||
position: static;
|
||||
flex-direction: row;
|
||||
transform: none;
|
||||
padding: 0;
|
||||
background: transparent;
|
||||
|
||||
li {
|
||||
margin-top: 0;
|
||||
margin-left: 8px;
|
||||
|
||||
&:last-child {
|
||||
a, button, .button {
|
||||
.tip {
|
||||
@ -261,11 +281,46 @@ body > header {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.dropdown {
|
||||
position: absolute;
|
||||
z-index: -1;
|
||||
top: 100%;
|
||||
right: 0;
|
||||
display: none;
|
||||
padding: 8px;
|
||||
|
||||
white-space: nowrap;
|
||||
background: $panelBackground;
|
||||
border-radius: 0 0 3px 3px;
|
||||
|
||||
box-shadow: 0 2px 2px transparentize(darken($panelBackground, 20%), 0.75);
|
||||
border-top: 4px solid lighten($panelBackground, 5%);
|
||||
|
||||
li {
|
||||
margin-left: 0;
|
||||
|
||||
&:not(:first-child) {
|
||||
margin-top: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
footer {
|
||||
&:hover .dropdown {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
> li:not(:first-child) {
|
||||
border-top: 0;
|
||||
padding-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
body > footer {
|
||||
padding: 8px;
|
||||
margin-top: 8px;
|
||||
text-align: center;
|
||||
@ -338,7 +393,7 @@ a {
|
||||
text-decoration: none;
|
||||
|
||||
&:hover {
|
||||
color: lighten($secondary, 10%);
|
||||
color: lighten($secondary, 30%);
|
||||
}
|
||||
|
||||
.feather.feather-external-link {
|
||||
@ -584,6 +639,10 @@ button, .button {
|
||||
|
||||
&.warning {
|
||||
background-color: $warningColor;
|
||||
|
||||
&:hover {
|
||||
background-color: lighten($warningColor, 10%);
|
||||
}
|
||||
}
|
||||
|
||||
&.error, &.danger {
|
||||
@ -603,6 +662,35 @@ button, .button {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ---
|
||||
// --- Tables
|
||||
// ---
|
||||
td.actions {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
form {
|
||||
padding: 0;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
button, .button {
|
||||
margin: 0;
|
||||
padding: 8px;
|
||||
|
||||
.feather {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
> *:not(:first-child) {
|
||||
margin-left: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.data-table {
|
||||
width: 100%;
|
||||
text-align: left;
|
||||
@ -614,6 +702,7 @@ button, .button {
|
||||
|
||||
th {
|
||||
border-bottom: 1px solid #39434a;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
tr:nth-child(even) {
|
||||
@ -633,6 +722,10 @@ button, .button {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ---
|
||||
// --- Breadcrumb widget
|
||||
// ---
|
||||
.breadcrumb {
|
||||
list-style: none;
|
||||
display: flex;
|
||||
@ -646,6 +739,7 @@ button, .button {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ---
|
||||
// --- Layout helpers
|
||||
// ---
|
||||
@ -653,24 +747,6 @@ button, .button {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
@mixin container {
|
||||
width: $mobileThreshold;
|
||||
padding: 0 16px;
|
||||
|
||||
@media (min-width: $mobileThreshold) {
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
@media (max-width: $mobileThreshold) {
|
||||
width: 100%;
|
||||
padding: 0 8px;
|
||||
}
|
||||
}
|
||||
|
||||
.container {
|
||||
@include container;
|
||||
}
|
||||
|
||||
.panel {
|
||||
position: relative;
|
||||
margin: 16px 0 48px;
|
||||
@ -692,10 +768,14 @@ button, .button {
|
||||
}
|
||||
|
||||
.sub-panel {
|
||||
margin: 32px -18px;
|
||||
margin: 32px 0;
|
||||
padding: 1px 16px;
|
||||
border: 2px solid lighten($panelBackground, 4%);
|
||||
border-radius: 5px;
|
||||
|
||||
form > & {
|
||||
margin: 32px -18px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -719,6 +799,10 @@ button, .button {
|
||||
stroke-linejoin: miter;
|
||||
fill: none;
|
||||
vertical-align: middle;
|
||||
|
||||
h1 > &, h2 > &, h3 > & {
|
||||
--icon-size: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
// ---
|
||||
@ -789,37 +873,7 @@ button, .button {
|
||||
}
|
||||
|
||||
.content {
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.copy-button {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border-radius: 0;
|
||||
|
||||
.feather {
|
||||
--icon-size: 20px;
|
||||
margin: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.copyable-text {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
margin: 8px;
|
||||
|
||||
background-color: darken($backgroundColor, 2%);
|
||||
border-radius: 5px;
|
||||
overflow: hidden;
|
||||
|
||||
.title {
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
.content {
|
||||
width: 0;
|
||||
flex-grow: 1;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
@ -869,3 +923,7 @@ button, .button {
|
||||
background: $secondary;
|
||||
}
|
||||
}
|
||||
|
||||
.table-col-grow {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
19
assets/sass/responsivity_tools.scss
Normal file
19
assets/sass/responsivity_tools.scss
Normal file
@ -0,0 +1,19 @@
|
||||
@import "vars";
|
||||
|
||||
@mixin container {
|
||||
width: 100%;
|
||||
padding: 0 8px;
|
||||
|
||||
@media (min-width: $mobileThreshold) {
|
||||
margin: 0 auto;
|
||||
padding: 0 16px;
|
||||
}
|
||||
|
||||
@media (min-width: $desktopThreshold) {
|
||||
width: $desktopThreshold;
|
||||
}
|
||||
}
|
||||
|
||||
.container {
|
||||
@include container;
|
||||
}
|
||||
21
package.json
21
package.json
@ -1,26 +1,26 @@
|
||||
{
|
||||
"name": "ily.li",
|
||||
"version": "0.5.5",
|
||||
"version": "0.6.0",
|
||||
"description": "Self-hosted file pusher",
|
||||
"repository": "https://eternae.ink/arisu/ily.li",
|
||||
"author": "Alice Gaudon <alice@gaudon.pro>",
|
||||
"license": "GPL-3.0-only",
|
||||
"main": "dist/src/main.js",
|
||||
"main": "dist/main.js",
|
||||
"scripts": {
|
||||
"dist-webpack": "webpack --mode production",
|
||||
"test": "jest --verbose --runInBand",
|
||||
"clean": "(test ! -d dist || rm -r dist)",
|
||||
"prepareSources": "cp package.json src/",
|
||||
"compile": "yarn clean && tsc",
|
||||
"build": "yarn compile && yarn dist-webpack",
|
||||
"lint": "eslint . --ext .js,.jsx,.ts,.tsx",
|
||||
"dev": "concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
|
||||
"start": "yarn build && node dist/src/main.js",
|
||||
"test": "jest --verbose --runInBand"
|
||||
"build": "yarn prepareSources && yarn compile && webpack --mode production",
|
||||
"dev": "yarn prepareSources && concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
|
||||
"start": "yarn build && node",
|
||||
"lint": "eslint . --ext .js,.jsx,.ts,.tsx"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.9.0",
|
||||
"@babel/preset-env": "^7.9.5",
|
||||
"@fortawesome/fontawesome-free": "^5.14.0",
|
||||
"@types/config": "^0.0.36",
|
||||
"@types/config": "^0.0.38",
|
||||
"@types/express": "^4.17.6",
|
||||
"@types/express-session": "^1.17.0",
|
||||
"@types/feather-icons": "^4.7.0",
|
||||
@ -46,6 +46,7 @@
|
||||
"imagemin-svgo": "^8.0.0",
|
||||
"img-loader": "^3.0.1",
|
||||
"jest": "^26.1.0",
|
||||
"maildev": "^1.1.0",
|
||||
"mini-css-extract-plugin": "^1.2.1",
|
||||
"node-sass": "^5.0.0",
|
||||
"nodemon": "^2.0.3",
|
||||
@ -61,6 +62,6 @@
|
||||
"config": "^3.3.1",
|
||||
"express": "^4.17.1",
|
||||
"formidable": "^1.2.2",
|
||||
"swaf": "^0.22.5"
|
||||
"swaf": "^0.23.0"
|
||||
}
|
||||
}
|
||||
|
||||
92
src/App.ts
92
src/App.ts
@ -15,34 +15,35 @@ import CsrfProtectionComponent from "swaf/components/CsrfProtectionComponent";
|
||||
import WebSocketServerComponent from "swaf/components/WebSocketServerComponent";
|
||||
import AboutController from "./controllers/AboutController";
|
||||
import AutoUpdateComponent from "swaf/components/AutoUpdateComponent";
|
||||
import AuthController from "./controllers/AuthController";
|
||||
import MagicLinkWebSocketListener from "swaf/auth/magic_link/MagicLinkWebSocketListener";
|
||||
import MagicLinkController from "./controllers/MagicLinkController";
|
||||
import MailController from "swaf/auth/MailController";
|
||||
import FileController from "./controllers/FileController";
|
||||
import CreateUsersAndUserEmailsTable from "swaf/auth/migrations/CreateUsersAndUserEmailsTable";
|
||||
import CreateMagicLinksTable from "swaf/auth/migrations/CreateMagicLinksTable";
|
||||
import CreateAuthTokensTable from "./migrations/CreateAuthTokensTable";
|
||||
import AuthComponent from "swaf/auth/AuthComponent";
|
||||
import AuthGuard from "swaf/auth/AuthGuard";
|
||||
import MagicLink from "swaf/auth/models/MagicLink";
|
||||
import AuthToken from "./models/AuthToken";
|
||||
import {MagicLinkActionType} from "./controllers/MagicLinkActionType";
|
||||
import {Request} from "express";
|
||||
import CreateFilesTable from "./migrations/CreateFilesTable";
|
||||
import IncreaseFilesSizeField from "./migrations/IncreaseFilesSizeField";
|
||||
import AddApprovedFieldToUsersTable from "swaf/auth/migrations/AddApprovedFieldToUsersTable";
|
||||
import CreateUrlRedirectsTable from "./migrations/CreateUrlRedirectsTable";
|
||||
import AuthTokenController from "./controllers/AuthTokenController";
|
||||
import URLRedirectController from "./controllers/URLRedirectController";
|
||||
import LinkController from "./controllers/LinkController";
|
||||
import BackendController from "swaf/helpers/BackendController";
|
||||
import RedirectBackComponent from "swaf/components/RedirectBackComponent";
|
||||
import DummyMigration from "swaf/migrations/DummyMigration";
|
||||
import DropLegacyLogsTable from "swaf/migrations/DropLegacyLogsTable";
|
||||
import {Session} from "express-session";
|
||||
import packageJson = require('../package.json');
|
||||
import FixUserMainEmailRelation from "swaf/auth/migrations/FixUserMainEmailRelation";
|
||||
import CreateUsersAndUserEmailsTableMigration from "swaf/auth/migrations/CreateUsersAndUserEmailsTableMigration";
|
||||
import CreateMagicLinksTableMigration from "swaf/auth/magic_link/CreateMagicLinksTableMigration";
|
||||
import AddApprovedFieldToUsersTableMigration from "swaf/auth/migrations/AddApprovedFieldToUsersTableMigration";
|
||||
import PreviousUrlComponent from "swaf/components/PreviousUrlComponent";
|
||||
import MagicLinkAuthMethod from "swaf/auth/magic_link/MagicLinkAuthMethod";
|
||||
import {MAGIC_LINK_MAIL} from "swaf/Mails";
|
||||
import PasswordAuthMethod from "swaf/auth/password/PasswordAuthMethod";
|
||||
import MailController from "swaf/mail/MailController";
|
||||
import AccountController from "swaf/auth/AccountController";
|
||||
import AuthController from "swaf/auth/AuthController";
|
||||
import MagicLinkController from "swaf/auth/magic_link/MagicLinkController";
|
||||
import AddUsedToMagicLinksMigration from "swaf/auth/magic_link/AddUsedToMagicLinksMigration";
|
||||
import MakeMagicLinksSessionNotUniqueMigration from "swaf/auth/magic_link/MakeMagicLinksSessionNotUniqueMigration";
|
||||
import AddPasswordToUsersMigration from "swaf/auth/password/AddPasswordToUsersMigration";
|
||||
import DropNameFromUsers from "swaf/auth/migrations/DropNameFromUsers";
|
||||
import packageJson = require('./package.json');
|
||||
|
||||
export default class App extends Application {
|
||||
public constructor(
|
||||
@ -56,15 +57,19 @@ export default class App extends Application {
|
||||
return [
|
||||
CreateMigrationsTable,
|
||||
DummyMigration,
|
||||
CreateUsersAndUserEmailsTable,
|
||||
CreateMagicLinksTable,
|
||||
CreateUsersAndUserEmailsTableMigration,
|
||||
CreateMagicLinksTableMigration,
|
||||
CreateAuthTokensTable,
|
||||
CreateFilesTable,
|
||||
IncreaseFilesSizeField,
|
||||
AddApprovedFieldToUsersTable,
|
||||
AddApprovedFieldToUsersTableMigration,
|
||||
CreateUrlRedirectsTable,
|
||||
DropLegacyLogsTable,
|
||||
FixUserMainEmailRelation,
|
||||
DummyMigration,
|
||||
AddUsedToMagicLinksMigration,
|
||||
MakeMagicLinksSessionNotUniqueMigration,
|
||||
AddPasswordToUsersMigration,
|
||||
DropNameFromUsers,
|
||||
];
|
||||
}
|
||||
|
||||
@ -75,13 +80,8 @@ export default class App extends Application {
|
||||
}
|
||||
|
||||
private registerComponents() {
|
||||
const redisComponent = new RedisComponent();
|
||||
const mysqlComponent = new MysqlComponent();
|
||||
|
||||
const expressAppComponent = new ExpressAppComponent(this.addr, this.port);
|
||||
this.use(expressAppComponent);
|
||||
|
||||
// Base
|
||||
this.use(new ExpressAppComponent(this.addr, this.port));
|
||||
this.use(new LogRequestsComponent());
|
||||
|
||||
// Static files
|
||||
@ -90,43 +90,22 @@ export default class App extends Application {
|
||||
|
||||
// Dynamic views and routes
|
||||
this.use(new NunjucksComponent());
|
||||
this.use(new RedirectBackComponent());
|
||||
this.use(new PreviousUrlComponent());
|
||||
|
||||
// Maintenance
|
||||
this.use(new MaintenanceComponent(this, () => {
|
||||
return redisComponent.canServe() && mysqlComponent.canServe();
|
||||
return this.as(RedisComponent).canServe() && this.as(MysqlComponent).canServe();
|
||||
}));
|
||||
this.use(new AutoUpdateComponent());
|
||||
|
||||
// Services
|
||||
this.use(mysqlComponent);
|
||||
this.use(new MysqlComponent());
|
||||
this.use(new MailComponent());
|
||||
|
||||
// Session
|
||||
this.use(redisComponent);
|
||||
this.use(new SessionComponent(redisComponent));
|
||||
this.use(new AuthComponent(new class extends AuthGuard<MagicLink | AuthToken> {
|
||||
public async getProofForSession(session: Session): Promise<MagicLink | AuthToken | null> {
|
||||
return await MagicLink.bySessionId(
|
||||
session.id,
|
||||
[MagicLinkActionType.LOGIN, MagicLinkActionType.REGISTER],
|
||||
);
|
||||
}
|
||||
|
||||
public async getProofForRequest(req: Request): Promise<MagicLink | AuthToken | null> {
|
||||
const authorization = req.header('Authorization');
|
||||
if (authorization) {
|
||||
const token = await AuthToken.select().where('secret', authorization).first();
|
||||
if (token) {
|
||||
token.use();
|
||||
await token.save();
|
||||
}
|
||||
return token;
|
||||
}
|
||||
|
||||
return await super.getProofForRequest(req);
|
||||
}
|
||||
}(this)));
|
||||
this.use(new RedisComponent());
|
||||
this.use(new SessionComponent(this.as(RedisComponent)));
|
||||
this.use(new AuthComponent(this, new MagicLinkAuthMethod(this, MAGIC_LINK_MAIL), new PasswordAuthMethod(this)));
|
||||
|
||||
// Utils
|
||||
this.use(new FormHelperComponent());
|
||||
@ -135,7 +114,7 @@ export default class App extends Application {
|
||||
this.use(new CsrfProtectionComponent());
|
||||
|
||||
// WebSocket server
|
||||
this.use(new WebSocketServerComponent(this, expressAppComponent, redisComponent));
|
||||
this.use(new WebSocketServerComponent(this, this.as(ExpressAppComponent), this.as(RedisComponent)));
|
||||
}
|
||||
|
||||
private registerWebSocketListeners() {
|
||||
@ -147,12 +126,13 @@ export default class App extends Application {
|
||||
this.use(new LinkController());
|
||||
|
||||
// Priority
|
||||
this.use(new MailController());
|
||||
this.use(new AuthController());
|
||||
this.use(new MagicLinkController(this.as<MagicLinkWebSocketListener<this>>(MagicLinkWebSocketListener)));
|
||||
this.use(new BackendController());
|
||||
|
||||
// Core functionality
|
||||
this.use(new MailController());
|
||||
// Core
|
||||
this.use(new AccountController());
|
||||
this.use(new BackendController());
|
||||
|
||||
// Other functionality
|
||||
this.use(new AuthTokenController());
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
import {cryptoRandomDictionary} from "swaf/Utils";
|
||||
import config from "config";
|
||||
import FileModel from "./models/FileModel";
|
||||
import {ServerError} from "swaf/HttpError";
|
||||
import {nanoid} from "nanoid";
|
||||
|
||||
const SLUG_DICTIONARY = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
|
||||
export default async function generateSlug(tries: number): Promise<string> {
|
||||
let i = 0;
|
||||
do {
|
||||
const slug = cryptoRandomDictionary(config.get<number>('newlyGeneratedSlugSize'), SLUG_DICTIONARY);
|
||||
const slug = nanoid(config.get<number>('newlyGeneratedSlugSize'));
|
||||
if (!await FileModel.getBySlug(slug)) {
|
||||
return slug;
|
||||
}
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
import MagicLinkAuthController from "swaf/auth/magic_link/MagicLinkAuthController";
|
||||
import {MAGIC_LINK_MAIL} from "swaf/Mails";
|
||||
|
||||
export default class AuthController extends MagicLinkAuthController {
|
||||
public constructor() {
|
||||
super(MAGIC_LINK_MAIL);
|
||||
}
|
||||
}
|
||||
@ -18,7 +18,7 @@ export default class AuthTokenController extends Controller {
|
||||
});
|
||||
await authToken.save();
|
||||
req.flash('success', 'Successfully created auth token.');
|
||||
res.redirectBack(Controller.route('file-upload'));
|
||||
res.redirect(req.getPreviousUrl() || Controller.route('file-upload'));
|
||||
}
|
||||
|
||||
protected async postRevokeAuthToken(req: Request, res: Response): Promise<void> {
|
||||
@ -34,6 +34,6 @@ export default class AuthTokenController extends Controller {
|
||||
await authToken.delete();
|
||||
|
||||
req.flash('success', 'Successfully deleted auth token.');
|
||||
res.redirectBack(Controller.route('file-upload'));
|
||||
res.redirect(req.getPreviousUrl() || Controller.route('file-upload'));
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ import * as fs from "fs";
|
||||
import AuthToken from "../models/AuthToken";
|
||||
import {IncomingForm} from "formidable";
|
||||
import generateSlug from "../SlugGenerator";
|
||||
import {log} from "swaf/Logger";
|
||||
import {logger} from "swaf/Logger";
|
||||
import FileUploadMiddleware from "swaf/FileUploadMiddleware";
|
||||
|
||||
|
||||
@ -66,6 +66,9 @@ export default class FileController extends Controller {
|
||||
}
|
||||
|
||||
const upload = req.files['upload'];
|
||||
if (Array.isArray(upload)) {
|
||||
throw new BadRequestError('Uploading multiple files at once is unsupported.', 'Please only upload one file at a time.', req.url);
|
||||
}
|
||||
|
||||
// TTL
|
||||
let ttl = config.get<number>('default_file_ttl');
|
||||
@ -97,7 +100,7 @@ export default class FileController extends Controller {
|
||||
html: () => {
|
||||
req.flash('success', 'Upload success!');
|
||||
req.flash('url', file.getURL(domain));
|
||||
res.redirectBack('/');
|
||||
res.redirect(Controller.route('file-manager'));
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -132,7 +135,7 @@ export default class FileController extends Controller {
|
||||
text: () => res.send('success'),
|
||||
html: () => {
|
||||
req.flash('success', 'Successfully deleted file.');
|
||||
res.redirectBack('/');
|
||||
res.redirect(Controller.route('file-manager'));
|
||||
},
|
||||
});
|
||||
}
|
||||
@ -140,7 +143,7 @@ export default class FileController extends Controller {
|
||||
public static async deleteFile(file: FileModel): Promise<void> {
|
||||
fs.unlinkSync(file.getOrFail('storage_path'));
|
||||
await file.delete();
|
||||
log.info('Deleted', file.storage_path, `(${file.real_name})`);
|
||||
logger.info('Deleted', file.storage_path, `(${file.real_name})`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -20,6 +20,6 @@ export default class HomeController extends Controller {
|
||||
* This is to test and assert that swaf extended types are available
|
||||
*/
|
||||
protected async goBack(req: Request, res: Response): Promise<void> {
|
||||
res.redirectBack();
|
||||
res.redirect(req.getPreviousUrl() || Controller.route('home'));
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ import FileController, {FileUploadFormMiddleware} from "./FileController";
|
||||
import * as fs from "fs";
|
||||
import {encodeRFC5987ValueChars} from "../Utils";
|
||||
import {promisify} from "util";
|
||||
import {log} from "swaf/Logger";
|
||||
import {logger} from "swaf/Logger";
|
||||
|
||||
export default class LinkController extends Controller {
|
||||
public routes(): void {
|
||||
@ -44,7 +44,7 @@ export default class LinkController extends Controller {
|
||||
|
||||
// If file is bigger than max hotlink size, fallback to express download
|
||||
if (stats.size > config.get<number>('max_hotlink_size') * 1024 * 1024) {
|
||||
log.info(`Fallback to express download for file of size ${stats.size}`);
|
||||
logger.info(`Fallback to express download for file of size ${stats.size}`);
|
||||
return res.download(file.getOrFail('storage_path'), fileName);
|
||||
}
|
||||
|
||||
@ -108,7 +108,7 @@ export default class LinkController extends Controller {
|
||||
|
||||
protected async domainFilter(req: Request, res: Response, next: NextFunction): Promise<void> {
|
||||
if (req.hostname !== config.get('domain')) {
|
||||
if (req.path === '/') return res.redirect(config.get<string>('base_url'));
|
||||
if (req.path === '/') return res.redirect(config.get<string>('public_url'));
|
||||
throw new NotFoundHttpError('Page', req.url);
|
||||
}
|
||||
next();
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
import _MagicLinkController from "swaf/auth/magic_link/MagicLinkController";
|
||||
import {Request, Response} from "express";
|
||||
import Controller from "swaf/Controller";
|
||||
import MagicLinkWebSocketListener from "swaf/auth/magic_link/MagicLinkWebSocketListener";
|
||||
import MagicLink from "swaf/auth/models/MagicLink";
|
||||
import AuthController from "./AuthController";
|
||||
import {MagicLinkActionType} from "./MagicLinkActionType";
|
||||
import App from "../App";
|
||||
import AuthComponent from "swaf/auth/AuthComponent";
|
||||
|
||||
export default class MagicLinkController extends _MagicLinkController<App> {
|
||||
public constructor(magicLinkWebSocketListener: MagicLinkWebSocketListener<App>) {
|
||||
super(magicLinkWebSocketListener);
|
||||
}
|
||||
|
||||
protected async performAction(magicLink: MagicLink, req: Request, res: Response): Promise<void> {
|
||||
switch (magicLink.action_type) {
|
||||
case MagicLinkActionType.LOGIN:
|
||||
case MagicLinkActionType.REGISTER: {
|
||||
await AuthController.checkAndAuth(req, res, magicLink);
|
||||
const proof = await this.getApp().as(AuthComponent).getAuthGuard().isAuthenticated(req.getSession());
|
||||
const user = await proof?.getResource();
|
||||
|
||||
if (!res.headersSent && user) {
|
||||
// Auth success
|
||||
req.flash('success', `Authentication success. Welcome, ${user.name}!`);
|
||||
res.redirect(req.query.redirect_uri?.toString() || Controller.route('home'));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -8,13 +8,13 @@ import AuthToken from "../models/AuthToken";
|
||||
|
||||
export default class URLRedirectController extends Controller {
|
||||
public routes(): void {
|
||||
this.get('/url/shrink', this.getURLShrinker, 'url-shrinker', RequireAuthMiddleware);
|
||||
this.get('/url/shrink', this.getUrlShrinker, 'url-shrinker', RequireAuthMiddleware);
|
||||
this.get('/url/shrink/script', this.downloadLinuxScript, 'url-linux-script');
|
||||
this.post('/url/shrink', this.addURLFrontend, 'shrink-url', RequireAuthMiddleware);
|
||||
this.get('/urls/:page([0-9]+)?', this.getURLRedirectManager, 'url-manager', RequireAuthMiddleware);
|
||||
this.post('/url/shrink', this.addUrlFrontend, 'shrink-url', RequireAuthMiddleware);
|
||||
this.get('/urls/:page([0-9]+)?', this.getUrlRedirectManager, 'url-manager', RequireAuthMiddleware);
|
||||
}
|
||||
|
||||
protected async getURLShrinker(req: Request, res: Response): Promise<void> {
|
||||
protected async getUrlShrinker(req: Request, res: Response): Promise<void> {
|
||||
const user = req.as(RequireAuthMiddleware).getUser();
|
||||
const allowedDomains = config.get<string[]>('allowed_url_domains');
|
||||
res.render('url-shrinker', {
|
||||
@ -28,14 +28,14 @@ export default class URLRedirectController extends Controller {
|
||||
res.download('assets/files/shrink_url.sh', 'shrink_url.sh');
|
||||
}
|
||||
|
||||
protected async getURLRedirectManager(req: Request, res: Response): Promise<void> {
|
||||
protected async getUrlRedirectManager(req: Request, res: Response): Promise<void> {
|
||||
const user = req.as(RequireAuthMiddleware).getUser();
|
||||
res.render('url-manager', {
|
||||
urls: await URLRedirect.paginateForUser(req, 100, user.getOrFail('id')),
|
||||
});
|
||||
}
|
||||
|
||||
protected async addURLFrontend(req: Request, res: Response, next: NextFunction): Promise<void> {
|
||||
protected async addUrlFrontend(req: Request, res: Response, next: NextFunction): Promise<void> {
|
||||
req.body.type = 'url';
|
||||
await URLRedirectController.addURL(
|
||||
req,
|
||||
@ -75,7 +75,7 @@ export default class URLRedirectController extends Controller {
|
||||
html: () => {
|
||||
req.flash('success', 'URL shrunk successfully!');
|
||||
req.flash('url', urlRedirect.getURL(domain));
|
||||
res.redirectBack('/');
|
||||
res.redirect(Controller.route('url-manager'));
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
10
src/main.ts
10
src/main.ts
@ -2,19 +2,19 @@ import {delimiter} from "path";
|
||||
|
||||
// Load config from specified path or default + swaf/config (default defaults)
|
||||
process.env['NODE_CONFIG_DIR'] =
|
||||
__dirname + '/../../node_modules/swaf/config/'
|
||||
__dirname + '/../node_modules/swaf/config/'
|
||||
+ delimiter
|
||||
+ (process.env['NODE_CONFIG_DIR'] || __dirname + '/../../config/');
|
||||
+ (process.env['NODE_CONFIG_DIR'] || __dirname + '/../config/');
|
||||
|
||||
import {log} from "swaf/Logger";
|
||||
import {logger} from "swaf/Logger";
|
||||
import App from "./App";
|
||||
import config from "config";
|
||||
|
||||
(async () => {
|
||||
log.debug('Config path:', process.env['NODE_CONFIG_DIR']);
|
||||
logger.debug('Config path:', process.env['NODE_CONFIG_DIR']);
|
||||
|
||||
const app = new App(config.get<string>('listen_addr'), config.get<number>('port'));
|
||||
await app.start();
|
||||
})().catch(err => {
|
||||
log.error(err);
|
||||
logger.error(err);
|
||||
});
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
import {Connection} from "mysql";
|
||||
import Migration from "swaf/db/Migration";
|
||||
import ModelFactory from "swaf/db/ModelFactory";
|
||||
import AuthToken from "../models/AuthToken";
|
||||
|
||||
export default class CreateAuthTokensTable extends Migration {
|
||||
public async install(connection: Connection): Promise<void> {
|
||||
public async install(): Promise<void> {
|
||||
await this.query(`CREATE TABLE auth_tokens
|
||||
(
|
||||
id INT NOT NULL AUTO_INCREMENT,
|
||||
@ -14,11 +13,11 @@ export default class CreateAuthTokensTable extends Migration {
|
||||
used_at DATETIME NOT NULL DEFAULT NOW(),
|
||||
ttl INT UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
)`, connection);
|
||||
)`);
|
||||
}
|
||||
|
||||
public async rollback(connection: Connection): Promise<void> {
|
||||
await this.query(`DROP TABLE IF EXISTS auth_tokens`, connection);
|
||||
public async rollback(): Promise<void> {
|
||||
await this.query(`DROP TABLE IF EXISTS auth_tokens`);
|
||||
}
|
||||
|
||||
public registerModels(): void {
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
import {Connection} from "mysql";
|
||||
import Migration from "swaf/db/Migration";
|
||||
import ModelFactory from "swaf/db/ModelFactory";
|
||||
import FileModel from "../models/FileModel";
|
||||
|
||||
export default class CreateFilesTable extends Migration {
|
||||
public async install(connection: Connection): Promise<void> {
|
||||
public async install(): Promise<void> {
|
||||
await this.query(`CREATE TABLE files
|
||||
(
|
||||
id INT NOT NULL AUTO_INCREMENT,
|
||||
@ -17,11 +16,11 @@ export default class CreateFilesTable extends Migration {
|
||||
created_at DATETIME NOT NULL DEFAULT NOW(),
|
||||
ttl INT UNSIGNED NOT NULL,
|
||||
PRIMARY KEY (id)
|
||||
)`, connection);
|
||||
)`);
|
||||
}
|
||||
|
||||
public async rollback(connection: Connection): Promise<void> {
|
||||
await this.query(`DROP TABLE IF EXISTS files`, connection);
|
||||
public async rollback(): Promise<void> {
|
||||
await this.query(`DROP TABLE IF EXISTS files`);
|
||||
}
|
||||
|
||||
public registerModels(): void {
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
import Migration from "swaf/db/Migration";
|
||||
import {Connection} from "mysql";
|
||||
import ModelFactory from "swaf/db/ModelFactory";
|
||||
import URLRedirect from "../models/URLRedirect";
|
||||
|
||||
export default class CreateUrlRedirectsTable extends Migration {
|
||||
public async install(connection: Connection): Promise<void> {
|
||||
public async install(): Promise<void> {
|
||||
await this.query(`CREATE TABLE url_redirects
|
||||
(
|
||||
id INT NOT NULL AUTO_INCREMENT,
|
||||
@ -13,11 +12,11 @@ export default class CreateUrlRedirectsTable extends Migration {
|
||||
target_url VARCHAR(1745) NOT NULL,
|
||||
created_at DATETIME NOT NULL DEFAULT NOW(),
|
||||
PRIMARY KEY (id)
|
||||
)`, connection);
|
||||
)`);
|
||||
}
|
||||
|
||||
public async rollback(connection: Connection): Promise<void> {
|
||||
await this.query(`DROP TABLE IF EXISTS url_redirects`, connection);
|
||||
public async rollback(): Promise<void> {
|
||||
await this.query(`DROP TABLE IF EXISTS url_redirects`);
|
||||
}
|
||||
|
||||
public registerModels(): void {
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
import Migration from "swaf/db/Migration";
|
||||
import {Connection} from "mysql";
|
||||
|
||||
export default class IncreaseFilesSizeField extends Migration {
|
||||
public async install(connection: Connection): Promise<void> {
|
||||
await this.query(`ALTER TABLE files MODIFY size BIGINT UNSIGNED`, connection);
|
||||
public async install(): Promise<void> {
|
||||
await this.query(`ALTER TABLE files MODIFY size BIGINT UNSIGNED`);
|
||||
}
|
||||
|
||||
public async rollback(connection: Connection): Promise<void> {
|
||||
await this.query(`ALTER TABLE files MODIFY size INT UNSIGNED`, connection);
|
||||
public async rollback(): Promise<void> {
|
||||
await this.query(`ALTER TABLE files MODIFY size INT UNSIGNED`);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import Model from "swaf/db/Model";
|
||||
import AuthProof from "swaf/auth/AuthProof";
|
||||
import User from "swaf/auth/models/User";
|
||||
import {cryptoRandomDictionary} from "swaf/Utils";
|
||||
import {nanoid} from "nanoid";
|
||||
|
||||
export default class AuthToken extends Model implements AuthProof<User> {
|
||||
public id?: number = undefined;
|
||||
@ -19,7 +19,7 @@ export default class AuthToken extends Model implements AuthProof<User> {
|
||||
|
||||
protected async autoFill(): Promise<void> {
|
||||
if (!this.secret) {
|
||||
this.secret = cryptoRandomDictionary(64, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_');
|
||||
this.secret = nanoid(64);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ export default class FileModel extends Model {
|
||||
this.setValidation('ttl').defined().min(0).max(4294967295);
|
||||
}
|
||||
|
||||
public getURL(domain: string = config.get<string>('base_url')): string {
|
||||
public getURL(domain: string = config.get<string>('public_url')): string {
|
||||
return (/^https?:\/\//.test(domain) ? '' : 'https://') + domain + Controller.route('get-file', {
|
||||
slug: this.getOrFail('slug'),
|
||||
});
|
||||
|
||||
@ -30,7 +30,7 @@ export default class URLRedirect extends Model {
|
||||
this.setValidation('target_url').defined().maxLength(1745).regexp(/^https?:\/\/.{3,259}?\/?/i);
|
||||
}
|
||||
|
||||
public getURL(domain: string = config.get<string>('base_url')): string {
|
||||
public getURL(domain: string = config.get<string>('public_url')): string {
|
||||
return (/^https?:\/\//.test(domain) ? '' : 'https://') + domain + Controller.route('get-url', {
|
||||
slug: this.getOrFail('slug'),
|
||||
});
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
"extends": "./tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "public/js",
|
||||
"rootDir": "./assets",
|
||||
"target": "ES6",
|
||||
"strict": true,
|
||||
"lib": [
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
"module": "CommonJS",
|
||||
"esModuleInterop": true,
|
||||
"outDir": "dist",
|
||||
"rootDir": "./src",
|
||||
"target": "ES6",
|
||||
"strict": true,
|
||||
"lib": [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<div class="container">
|
||||
<section class="panel">
|
||||
<h2>Setup a desktop utility</h2>
|
||||
<h2><i data-feather="tool"></i> Setup a desktop utility</h2>
|
||||
<p>There may be a desktop client at some point. For now, if you're an advanced user, you can setup
|
||||
scripts/macros.</p>
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<table class="data-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th class="table-col-grow">Name</th>
|
||||
<th>Download link</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -114,10 +114,9 @@
|
||||
<p>For examples with curl, please download and review the scripts above.</p>
|
||||
</section>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<section class="panel">
|
||||
<h2>Auth tokens</h2>
|
||||
<h2><i data-feather="key"></i> Auth tokens</h2>
|
||||
<form action="{{ route('generate-token') }}" method="POST">
|
||||
{{ macros.csrf(getCsrfToken) }}
|
||||
|
||||
@ -128,7 +127,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Secret</th>
|
||||
<th class="table-col-grow">Secret</th>
|
||||
<th>Created at</th>
|
||||
<th>Last used at</th>
|
||||
<th>Actions</th>
|
||||
@ -147,9 +146,9 @@
|
||||
</td>
|
||||
<td>{{ token.created_at.toISOString() }}</td>
|
||||
<td>{{ token.used_at.toISOString() }}</td>
|
||||
<td>
|
||||
<td class="actions">
|
||||
<form action="{{ route('revoke-token', token.id) }}" method="POST">
|
||||
<button class="button danger"><i data-feather="trash"></i> Revoke</button>
|
||||
<button class="button danger"><i data-feather="trash"></i> <span class="tip">Revoke</span></button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
@ -157,3 +156,4 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@ -10,13 +10,14 @@
|
||||
<h1>File manager</h1>
|
||||
<p>You're their manager, please be nice with them.</p>
|
||||
|
||||
<div class="container">
|
||||
<section class="panel">
|
||||
<h2>File list</h2>
|
||||
<h2><i data-feather="folder"></i> File list</h2>
|
||||
<table class="data-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>URL</th>
|
||||
<th class="table-col-grow">URL</th>
|
||||
<th>Name</th>
|
||||
<th>Size</th>
|
||||
<th>Expires at</th>
|
||||
@ -34,17 +35,17 @@
|
||||
<button class="copy-button"><i data-feather="copy"></i></button>
|
||||
</div>
|
||||
</td>
|
||||
<td>{{ file.real_name }}</td>
|
||||
<td><pre>{{ file.real_name }}</pre></td>
|
||||
<td>{{ (file.size / (1024 * 1024)).toFixed(2) }}MB</td>
|
||||
{% set expires_at = file.getExpirationDate() %}
|
||||
<td>{% if expires_at %}{{ expires_at.toISOString() }}{% else %}Never{% endif %}</td>
|
||||
<td>
|
||||
<td class="actions">
|
||||
{% if file.shouldBeDeleted() %}
|
||||
Pending deletion
|
||||
{% else %}
|
||||
<form action="{{ route('delete-file-frontend', file.slug) }}" method="post">
|
||||
{{ macros.csrf(getCsrfToken) }}
|
||||
<button class="button danger"><i data-feather="trash"></i> Delete</button>
|
||||
<button class="button danger"><i data-feather="trash"></i> <span class="tip">Delete</span></button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</td>
|
||||
@ -53,4 +54,5 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</section>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
<div class="container">
|
||||
<section class="panel">
|
||||
<h2>Upload a file</h2>
|
||||
<h2><i data-feather="upload"></i> Upload a file</h2>
|
||||
|
||||
<form action="{{ route('post-file-frontend') }}" method="POST" enctype="multipart/form-data"
|
||||
id="upload-form">
|
||||
|
||||
@ -18,20 +18,31 @@
|
||||
<ul id="main-menu">
|
||||
<li><a href="{{ route('about') }}"><i data-feather="info"></i> <span class="tip">About</span></a></li>
|
||||
{% if user %}
|
||||
<li><a href="{{ route('file-manager') }}"><i data-feather="folder"></i> <span class="tip">File manager</span></a></li>
|
||||
<li><a href="{{ route('file-manager') }}"><i data-feather="folder"></i> <span class="tip">File manager</span></a>
|
||||
<ul class="dropdown">
|
||||
<li><a href="{{ route('file-upload') }}"><i data-feather="upload"></i> <span class="tip">Upload file</span></a></li>
|
||||
<li><a href="{{ route('url-manager') }}"><i data-feather="link"></i> <span class="tip">URL manager</span></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><a href="{{ route('url-manager') }}"><i data-feather="link"></i> <span class="tip">URL manager</span></a>
|
||||
<ul class="dropdown">
|
||||
<li><a href="{{ route('url-shrinker') }}"><i data-feather="crosshair"></i> <span class="tip">Shrink URL</span></a></li>
|
||||
</ul>
|
||||
</li>
|
||||
{% if user.is_admin %}
|
||||
<li><a href="{{ route('backend') }}"><i data-feather="settings"></i> <span class="tip">Backend</span></a></li>
|
||||
{% endif %}
|
||||
<li><a href="{{ route('account') }}"><i data-feather="user"></i> <span class="tip">{{ user.name | default('Account') }}</span></a>
|
||||
<ul class="dropdown">
|
||||
<li>
|
||||
<hr>
|
||||
<form action="{{ route('logout') }}?{{ querystring.stringify({redirect_uri: '/'}) }}" method="POST">
|
||||
<button><i data-feather="log-out"></i> <span class="tip">Logout</span></button>
|
||||
|
||||
{{ macros.csrf(getCsrfToken) }}
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
{% else %}
|
||||
<li><a href="{{ route('auth') }}"><i data-feather="user"></i> <span class="tip">Login / Register</span></a></li>
|
||||
{% endif %}
|
||||
|
||||
@ -8,13 +8,14 @@
|
||||
<h1>URL manager</h1>
|
||||
<p>These are permanent.</p>
|
||||
|
||||
<div class="container">
|
||||
<section class="panel">
|
||||
<h2>URL list</h2>
|
||||
<h2><i data-feather="link"></i> URL list</h2>
|
||||
<table class="data-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>URL</th>
|
||||
<th class="table-col-grow">URL</th>
|
||||
<th>Target</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@ -29,10 +30,11 @@
|
||||
<button class="copy-button"><i data-feather="copy"></i></button>
|
||||
</div>
|
||||
</td>
|
||||
<td>{{ url.target_url }}</td>
|
||||
<td><pre>{{ url.target_url }}</pre></td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</section>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
<div class="container">
|
||||
<section class="panel">
|
||||
<h2>Shrink a URL</h2>
|
||||
<h2><i data-feather="crosshair"></i> Shrink a URL</h2>
|
||||
|
||||
<form action="{{ route('shrink-url') }}" method="POST" id="url-shrink-form">
|
||||
{{ macros.field(_locals, 'text', 'target_url', '', 'Target URL', 'Only valid URLs starting with http:// or https://', validation_attributes='required') }}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user