Merge pull request 'Convert frontend to Vue' (#3) from vue into master
Reviewed-on: #3
This commit is contained in:
commit
378d764220
8
.gitignore
vendored
8
.gitignore
vendored
@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
# Unignore all with extensions
|
# Unignore all with extensions
|
||||||
!*.*
|
!*.*
|
||||||
|
!Dockerfile
|
||||||
|
|
||||||
# Unignore all dirs
|
# Unignore all dirs
|
||||||
!*/
|
!*/
|
||||||
@ -85,4 +86,9 @@ GitHub.sublime-settings
|
|||||||
# Support for Project snippet scope
|
# Support for Project snippet scope
|
||||||
!.vscode/*.code-snippets
|
!.vscode/*.code-snippets
|
||||||
|
|
||||||
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,sublimetext,go
|
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,sublimetext,go
|
||||||
|
node_modules
|
||||||
|
.DS_Store
|
||||||
|
dist
|
||||||
|
dist-ssr
|
||||||
|
*.local
|
6
.vscode/settings.json
vendored
Normal file
6
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"files.exclude": {
|
||||||
|
"**/node_modules": true,
|
||||||
|
"**/vendor": true
|
||||||
|
}
|
||||||
|
}
|
@ -1,3 +0,0 @@
|
|||||||
FROM golang:1.17
|
|
||||||
RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
|
|
||||||
RUN go install github.com/go-task/task/v3/cmd/task@latest
|
|
19
README.md
19
README.md
@ -1,3 +1,20 @@
|
|||||||
# Budgeteer
|
# Budgeteer
|
||||||
|
|
||||||
Budgeting Web-Application
|
Budgeting Web-Application
|
||||||
|
|
||||||
|
## Data structure
|
||||||
|
|
||||||
|
1 User
|
||||||
|
N Budgets
|
||||||
|
AccountID[]
|
||||||
|
CategoryID[]
|
||||||
|
PayeeID[]
|
||||||
|
|
||||||
|
N Accounts
|
||||||
|
TransactionID[]
|
||||||
|
N Categories
|
||||||
|
AssignmentID[]
|
||||||
|
N Payees
|
||||||
|
|
||||||
|
N Transactions
|
||||||
|
N Assignments
|
35
Taskfile.yml
35
Taskfile.yml
@ -27,7 +27,6 @@ tasks:
|
|||||||
|
|
||||||
build:
|
build:
|
||||||
desc: Build budgeteer
|
desc: Build budgeteer
|
||||||
deps: [gomod, sqlc]
|
|
||||||
sources:
|
sources:
|
||||||
- ./go.mod
|
- ./go.mod
|
||||||
- ./go.sum
|
- ./go.sum
|
||||||
@ -37,7 +36,7 @@ tasks:
|
|||||||
- ./http/*.go
|
- ./http/*.go
|
||||||
- ./jwt/*.go
|
- ./jwt/*.go
|
||||||
- ./postgres/*.go
|
- ./postgres/*.go
|
||||||
- ./web/**/*
|
- ./web/dist/**/*
|
||||||
- ./postgres/schema/*
|
- ./postgres/schema/*
|
||||||
generates:
|
generates:
|
||||||
- build/budgeteer{{exeExt}}
|
- build/budgeteer{{exeExt}}
|
||||||
@ -46,15 +45,43 @@ tasks:
|
|||||||
cmds:
|
cmds:
|
||||||
- go build -o ./build/budgeteer{{exeExt}} ./cmd/budgeteer
|
- go build -o ./build/budgeteer{{exeExt}} ./cmd/budgeteer
|
||||||
|
|
||||||
|
build-dev:
|
||||||
|
desc: Build budgeteer in dev mode
|
||||||
|
deps: [gomod, sqlc]
|
||||||
|
cmds:
|
||||||
|
- task: build
|
||||||
|
|
||||||
|
build-prod:
|
||||||
|
desc: Build budgeteer in prod mode
|
||||||
|
deps: [gomod, sqlc, frontend]
|
||||||
|
cmds:
|
||||||
|
- task: build
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
desc: Build vue frontend
|
||||||
|
sources:
|
||||||
|
- web/src/**/*
|
||||||
|
generates:
|
||||||
|
- web/dist/**/*
|
||||||
|
cmds:
|
||||||
|
- cd web
|
||||||
|
- yarn build
|
||||||
|
|
||||||
docker:
|
docker:
|
||||||
desc: Build budgeeter:latest
|
desc: Build budgeeter:latest
|
||||||
deps: [build]
|
deps: [build-prod]
|
||||||
sources:
|
sources:
|
||||||
- ./build/budgeteer
|
- ./build/budgeteer{{exeExt}}
|
||||||
cmds:
|
cmds:
|
||||||
- docker build -t budgeteer:latest -t hub.javil.eu/budgeteer:latest ./build
|
- docker build -t budgeteer:latest -t hub.javil.eu/budgeteer:latest ./build
|
||||||
|
|
||||||
run:
|
run:
|
||||||
|
desc: Start budgeteer
|
||||||
|
deps: [build-dev]
|
||||||
|
cmds:
|
||||||
|
- ./build/budgeteer{{exeExt}}
|
||||||
|
|
||||||
|
rundocker:
|
||||||
desc: Start docker-compose
|
desc: Start docker-compose
|
||||||
deps: [docker]
|
deps: [docker]
|
||||||
cmds:
|
cmds:
|
||||||
|
45
docker-compose.dev.yml
Normal file
45
docker-compose.dev.yml
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
version: '3.7'
|
||||||
|
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
image: budgeteer:dev
|
||||||
|
build:
|
||||||
|
context: ./docker/
|
||||||
|
container_name: budgeteer
|
||||||
|
stdin_open: true # docker run -i
|
||||||
|
tty: true # docker run -t
|
||||||
|
ports:
|
||||||
|
- 1323:1323
|
||||||
|
- 3000:3000
|
||||||
|
user: '1000'
|
||||||
|
volumes:
|
||||||
|
- ~/budgeteer:/src
|
||||||
|
- ~/.gitconfig:/.gitconfig
|
||||||
|
- ~/.go:/go
|
||||||
|
- ~/.cache:/.cache
|
||||||
|
environment:
|
||||||
|
BUDGETEER_DB_NAME: budgeteer
|
||||||
|
BUDGETEER_DB_USER: budgeteer
|
||||||
|
BUDGETEER_DB_PASS: budgeteer
|
||||||
|
BUDGETEER_DB_HOST: db:5432
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
|
||||||
|
db:
|
||||||
|
image: postgres:14
|
||||||
|
volumes:
|
||||||
|
- db:/var/lib/postgresql/data
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: budgeteer
|
||||||
|
POSTGRES_PASSWORD: budgeteer
|
||||||
|
POSTGRES_DBE: budgeteer
|
||||||
|
|
||||||
|
adminer:
|
||||||
|
image: adminer
|
||||||
|
ports:
|
||||||
|
- 1424:8080
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
db:
|
13
docker/Dockerfile
Normal file
13
docker/Dockerfile
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
FROM alpine
|
||||||
|
RUN apk add go
|
||||||
|
RUN apk add nodejs yarn bash curl git git-perl tmux
|
||||||
|
RUN bash -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin
|
||||||
|
ADD build.sh /
|
||||||
|
RUN addgroup -S dev && adduser -S dev -G dev
|
||||||
|
USER dev
|
||||||
|
RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
|
||||||
|
RUN go install github.com/go-task/task/v3/cmd/task@latest
|
||||||
|
RUN yarn global add @vue/cli
|
||||||
|
ENV PATH="/home/dev/go/bin:/home/dev/.yarn/bin/:${PATH}"
|
||||||
|
WORKDIR /src
|
||||||
|
CMD /build.sh
|
7
docker/build.sh
Executable file
7
docker/build.sh
Executable file
@ -0,0 +1,7 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
tmux new-session -d -s watch 'cd web; yarn dev'
|
||||||
|
tmux split-window;
|
||||||
|
tmux send 'task -w run' ENTER;
|
||||||
|
tmux split-window;
|
||||||
|
tmux a;
|
@ -8,21 +8,11 @@ import (
|
|||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AccountData struct {
|
func (h *Handler) transactionsForAccount(c *gin.Context) {
|
||||||
AlwaysNeededData
|
|
||||||
Account *postgres.Account
|
|
||||||
Categories []postgres.GetCategoriesRow
|
|
||||||
Transactions []postgres.GetTransactionsForAccountRow
|
|
||||||
Payees []postgres.Payee
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) account(c *gin.Context) {
|
|
||||||
data := c.MustGet("data").(AlwaysNeededData)
|
|
||||||
|
|
||||||
accountID := c.Param("accountid")
|
accountID := c.Param("accountid")
|
||||||
accountUUID, err := uuid.Parse(accountID)
|
accountUUID, err := uuid.Parse(accountID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/login")
|
c.AbortWithError(http.StatusBadRequest, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,31 +22,14 @@ func (h *Handler) account(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
categories, err := h.Service.GetCategories(c.Request.Context(), data.Budget.ID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID)
|
transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
c.AbortWithError(http.StatusNotFound, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
payees, err := h.Service.GetPayees(c.Request.Context(), data.Budget.ID)
|
c.JSON(http.StatusOK, struct {
|
||||||
if err != nil {
|
Account postgres.Account
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
Transactions []postgres.GetTransactionsForAccountRow
|
||||||
return
|
}{account, transactions})
|
||||||
}
|
|
||||||
|
|
||||||
d := AccountData{
|
|
||||||
data,
|
|
||||||
&account,
|
|
||||||
categories,
|
|
||||||
transactions,
|
|
||||||
payees,
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "account.html", d)
|
|
||||||
}
|
}
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
package http
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
)
|
|
||||||
|
|
||||||
type AccountsData struct {
|
|
||||||
AlwaysNeededData
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) accounts(c *gin.Context) {
|
|
||||||
d := AccountsData{
|
|
||||||
c.MustGet("data").(AlwaysNeededData),
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "accounts.html", d)
|
|
||||||
}
|
|
@ -9,18 +9,7 @@ import (
|
|||||||
"github.com/pressly/goose/v3"
|
"github.com/pressly/goose/v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
type AdminData struct {
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) admin(c *gin.Context) {
|
|
||||||
d := AdminData{}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "admin.html", d)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) clearDatabase(c *gin.Context) {
|
func (h *Handler) clearDatabase(c *gin.Context) {
|
||||||
d := AdminData{}
|
|
||||||
|
|
||||||
if err := goose.Reset(h.Service.DB, "schema"); err != nil {
|
if err := goose.Reset(h.Service.DB, "schema"); err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
}
|
}
|
||||||
@ -28,30 +17,26 @@ func (h *Handler) clearDatabase(c *gin.Context) {
|
|||||||
if err := goose.Up(h.Service.DB, "schema"); err != nil {
|
if err := goose.Up(h.Service.DB, "schema"); err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "admin.html", d)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type SettingsData struct {
|
func (h *Handler) deleteBudget(c *gin.Context) {
|
||||||
AlwaysNeededData
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) settings(c *gin.Context) {
|
|
||||||
d := SettingsData{
|
|
||||||
c.MustGet("data").(AlwaysNeededData),
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "settings.html", d)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) clearBudget(c *gin.Context) {
|
|
||||||
budgetID := c.Param("budgetid")
|
budgetID := c.Param("budgetid")
|
||||||
budgetUUID, err := uuid.Parse(budgetID)
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/login")
|
c.AbortWithStatus(http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h.clearBudgetData(c, budgetUUID)
|
||||||
|
|
||||||
|
err = h.Service.DeleteBudget(c.Request.Context(), budgetUUID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) clearBudgetData(c *gin.Context, budgetUUID uuid.UUID) {
|
||||||
rows, err := h.Service.DeleteAllAssignments(c.Request.Context(), budgetUUID)
|
rows, err := h.Service.DeleteAllAssignments(c.Request.Context(), budgetUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
@ -69,6 +54,17 @@ func (h *Handler) clearBudget(c *gin.Context) {
|
|||||||
fmt.Printf("Deleted %d transactions\n", rows)
|
fmt.Printf("Deleted %d transactions\n", rows)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) clearBudget(c *gin.Context) {
|
||||||
|
budgetID := c.Param("budgetid")
|
||||||
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithStatus(http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
h.clearBudgetData(c, budgetUUID)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) cleanNegativeBudget(c *gin.Context) {
|
func (h *Handler) cleanNegativeBudget(c *gin.Context) {
|
||||||
/*budgetID := c.Param("budgetid")
|
/*budgetID := c.Param("budgetid")
|
||||||
budgetUUID, err := uuid.Parse(budgetID)
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
@ -113,5 +109,4 @@ func (h *Handler) cleanNegativeBudget(c *gin.Context) {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,57 +0,0 @@
|
|||||||
package http
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
|
||||||
|
|
||||||
type AlwaysNeededData struct {
|
|
||||||
Budget postgres.Budget
|
|
||||||
Accounts []postgres.GetAccountsWithBalanceRow
|
|
||||||
OnBudgetAccounts []postgres.GetAccountsWithBalanceRow
|
|
||||||
OffBudgetAccounts []postgres.GetAccountsWithBalanceRow
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) getImportantData(c *gin.Context) {
|
|
||||||
budgetID := c.Param("budgetid")
|
|
||||||
budgetUUID, err := uuid.Parse(budgetID)
|
|
||||||
if err != nil {
|
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/login")
|
|
||||||
c.Abort()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var onBudgetAccounts, offBudgetAccounts []postgres.GetAccountsWithBalanceRow
|
|
||||||
for _, account := range accounts {
|
|
||||||
if account.OnBudget {
|
|
||||||
onBudgetAccounts = append(onBudgetAccounts, account)
|
|
||||||
} else {
|
|
||||||
offBudgetAccounts = append(offBudgetAccounts, account)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
base := AlwaysNeededData{
|
|
||||||
Accounts: accounts,
|
|
||||||
OnBudgetAccounts: onBudgetAccounts,
|
|
||||||
OffBudgetAccounts: offBudgetAccounts,
|
|
||||||
Budget: budget,
|
|
||||||
}
|
|
||||||
|
|
||||||
c.Set("data", base)
|
|
||||||
c.Next()
|
|
||||||
}
|
|
54
http/autocomplete.go
Normal file
54
http/autocomplete.go
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.javil.eu/jacob1123/budgeteer/postgres"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (h *Handler) autocompleteCategories(c *gin.Context) {
|
||||||
|
budgetID := c.Param("budgetid")
|
||||||
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
query := c.Request.URL.Query().Get("s")
|
||||||
|
searchParams := postgres.SearchCategoriesParams{
|
||||||
|
BudgetID: budgetUUID,
|
||||||
|
Search: "%" + query + "%",
|
||||||
|
}
|
||||||
|
categories, err := h.Service.SearchCategories(c.Request.Context(), searchParams)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, categories)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) autocompletePayee(c *gin.Context) {
|
||||||
|
budgetID := c.Param("budgetid")
|
||||||
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
query := c.Request.URL.Query().Get("s")
|
||||||
|
searchParams := postgres.SearchPayeesParams{
|
||||||
|
BudgetID: budgetUUID,
|
||||||
|
Search: query + "%",
|
||||||
|
}
|
||||||
|
payees, err := h.Service.SearchPayees(c.Request.Context(), searchParams)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, payees)
|
||||||
|
}
|
@ -1,64 +1,36 @@
|
|||||||
package http
|
package http
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer"
|
"git.javil.eu/jacob1123/budgeteer"
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type AllAccountsData struct {
|
type newBudgetInformation struct {
|
||||||
AlwaysNeededData
|
Name string `json:"name"`
|
||||||
Account *postgres.Account
|
|
||||||
Categories []postgres.GetCategoriesRow
|
|
||||||
Transactions []postgres.GetTransactionsForBudgetRow
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) allAccounts(c *gin.Context) {
|
|
||||||
budgetID := c.Param("budgetid")
|
|
||||||
budgetUUID, err := uuid.Parse(budgetID)
|
|
||||||
if err != nil {
|
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/login")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transactions, err := h.Service.GetTransactionsForBudget(c.Request.Context(), budgetUUID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
d := AllAccountsData{
|
|
||||||
c.MustGet("data").(AlwaysNeededData),
|
|
||||||
&postgres.Account{
|
|
||||||
Name: "All accounts",
|
|
||||||
},
|
|
||||||
categories,
|
|
||||||
transactions,
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "account.html", d)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) newBudget(c *gin.Context) {
|
func (h *Handler) newBudget(c *gin.Context) {
|
||||||
budgetName, succ := c.GetPostForm("name")
|
var newBudget newBudgetInformation
|
||||||
if !succ {
|
err := c.BindJSON(&newBudget)
|
||||||
c.AbortWithStatus(http.StatusNotAcceptable)
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusNotAcceptable, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if newBudget.Name == "" {
|
||||||
|
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("Budget name is needed"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
userID := c.MustGet("token").(budgeteer.Token).GetID()
|
userID := c.MustGet("token").(budgeteer.Token).GetID()
|
||||||
_, err := h.Service.NewBudget(c.Request.Context(), budgetName, userID)
|
budget, err := h.Service.NewBudget(c.Request.Context(), newBudget.Name, userID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, budget)
|
||||||
}
|
}
|
||||||
|
@ -8,17 +8,9 @@ import (
|
|||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
"git.javil.eu/jacob1123/budgeteer/postgres"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
type BudgetingData struct {
|
|
||||||
AlwaysNeededData
|
|
||||||
Categories []CategoryWithBalance
|
|
||||||
AvailableBalance float64
|
|
||||||
Date time.Time
|
|
||||||
Next time.Time
|
|
||||||
Previous time.Time
|
|
||||||
}
|
|
||||||
|
|
||||||
func getFirstOfMonth(year, month int, location *time.Location) time.Time {
|
func getFirstOfMonth(year, month int, location *time.Location) time.Time {
|
||||||
return time.Date(year, time.Month(month), 1, 0, 0, 0, 0, location)
|
return time.Date(year, time.Month(month), 1, 0, 0, 0, 0, location)
|
||||||
}
|
}
|
||||||
@ -32,10 +24,10 @@ func getFirstOfMonthTime(date time.Time) time.Time {
|
|||||||
|
|
||||||
type CategoryWithBalance struct {
|
type CategoryWithBalance struct {
|
||||||
*postgres.GetCategoriesRow
|
*postgres.GetCategoriesRow
|
||||||
Available float64
|
Available postgres.Numeric
|
||||||
AvailableLastMonth float64
|
AvailableLastMonth postgres.Numeric
|
||||||
Activity float64
|
Activity postgres.Numeric
|
||||||
Assigned float64
|
Assigned postgres.Numeric
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDate(c *gin.Context) (time.Time, error) {
|
func getDate(c *gin.Context) (time.Time, error) {
|
||||||
@ -59,9 +51,19 @@ func getDate(c *gin.Context) (time.Time, error) {
|
|||||||
return getFirstOfMonth(year, month, time.Now().Location()), nil
|
return getFirstOfMonth(year, month, time.Now().Location()), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) budgeting(c *gin.Context) {
|
func (h *Handler) budgetingForMonth(c *gin.Context) {
|
||||||
alwaysNeededData := c.MustGet("data").(AlwaysNeededData)
|
budgetID := c.Param("budgetid")
|
||||||
budgetUUID := alwaysNeededData.Budget.ID
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusBadRequest, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
firstOfMonth, err := getDate(c)
|
firstOfMonth, err := getDate(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -69,17 +71,13 @@ func (h *Handler) budgeting(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
firstOfNextMonth := firstOfMonth.AddDate(0, 1, 0)
|
categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
|
||||||
firstOfPreviousMonth := firstOfMonth.AddDate(0, -1, 0)
|
if err != nil {
|
||||||
d := BudgetingData{
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
AlwaysNeededData: alwaysNeededData,
|
return
|
||||||
Date: firstOfMonth,
|
|
||||||
Next: firstOfNextMonth,
|
|
||||||
Previous: firstOfPreviousMonth,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
categories, err := h.Service.GetCategories(c.Request.Context(), budgetUUID)
|
firstOfNextMonth := firstOfMonth.AddDate(0, 1, 0)
|
||||||
|
|
||||||
cumultativeBalances, err := h.Service.GetCumultativeBalances(c.Request.Context(), budgetUUID)
|
cumultativeBalances, err := h.Service.GetCumultativeBalances(c.Request.Context(), budgetUUID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("load balances: %w", err))
|
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("load balances: %w", err))
|
||||||
@ -87,16 +85,14 @@ func (h *Handler) budgeting(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// skip everything in the future
|
// skip everything in the future
|
||||||
categoriesWithBalance, moneyUsed, err := h.calculateBalances(c, alwaysNeededData.Budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
|
categoriesWithBalance, moneyUsed, err := h.calculateBalances(c, budget, firstOfNextMonth, firstOfMonth, categories, cumultativeBalances)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
d.Categories = categoriesWithBalance
|
|
||||||
|
|
||||||
data := c.MustGet("data").(AlwaysNeededData)
|
availableBalance := postgres.NewZeroNumeric()
|
||||||
var availableBalance float64 = 0
|
|
||||||
for _, cat := range categories {
|
for _, cat := range categories {
|
||||||
if cat.ID != data.Budget.IncomeCategoryID {
|
if cat.ID != budget.IncomeCategoryID {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
availableBalance = moneyUsed
|
availableBalance = moneyUsed
|
||||||
@ -110,29 +106,68 @@ func (h *Handler) budgeting(c *gin.Context) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
availableBalance += bal.Transactions.GetFloat64()
|
availableBalance = availableBalance.Add(bal.Transactions)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
d.AvailableBalance = availableBalance
|
data := struct {
|
||||||
|
Categories []CategoryWithBalance
|
||||||
|
AvailableBalance postgres.Numeric
|
||||||
|
}{categoriesWithBalance, availableBalance}
|
||||||
|
c.JSON(http.StatusOK, data)
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "budgeting.html", d)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) calculateBalances(c *gin.Context, budget postgres.Budget, firstOfNextMonth time.Time, firstOfMonth time.Time, categories []postgres.GetCategoriesRow, cumultativeBalances []postgres.GetCumultativeBalancesRow) ([]CategoryWithBalance, float64, error) {
|
func (h *Handler) budgeting(c *gin.Context) {
|
||||||
|
budgetID := c.Param("budgetid")
|
||||||
|
budgetUUID, err := uuid.Parse(budgetID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("budgetid missing from URL"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusNotFound, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data := struct {
|
||||||
|
Accounts []postgres.GetAccountsWithBalanceRow
|
||||||
|
Budget postgres.Budget
|
||||||
|
}{accounts, budget}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) calculateBalances(c *gin.Context, budget postgres.Budget, firstOfNextMonth time.Time, firstOfMonth time.Time, categories []postgres.GetCategoriesRow, cumultativeBalances []postgres.GetCumultativeBalancesRow) ([]CategoryWithBalance, postgres.Numeric, error) {
|
||||||
categoriesWithBalance := []CategoryWithBalance{}
|
categoriesWithBalance := []CategoryWithBalance{}
|
||||||
hiddenCategory := CategoryWithBalance{
|
hiddenCategory := CategoryWithBalance{
|
||||||
GetCategoriesRow: &postgres.GetCategoriesRow{
|
GetCategoriesRow: &postgres.GetCategoriesRow{
|
||||||
Name: "",
|
Name: "",
|
||||||
Group: "Hidden Categories",
|
Group: "Hidden Categories",
|
||||||
},
|
},
|
||||||
|
Available: postgres.NewZeroNumeric(),
|
||||||
|
AvailableLastMonth: postgres.NewZeroNumeric(),
|
||||||
|
Activity: postgres.NewZeroNumeric(),
|
||||||
|
Assigned: postgres.NewZeroNumeric(),
|
||||||
}
|
}
|
||||||
|
|
||||||
var moneyUsed float64 = 0
|
moneyUsed := postgres.NewZeroNumeric()
|
||||||
for i := range categories {
|
for i := range categories {
|
||||||
cat := &categories[i]
|
cat := &categories[i]
|
||||||
categoryWithBalance := CategoryWithBalance{
|
categoryWithBalance := CategoryWithBalance{
|
||||||
GetCategoriesRow: cat,
|
GetCategoriesRow: cat,
|
||||||
|
Available: postgres.NewZeroNumeric(),
|
||||||
|
AvailableLastMonth: postgres.NewZeroNumeric(),
|
||||||
|
Activity: postgres.NewZeroNumeric(),
|
||||||
|
Assigned: postgres.NewZeroNumeric(),
|
||||||
}
|
}
|
||||||
for _, bal := range cumultativeBalances {
|
for _, bal := range cumultativeBalances {
|
||||||
if bal.CategoryID != cat.ID {
|
if bal.CategoryID != cat.ID {
|
||||||
@ -143,29 +178,28 @@ func (h *Handler) calculateBalances(c *gin.Context, budget postgres.Budget, firs
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
moneyUsed -= bal.Assignments.GetFloat64()
|
moneyUsed = moneyUsed.Sub(bal.Assignments)
|
||||||
categoryWithBalance.Available += bal.Assignments.GetFloat64()
|
categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Assignments)
|
||||||
categoryWithBalance.Available += bal.Transactions.GetFloat64()
|
categoryWithBalance.Available = categoryWithBalance.Available.Add(bal.Transactions)
|
||||||
if categoryWithBalance.Available < 0 && bal.Date.Before(firstOfMonth) {
|
if !categoryWithBalance.Available.IsPositive() && bal.Date.Before(firstOfMonth) {
|
||||||
moneyUsed += categoryWithBalance.Available
|
moneyUsed = moneyUsed.Add(categoryWithBalance.Available)
|
||||||
categoryWithBalance.Available = 0
|
categoryWithBalance.Available = postgres.NewZeroNumeric()
|
||||||
}
|
}
|
||||||
|
|
||||||
if bal.Date.Before(firstOfMonth) {
|
if bal.Date.Before(firstOfMonth) {
|
||||||
categoryWithBalance.AvailableLastMonth = categoryWithBalance.Available
|
categoryWithBalance.AvailableLastMonth = categoryWithBalance.Available
|
||||||
} else if bal.Date.Before(firstOfNextMonth) {
|
} else if bal.Date.Before(firstOfNextMonth) {
|
||||||
categoryWithBalance.Activity = bal.Transactions.GetFloat64()
|
categoryWithBalance.Activity = bal.Transactions
|
||||||
categoryWithBalance.Assigned = bal.Assignments.GetFloat64()
|
categoryWithBalance.Assigned = bal.Assignments
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// do not show hidden categories
|
// do not show hidden categories
|
||||||
if cat.Group == "Hidden Categories" {
|
if cat.Group == "Hidden Categories" {
|
||||||
hiddenCategory.Available += categoryWithBalance.Available
|
hiddenCategory.Available = hiddenCategory.Available.Add(categoryWithBalance.Available)
|
||||||
hiddenCategory.AvailableLastMonth += categoryWithBalance.AvailableLastMonth
|
hiddenCategory.AvailableLastMonth = hiddenCategory.AvailableLastMonth.Add(categoryWithBalance.AvailableLastMonth)
|
||||||
hiddenCategory.Activity += categoryWithBalance.Activity
|
hiddenCategory.Activity = hiddenCategory.Activity.Add(categoryWithBalance.Activity)
|
||||||
hiddenCategory.Assigned += categoryWithBalance.Assigned
|
hiddenCategory.Assigned = hiddenCategory.Assigned.Add(categoryWithBalance.Assigned)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ func (h *Handler) dashboard(c *gin.Context) {
|
|||||||
d := DashboardData{
|
d := DashboardData{
|
||||||
Budgets: budgets,
|
Budgets: budgets,
|
||||||
}
|
}
|
||||||
c.HTML(http.StatusOK, "dashboard.html", d)
|
c.JSON(http.StatusOK, d)
|
||||||
}
|
}
|
||||||
|
|
||||||
type DashboardData struct {
|
type DashboardData struct {
|
||||||
|
51
http/http.go
51
http/http.go
@ -23,7 +23,6 @@ type Handler struct {
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
expiration = 72
|
expiration = 72
|
||||||
authCookie = "authentication"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Serve starts the HTTP Server
|
// Serve starts the HTTP Server
|
||||||
@ -31,42 +30,26 @@ func (h *Handler) Serve() {
|
|||||||
router := gin.Default()
|
router := gin.Default()
|
||||||
router.FuncMap["now"] = time.Now
|
router.FuncMap["now"] = time.Now
|
||||||
|
|
||||||
templates, err := NewTemplates(router.FuncMap)
|
static, err := fs.Sub(web.Static, "dist")
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
router.HTMLRender = templates
|
|
||||||
|
|
||||||
static, err := fs.Sub(web.Static, "static")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic("couldn't open static files")
|
panic("couldn't open static files")
|
||||||
}
|
}
|
||||||
router.Use(enableCachingForStaticFiles())
|
staticFS := http.FS(static)
|
||||||
router.StaticFS("/static", http.FS(static))
|
|
||||||
|
|
||||||
router.GET("/", func(c *gin.Context) { c.HTML(http.StatusOK, "index.html", nil) })
|
router.Use(enableCachingForStaticFiles())
|
||||||
router.GET("/login", h.login)
|
router.NoRoute(
|
||||||
router.GET("/register", h.register)
|
func(c *gin.Context) {
|
||||||
|
c.FileFromFS(c.Request.URL.Path, staticFS)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
withLogin := router.Group("")
|
withLogin := router.Group("")
|
||||||
withLogin.Use(h.verifyLoginWithRedirect)
|
withLogin.Use(h.verifyLoginWithRedirect)
|
||||||
withLogin.GET("/dashboard", h.dashboard)
|
|
||||||
withLogin.GET("/admin", h.admin)
|
|
||||||
withLogin.GET("/admin/clear-database", h.clearDatabase)
|
|
||||||
|
|
||||||
withBudget := router.Group("")
|
withBudget := router.Group("")
|
||||||
withBudget.Use(h.verifyLoginWithRedirect)
|
withBudget.Use(h.verifyLoginWithForbidden)
|
||||||
withBudget.Use(h.getImportantData)
|
|
||||||
withBudget.GET("/budget/:budgetid", h.budgeting)
|
|
||||||
withBudget.GET("/budget/:budgetid/:year/:month", h.budgeting)
|
withBudget.GET("/budget/:budgetid/:year/:month", h.budgeting)
|
||||||
withBudget.GET("/budget/:budgetid/all-accounts", h.allAccounts)
|
|
||||||
withBudget.GET("/budget/:budgetid/accounts", h.accounts)
|
|
||||||
withBudget.GET("/budget/:budgetid/account/:accountid", h.account)
|
|
||||||
withBudget.GET("/budget/:budgetid/settings", h.settings)
|
|
||||||
withBudget.GET("/budget/:budgetid/settings/clear", h.clearBudget)
|
|
||||||
withBudget.GET("/budget/:budgetid/settings/clean-negative", h.cleanNegativeBudget)
|
withBudget.GET("/budget/:budgetid/settings/clean-negative", h.cleanNegativeBudget)
|
||||||
withBudget.GET("/budget/:budgetid/transaction/:transactionid", h.transaction)
|
|
||||||
|
|
||||||
api := router.Group("/api/v1")
|
api := router.Group("/api/v1")
|
||||||
|
|
||||||
@ -76,10 +59,17 @@ func (h *Handler) Serve() {
|
|||||||
unauthenticated.POST("/register", h.registerPost)
|
unauthenticated.POST("/register", h.registerPost)
|
||||||
|
|
||||||
authenticated := api.Group("")
|
authenticated := api.Group("")
|
||||||
authenticated.Use(h.verifyLoginWithRedirect)
|
authenticated.Use(h.verifyLoginWithForbidden)
|
||||||
|
authenticated.GET("/dashboard", h.dashboard)
|
||||||
user := authenticated.Group("/user")
|
authenticated.GET("/account/:accountid/transactions", h.transactionsForAccount)
|
||||||
user.GET("/logout", logout)
|
authenticated.GET("/admin/clear-database", h.clearDatabase)
|
||||||
|
authenticated.GET("/budget/:budgetid", h.budgeting)
|
||||||
|
authenticated.GET("/budget/:budgetid/:year/:month", h.budgetingForMonth)
|
||||||
|
authenticated.GET("/budget/:budgetid/autocomplete/payees", h.autocompletePayee)
|
||||||
|
authenticated.GET("/budget/:budgetid/autocomplete/categories", h.autocompleteCategories)
|
||||||
|
authenticated.DELETE("/budget/:budgetid", h.deleteBudget)
|
||||||
|
authenticated.POST("/budget/:budgetid/import/ynab", h.importYNAB)
|
||||||
|
authenticated.POST("/budget/:budgetid/settings/clear", h.clearBudget)
|
||||||
|
|
||||||
budget := authenticated.Group("/budget")
|
budget := authenticated.Group("/budget")
|
||||||
budget.POST("/new", h.newBudget)
|
budget.POST("/new", h.newBudget)
|
||||||
@ -87,7 +77,6 @@ func (h *Handler) Serve() {
|
|||||||
transaction := authenticated.Group("/transaction")
|
transaction := authenticated.Group("/transaction")
|
||||||
transaction.POST("/new", h.newTransaction)
|
transaction.POST("/new", h.newTransaction)
|
||||||
transaction.POST("/:transactionid", h.newTransaction)
|
transaction.POST("/:transactionid", h.newTransaction)
|
||||||
transaction.POST("/import/ynab", h.importYNAB)
|
|
||||||
|
|
||||||
router.Run(":1323")
|
router.Run(":1323")
|
||||||
}
|
}
|
||||||
|
30
http/json-date.go
Normal file
30
http/json-date.go
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
type JSONDate time.Time
|
||||||
|
|
||||||
|
// Implement Marshaler and Unmarshaler interface
|
||||||
|
func (j *JSONDate) UnmarshalJSON(b []byte) error {
|
||||||
|
s := strings.Trim(string(b), "\"")
|
||||||
|
t, err := time.Parse("2006-01-02", s)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
*j = JSONDate(t)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (j JSONDate) MarshalJSON() ([]byte, error) {
|
||||||
|
return json.Marshal(time.Time(j))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maybe a Format function for printing your date
|
||||||
|
func (j JSONDate) Format(s string) string {
|
||||||
|
t := time.Time(j)
|
||||||
|
return t.Format(s)
|
||||||
|
}
|
130
http/session.go
130
http/session.go
@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer"
|
"git.javil.eu/jacob1123/budgeteer"
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
"git.javil.eu/jacob1123/budgeteer/postgres"
|
||||||
@ -12,20 +11,32 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, error) {
|
func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, error) {
|
||||||
tokenString, err := c.Cookie(authCookie)
|
tokenString := c.GetHeader("Authorization")
|
||||||
if err != nil {
|
if len(tokenString) < 8 {
|
||||||
return nil, fmt.Errorf("get cookie: %w", err)
|
return nil, fmt.Errorf("no authorization header supplied")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tokenString = tokenString[7:]
|
||||||
token, err := h.TokenVerifier.VerifyToken(tokenString)
|
token, err := h.TokenVerifier.VerifyToken(tokenString)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.SetCookie(authCookie, "", -1, "", "", false, false)
|
|
||||||
return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
|
return nil, fmt.Errorf("verify token '%s': %w", tokenString, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return token, nil
|
return token, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handler) verifyLoginWithForbidden(c *gin.Context) {
|
||||||
|
token, err := h.verifyLogin(c)
|
||||||
|
if err != nil {
|
||||||
|
//c.Header("WWW-Authenticate", "Bearer")
|
||||||
|
c.AbortWithError(http.StatusForbidden, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.Set("token", token)
|
||||||
|
c.Next()
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) verifyLoginWithRedirect(c *gin.Context) {
|
func (h *Handler) verifyLoginWithRedirect(c *gin.Context) {
|
||||||
token, err := h.verifyLogin(c)
|
token, err := h.verifyLogin(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -38,43 +49,25 @@ func (h *Handler) verifyLoginWithRedirect(c *gin.Context) {
|
|||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) login(c *gin.Context) {
|
type loginInformation struct {
|
||||||
if _, err := h.verifyLogin(c); err == nil {
|
Password string `json:"password"`
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/dashboard")
|
User string `json:"user"`
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "login.html", nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) register(c *gin.Context) {
|
|
||||||
if _, err := h.verifyLogin(c); err == nil {
|
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/dashboard")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "register.html", nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func logout(c *gin.Context) {
|
|
||||||
clearLogin(c)
|
|
||||||
}
|
|
||||||
|
|
||||||
func clearLogin(c *gin.Context) {
|
|
||||||
c.SetCookie(authCookie, "", -1, "", "", false, true)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) loginPost(c *gin.Context) {
|
func (h *Handler) loginPost(c *gin.Context) {
|
||||||
username, _ := c.GetPostForm("username")
|
var login loginInformation
|
||||||
password, _ := c.GetPostForm("password")
|
err := c.BindJSON(&login)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
user, err := h.Service.GetUserByUsername(c.Request.Context(), username)
|
user, err := h.Service.GetUserByUsername(c.Request.Context(), login.User)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusUnauthorized, err)
|
c.AbortWithError(http.StatusUnauthorized, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = h.CredentialsVerifier.Verify(password, user.Password); err != nil {
|
if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
|
||||||
c.AbortWithError(http.StatusUnauthorized, err)
|
c.AbortWithError(http.StatusUnauthorized, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -86,37 +79,70 @@ func (h *Handler) loginPost(c *gin.Context) {
|
|||||||
|
|
||||||
go h.Service.UpdateLastLogin(context.Background(), user.ID)
|
go h.Service.UpdateLastLogin(context.Background(), user.ID)
|
||||||
|
|
||||||
maxAge := (int)((expiration * time.Hour).Seconds())
|
budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
|
||||||
c.SetCookie(authCookie, t, maxAge, "", "", false, true)
|
if err != nil {
|
||||||
c.JSON(http.StatusOK, map[string]string{
|
|
||||||
"token": t,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) registerPost(c *gin.Context) {
|
|
||||||
email, _ := c.GetPostForm("email")
|
|
||||||
password, _ := c.GetPostForm("password")
|
|
||||||
name, _ := c.GetPostForm("name")
|
|
||||||
|
|
||||||
_, err := h.Service.GetUserByUsername(c.Request.Context(), email)
|
|
||||||
if err == nil {
|
|
||||||
c.AbortWithStatus(http.StatusUnauthorized)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
hash, err := h.CredentialsVerifier.Hash(password)
|
c.JSON(http.StatusOK, struct {
|
||||||
|
Token string
|
||||||
|
User postgres.User
|
||||||
|
Budgets []postgres.Budget
|
||||||
|
}{t, user, budgets})
|
||||||
|
}
|
||||||
|
|
||||||
|
type registerInformation struct {
|
||||||
|
Password string `json:"password"`
|
||||||
|
Email string `json:"email"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handler) registerPost(c *gin.Context) {
|
||||||
|
var register registerInformation
|
||||||
|
c.BindJSON(®ister)
|
||||||
|
|
||||||
|
if register.Email == "" || register.Password == "" || register.Name == "" {
|
||||||
|
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("e-mail, password and name are required"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := h.Service.GetUserByUsername(c.Request.Context(), register.Email)
|
||||||
|
if err == nil {
|
||||||
|
c.AbortWithError(http.StatusUnauthorized, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
hash, err := h.CredentialsVerifier.Hash(register.Password)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusUnauthorized, err)
|
c.AbortWithError(http.StatusUnauthorized, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
createUser := postgres.CreateUserParams{
|
createUser := postgres.CreateUserParams{
|
||||||
Name: name,
|
Name: register.Name,
|
||||||
Password: hash,
|
Password: hash,
|
||||||
Email: email,
|
Email: register.Email,
|
||||||
}
|
}
|
||||||
_, err = h.Service.CreateUser(c.Request.Context(), createUser)
|
user, err := h.Service.CreateUser(c.Request.Context(), createUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, err)
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
t, err := h.TokenVerifier.CreateToken(&user)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusUnauthorized, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
go h.Service.UpdateLastLogin(context.Background(), user.ID)
|
||||||
|
|
||||||
|
budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.JSON(http.StatusOK, struct {
|
||||||
|
Token string
|
||||||
|
User postgres.User
|
||||||
|
Budgets []postgres.Budget
|
||||||
|
}{t, user, budgets})
|
||||||
}
|
}
|
||||||
|
@ -1,45 +0,0 @@
|
|||||||
package http
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"html/template"
|
|
||||||
"io/fs"
|
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/web"
|
|
||||||
"github.com/gin-gonic/gin/render"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Templates struct {
|
|
||||||
templates map[string]*template.Template
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewTemplates(funcMap template.FuncMap) (*Templates, error) {
|
|
||||||
templates, err := fs.Glob(web.Templates, "*.tpl")
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("glob: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
result := &Templates{
|
|
||||||
templates: make(map[string]*template.Template, 0),
|
|
||||||
}
|
|
||||||
pages, err := fs.Glob(web.Templates, "*.html")
|
|
||||||
for _, page := range pages {
|
|
||||||
allTemplates := append(templates, page)
|
|
||||||
tpl, err := template.New(page).Funcs(funcMap).ParseFS(web.Templates, allTemplates...)
|
|
||||||
fmt.Printf("page: %s, templates: %v\n", page, templates)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
result.templates[page] = tpl
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tpl *Templates) Instance(name string, obj interface{}) render.Render {
|
|
||||||
return render.HTML{
|
|
||||||
Template: tpl.templates[name],
|
|
||||||
Name: name,
|
|
||||||
Data: obj,
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,62 +0,0 @@
|
|||||||
package http
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
|
||||||
|
|
||||||
type TransactionData struct {
|
|
||||||
AlwaysNeededData
|
|
||||||
Transaction *postgres.Transaction
|
|
||||||
Account *postgres.Account
|
|
||||||
Categories []postgres.GetCategoriesRow
|
|
||||||
Payees []postgres.Payee
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Handler) transaction(c *gin.Context) {
|
|
||||||
data := c.MustGet("data").(AlwaysNeededData)
|
|
||||||
|
|
||||||
transactionID := c.Param("transactionid")
|
|
||||||
transactionUUID, err := uuid.Parse(transactionID)
|
|
||||||
if err != nil {
|
|
||||||
c.Redirect(http.StatusTemporaryRedirect, "/login")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
account, err := h.Service.GetAccount(c.Request.Context(), transaction.AccountID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
categories, err := h.Service.GetCategories(c.Request.Context(), data.Budget.ID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
payees, err := h.Service.GetPayees(c.Request.Context(), data.Budget.ID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotFound, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
d := TransactionData{
|
|
||||||
data,
|
|
||||||
&transaction,
|
|
||||||
&account,
|
|
||||||
categories,
|
|
||||||
payees,
|
|
||||||
}
|
|
||||||
|
|
||||||
c.HTML(http.StatusOK, "transaction.html", d)
|
|
||||||
}
|
|
@ -7,92 +7,83 @@ import (
|
|||||||
|
|
||||||
"git.javil.eu/jacob1123/budgeteer/postgres"
|
"git.javil.eu/jacob1123/budgeteer/postgres"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/google/uuid"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type NewTransactionPayload struct {
|
||||||
|
Date JSONDate `json:"date"`
|
||||||
|
Payee struct {
|
||||||
|
ID uuid.NullUUID
|
||||||
|
Name string
|
||||||
|
} `json:"payee"`
|
||||||
|
Category struct {
|
||||||
|
ID uuid.NullUUID
|
||||||
|
Name string
|
||||||
|
} `json:"category"`
|
||||||
|
Memo string `json:"memo"`
|
||||||
|
Amount string `json:"amount"`
|
||||||
|
BudgetID uuid.UUID `json:"budget_id"`
|
||||||
|
AccountID uuid.UUID `json:"account_id"`
|
||||||
|
State string `json:"state"`
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) newTransaction(c *gin.Context) {
|
func (h *Handler) newTransaction(c *gin.Context) {
|
||||||
transactionMemo, _ := c.GetPostForm("memo")
|
var payload NewTransactionPayload
|
||||||
transactionAccountID, err := getUUID(c, "account_id")
|
err := c.BindJSON(&payload)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("account_id: %w", err))
|
c.AbortWithError(http.StatusInternalServerError, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
transactionCategoryID, err := getNullUUIDFromForm(c, "category_id")
|
fmt.Printf("%v\n", payload)
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("category_id: %w", err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transactionPayeeID, err := getNullUUIDFromForm(c, "payee_id")
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("payee_id: %w", err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transactionDate, succ := c.GetPostForm("date")
|
|
||||||
if !succ {
|
|
||||||
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("date missing"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transactionDateValue, err := time.Parse("2006-01-02", transactionDate)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("date is not a valid date"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
transactionAmount, succ := c.GetPostForm("amount")
|
|
||||||
if !succ {
|
|
||||||
c.AbortWithError(http.StatusNotAcceptable, fmt.Errorf("amount missing"))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
amount := postgres.Numeric{}
|
amount := postgres.Numeric{}
|
||||||
amount.Set(transactionAmount)
|
amount.Set(payload.Amount)
|
||||||
|
|
||||||
transactionUUID, err := getNullUUIDFromParam(c, "transactionid")
|
/*transactionUUID, err := getNullUUIDFromParam(c, "transactionid")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("parse transaction id: %w", err))
|
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("parse transaction id: %w", err))
|
||||||
return
|
return
|
||||||
|
}*/
|
||||||
|
|
||||||
|
//if !transactionUUID.Valid {
|
||||||
|
new := postgres.CreateTransactionParams{
|
||||||
|
Memo: payload.Memo,
|
||||||
|
Date: time.Time(payload.Date),
|
||||||
|
Amount: amount,
|
||||||
|
AccountID: payload.AccountID,
|
||||||
|
PayeeID: payload.Payee.ID, //TODO handle new payee
|
||||||
|
CategoryID: payload.Category.ID, //TODO handle new category
|
||||||
|
Status: postgres.TransactionStatus(payload.State),
|
||||||
|
}
|
||||||
|
_, err = h.Service.CreateTransaction(c.Request.Context(), new)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
|
||||||
}
|
}
|
||||||
|
|
||||||
if !transactionUUID.Valid {
|
return
|
||||||
new := postgres.CreateTransactionParams{
|
// }
|
||||||
Memo: transactionMemo,
|
/*
|
||||||
Date: transactionDateValue,
|
_, delete := c.GetPostForm("delete")
|
||||||
|
if delete {
|
||||||
|
err = h.Service.DeleteTransaction(c.Request.Context(), transactionUUID.UUID)
|
||||||
|
if err != nil {
|
||||||
|
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
update := postgres.UpdateTransactionParams{
|
||||||
|
ID: transactionUUID.UUID,
|
||||||
|
Memo: payload.Memo,
|
||||||
|
Date: time.Time(payload.Date),
|
||||||
Amount: amount,
|
Amount: amount,
|
||||||
AccountID: transactionAccountID,
|
AccountID: transactionAccountID,
|
||||||
PayeeID: transactionPayeeID,
|
PayeeID: payload.Payee.ID, //TODO handle new payee
|
||||||
CategoryID: transactionCategoryID,
|
CategoryID: payload.Category.ID, //TODO handle new category
|
||||||
}
|
}
|
||||||
_, err = h.Service.CreateTransaction(c.Request.Context(), new)
|
err = h.Service.UpdateTransaction(c.Request.Context(), update)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err))
|
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update transaction: %w", err))
|
||||||
}
|
}*/
|
||||||
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
_, delete := c.GetPostForm("delete")
|
|
||||||
if delete {
|
|
||||||
err = h.Service.DeleteTransaction(c.Request.Context(), transactionUUID.UUID)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err))
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
update := postgres.UpdateTransactionParams{
|
|
||||||
ID: transactionUUID.UUID,
|
|
||||||
Memo: transactionMemo,
|
|
||||||
Date: transactionDateValue,
|
|
||||||
Amount: amount,
|
|
||||||
AccountID: transactionAccountID,
|
|
||||||
PayeeID: transactionPayeeID,
|
|
||||||
CategoryID: transactionCategoryID,
|
|
||||||
}
|
|
||||||
err = h.Service.UpdateTransaction(c.Request.Context(), update)
|
|
||||||
if err != nil {
|
|
||||||
c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update transaction: %w", err))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (h *Handler) importYNAB(c *gin.Context) {
|
func (h *Handler) importYNAB(c *gin.Context) {
|
||||||
budgetID, succ := c.GetPostForm("budget_id")
|
budgetID, succ := c.Params.Get("budgetid")
|
||||||
if !succ {
|
if !succ {
|
||||||
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("no budget_id specified"))
|
c.AbortWithError(http.StatusBadRequest, fmt.Errorf("no budget_id specified"))
|
||||||
return
|
return
|
||||||
|
@ -34,6 +34,15 @@ func (q *Queries) CreateBudget(ctx context.Context, arg CreateBudgetParams) (Bud
|
|||||||
return i, err
|
return i, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const deleteBudget = `-- name: DeleteBudget :exec
|
||||||
|
DELETE FROM budgets WHERE id = $1
|
||||||
|
`
|
||||||
|
|
||||||
|
func (q *Queries) DeleteBudget(ctx context.Context, id uuid.UUID) error {
|
||||||
|
_, err := q.db.ExecContext(ctx, deleteBudget, id)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
const getBudget = `-- name: GetBudget :one
|
const getBudget = `-- name: GetBudget :one
|
||||||
SELECT id, name, last_modification, income_category_id FROM budgets
|
SELECT id, name, last_modification, income_category_id FROM budgets
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
|
@ -116,3 +116,44 @@ func (q *Queries) GetCategoryGroups(ctx context.Context, budgetID uuid.UUID) ([]
|
|||||||
}
|
}
|
||||||
return items, nil
|
return items, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const searchCategories = `-- name: SearchCategories :many
|
||||||
|
SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id FROM categories
|
||||||
|
INNER JOIN category_groups ON categories.category_group_id = category_groups.id
|
||||||
|
WHERE category_groups.budget_id = $1
|
||||||
|
AND categories.name LIKE $2
|
||||||
|
ORDER BY category_groups.name, categories.name
|
||||||
|
`
|
||||||
|
|
||||||
|
type SearchCategoriesParams struct {
|
||||||
|
BudgetID uuid.UUID
|
||||||
|
Search string
|
||||||
|
}
|
||||||
|
|
||||||
|
type SearchCategoriesRow struct {
|
||||||
|
Name interface{}
|
||||||
|
ID uuid.UUID
|
||||||
|
}
|
||||||
|
|
||||||
|
func (q *Queries) SearchCategories(ctx context.Context, arg SearchCategoriesParams) ([]SearchCategoriesRow, error) {
|
||||||
|
rows, err := q.db.QueryContext(ctx, searchCategories, arg.BudgetID, arg.Search)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var items []SearchCategoriesRow
|
||||||
|
for rows.Next() {
|
||||||
|
var i SearchCategoriesRow
|
||||||
|
if err := rows.Scan(&i.Name, &i.ID); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items = append(items, i)
|
||||||
|
}
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
@ -1,11 +1,20 @@
|
|||||||
package postgres
|
package postgres
|
||||||
|
|
||||||
import "github.com/jackc/pgtype"
|
import (
|
||||||
|
"fmt"
|
||||||
|
"math/big"
|
||||||
|
|
||||||
|
"github.com/jackc/pgtype"
|
||||||
|
)
|
||||||
|
|
||||||
type Numeric struct {
|
type Numeric struct {
|
||||||
pgtype.Numeric
|
pgtype.Numeric
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func NewZeroNumeric() Numeric {
|
||||||
|
return Numeric{pgtype.Numeric{Exp: 0, Int: big.NewInt(0), Status: pgtype.Present, NaN: false}}
|
||||||
|
}
|
||||||
|
|
||||||
func (n Numeric) GetFloat64() float64 {
|
func (n Numeric) GetFloat64() float64 {
|
||||||
if n.Status != pgtype.Present {
|
if n.Status != pgtype.Present {
|
||||||
return 0
|
return 0
|
||||||
@ -33,3 +42,88 @@ func (n Numeric) IsZero() bool {
|
|||||||
float := n.GetFloat64()
|
float := n.GetFloat64()
|
||||||
return float == 0
|
return float == 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (n Numeric) MatchExp(exp int32) Numeric {
|
||||||
|
diffExp := n.Exp - exp
|
||||||
|
factor := big.NewInt(0).Exp(big.NewInt(10), big.NewInt(int64(diffExp)), nil)
|
||||||
|
return Numeric{pgtype.Numeric{
|
||||||
|
Exp: exp,
|
||||||
|
Int: big.NewInt(0).Mul(n.Int, factor),
|
||||||
|
Status: n.Status,
|
||||||
|
NaN: n.NaN,
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n Numeric) Sub(o Numeric) Numeric {
|
||||||
|
left := n
|
||||||
|
right := o
|
||||||
|
if n.Exp < o.Exp {
|
||||||
|
right = o.MatchExp(n.Exp)
|
||||||
|
} else if n.Exp > o.Exp {
|
||||||
|
left = n.MatchExp(o.Exp)
|
||||||
|
}
|
||||||
|
|
||||||
|
if left.Exp == right.Exp {
|
||||||
|
return Numeric{pgtype.Numeric{
|
||||||
|
Exp: left.Exp,
|
||||||
|
Int: big.NewInt(0).Sub(left.Int, right.Int),
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
panic("Cannot subtract with different exponents")
|
||||||
|
}
|
||||||
|
func (n Numeric) Add(o Numeric) Numeric {
|
||||||
|
left := n
|
||||||
|
right := o
|
||||||
|
if n.Exp < o.Exp {
|
||||||
|
right = o.MatchExp(n.Exp)
|
||||||
|
} else if n.Exp > o.Exp {
|
||||||
|
left = n.MatchExp(o.Exp)
|
||||||
|
}
|
||||||
|
|
||||||
|
if left.Exp == right.Exp {
|
||||||
|
return Numeric{pgtype.Numeric{
|
||||||
|
Exp: left.Exp,
|
||||||
|
Int: big.NewInt(0).Add(left.Int, right.Int),
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
panic("Cannot add with different exponents")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n Numeric) MarshalJSON() ([]byte, error) {
|
||||||
|
if n.Int.Int64() == 0 {
|
||||||
|
return []byte("\"0\""), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
s := fmt.Sprintf("%d", n.Int)
|
||||||
|
bytes := []byte(s)
|
||||||
|
|
||||||
|
exp := n.Exp
|
||||||
|
for exp > 0 {
|
||||||
|
bytes = append(bytes, byte('0'))
|
||||||
|
exp--
|
||||||
|
}
|
||||||
|
|
||||||
|
if exp == 0 {
|
||||||
|
return bytes, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
length := int32(len(bytes))
|
||||||
|
var bytesWithSeparator []byte
|
||||||
|
|
||||||
|
exp = -exp
|
||||||
|
for length <= exp {
|
||||||
|
bytes = append(bytes, byte('0'))
|
||||||
|
length++
|
||||||
|
}
|
||||||
|
|
||||||
|
split := length - exp
|
||||||
|
bytesWithSeparator = append(bytesWithSeparator, bytes[:split]...)
|
||||||
|
if split == 1 && n.Int.Int64() < 0 {
|
||||||
|
bytesWithSeparator = append(bytesWithSeparator, byte('0'))
|
||||||
|
}
|
||||||
|
bytesWithSeparator = append(bytesWithSeparator, byte('.'))
|
||||||
|
bytesWithSeparator = append(bytesWithSeparator, bytes[split:]...)
|
||||||
|
return bytesWithSeparator, nil
|
||||||
|
}
|
||||||
|
@ -56,3 +56,38 @@ func (q *Queries) GetPayees(ctx context.Context, budgetID uuid.UUID) ([]Payee, e
|
|||||||
}
|
}
|
||||||
return items, nil
|
return items, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const searchPayees = `-- name: SearchPayees :many
|
||||||
|
SELECT payees.id, payees.budget_id, payees.name FROM payees
|
||||||
|
WHERE payees.budget_id = $1
|
||||||
|
AND payees.name LIKE $2
|
||||||
|
ORDER BY payees.name
|
||||||
|
`
|
||||||
|
|
||||||
|
type SearchPayeesParams struct {
|
||||||
|
BudgetID uuid.UUID
|
||||||
|
Search string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (q *Queries) SearchPayees(ctx context.Context, arg SearchPayeesParams) ([]Payee, error) {
|
||||||
|
rows, err := q.db.QueryContext(ctx, searchPayees, arg.BudgetID, arg.Search)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var items []Payee
|
||||||
|
for rows.Next() {
|
||||||
|
var i Payee
|
||||||
|
if err := rows.Scan(&i.ID, &i.BudgetID, &i.Name); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
items = append(items, i)
|
||||||
|
}
|
||||||
|
if err := rows.Close(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return items, nil
|
||||||
|
}
|
||||||
|
@ -31,4 +31,7 @@ FROM (
|
|||||||
FROM transactions
|
FROM transactions
|
||||||
INNER JOIN accounts ON accounts.id = transactions.account_id
|
INNER JOIN accounts ON accounts.id = transactions.account_id
|
||||||
WHERE accounts.budget_id = @budget_id
|
WHERE accounts.budget_id = @budget_id
|
||||||
) dates;
|
) dates;
|
||||||
|
|
||||||
|
-- name: DeleteBudget :exec
|
||||||
|
DELETE FROM budgets WHERE id = $1;
|
@ -18,4 +18,12 @@ RETURNING *;
|
|||||||
SELECT categories.*, category_groups.name as group FROM categories
|
SELECT categories.*, category_groups.name as group FROM categories
|
||||||
INNER JOIN category_groups ON categories.category_group_id = category_groups.id
|
INNER JOIN category_groups ON categories.category_group_id = category_groups.id
|
||||||
WHERE category_groups.budget_id = $1
|
WHERE category_groups.budget_id = $1
|
||||||
ORDER BY category_groups.name, categories.name;
|
ORDER BY category_groups.name, categories.name;
|
||||||
|
|
||||||
|
-- name: SearchCategories :many
|
||||||
|
SELECT CONCAT(category_groups.name, ' : ', categories.name) as name, categories.id FROM categories
|
||||||
|
INNER JOIN category_groups ON categories.category_group_id = category_groups.id
|
||||||
|
WHERE category_groups.budget_id = @budget_id
|
||||||
|
AND categories.name LIKE @search
|
||||||
|
ORDER BY category_groups.name, categories.name;
|
||||||
|
--ORDER BY levenshtein(payees.name, $2);
|
@ -7,4 +7,11 @@ RETURNING *;
|
|||||||
-- name: GetPayees :many
|
-- name: GetPayees :many
|
||||||
SELECT payees.* FROM payees
|
SELECT payees.* FROM payees
|
||||||
WHERE payees.budget_id = $1
|
WHERE payees.budget_id = $1
|
||||||
ORDER BY name;
|
ORDER BY name;
|
||||||
|
|
||||||
|
-- name: SearchPayees :many
|
||||||
|
SELECT payees.* FROM payees
|
||||||
|
WHERE payees.budget_id = @budget_id
|
||||||
|
AND payees.name LIKE @search
|
||||||
|
ORDER BY payees.name;
|
||||||
|
--ORDER BY levenshtein(payees.name, $2);
|
5
postgres/schema/0014_enable-fuzzy-match-module.sql
Normal file
5
postgres/schema/0014_enable-fuzzy-match-module.sql
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
-- +goose Up
|
||||||
|
CREATE EXTENSION IF NOT EXISTS "fuzzystrmatch";
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
DROP EXTENSION "fuzzystrmatch";
|
@ -1,77 +0,0 @@
|
|||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "title"}}{{.Account.Name}}{{end}}
|
|
||||||
|
|
||||||
{{define "new"}}
|
|
||||||
{{template "transaction-new" .}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
<div class="budget-item">
|
|
||||||
<a href="#newtransactionmodal" data-bs-toggle="modal" data-bs-target="#newtransactionmodal">New Transaction</a>
|
|
||||||
<span class="time"></span>
|
|
||||||
</div>
|
|
||||||
<table class="container col-lg-12" id="content">
|
|
||||||
<form id="newtransactionform" action="/api/v1/transaction/new" method="POST">
|
|
||||||
<td>
|
|
||||||
<input type="hidden" name="account_id" value="{{.Account.ID}}" />
|
|
||||||
<input type="date" name="date" class="form-control" value="{{now.Format "2006-01-02"}}" />
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{.Account.Name}}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<input list="payees" name="payee_id" class="form-control">
|
|
||||||
<datalist id="payees">
|
|
||||||
<option value="">-- none --</option>
|
|
||||||
{{range .Payees}}
|
|
||||||
<option data-value="{{.ID}}">{{.Name}}</option>
|
|
||||||
{{- end}}
|
|
||||||
</datalist>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<input list="categories" name="category_id" class="form-control">
|
|
||||||
<datalist id="categories">
|
|
||||||
<option value="">-- none --</option>
|
|
||||||
{{range .Categories}}
|
|
||||||
<option data-value="{{.ID}}">{{.Group}} : {{.Name}}</option>
|
|
||||||
{{- end}}
|
|
||||||
</select>
|
|
||||||
</td>
|
|
||||||
<td></td>
|
|
||||||
<td>
|
|
||||||
<input type="text" name="memo" class="form-control" />
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<input type="number" name="amount" class="form-control" placeholder="0.00" />
|
|
||||||
<input type="submit" class="btn btn-primary" name="create" value="Create" class="form-control" />
|
|
||||||
</td>
|
|
||||||
</form>
|
|
||||||
{{range .Transactions}}
|
|
||||||
<tr class="{{if .Date.After now}}future{{end}}">
|
|
||||||
<td>{{.Date.Format "02.01.2006"}}</td>
|
|
||||||
<td>
|
|
||||||
{{.Account}}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{.Payee}}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{if .CategoryGroup}}
|
|
||||||
{{.CategoryGroup}} : {{.Category}}
|
|
||||||
{{end}}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{{if .GroupID.Valid}}☀{{end}}
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<a href="/budget/{{$.Budget.ID}}/transaction/{{.ID}}">{{.Memo}}</a>
|
|
||||||
</td>
|
|
||||||
{{template "amount-cell" .Amount}}
|
|
||||||
<td>
|
|
||||||
{{.Status}}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{{end}}
|
|
||||||
</table>
|
|
||||||
{{end}}
|
|
@ -1,17 +0,0 @@
|
|||||||
{{define "title"}}
|
|
||||||
Accounts
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "new"}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
{{range .Accounts}}
|
|
||||||
<div class="budget-item">
|
|
||||||
<a href="/budget/{{$.Budget.ID}}/account/{{.ID}}">{{.Name}}</a>
|
|
||||||
<span class="time">{{printf "%.2f" .Balance.GetFloat64}}</span>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
@ -1,18 +0,0 @@
|
|||||||
|
|
||||||
{{define "title"}}
|
|
||||||
Admin
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "sidebar"}}
|
|
||||||
Settings for all Budgets
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
<h1>Danger Zone</h1>
|
|
||||||
<div class="budget-item">
|
|
||||||
<button>Clear database</button>
|
|
||||||
<p>This removes all data and starts from scratch. Not undoable!</p>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
@ -1,23 +0,0 @@
|
|||||||
{{define "amount"}}
|
|
||||||
<span class="right {{if .IsZero}}zero{{else if not .IsPositive}}negative{{end}}">
|
|
||||||
{{printf "%.2f" .GetFloat64}}
|
|
||||||
</span>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "amount-cell"}}
|
|
||||||
<td class="right {{if .IsZero}}zero{{else if not .IsPositive}}negative{{end}}">
|
|
||||||
{{printf "%.2f" .GetFloat64}}
|
|
||||||
</td>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "amountf64"}}
|
|
||||||
<span class="right {{if eq . 0.0}}zero{{else if lt . 0.0}}negative{{end}}">
|
|
||||||
{{printf "%.2f" .}}
|
|
||||||
</span>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "amountf64-cell"}}
|
|
||||||
<td class="right {{if eq . 0.0}}zero{{else if lt . 0.0}}negative{{end}}">
|
|
||||||
{{printf "%.2f" .}}
|
|
||||||
</td>
|
|
||||||
{{end}}
|
|
39
web/base.tpl
39
web/base.tpl
@ -1,39 +0,0 @@
|
|||||||
{{define "base"}}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
|
|
||||||
|
|
||||||
<link href="/static/css/bootstrap.min.css" rel="stylesheet" />
|
|
||||||
<link href="/static/css/main.css" rel="stylesheet" />
|
|
||||||
|
|
||||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
|
|
||||||
<script src="https://malsup.github.io/jquery.form.js"></script>
|
|
||||||
|
|
||||||
<script src="/static/js/bootstrap.min.js"></script>
|
|
||||||
<script src="/static/js/main.js"></script>
|
|
||||||
<title>{{template "title" .}} - Budgeteer</title>
|
|
||||||
|
|
||||||
{{block "more-head" .}}{{end}}
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="wrapper">
|
|
||||||
<div id="sidebar">
|
|
||||||
{{block "sidebar" .}}
|
|
||||||
{{template "budget-sidebar" .}}
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
<div id="content">
|
|
||||||
<div class="container" id="head">
|
|
||||||
{{template "title" .}}
|
|
||||||
</div>
|
|
||||||
<div class="container col-lg-12" id="content">
|
|
||||||
{{template "main" .}}
|
|
||||||
</div>
|
|
||||||
{{block "new" .}}{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
{{end}}
|
|
@ -1,40 +0,0 @@
|
|||||||
{{define "budget-new"}}
|
|
||||||
<div id="newbudgetmodal" class="modal fade" role="dialog">
|
|
||||||
<div class="modal-dialog" role="document">
|
|
||||||
<script>
|
|
||||||
$(document).ready(function () {
|
|
||||||
$('#errorcreatingbudget').hide();
|
|
||||||
$('#newbudgetform').ajaxForm({
|
|
||||||
error: function() {
|
|
||||||
$('#errorcreatingbudget').show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h5 class="modal-title">New Budget</h5>
|
|
||||||
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
|
|
||||||
<span aria-hidden="true">×</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<form id="newbudgetform" action="/api/v1/budget/new" method="POST">
|
|
||||||
<div class="modal-body">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="name">Name</label>
|
|
||||||
<input type="text" name="name" class="form-control" placeholder="Name" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="errorcreatingbudget">
|
|
||||||
Error creating budget.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
|
|
||||||
<input type="submit" class="btn btn-primary" value="Create" class="form-control" />
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
@ -1,48 +0,0 @@
|
|||||||
{{define "budget-sidebar"}}
|
|
||||||
<h1><a href="/dashboard">⌂</a> {{.Budget.Name}}</h1>
|
|
||||||
<ul>
|
|
||||||
<li><a href="/budget/{{.Budget.ID}}">Budget</a></li>
|
|
||||||
<li>Reports (Coming Soon)</li>
|
|
||||||
<li><a href="/budget/{{.Budget.ID}}/all-accounts">All Accounts</a></li>
|
|
||||||
<li>
|
|
||||||
On-Budget Accounts
|
|
||||||
<ul class="two-valued">
|
|
||||||
{{- range .OnBudgetAccounts}}
|
|
||||||
<li>
|
|
||||||
<a href="/budget/{{$.Budget.ID}}/account/{{.ID}}">{{.Name}}</a>
|
|
||||||
{{- template "amount" .Balance}}
|
|
||||||
</li>
|
|
||||||
{{- end}}
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Off-Budget Accounts
|
|
||||||
<ul class="two-valued">
|
|
||||||
{{- range .OffBudgetAccounts}}
|
|
||||||
<li>
|
|
||||||
<a href="/budget/{{$.Budget.ID}}/account/{{.ID}}">{{.Name}}</a>
|
|
||||||
{{template "amount" .Balance -}}
|
|
||||||
</li>
|
|
||||||
{{- end}}
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
Closed Accounts
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="/budget/{{$.Budget.ID}}/accounts">Edit accounts</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
+ Add Account
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="/budget/{{.Budget.ID}}/settings">Budget-Settings</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="/admin">Admin</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a href="/api/v1/user/logout">Logout</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
{{end}}
|
|
@ -1,50 +0,0 @@
|
|||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "title"}}
|
|
||||||
{{printf "Budget for %s %d" .Date.Month .Date.Year}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "new"}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
<div class="budget-item">
|
|
||||||
<a href="#newtransactionmodal" data-bs-toggle="modal" data-bs-target="#newtransactionmodal">New Transaction</a>
|
|
||||||
<span class="time"></span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<a href="{{printf "/budget/%s/%d/%d" .Budget.ID .Previous.Year .Previous.Month}}">Previous Month</a> -
|
|
||||||
<a href="{{printf "/budget/%s" .Budget.ID}}">Current Month</a> -
|
|
||||||
<a href="{{printf "/budget/%s/%d/%d" .Budget.ID .Next.Year .Next.Month}}">Next Month</a>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span>Available Balance: </span>{{template "amountf64" .AvailableBalance}}
|
|
||||||
</div>
|
|
||||||
<table class="container col-lg-12" id="content">
|
|
||||||
<tr>
|
|
||||||
<th>Group</th>
|
|
||||||
<th>Category</th>
|
|
||||||
<th></th>
|
|
||||||
<th></th>
|
|
||||||
<th>Leftover</th>
|
|
||||||
<th>Assigned</th>
|
|
||||||
<th>Activity</th>
|
|
||||||
<th>Available</th>
|
|
||||||
</tr>
|
|
||||||
{{range .Categories}}
|
|
||||||
<tr>
|
|
||||||
<td>{{.Group}}</td>
|
|
||||||
<td>{{.Name}}</td>
|
|
||||||
<td>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
</td>
|
|
||||||
{{template "amountf64-cell" .AvailableLastMonth}}
|
|
||||||
{{template "amountf64-cell" .Assigned}}
|
|
||||||
{{template "amountf64-cell" .Activity}}
|
|
||||||
{{template "amountf64-cell" .Available}}
|
|
||||||
</tr>
|
|
||||||
{{end}}
|
|
||||||
</table>
|
|
||||||
{{end}}
|
|
@ -1,26 +0,0 @@
|
|||||||
{{define "title"}}
|
|
||||||
Budgets
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "new"}}
|
|
||||||
{{template "budget-new"}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "sidebar"}}
|
|
||||||
Please select a budget.
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
{{range .Budgets}}
|
|
||||||
<div class="budget-item">
|
|
||||||
<a href="budget/{{.ID}}">{{.Name}}</a>
|
|
||||||
<span class="time"></span>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
<div class="budget-item">
|
|
||||||
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#newbudgetmodal">New Budget</a>
|
|
||||||
<span class="time"></span>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
@ -1,17 +1,13 @@
|
|||||||
{{define "title"}}
|
<!DOCTYPE html>
|
||||||
Start
|
<html lang="en">
|
||||||
{{end}}
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
{{define "new"}}
|
<link rel="icon" href="/favicon.ico" />
|
||||||
{{end}}
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Vite App</title>
|
||||||
{{template "base" .}}
|
</head>
|
||||||
|
<body>
|
||||||
{{define "main"}}
|
<div id="app"></div>
|
||||||
<div class="container col-md-8 col-ld-8" id="content">
|
<script type="module" src="/src/main.ts"></script>
|
||||||
Willkommen bei Budgeteer, der neuen App für's Budget!
|
</body>
|
||||||
</div>
|
</html>
|
||||||
<div class="container col-md-4" id="login">
|
|
||||||
<a href="/login">Login</a> or <a href="/login">register</a>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "title"}}Login{{end}}
|
|
||||||
|
|
||||||
{{define "more-head"}}
|
|
||||||
<script>
|
|
||||||
$(document).ready(function() {
|
|
||||||
$('#invalidCredentials').hide();
|
|
||||||
$('#loginForm').ajaxForm({
|
|
||||||
success: function() {
|
|
||||||
window.location.href = "/dashboard";
|
|
||||||
},
|
|
||||||
error: function() {
|
|
||||||
$('#invalidCredentials').show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
<form id="loginForm" action="/api/v1/user/login" method="POST" class="center-block">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="username">User</label>
|
|
||||||
<input type="text" name="username" class="form-control" placeholder="User" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password">Password</label>
|
|
||||||
<input type="password" name="password" class="form-control" placeholder="Password" />
|
|
||||||
<p id="invalidCredentials">
|
|
||||||
The entered credentials are invalid
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<input type="submit" value="Login" class="btn btn-default" />
|
|
||||||
|
|
||||||
<p>
|
|
||||||
New user? <a href="/register">Register</a> instead!
|
|
||||||
</p>
|
|
||||||
</form>
|
|
||||||
{{end}}
|
|
29
web/package.json
Normal file
29
web/package.json
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"name": "web",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"scripts": {
|
||||||
|
"serve": "vite preview",
|
||||||
|
"build": "vite build",
|
||||||
|
"dev": "vite",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@mdi/font": "5.9.55",
|
||||||
|
"autoprefixer": "^10.4.2",
|
||||||
|
"postcss": "^8.4.6",
|
||||||
|
"tailwindcss": "^3.0.18",
|
||||||
|
"vue": "^3.2.25",
|
||||||
|
"vue-router": "^4.0.12",
|
||||||
|
"vuex": "^4.0.2"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@vitejs/plugin-vue": "^2.0.0",
|
||||||
|
"@vue/cli-plugin-babel": "5.0.0-beta.7",
|
||||||
|
"@vue/cli-plugin-typescript": "~4.5.0",
|
||||||
|
"@vue/cli-service": "5.0.0-beta.7",
|
||||||
|
"sass": "^1.38.0",
|
||||||
|
"sass-loader": "^10.0.0",
|
||||||
|
"vite": "^2.7.2",
|
||||||
|
"vue-cli-plugin-vuetify": "~2.4.5"
|
||||||
|
}
|
||||||
|
}
|
6
web/postcss.config.js
Normal file
6
web/postcss.config.js
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
module.exports = {
|
||||||
|
plugins: {
|
||||||
|
tailwindcss: {},
|
||||||
|
autoprefixer: {},
|
||||||
|
},
|
||||||
|
}
|
BIN
web/public/favicon.ico
Normal file
BIN
web/public/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
@ -1,72 +0,0 @@
|
|||||||
{{define "title"}}Register{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "more-head"}}
|
|
||||||
<script>
|
|
||||||
function checkPasswordMatchUi() {
|
|
||||||
if(checkPasswordMatch())
|
|
||||||
$("#divCheckPasswordMatch").html("Passwords match.");
|
|
||||||
else
|
|
||||||
$("#divCheckPasswordMatch").html("Passwords do not match!");
|
|
||||||
}
|
|
||||||
|
|
||||||
function checkPasswordMatch() {
|
|
||||||
var password = $("#password").val();
|
|
||||||
var confirmPassword = $("#password_confirm").val();
|
|
||||||
return password == confirmPassword;
|
|
||||||
}
|
|
||||||
|
|
||||||
$(document).ready(function () {
|
|
||||||
$("#password, #password_confirm").keyup(checkPasswordMatchUi);
|
|
||||||
$('#invalidCredentials').hide();
|
|
||||||
$('#loginForm').ajaxForm({
|
|
||||||
beforeSubmit: function(a, b, c) {
|
|
||||||
var match = checkPasswordMatch();
|
|
||||||
if(!match){
|
|
||||||
$("#divCheckPasswordMatch").fadeOut(300).fadeIn(300).fadeOut(300).fadeIn(300);
|
|
||||||
}
|
|
||||||
return match;
|
|
||||||
},
|
|
||||||
success: function() {
|
|
||||||
window.location.href = "/dashboard";
|
|
||||||
},
|
|
||||||
error: function() {
|
|
||||||
$('#invalidCredentials').show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
<form id="loginForm" action="/api/v1/user/register" method="POST" class="center-block">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="email">E-Mail</label>
|
|
||||||
<input type="text" name="email" class="form-control" placeholder="E-Mail" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="name">Name</label>
|
|
||||||
<input type="text" name="name" class="form-control" placeholder="Name" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password">Password</label>
|
|
||||||
<input type="password" name="password" id="password" class="form-control" placeholder="Password" />
|
|
||||||
<input type="password" id="password_confirm" class="form-control" placeholder="Verify password" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="divCheckPasswordMatch"></div>
|
|
||||||
|
|
||||||
<div id="invalidCredentials">
|
|
||||||
Username already exists
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<input type="submit" value="Login" class="form-control" />
|
|
||||||
|
|
||||||
<p>
|
|
||||||
Existing user? <a href="/login">Login</a> instead!
|
|
||||||
</p>
|
|
||||||
</form>
|
|
||||||
{{end}}
|
|
@ -1,32 +0,0 @@
|
|||||||
{{define "title"}}
|
|
||||||
Settings for Budget "{{.Budget.Name}}"
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{template "base" .}}
|
|
||||||
|
|
||||||
{{define "main"}}
|
|
||||||
<h1>Danger Zone</h1>
|
|
||||||
<div class="budget-item">
|
|
||||||
<a href="/budget/{{.Budget.ID}}/settings/clear">Clear budget</a>
|
|
||||||
<p>This removes transactions and assignments to start from scratch. Accounts and categories are kept. Not undoable!</p>
|
|
||||||
</div>
|
|
||||||
<div class="budget-item">
|
|
||||||
<a href="/budget/{{.Budget.ID}}/settings/clean-negative">Fix all historic negative category-balances</a>
|
|
||||||
<p>This restores YNABs functionality, that would substract any overspent categories' balances from next months inflows.</p>
|
|
||||||
</div>
|
|
||||||
<div class="budget-item">
|
|
||||||
<form method="POST" action="/api/v1/transaction/import/ynab" enctype="multipart/form-data">
|
|
||||||
<input type="hidden" name="budget_id" value="{{.Budget.ID}}" />
|
|
||||||
<label for="transactions_file">
|
|
||||||
Transaktionen:
|
|
||||||
<input type="file" name="transactions" accept="text/*" />
|
|
||||||
</label>
|
|
||||||
<br />
|
|
||||||
<label for="assignments_file">
|
|
||||||
Budget:
|
|
||||||
<input type="file" name="assignments" accept="text/*" />
|
|
||||||
</label>
|
|
||||||
<button type="submit">Importieren</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
5
web/src/@types/shims-vue.d.ts
vendored
Normal file
5
web/src/@types/shims-vue.d.ts
vendored
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
declare module "*.vue" {
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
const component: ReturnType<typeof defineComponent>;
|
||||||
|
export default component;
|
||||||
|
}
|
9
web/src/@types/shims-vuex.d.ts
vendored
Normal file
9
web/src/@types/shims-vuex.d.ts
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
import { ComponentCustomProperties } from 'vue'
|
||||||
|
import { State } from '../store'
|
||||||
|
import { Store } from 'vuex'
|
||||||
|
|
||||||
|
declare module '@vue/runtime-core' {
|
||||||
|
interface ComponentCustomProperties {
|
||||||
|
$store: Store<State>
|
||||||
|
}
|
||||||
|
}
|
62
web/src/App.vue
Normal file
62
web/src/App.vue
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
import { LOGOUT } from "./store/mutation-types";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
computed: {
|
||||||
|
loggedIn() {
|
||||||
|
return this.$store.state.Session.Token;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
logout () {
|
||||||
|
this.$store.commit(LOGOUT);
|
||||||
|
this.$router.push("/login")
|
||||||
|
},
|
||||||
|
toggleMenu () {
|
||||||
|
this.$store.commit("toggleMenu");
|
||||||
|
},
|
||||||
|
toggleMenuSize () {
|
||||||
|
this.$store.commit("toggleMenuSize");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
beforeCreate () {
|
||||||
|
this.$store.commit("initializeStore");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="box-border w-full">
|
||||||
|
<div class="flex bg-gray-400 p-4 m-2 rounded-lg">
|
||||||
|
<span class="flex-1 font-bold text-5xl -my-3 hidden md:inline" @click="toggleMenuSize">≡</span>
|
||||||
|
<span class="flex-1 font-bold text-5xl -my-3 md:hidden" @click="toggleMenu">≡</span>
|
||||||
|
|
||||||
|
<span class="flex-1">{{$store.getters.CurrentBudgetName}}</span>
|
||||||
|
|
||||||
|
<div class="flex flex-1 flex-row justify-end -mx-4">
|
||||||
|
<router-link class="mx-4" v-if="loggedIn" to="/dashboard">Dashboard</router-link>
|
||||||
|
<router-link class="mx-4" v-if="!loggedIn" to="/login">Login</router-link>
|
||||||
|
<a class="mx-4" v-if="loggedIn" @click="logout">Logout</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col md:flex-row flex-1">
|
||||||
|
<div :class="[$store.state.ExpandMenu ? 'md:w-72' : 'md:w-36', $store.state.ShowMenu ? '' : 'hidden']" class="md:block flex-shrink-0 w-full">
|
||||||
|
<router-view name="sidebar"></router-view>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex-1 p-6">
|
||||||
|
<router-view></router-view>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
#app {
|
||||||
|
font-family: Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
</style>
|
93
web/src/components/Autocomplete.vue
Normal file
93
web/src/components/Autocomplete.vue
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent, PropType } from "vue"
|
||||||
|
|
||||||
|
export interface Suggestion {
|
||||||
|
ID : string
|
||||||
|
Name : string
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Data {
|
||||||
|
Selected: Suggestion | undefined
|
||||||
|
SearchQuery: String
|
||||||
|
Suggestions: Suggestion[]
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
Selected: undefined,
|
||||||
|
SearchQuery: this.modelValue || "",
|
||||||
|
Suggestions: new Array<Suggestion>(),
|
||||||
|
} as Data
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
modelValue: Object as PropType<Suggestion>,
|
||||||
|
type: String
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
SearchQuery() {
|
||||||
|
this.load(this.$data.SearchQuery);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
saveTransaction(e : MouseEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
},
|
||||||
|
load(text : String) {
|
||||||
|
this.$emit('update:modelValue', {ID: null, Name: text});
|
||||||
|
if (text == ""){
|
||||||
|
this.$data.Suggestions = [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
fetch("/api/v1/budget/" + this.$store.getters.CurrentBudget.ID + "/autocomplete/" + this.type + "?s=" + text, {
|
||||||
|
headers: this.$store.getters.AuthHeaders
|
||||||
|
}) .then(x=>x.json())
|
||||||
|
.then(x => {
|
||||||
|
let suggestions = x || [];
|
||||||
|
if(suggestions.length > 10){
|
||||||
|
suggestions = suggestions.slice(0, 10);
|
||||||
|
}
|
||||||
|
this.$data.Suggestions = suggestions;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
keypress(e : KeyboardEvent) {
|
||||||
|
console.log(e.key);
|
||||||
|
if(e.key == "Enter") {
|
||||||
|
const selected = this.$data.Suggestions[0];
|
||||||
|
this.selectElement(selected);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
selectElement(element : Suggestion) {
|
||||||
|
this.$data.Selected = element;
|
||||||
|
this.$data.Suggestions = [];
|
||||||
|
this.$emit('update:modelValue', element);
|
||||||
|
},
|
||||||
|
select(e : MouseEvent) {
|
||||||
|
const target = (<HTMLInputElement>e.target);
|
||||||
|
const valueAttribute = target.attributes.getNamedItem("value");
|
||||||
|
let selectedID = "";
|
||||||
|
if(valueAttribute != null)
|
||||||
|
selectedID = valueAttribute.value;
|
||||||
|
const selected = this.$data.Suggestions.filter(x => x.ID == selectedID)[0];
|
||||||
|
this.selectElement(selected);
|
||||||
|
},
|
||||||
|
clear() {
|
||||||
|
this.$data.Selected = undefined;
|
||||||
|
this.$emit('update:modelValue', {ID: null, Name: this.$data.SearchQuery});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<input @keypress="keypress" v-if="Selected == undefined" v-model="SearchQuery" />
|
||||||
|
<span @click="clear" v-if="Selected != undefined" class="bg-gray-300">{{Selected.Name}}</span>
|
||||||
|
<div v-if="Suggestions.length > 0" class="absolute bg-gray-400 w-64 p-2">
|
||||||
|
<span v-for="suggestion in Suggestions" class="block" @click="select" :value="suggestion.ID">
|
||||||
|
{{suggestion.Name}}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
13
web/src/components/Card.vue
Normal file
13
web/src/components/Card.vue
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex flex-row items-center bg-gray-300 h-32 rounded-lg">
|
||||||
|
<slot></slot>
|
||||||
|
</div>
|
||||||
|
</template>
|
19
web/src/components/Currency.vue
Normal file
19
web/src/components/Currency.vue
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
props: ["value"],
|
||||||
|
computed: {
|
||||||
|
formattedValue() {
|
||||||
|
return Number(this.value).toLocaleString(undefined, {
|
||||||
|
minimumFractionDigits: 2,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<span class="text-right" :class="value < 0 ? 'negative' : ''">{{formattedValue}} €</span>
|
||||||
|
</template>
|
45
web/src/dialogs/NewBudget.vue
Normal file
45
web/src/dialogs/NewBudget.vue
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import Card from '../components/Card.vue';
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
import { NEW_BUDGET } from "../store/action-types";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
dialog: false,
|
||||||
|
budgetName: ""
|
||||||
|
}
|
||||||
|
},
|
||||||
|
components: { Card },
|
||||||
|
methods: {
|
||||||
|
saveBudget() {
|
||||||
|
this.$store.dispatch(NEW_BUDGET, this.$data.budgetName);
|
||||||
|
this.$data.dialog = false;
|
||||||
|
},
|
||||||
|
newBudget() {
|
||||||
|
this.$data.dialog = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Card>
|
||||||
|
<p class="w-24 text-center text-6xl">+</p>
|
||||||
|
<button class="text-lg" dark @click="newBudget">New Budget</button>
|
||||||
|
</Card>
|
||||||
|
<div v-if="dialog" justify="center">
|
||||||
|
<div>
|
||||||
|
<div>
|
||||||
|
<span class="text-h5">New Budget</span>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="text" v-model="budgetName" label="Budget name" required />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<button @click="dialog = false">Close</button>
|
||||||
|
<button @click="saveBudget">Save</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
11
web/src/index.css
Normal file
11
web/src/index.css
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 200%;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
20
web/src/main.ts
Normal file
20
web/src/main.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import { createApp } from 'vue'
|
||||||
|
import App from './App.vue'
|
||||||
|
import './index.css'
|
||||||
|
import router from './router'
|
||||||
|
import { store, key } from './store'
|
||||||
|
import { SET_CURRENT_ACCOUNT, SET_CURRENT_BUDGET } from './store/action-types'
|
||||||
|
|
||||||
|
const app = createApp(App)
|
||||||
|
app.use(router)
|
||||||
|
app.use(store, key)
|
||||||
|
app.mount('#app')
|
||||||
|
|
||||||
|
router.beforeEach(async (to, from, next) => {
|
||||||
|
await store.dispatch(SET_CURRENT_BUDGET, to.params.budgetid);
|
||||||
|
await store.dispatch(SET_CURRENT_ACCOUNT, {
|
||||||
|
accountid: to.params.accountid,
|
||||||
|
budgetid: to.params.budgetid
|
||||||
|
});
|
||||||
|
next();
|
||||||
|
})
|
106
web/src/pages/Account.vue
Normal file
106
web/src/pages/Account.vue
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue"
|
||||||
|
import Autocomplete, { Suggestion } from '../components/Autocomplete.vue'
|
||||||
|
import Currency from "../components/Currency.vue";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
TransactionDate: new Date().toISOString().substring(0, 10),
|
||||||
|
Payee: undefined as Suggestion | undefined,
|
||||||
|
Category: undefined as Suggestion | undefined,
|
||||||
|
Memo: "",
|
||||||
|
Amount: 0
|
||||||
|
}
|
||||||
|
},
|
||||||
|
components: { Autocomplete, Currency },
|
||||||
|
props: ["budgetid", "accountid"],
|
||||||
|
methods: {
|
||||||
|
saveTransaction(e : MouseEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
fetch("/api/v1/transaction/new", {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify({
|
||||||
|
budget_id: this.budgetid,
|
||||||
|
account_id: this.accountid,
|
||||||
|
date: this.$data.TransactionDate,
|
||||||
|
payee: this.$data.Payee,
|
||||||
|
category: this.$data.Category,
|
||||||
|
memo: this.$data.Memo,
|
||||||
|
amount: this.$data.Amount,
|
||||||
|
state: "Uncleared"
|
||||||
|
}),
|
||||||
|
headers: this.$store.getters.AuthHeaders,
|
||||||
|
})
|
||||||
|
.then(x => x.json());
|
||||||
|
},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<h1>{{ $store.getters.CurrentAccount.Name }}</h1>
|
||||||
|
<p>
|
||||||
|
Current Balance:
|
||||||
|
<Currency :value="$store.getters.CurrentAccount.Balance" />
|
||||||
|
</p>
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 90px;" class="text-sm">
|
||||||
|
<input type="date" v-model="TransactionDate" />
|
||||||
|
</td>
|
||||||
|
<td style="max-width: 150px;">
|
||||||
|
<Autocomplete v-model="Payee" type="payees" />
|
||||||
|
</td>
|
||||||
|
<td style="max-width: 200px;">
|
||||||
|
<Autocomplete v-model="Category" type="categories" />
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" v-model="Memo" />
|
||||||
|
</td>
|
||||||
|
<td style="width: 80px;">
|
||||||
|
<input type="currency" v-model="Amount" />
|
||||||
|
</td>
|
||||||
|
<td style="width: 20px;">
|
||||||
|
<input type="submit" @click="saveTransaction" value="Save" />
|
||||||
|
</td>
|
||||||
|
<td style="width: 20px;"></td>
|
||||||
|
</tr>
|
||||||
|
<tr v-for="(transaction, index) in $store.getters.Transactions"
|
||||||
|
class="{{transaction.Date.After now ? 'future' : ''}}"
|
||||||
|
:class="[index % 6 < 3 ? 'bg-gray-300' : 'bg-gray-100']">
|
||||||
|
<!--:class="[index % 6 < 3 ? index % 6 === 1 ? 'bg-gray-400' : 'bg-gray-300' : index % 6 !== 4 ? 'bg-gray-100' : '']">-->
|
||||||
|
<td style="width: 90px;">{{ transaction.Date.substring(0, 10) }}</td>
|
||||||
|
<td style="max-width: 150px;">{{ transaction.Payee }}</td>
|
||||||
|
<td
|
||||||
|
style="max-width: 200px;"
|
||||||
|
>{{ transaction.CategoryGroup ? transaction.CategoryGroup + " : " + transaction.Category : "" }}</td>
|
||||||
|
<td>
|
||||||
|
<a
|
||||||
|
:href="'/budget/' + $store.getters.CurrentBudgetID + '/transaction/' + transaction.ID"
|
||||||
|
>{{ transaction.Memo }}</a>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<Currency class="block" :value="transaction.Amount" />
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
style="width: 20px;"
|
||||||
|
>{{ transaction.Status == "Reconciled" ? "✔" : (transaction.Status == "Uncleared" ? "" : "*") }}</td>
|
||||||
|
<td style="width: 20px;">{{ transaction.GroupID ? "☀" : "" }}</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
table-layout: fixed;
|
||||||
|
}
|
||||||
|
td {
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.negative {
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
|
</style>
|
56
web/src/pages/BudgetSidebar.vue
Normal file
56
web/src/pages/BudgetSidebar.vue
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue"
|
||||||
|
import Currency from "../components/Currency.vue"
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
props: ["budgetid", "accountid"],
|
||||||
|
components: { Currency }
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex flex-col">
|
||||||
|
<span class="m-1 p-1 px-3 text-xl">
|
||||||
|
<router-link to="/dashboard">⌂</router-link>
|
||||||
|
{{$store.getters.CurrentBudgetName}}
|
||||||
|
</span>
|
||||||
|
<span class="bg-orange-200 rounded-lg m-1 p-1 px-3 flex flex-col">
|
||||||
|
<router-link :to="'/budget/'+budgetid+'/budgeting'">Budget</router-link><br />
|
||||||
|
<!--<router-link :to="'/budget/'+$store.getters.CurrentBudgetID+'/reports'">Reports</router-link>-->
|
||||||
|
<!--<router-link :to="'/budget/'+$store.getters.CurrentBudgetID+'/all-accounts'">All Accounts</router-link>-->
|
||||||
|
</span>
|
||||||
|
<li class="bg-orange-200 rounded-lg m-1 p-1 px-3">
|
||||||
|
<div class="flex flex-row justify-between font-bold">
|
||||||
|
<span>On-Budget Accounts</span>
|
||||||
|
<Currency :class="$store.state.ExpandMenu?'md:inline':'md:hidden'" :value="$store.getters.OnBudgetAccountsBalance" />
|
||||||
|
</div>
|
||||||
|
<div v-for="account in $store.getters.OnBudgetAccounts" class="flex flex-row justify-between">
|
||||||
|
<router-link :to="'/budget/'+budgetid+'/account/'+account.ID">{{account.Name}}</router-link>
|
||||||
|
<Currency :class="$store.state.ExpandMenu?'md:inline':'md:hidden'" :value="account.Balance" />
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li class="bg-red-200 rounded-lg m-1 p-1 px-3">
|
||||||
|
<div class="flex flex-row justify-between font-bold">
|
||||||
|
<span>Off-Budget Accounts</span>
|
||||||
|
<Currency :class="$store.state.ExpandMenu?'md:inline':'md:hidden'" :value="$store.getters.OffBudgetAccountsBalance" />
|
||||||
|
</div>
|
||||||
|
<div v-for="account in $store.getters.OffBudgetAccounts" class="flex flex-row justify-between">
|
||||||
|
<router-link :to="'/budget/'+budgetid+'/account/'+account.ID">{{account.Name}}</router-link>
|
||||||
|
<Currency :class="$store.state.ExpandMenu?'md:inline':'md:hidden'" :value="account.Balance" />
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li class="bg-red-200 rounded-lg m-1 p-1 px-3">
|
||||||
|
Closed Accounts
|
||||||
|
</li>
|
||||||
|
<!--<li>
|
||||||
|
<router-link :to="'/budget/'+$store.getters.CurrentBudgetID+'/accounts'">Edit accounts</router-link>
|
||||||
|
</li>-->
|
||||||
|
<li class="bg-red-200 rounded-lg m-1 p-1 px-3">
|
||||||
|
+ Add Account
|
||||||
|
</li>
|
||||||
|
<li class="bg-red-200 rounded-lg m-1 p-1 px-3">
|
||||||
|
<router-link :to="'/budget/'+$store.getters.CurrentBudgetID+'/settings'">Budget-Settings</router-link>
|
||||||
|
</li>
|
||||||
|
<!--<li><router-link to="/admin">Admin</router-link></li>-->
|
||||||
|
</div>
|
||||||
|
</template>
|
94
web/src/pages/Budgeting.vue
Normal file
94
web/src/pages/Budgeting.vue
Normal file
@ -0,0 +1,94 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
import { FETCH_MONTH_BUDGET } from "../store/action-types";
|
||||||
|
import { TITLE } from "../store/mutation-types";
|
||||||
|
import Currency from "../components/Currency.vue";
|
||||||
|
|
||||||
|
interface Date {
|
||||||
|
Year:Number,
|
||||||
|
Month:Number,
|
||||||
|
}
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
mounted() {
|
||||||
|
this.$store.commit(TITLE, "Budget for " + this.month + " " + this.year);
|
||||||
|
return this.$store.dispatch(FETCH_MONTH_BUDGET, { budgetid: this.budgetid, year: this.year, month: this.month });
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
year() {
|
||||||
|
return this.$store.dispatch(FETCH_MONTH_BUDGET, { budgetid: this.budgetid, year: this.year, month: this.month });
|
||||||
|
},
|
||||||
|
month() {
|
||||||
|
return this.$store.dispatch(FETCH_MONTH_BUDGET, { budgetid: this.budgetid, year: this.year, month: this.month });
|
||||||
|
},
|
||||||
|
},
|
||||||
|
props: ["budgetid", "year", "month"],
|
||||||
|
computed: {
|
||||||
|
Categories() {
|
||||||
|
return this.$store.getters.Categories(this.year, this.month);
|
||||||
|
},
|
||||||
|
previous() : Date {
|
||||||
|
return {
|
||||||
|
Year: new Date(this.year, this.month - 1, 1).getFullYear(),
|
||||||
|
Month: new Date(this.year, this.month - 1, 1).getMonth(),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
current() : Date {
|
||||||
|
return {
|
||||||
|
Year: new Date().getFullYear(),
|
||||||
|
Month: new Date().getMonth(),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
selected() : Date {
|
||||||
|
return {
|
||||||
|
Year: this.year,
|
||||||
|
Month: Number(this.month) + 1
|
||||||
|
}
|
||||||
|
},
|
||||||
|
next() : Date {
|
||||||
|
return {
|
||||||
|
Year: new Date(this.year, Number(this.month) + 1, 1).getFullYear(),
|
||||||
|
Month: new Date(this.year, Number(this.month) + 1, 1).getMonth(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
components: { Currency }
|
||||||
|
})
|
||||||
|
|
||||||
|
/*{{define "title"}}
|
||||||
|
{{printf "Budget for %s %d" .Date.Month .Date.Year}}
|
||||||
|
{{end}}*/
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<h1>
|
||||||
|
Budget for {{selected.Month}}/{{selected.Year}}
|
||||||
|
</h1>
|
||||||
|
<div>
|
||||||
|
<router-link :to="'/budget/'+$store.getters.CurrentBudget.ID +'/budgeting/' + previous.Year + '/' + previous.Month">Previous Month</router-link> -
|
||||||
|
<router-link :to="'/budget/'+$store.getters.CurrentBudget.ID +'/budgeting/' + current.Year + '/' + current.Month">Current Month</router-link> -
|
||||||
|
<router-link :to="'/budget/'+$store.getters.CurrentBudget.ID +'/budgeting/' + next.Year + '/' + next.Month">Next Month</router-link>
|
||||||
|
</div>
|
||||||
|
<table class="container col-lg-12" id="content">
|
||||||
|
<tr>
|
||||||
|
<th>Group</th>
|
||||||
|
<th>Category</th>
|
||||||
|
<th></th>
|
||||||
|
<th></th>
|
||||||
|
<th>Leftover</th>
|
||||||
|
<th>Assigned</th>
|
||||||
|
<th>Activity</th>
|
||||||
|
<th>Available</th>
|
||||||
|
</tr>
|
||||||
|
<tr v-for="category in Categories">
|
||||||
|
<td>{{category.Group}}</td>
|
||||||
|
<td>{{category.Name}}</td>
|
||||||
|
<td></td>
|
||||||
|
<td></td>
|
||||||
|
<td class="text-right"><Currency :value="category.AvailableLastMonth" /></td>
|
||||||
|
<td class="text-right"><Currency :value="category.Assigned" /></td>
|
||||||
|
<td class="text-right"><Currency :value="category.Activity" /></td>
|
||||||
|
<td class="text-right"><Currency :value="category.Available" /></td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</template>
|
24
web/src/pages/Dashboard.vue
Normal file
24
web/src/pages/Dashboard.vue
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import NewBudget from '../dialogs/NewBudget.vue';
|
||||||
|
import Card from '../components/Card.vue';
|
||||||
|
import { defineComponent } from 'vue';
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
props: ["budgetid"],
|
||||||
|
components: { NewBudget, Card }
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<h1>Budgets</h1>
|
||||||
|
<div class="grid md:grid-cols-2 gap-6">
|
||||||
|
<Card v-for="budget in $store.getters.Budgets">
|
||||||
|
<router-link v-bind:to="'/budget/'+budget.ID+'/budgeting'" class="contents">
|
||||||
|
<!--<svg class="w-24"></svg>-->
|
||||||
|
<p class="w-24 text-center text-6xl"></p>
|
||||||
|
<span class="text-lg">{{budget.Name}}{{budget.ID == budgetid ? " *" : ""}}</span>
|
||||||
|
</router-link>
|
||||||
|
</Card>
|
||||||
|
<NewBudget />
|
||||||
|
</div>
|
||||||
|
</template>
|
18
web/src/pages/Index.vue
Normal file
18
web/src/pages/Index.vue
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from 'vue';
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="font-bold" id="content">
|
||||||
|
Willkommen bei Budgeteer, der neuen App für's Budget!
|
||||||
|
</div>
|
||||||
|
<div class="container col-md-4" id="login">
|
||||||
|
<router-link to="/login">Login</router-link> or <router-link to="/login">register</router-link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
47
web/src/pages/Login.vue
Normal file
47
web/src/pages/Login.vue
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { TITLE } from "../store/mutation-types";
|
||||||
|
import { LOGIN } from '../store/action-types'
|
||||||
|
import { defineComponent } from "vue";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
error: "",
|
||||||
|
login: {
|
||||||
|
user: "",
|
||||||
|
password: ""
|
||||||
|
},
|
||||||
|
showPassword: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.$store.commit(TITLE, "Login");
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
formSubmit(e : MouseEvent) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.$store.dispatch(LOGIN, this.$data.login)
|
||||||
|
.then(x => {
|
||||||
|
this.$data.error = "";
|
||||||
|
this.$router.replace("/dashboard");
|
||||||
|
})
|
||||||
|
.catch(x => this.$data.error = "The entered credentials are invalid!");
|
||||||
|
|
||||||
|
// TODO display invalidCredentials
|
||||||
|
// TODO redirect to dashboard on success
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<input type="text" v-model="login.user" placeholder="Username" class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
|
||||||
|
<input type="password" v-model="login.password" placeholder="Password" class="border-2 border-black rounded-lg block px-2 my-2 w-48" />
|
||||||
|
</div>
|
||||||
|
<div>{{ error }}</div>
|
||||||
|
<button type="submit" @click="formSubmit" class="bg-blue-300 rounded-lg p-2 w-48">Login</button>
|
||||||
|
<p>
|
||||||
|
New user? <router-link to="/register">Register</router-link> instead!
|
||||||
|
</p>
|
||||||
|
</template>
|
67
web/src/pages/Register.vue
Normal file
67
web/src/pages/Register.vue
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from 'vue';
|
||||||
|
import { REGISTER } from "../store/action-types";
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
showPassword: false,
|
||||||
|
error: "",
|
||||||
|
login: {
|
||||||
|
email: "",
|
||||||
|
password: "",
|
||||||
|
name: "",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
formSubmit (e) {
|
||||||
|
e.preventDefault();
|
||||||
|
this.$store.dispatch(REGISTER, this.$data.login)
|
||||||
|
.then(() => this.$data.error = "")
|
||||||
|
.catch(() => this.$data.error = ["Something went wrong!"]);
|
||||||
|
|
||||||
|
// TODO display invalidCredentials
|
||||||
|
// TODO redirect to dashboard on success
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<v-container>
|
||||||
|
<v-row>
|
||||||
|
<v-col cols="12">
|
||||||
|
<v-text-field v-model="login.email" type="text" label="E-Mail" />
|
||||||
|
</v-col>
|
||||||
|
<v-col cols="12">
|
||||||
|
<v-text-field v-model="login.name" type="text" label="Name" />
|
||||||
|
</v-col>
|
||||||
|
<v-col cols="6">
|
||||||
|
<v-text-field v-model="login.password" label="Password"
|
||||||
|
:append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
|
||||||
|
:type="showPassword ? 'text' : 'password'"
|
||||||
|
@click:append="showPassword = showPassword"
|
||||||
|
:error-message="error"
|
||||||
|
error-count="2"
|
||||||
|
error />
|
||||||
|
</v-col>
|
||||||
|
<v-col cols="6">
|
||||||
|
<v-text-field v-model="login.password" label="Repeat password"
|
||||||
|
:append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
|
||||||
|
:type="showPassword ? 'text' : 'password'"
|
||||||
|
@click:append="showPassword = showPassword"
|
||||||
|
:error-message="error"
|
||||||
|
error-count="2"
|
||||||
|
error />
|
||||||
|
</v-col>
|
||||||
|
</v-row>
|
||||||
|
<div class="form-group">
|
||||||
|
{{ error }}
|
||||||
|
</div>
|
||||||
|
<v-btn type="submit" @click="formSubmit">Register</v-btn>
|
||||||
|
<p>
|
||||||
|
Existing user? <router-link to="/login">Login</router-link> instead!
|
||||||
|
</p>
|
||||||
|
</v-container>
|
||||||
|
</template>
|
138
web/src/pages/Settings.vue
Normal file
138
web/src/pages/Settings.vue
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { defineComponent } from "vue"
|
||||||
|
import { IMPORT_YNAB } from "../store/action-types";
|
||||||
|
import { TITLE } from "../store/mutation-types"
|
||||||
|
|
||||||
|
export default defineComponent({
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
transactionsFile: undefined as File | undefined,
|
||||||
|
assignmentsFile: undefined as File | undefined
|
||||||
|
}
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
filesIncomplete() {
|
||||||
|
return this.$data.transactionsFile == undefined || this.$data.assignmentsFile == undefined;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.$store.commit(TITLE, "Settings")
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
gotAssignments(e : Event) {
|
||||||
|
const input = (<HTMLInputElement>e.target);
|
||||||
|
if(input.files != null)
|
||||||
|
this.$data.assignmentsFile = input.files[0];
|
||||||
|
},
|
||||||
|
gotTransactions(e : Event) {
|
||||||
|
const input = (<HTMLInputElement>e.target);
|
||||||
|
if(input.files != null)
|
||||||
|
this.$data.transactionsFile = input.files[0];
|
||||||
|
},
|
||||||
|
deleteBudget() {
|
||||||
|
fetch("/api/v1/budget/" + this.$store.getters.CurrentBudget.ID, {
|
||||||
|
method: "DELETE",
|
||||||
|
headers: {
|
||||||
|
'Authorization': 'Bearer ' + this.$store.state.Session.Token
|
||||||
|
},
|
||||||
|
});
|
||||||
|
this.$store.commit("deleteBudget", this.$store.getters.CurrentBudget.ID)
|
||||||
|
this.$router.push("/")
|
||||||
|
},
|
||||||
|
clearBudget() {
|
||||||
|
fetch("/api/v1/budget/" + this.$store.getters.CurrentBudget.ID + "/settings/clear", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
'Authorization': 'Bearer ' + this.$store.state.Session.Token
|
||||||
|
},
|
||||||
|
})
|
||||||
|
},
|
||||||
|
cleanNegative() {
|
||||||
|
// <a href="/budget/{{.Budget.ID}}/settings/clean-negative">Fix all historic negative category-balances</a>
|
||||||
|
},
|
||||||
|
ynabImport() {
|
||||||
|
if (this.$data.transactionsFile == undefined || this.$data.assignmentsFile == undefined)
|
||||||
|
return
|
||||||
|
|
||||||
|
let formData = new FormData();
|
||||||
|
formData.append("transactions", this.$data.transactionsFile);
|
||||||
|
formData.append("assignments", this.$data.assignmentsFile);
|
||||||
|
this.$store.dispatch(IMPORT_YNAB, formData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<v-container>
|
||||||
|
<h1>Danger Zone</h1>
|
||||||
|
<v-row>
|
||||||
|
<v-col cols="12" md="6" xl="3">
|
||||||
|
<v-card>
|
||||||
|
<v-card-header>
|
||||||
|
<v-card-header-text>
|
||||||
|
<v-card-title>Clear Budget</v-card-title>
|
||||||
|
<v-card-subtitle>This removes transactions and assignments to start from scratch. Accounts and categories are kept. Not undoable!</v-card-subtitle>
|
||||||
|
</v-card-header-text>
|
||||||
|
</v-card-header>
|
||||||
|
<v-card-actions class="justify-center">
|
||||||
|
<v-btn @click="clearBudget">Clear budget</v-btn>
|
||||||
|
</v-card-actions>
|
||||||
|
</v-card>
|
||||||
|
</v-col>
|
||||||
|
<v-col cols="12" md="6" xl="3">
|
||||||
|
<v-card>
|
||||||
|
<v-card-header>
|
||||||
|
<v-card-header-text>
|
||||||
|
<v-card-title>Delete Budget</v-card-title>
|
||||||
|
<v-card-subtitle>This deletes the whole bugdet including all transactions, assignments, accounts and categories. Not undoable!</v-card-subtitle>
|
||||||
|
</v-card-header-text>
|
||||||
|
</v-card-header>
|
||||||
|
<v-card-actions class="justify-center">
|
||||||
|
<v-btn @click="deleteBudget">Delete budget</v-btn>
|
||||||
|
</v-card-actions>
|
||||||
|
</v-card>
|
||||||
|
</v-col>
|
||||||
|
<v-col cols="12" md="6" xl="3">
|
||||||
|
<v-card>
|
||||||
|
<v-card-header>
|
||||||
|
<v-card-header-text>
|
||||||
|
<v-card-title>Fix all historic negative category-balances</v-card-title>
|
||||||
|
<v-card-subtitle>This restores YNABs functionality, that would substract any overspent categories' balances from next months inflows.</v-card-subtitle>
|
||||||
|
</v-card-header-text>
|
||||||
|
</v-card-header>
|
||||||
|
<v-card-actions class="justify-center">
|
||||||
|
<v-btn @click="cleanNegative">Fix negative</v-btn>
|
||||||
|
</v-card-actions>
|
||||||
|
</v-card>
|
||||||
|
</v-col>
|
||||||
|
<v-col cols="12" xl="6">
|
||||||
|
<v-card>
|
||||||
|
<v-card-header>
|
||||||
|
<v-card-header-text>
|
||||||
|
<v-card-title>Import YNAB Budget</v-card-title>
|
||||||
|
</v-card-header-text>
|
||||||
|
</v-card-header>
|
||||||
|
|
||||||
|
<label for="transactions_file">
|
||||||
|
Transaktionen:
|
||||||
|
<input type="file" @change="gotTransactions" accept="text/*" />
|
||||||
|
</label>
|
||||||
|
<br />
|
||||||
|
<label for="assignments_file">
|
||||||
|
Budget:
|
||||||
|
<input type="file" @change="gotAssignments" accept="text/*" />
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<v-card-actions class="justify-center">
|
||||||
|
<v-btn
|
||||||
|
:disabled="filesIncomplete"
|
||||||
|
@click="ynabImport"
|
||||||
|
>Importieren</v-btn>
|
||||||
|
</v-card-actions>
|
||||||
|
</v-card>
|
||||||
|
</v-col>
|
||||||
|
</v-row>
|
||||||
|
<v-card></v-card>
|
||||||
|
</v-container>
|
||||||
|
</template>
|
29
web/src/router/index.ts
Normal file
29
web/src/router/index.ts
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import { createRouter, createWebHistory, RouteLocationNormalized } from 'vue-router'
|
||||||
|
import Dashboard from '../pages/Dashboard.vue';
|
||||||
|
import Login from '../pages/Login.vue';
|
||||||
|
import Index from '../pages/Index.vue';
|
||||||
|
import Register from '../pages/Register.vue';
|
||||||
|
import Account from '@/pages/Account.vue';
|
||||||
|
import Settings from '../pages/Settings.vue';
|
||||||
|
import Budgeting from '../pages/Budgeting.vue';
|
||||||
|
import BudgetSidebar from '../pages/BudgetSidebar.vue';
|
||||||
|
|
||||||
|
const routes = [
|
||||||
|
{ path: "/", name: "Index", component: Index },
|
||||||
|
{ path: "/dashboard", name: "Dashboard", component: Dashboard },
|
||||||
|
{ path: "/login", name: "Login", component: Login },
|
||||||
|
{ path: "/register", name: "Register", component: Register },
|
||||||
|
{ path: "/budget/:budgetid/budgeting", name: "Budget", redirect: (to : RouteLocationNormalized) =>
|
||||||
|
'/budget/' + to.params.budgetid + '/budgeting/' + new Date().getFullYear() + '/' + new Date().getMonth()
|
||||||
|
},
|
||||||
|
{ path: "/budget/:budgetid/budgeting/:year/:month", name: "Budget with date", components: { default: Budgeting, sidebar: BudgetSidebar }, props: true },
|
||||||
|
{ path: "/budget/:budgetid/Settings", name: "Budget Settings", components: { default: Settings, sidebar: BudgetSidebar }, props: true },
|
||||||
|
{ path: "/budget/:budgetid/account/:accountid", name: "Account", components: { default: Account, sidebar: BudgetSidebar }, props: true },
|
||||||
|
]
|
||||||
|
|
||||||
|
const router = createRouter({
|
||||||
|
history: createWebHistory(),
|
||||||
|
routes,
|
||||||
|
})
|
||||||
|
|
||||||
|
export default router
|
11
web/src/store/action-types.ts
Normal file
11
web/src/store/action-types.ts
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
export const IMPORT_YNAB = "YNAB import";
|
||||||
|
export const GET = "GET";
|
||||||
|
export const POST = "POST";
|
||||||
|
export const NEW_BUDGET = "New budget";
|
||||||
|
export const SET_CURRENT_BUDGET = "Set current budget";
|
||||||
|
export const SET_CURRENT_ACCOUNT = "Set current account";
|
||||||
|
export const FETCH_BUDGET = "Fetch budget";
|
||||||
|
export const FETCH_MONTH_BUDGET = "Fetch budget for month";
|
||||||
|
export const LOGIN = 'Log in';
|
||||||
|
export const REGISTER = 'Register';
|
||||||
|
export const FETCH_ACCOUNT = "Fetch account";
|
152
web/src/store/budget/index.ts
Normal file
152
web/src/store/budget/index.ts
Normal file
@ -0,0 +1,152 @@
|
|||||||
|
import { Module } from "vuex";
|
||||||
|
import { FETCH_ACCOUNT, FETCH_BUDGET, FETCH_MONTH_BUDGET, SET_CURRENT_ACCOUNT } from "../action-types";
|
||||||
|
import { LOGOUT, TITLE } from "../mutation-types";
|
||||||
|
|
||||||
|
export interface BudgetState {
|
||||||
|
Accounts: Map<string, Account>,
|
||||||
|
CurrentAccountID?: string,
|
||||||
|
Categories: Map<string, Category>,
|
||||||
|
Months: Map<number, Map<number, Map<string, Category>>>,
|
||||||
|
Transactions: [],
|
||||||
|
Assignments: []
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Account {
|
||||||
|
ID: string
|
||||||
|
OnBudget: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Category {
|
||||||
|
Group: string
|
||||||
|
Name: string
|
||||||
|
AvailableLastMonth: number
|
||||||
|
Assigned: number
|
||||||
|
Activity: number
|
||||||
|
Available: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export const budgetStore : Module<BudgetState, any> = {
|
||||||
|
state: {
|
||||||
|
Accounts: new Map<string, Account>(),
|
||||||
|
CurrentAccountID: undefined,
|
||||||
|
Months: new Map<number, Map<number, Map<string, Category>>>(),
|
||||||
|
Categories: new Map<string, Category>(),
|
||||||
|
Transactions: [],
|
||||||
|
Assignments: []
|
||||||
|
},
|
||||||
|
|
||||||
|
mutations: {
|
||||||
|
initializeStore(state) {
|
||||||
|
const store = localStorage.getItem("store");
|
||||||
|
if (!store)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const restoredState = JSON.parse(store);
|
||||||
|
if (!restoredState)
|
||||||
|
return;
|
||||||
|
|
||||||
|
state.CurrentAccountID = restoredState.CurrentAccountID;
|
||||||
|
|
||||||
|
for (const account of restoredState.Accounts || []) {
|
||||||
|
state.Accounts.set(account[0], account[1]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[LOGOUT](state) {
|
||||||
|
state.Accounts.clear();
|
||||||
|
state.Categories.clear();
|
||||||
|
state.Transactions = [];
|
||||||
|
state.Assignments = [];
|
||||||
|
},
|
||||||
|
addAccount(state, account) {
|
||||||
|
state.Accounts.set(account.ID, account);
|
||||||
|
},
|
||||||
|
addCategory(state, category) {
|
||||||
|
state.Categories.set(category.ID, category);
|
||||||
|
},
|
||||||
|
addCategoriesForMonth(state, {year, month, categories}) {
|
||||||
|
const yearMap = state.Months.get(year) || new Map<number, Map<string, Category>>();
|
||||||
|
state.Months.set(year, yearMap);
|
||||||
|
|
||||||
|
const monthMap = yearMap.get(month) || new Map<string, Category>();
|
||||||
|
yearMap.set(month, monthMap);
|
||||||
|
|
||||||
|
for (const category of categories){
|
||||||
|
monthMap.set(category.ID, category);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
setCurrentAccountID(state, accountid) {
|
||||||
|
state.CurrentAccountID = accountid;
|
||||||
|
},
|
||||||
|
setTransactions(state, transactions) {
|
||||||
|
state.Transactions = transactions;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
getters: {
|
||||||
|
Accounts(state) {
|
||||||
|
return state.Accounts.values();
|
||||||
|
},
|
||||||
|
Categories: (state) => (year : number, month : number) => {
|
||||||
|
const yearMap = state.Months.get(year);
|
||||||
|
return yearMap?.get(month)?.values();
|
||||||
|
},
|
||||||
|
CurrentAccount(state) : Account | undefined {
|
||||||
|
if (state.CurrentAccountID == null)
|
||||||
|
return undefined;
|
||||||
|
return state.Accounts.get(state.CurrentAccountID);
|
||||||
|
},
|
||||||
|
OnBudgetAccounts(state) {
|
||||||
|
return Array.from(state.Accounts.values()).filter(x => x.OnBudget);
|
||||||
|
},
|
||||||
|
OnBudgetAccountsBalance(state, getters){
|
||||||
|
return getters.OnBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0);
|
||||||
|
},
|
||||||
|
OffBudgetAccounts(state) {
|
||||||
|
return Array.from(state.Accounts.values()).filter(x => !x.OnBudget);
|
||||||
|
},
|
||||||
|
OffBudgetAccountsBalance(state, getters){
|
||||||
|
return getters.OffBudgetAccounts.reduce((prev, curr) => prev + Number(curr.Balance), 0);
|
||||||
|
},
|
||||||
|
Transactions(state) {
|
||||||
|
return (state.Transactions || []);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
actions: {
|
||||||
|
async [SET_CURRENT_ACCOUNT]({ state, commit, dispatch, getters }, { budgetid, accountid }) {
|
||||||
|
if (budgetid == null)
|
||||||
|
return
|
||||||
|
|
||||||
|
commit("setCurrentAccountID", accountid);
|
||||||
|
if (accountid == null)
|
||||||
|
return
|
||||||
|
|
||||||
|
commit(TITLE, getters.CurrentAccount.Name);
|
||||||
|
await dispatch(FETCH_ACCOUNT, accountid)
|
||||||
|
},
|
||||||
|
async [FETCH_ACCOUNT]({ state, commit, rootState }, accountid) {
|
||||||
|
const result = await fetch("/api/v1/account/" + accountid + "/transactions", {
|
||||||
|
headers: {
|
||||||
|
'Authorization': 'Bearer ' + rootState.Session.Token
|
||||||
|
}
|
||||||
|
});
|
||||||
|
const response = await result.json();
|
||||||
|
commit("setTransactions", response.Transactions);
|
||||||
|
},
|
||||||
|
async [FETCH_BUDGET]({ state, commit, dispatch, rootState }, budgetid) {
|
||||||
|
const result = await dispatch("GET", { path: "/budget/" + budgetid });
|
||||||
|
const response = await result.json();
|
||||||
|
for (const account of response.Accounts || []) {
|
||||||
|
commit("addAccount", account);
|
||||||
|
}
|
||||||
|
for (const category of response.Categories || []) {
|
||||||
|
commit("addCategory", category);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async [FETCH_MONTH_BUDGET]({state, commit, dispatch, rootState }, {budgetid, month, year}) {
|
||||||
|
const result = await dispatch("GET", { path: "/budget/" + budgetid + "/" + year + "/" + month});
|
||||||
|
const response = await result.json();
|
||||||
|
commit("addCategoriesForMonth", {year, month, categories: response.Categories})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
184
web/src/store/index.ts
Normal file
184
web/src/store/index.ts
Normal file
@ -0,0 +1,184 @@
|
|||||||
|
import { InjectionKey } from 'vue'
|
||||||
|
import { createStore, Store, createLogger } from 'vuex'
|
||||||
|
import { LOGIN_SUCCESS, LOGOUT, TITLE } from './mutation-types'
|
||||||
|
import { FETCH_ACCOUNT, FETCH_BUDGET, GET, REGISTER, IMPORT_YNAB, LOGIN, NEW_BUDGET, POST, SET_CURRENT_ACCOUNT, SET_CURRENT_BUDGET } from './action-types'
|
||||||
|
import { budgetStore } from './budget'
|
||||||
|
|
||||||
|
export interface State {
|
||||||
|
Session: {
|
||||||
|
Token?: string
|
||||||
|
User?: string
|
||||||
|
},
|
||||||
|
ShowMenu?: boolean,
|
||||||
|
ExpandMenu?: boolean,
|
||||||
|
Budgets: Map<string, Budget>,
|
||||||
|
CurrentBudgetID?: string,
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Budget {
|
||||||
|
ID: string
|
||||||
|
Name: string
|
||||||
|
AvailableBalance: number
|
||||||
|
}
|
||||||
|
|
||||||
|
export const key: InjectionKey<Store<State>> = Symbol()
|
||||||
|
|
||||||
|
export const store = createStore<State>({
|
||||||
|
state: {
|
||||||
|
Session: {
|
||||||
|
Token: undefined,
|
||||||
|
User: undefined
|
||||||
|
},
|
||||||
|
ShowMenu: undefined,
|
||||||
|
Budgets: new Map<string, Budget>(),
|
||||||
|
CurrentBudgetID: undefined,
|
||||||
|
},
|
||||||
|
mutations: {
|
||||||
|
deleteBudget(state: State, budgetid: string) {
|
||||||
|
state.Budgets.delete(budgetid)
|
||||||
|
},
|
||||||
|
toggleMenu(state) {
|
||||||
|
state.ShowMenu = !state.ShowMenu;
|
||||||
|
},
|
||||||
|
toggleMenuSize(state) {
|
||||||
|
state.ExpandMenu = !state.ExpandMenu;
|
||||||
|
},
|
||||||
|
initializeStore(state) {
|
||||||
|
const store = localStorage.getItem("store");
|
||||||
|
if (!store)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const restoredState = JSON.parse(store);
|
||||||
|
if (!restoredState)
|
||||||
|
return;
|
||||||
|
|
||||||
|
state.Session = restoredState.Session;
|
||||||
|
state.CurrentBudgetID = restoredState.CurrentBudgetID;
|
||||||
|
state.ShowMenu = restoredState.ShowMenu;
|
||||||
|
state.ExpandMenu = restoredState.ExpandMenu;
|
||||||
|
|
||||||
|
for (const budget of restoredState.Budgets || []) {
|
||||||
|
state.Budgets.set(budget[0], budget[1]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[TITLE](state, title) {
|
||||||
|
document.title = "Budgeteer - " + title;
|
||||||
|
},
|
||||||
|
[LOGIN_SUCCESS](state, result) {
|
||||||
|
state.Session = {
|
||||||
|
User: result.User,
|
||||||
|
Token: result.Token
|
||||||
|
};
|
||||||
|
for (const budget of result.Budgets) {
|
||||||
|
state.Budgets.set(budget.ID, budget)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
addBudget(state, budget) {
|
||||||
|
state.Budgets.set(budget.ID, budget);
|
||||||
|
},
|
||||||
|
[LOGOUT](state) {
|
||||||
|
state.Session = { Token: undefined, User: undefined };
|
||||||
|
state.Budgets.clear();
|
||||||
|
},
|
||||||
|
setCurrentBudgetID(state, budgetid) {
|
||||||
|
state.CurrentBudgetID = budgetid;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
actions: {
|
||||||
|
[LOGIN]({ state, commit }, login) {
|
||||||
|
return fetch("/api/v1/user/login", { method: "POST", body: JSON.stringify(login) })
|
||||||
|
.then(x => x.json())
|
||||||
|
.then(x => commit(LOGIN_SUCCESS, x))
|
||||||
|
},
|
||||||
|
[REGISTER]({ state, commit }, login) {
|
||||||
|
return fetch("/api/v1/user/register", { method: "POST", body: JSON.stringify(login) })
|
||||||
|
.then(x => x.json())
|
||||||
|
.then(x => commit(LOGIN_SUCCESS, x))
|
||||||
|
},
|
||||||
|
[IMPORT_YNAB]({ getters, dispatch }, formData) {
|
||||||
|
return dispatch("POST", { path: "/budget/" + getters.CurrentBudget.ID + "/import/ynab", body: formData });
|
||||||
|
},
|
||||||
|
[GET]({ getters }, { path }) {
|
||||||
|
return fetch("/api/v1" + path, {
|
||||||
|
headers: getters.AuthHeaders,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
[POST]({ getters }, { path, body }) {
|
||||||
|
return fetch("/api/v1" + path, {
|
||||||
|
method: "POST",
|
||||||
|
headers: getters.AuthHeaders,
|
||||||
|
body: body,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
/*async fetchDashboard ({state, commit, rootState}) {
|
||||||
|
const response = await fetch("/api/v1/dashboard", {
|
||||||
|
headers: {
|
||||||
|
'Authorization': 'Bearer ' + rootState.Session.Token
|
||||||
|
}
|
||||||
|
})
|
||||||
|
const data = await response.json();
|
||||||
|
commit("setBudgets", data.Budgets);
|
||||||
|
},*/
|
||||||
|
async [NEW_BUDGET]({ state, commit, dispatch, rootState }, budgetName) {
|
||||||
|
const result = await dispatch("POST", {
|
||||||
|
path: "/budget/new",
|
||||||
|
body: JSON.stringify({ name: budgetName })
|
||||||
|
});
|
||||||
|
const response = await result.json();
|
||||||
|
commit("addBudget", response)
|
||||||
|
},
|
||||||
|
async [SET_CURRENT_BUDGET]({ state, commit, dispatch, rootState }, budgetid) {
|
||||||
|
commit("setCurrentBudgetID", budgetid);
|
||||||
|
|
||||||
|
if (budgetid == null)
|
||||||
|
return
|
||||||
|
|
||||||
|
await dispatch(FETCH_BUDGET, budgetid)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
getters: {
|
||||||
|
Budgets(state) {
|
||||||
|
return state.Budgets.values();
|
||||||
|
},
|
||||||
|
AuthHeaders(state) {
|
||||||
|
return {
|
||||||
|
'Authorization': 'Bearer ' + state.Session.Token
|
||||||
|
}
|
||||||
|
},
|
||||||
|
CurrentBudget(state) : Budget | undefined {
|
||||||
|
if (state.CurrentBudgetID == null)
|
||||||
|
return undefined;
|
||||||
|
|
||||||
|
return state.Budgets.get(state.CurrentBudgetID);
|
||||||
|
},
|
||||||
|
CurrentBudgetID(state) : string | undefined {
|
||||||
|
return state.CurrentBudgetID;
|
||||||
|
},
|
||||||
|
CurrentBudgetName(state) : string {
|
||||||
|
if (state.CurrentBudgetID == null)
|
||||||
|
return "";
|
||||||
|
|
||||||
|
const currentBudget = state.Budgets.get(state.CurrentBudgetID);
|
||||||
|
if(currentBudget != undefined)
|
||||||
|
return currentBudget.Name;
|
||||||
|
return "";
|
||||||
|
},
|
||||||
|
},
|
||||||
|
plugins: [createLogger()],
|
||||||
|
modules: {
|
||||||
|
budget: budgetStore
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
store.subscribe((mutation, state) => {
|
||||||
|
let persistedState = {
|
||||||
|
Session: state.Session,
|
||||||
|
Budgets: [...state.Budgets],
|
||||||
|
// Accounts: [...state.Accounts],
|
||||||
|
CurrentBudgetID: state.CurrentBudgetID,
|
||||||
|
//CurrentAccountID: state.CurrentAccountID,
|
||||||
|
ExpandMenu: state.ExpandMenu,
|
||||||
|
ShowMenu: state.ShowMenu
|
||||||
|
}
|
||||||
|
localStorage.setItem("store", JSON.stringify(persistedState));
|
||||||
|
})
|
3
web/src/store/mutation-types.ts
Normal file
3
web/src/store/mutation-types.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
export const LOGIN_SUCCESS = '✔ Logged in';
|
||||||
|
export const LOGOUT = 'Log out';
|
||||||
|
export const TITLE = 'Update title';
|
2
web/src/styles/_variables.scss
Normal file
2
web/src/styles/_variables.scss
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
// Place SASS variable overrides here
|
||||||
|
// $font-size-root: 18px;
|
@ -1,935 +0,0 @@
|
|||||||
# Apache Server Configs v2.11.0 | MIT License
|
|
||||||
# https://github.com/h5bp/server-configs-apache
|
|
||||||
|
|
||||||
# (!) Using `.htaccess` files slows down Apache, therefore, if you have
|
|
||||||
# access to the main server configuration file (which is usually called
|
|
||||||
# `httpd.conf`), you should add this logic there.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/howto/htaccess.html.
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # CROSS-ORIGIN #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Cross-origin requests |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Allow cross-origin requests.
|
|
||||||
#
|
|
||||||
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
|
|
||||||
# http://enable-cors.org/
|
|
||||||
# http://www.w3.org/TR/cors/
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header set Access-Control-Allow-Origin "*"
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Cross-origin images |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Send the CORS header for images when browsers request it.
|
|
||||||
#
|
|
||||||
# https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image
|
|
||||||
# https://blog.chromium.org/2011/07/using-cross-domain-images-in-webgl-and.html
|
|
||||||
|
|
||||||
<IfModule mod_setenvif.c>
|
|
||||||
<IfModule mod_headers.c>
|
|
||||||
<FilesMatch "\.(bmp|cur|gif|ico|jpe?g|png|svgz?|webp)$">
|
|
||||||
SetEnvIf Origin ":" IS_CORS
|
|
||||||
Header set Access-Control-Allow-Origin "*" env=IS_CORS
|
|
||||||
</FilesMatch>
|
|
||||||
</IfModule>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Cross-origin web fonts |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Allow cross-origin access to web fonts.
|
|
||||||
|
|
||||||
<IfModule mod_headers.c>
|
|
||||||
<FilesMatch "\.(eot|otf|tt[cf]|woff2?)$">
|
|
||||||
Header set Access-Control-Allow-Origin "*"
|
|
||||||
</FilesMatch>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Cross-origin resource timing |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Allow cross-origin access to the timing information for all resources.
|
|
||||||
#
|
|
||||||
# If a resource isn't served with a `Timing-Allow-Origin` header that
|
|
||||||
# would allow its timing information to be shared with the document,
|
|
||||||
# some of the attributes of the `PerformanceResourceTiming` object will
|
|
||||||
# be set to zero.
|
|
||||||
#
|
|
||||||
# http://www.w3.org/TR/resource-timing/
|
|
||||||
# http://www.stevesouders.com/blog/2014/08/21/resource-timing-practical-tips/
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header set Timing-Allow-Origin: "*"
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # ERRORS #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Custom error messages/pages |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Customize what Apache returns to the client in case of an error.
|
|
||||||
# https://httpd.apache.org/docs/current/mod/core.html#errordocument
|
|
||||||
|
|
||||||
ErrorDocument 404 /404.html
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Error prevention |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Disable the pattern matching based on filenames.
|
|
||||||
#
|
|
||||||
# This setting prevents Apache from returning a 404 error as the result
|
|
||||||
# of a rewrite when the directory with the same name does not exist.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/content-negotiation.html#multiviews
|
|
||||||
|
|
||||||
Options -MultiViews
|
|
||||||
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # INTERNET EXPLORER #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Document modes |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Force Internet Explorer 8/9/10 to render pages in the highest mode
|
|
||||||
# available in the various cases when it may not.
|
|
||||||
#
|
|
||||||
# https://hsivonen.fi/doctype/#ie8
|
|
||||||
#
|
|
||||||
# (!) Starting with Internet Explorer 11, document modes are deprecated.
|
|
||||||
# If your business still relies on older web apps and services that were
|
|
||||||
# designed for older versions of Internet Explorer, you might want to
|
|
||||||
# consider enabling `Enterprise Mode` throughout your company.
|
|
||||||
#
|
|
||||||
# http://msdn.microsoft.com/en-us/library/ie/bg182625.aspx#docmode
|
|
||||||
# http://blogs.msdn.com/b/ie/archive/2014/04/02/stay-up-to-date-with-enterprise-mode-for-internet-explorer-11.aspx
|
|
||||||
|
|
||||||
<IfModule mod_headers.c>
|
|
||||||
Header set X-UA-Compatible "IE=edge"
|
|
||||||
# `mod_headers` cannot match based on the content-type, however,
|
|
||||||
# the `X-UA-Compatible` response header should be send only for
|
|
||||||
# HTML documents and not for the other resources.
|
|
||||||
<FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|woff2?|xloc|xml|xpi)$">
|
|
||||||
Header unset X-UA-Compatible
|
|
||||||
</FilesMatch>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Iframes cookies |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Allow cookies to be set from iframes in Internet Explorer.
|
|
||||||
#
|
|
||||||
# http://msdn.microsoft.com/en-us/library/ms537343.aspx
|
|
||||||
# http://www.w3.org/TR/2000/CR-P3P-20001215/
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header set P3P "policyref=\"/w3c/p3p.xml\", CP=\"IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT\""
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # MEDIA TYPES AND CHARACTER ENCODINGS #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Media types |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Serve resources with the proper media types (f.k.a. MIME types).
|
|
||||||
#
|
|
||||||
# https://www.iana.org/assignments/media-types/media-types.xhtml
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_mime.html#addtype
|
|
||||||
|
|
||||||
<IfModule mod_mime.c>
|
|
||||||
|
|
||||||
# Data interchange
|
|
||||||
|
|
||||||
AddType application/json json map topojson
|
|
||||||
AddType application/ld+json jsonld
|
|
||||||
AddType application/vnd.geo+json geojson
|
|
||||||
AddType application/xml atom rdf rss xml
|
|
||||||
|
|
||||||
|
|
||||||
# JavaScript
|
|
||||||
|
|
||||||
# Normalize to standard type.
|
|
||||||
# https://tools.ietf.org/html/rfc4329#section-7.2
|
|
||||||
|
|
||||||
AddType application/javascript js
|
|
||||||
|
|
||||||
|
|
||||||
# Manifest files
|
|
||||||
|
|
||||||
# If you are providing a web application manifest file (see
|
|
||||||
# the specification: https://w3c.github.io/manifest/), it is
|
|
||||||
# recommended that you serve it with the `application/manifest+json`
|
|
||||||
# media type.
|
|
||||||
#
|
|
||||||
# Because the web application manifest file doesn't have its
|
|
||||||
# own unique file extension, you can set its media type either
|
|
||||||
# by matching:
|
|
||||||
#
|
|
||||||
# 1) the exact location of the file (this can be done using a
|
|
||||||
# directive such as `<Location>`, but it will NOT work in
|
|
||||||
# the `.htaccess` file, so you will have to do it in the main
|
|
||||||
# server configuration file or inside of a `<VirtualHost>`
|
|
||||||
# container)
|
|
||||||
#
|
|
||||||
# e.g.:
|
|
||||||
#
|
|
||||||
# <Location "/.well-known/manifest.json">
|
|
||||||
# AddType application/manifest+json json
|
|
||||||
# </Location>
|
|
||||||
#
|
|
||||||
# 2) the filename (this can be problematic as you will need to
|
|
||||||
# ensure that you don't have any other file with the same name
|
|
||||||
# as the one you gave to your web application manifest file)
|
|
||||||
#
|
|
||||||
# e.g.:
|
|
||||||
#
|
|
||||||
# <Files "manifest.json">
|
|
||||||
# AddType application/manifest+json json
|
|
||||||
# </Files>
|
|
||||||
|
|
||||||
AddType application/x-web-app-manifest+json webapp
|
|
||||||
AddType text/cache-manifest appcache manifest
|
|
||||||
|
|
||||||
|
|
||||||
# Media files
|
|
||||||
|
|
||||||
AddType audio/mp4 f4a f4b m4a
|
|
||||||
AddType audio/ogg oga ogg opus
|
|
||||||
AddType image/bmp bmp
|
|
||||||
AddType image/webp webp
|
|
||||||
AddType video/mp4 f4v f4p m4v mp4
|
|
||||||
AddType video/ogg ogv
|
|
||||||
AddType video/webm webm
|
|
||||||
AddType video/x-flv flv
|
|
||||||
AddType image/svg+xml svg svgz
|
|
||||||
|
|
||||||
# Serving `.ico` image files with a different media type
|
|
||||||
# prevents Internet Explorer from displaying then as images:
|
|
||||||
# https://github.com/h5bp/html5-boilerplate/commit/37b5fec090d00f38de64b591bcddcb205aadf8ee
|
|
||||||
|
|
||||||
AddType image/x-icon cur ico
|
|
||||||
|
|
||||||
|
|
||||||
# Web fonts
|
|
||||||
|
|
||||||
AddType application/font-woff woff
|
|
||||||
AddType application/font-woff2 woff2
|
|
||||||
AddType application/vnd.ms-fontobject eot
|
|
||||||
|
|
||||||
# Browsers usually ignore the font media types and simply sniff
|
|
||||||
# the bytes to figure out the font type.
|
|
||||||
# https://mimesniff.spec.whatwg.org/#matching-a-font-type-pattern
|
|
||||||
#
|
|
||||||
# However, Blink and WebKit based browsers will show a warning
|
|
||||||
# in the console if the following font types are served with any
|
|
||||||
# other media types.
|
|
||||||
|
|
||||||
AddType application/x-font-ttf ttc ttf
|
|
||||||
AddType font/opentype otf
|
|
||||||
|
|
||||||
|
|
||||||
# Other
|
|
||||||
|
|
||||||
AddType application/octet-stream safariextz
|
|
||||||
AddType application/x-bb-appworld bbaw
|
|
||||||
AddType application/x-chrome-extension crx
|
|
||||||
AddType application/x-opera-extension oex
|
|
||||||
AddType application/x-xpinstall xpi
|
|
||||||
AddType text/vcard vcard vcf
|
|
||||||
AddType text/vnd.rim.location.xloc xloc
|
|
||||||
AddType text/vtt vtt
|
|
||||||
AddType text/x-component htc
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Character encodings |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Serve all resources labeled as `text/html` or `text/plain`
|
|
||||||
# with the media type `charset` parameter set to `UTF-8`.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/core.html#adddefaultcharset
|
|
||||||
|
|
||||||
AddDefaultCharset utf-8
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Serve the following file types with the media type `charset`
|
|
||||||
# parameter set to `UTF-8`.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_mime.html#addcharset
|
|
||||||
|
|
||||||
<IfModule mod_mime.c>
|
|
||||||
AddCharset utf-8 .atom \
|
|
||||||
.bbaw \
|
|
||||||
.css \
|
|
||||||
.geojson \
|
|
||||||
.js \
|
|
||||||
.json \
|
|
||||||
.jsonld \
|
|
||||||
.rdf \
|
|
||||||
.rss \
|
|
||||||
.topojson \
|
|
||||||
.vtt \
|
|
||||||
.webapp \
|
|
||||||
.xloc \
|
|
||||||
.xml
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # REWRITES #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Rewrite engine |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# (1) Turn on the rewrite engine (this is necessary in order for
|
|
||||||
# the `RewriteRule` directives to work).
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_rewrite.html#RewriteEngine
|
|
||||||
#
|
|
||||||
# (2) Enable the `FollowSymLinks` option if it isn't already.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/core.html#options
|
|
||||||
#
|
|
||||||
# (3) If your web host doesn't allow the `FollowSymlinks` option,
|
|
||||||
# you need to comment it out or remove it, and then uncomment
|
|
||||||
# the `Options +SymLinksIfOwnerMatch` line (4), but be aware
|
|
||||||
# of the performance impact.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/misc/perf-tuning.html#symlinks
|
|
||||||
#
|
|
||||||
# (4) Some cloud hosting services will require you set `RewriteBase`.
|
|
||||||
#
|
|
||||||
# http://www.rackspace.com/knowledge_center/frequently-asked-question/why-is-modrewrite-not-working-on-my-site
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
|
|
||||||
#
|
|
||||||
# (5) Depending on how your server is set up, you may also need to
|
|
||||||
# use the `RewriteOptions` directive to enable some options for
|
|
||||||
# the rewrite engine.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewriteoptions
|
|
||||||
|
|
||||||
<IfModule mod_rewrite.c>
|
|
||||||
|
|
||||||
# (1)
|
|
||||||
RewriteEngine On
|
|
||||||
|
|
||||||
# (2)
|
|
||||||
Options +FollowSymlinks
|
|
||||||
|
|
||||||
# (3)
|
|
||||||
# Options +SymLinksIfOwnerMatch
|
|
||||||
|
|
||||||
# (4)
|
|
||||||
# RewriteBase /
|
|
||||||
|
|
||||||
# (5)
|
|
||||||
# RewriteOptions <options>
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Forcing `https://` |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Redirect from the `http://` to the `https://` version of the URL.
|
|
||||||
# https://wiki.apache.org/httpd/RewriteHTTPToHTTPS
|
|
||||||
|
|
||||||
# <IfModule mod_rewrite.c>
|
|
||||||
# RewriteEngine On
|
|
||||||
# RewriteCond %{HTTPS} !=on
|
|
||||||
# RewriteRule ^(.*)$ https://%{HTTP_HOST}/$1 [R=301,L]
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Suppressing / Forcing the `www.` at the beginning of URLs |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# The same content should never be available under two different
|
|
||||||
# URLs, especially not with and without `www.` at the beginning.
|
|
||||||
# This can cause SEO problems (duplicate content), and therefore,
|
|
||||||
# you should choose one of the alternatives and redirect the other
|
|
||||||
# one.
|
|
||||||
#
|
|
||||||
# By default `Option 1` (no `www.`) is activated.
|
|
||||||
# http://no-www.org/faq.php?q=class_b
|
|
||||||
#
|
|
||||||
# If you would prefer to use `Option 2`, just comment out all the
|
|
||||||
# lines from `Option 1` and uncomment the ones from `Option 2`.
|
|
||||||
#
|
|
||||||
# (!) NEVER USE BOTH RULES AT THE SAME TIME!
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Option 1: rewrite www.example.com → example.com
|
|
||||||
|
|
||||||
<IfModule mod_rewrite.c>
|
|
||||||
RewriteEngine On
|
|
||||||
RewriteCond %{HTTPS} !=on
|
|
||||||
RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
|
|
||||||
RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Option 2: rewrite example.com → www.example.com
|
|
||||||
#
|
|
||||||
# Be aware that the following might not be a good idea if you use "real"
|
|
||||||
# subdomains for certain parts of your website.
|
|
||||||
|
|
||||||
# <IfModule mod_rewrite.c>
|
|
||||||
# RewriteEngine On
|
|
||||||
# RewriteCond %{HTTPS} !=on
|
|
||||||
# RewriteCond %{HTTP_HOST} !^www\. [NC]
|
|
||||||
# RewriteCond %{SERVER_ADDR} !=127.0.0.1
|
|
||||||
# RewriteCond %{SERVER_ADDR} !=::1
|
|
||||||
# RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # SECURITY #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Clickjacking |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Protect website against clickjacking.
|
|
||||||
#
|
|
||||||
# The example below sends the `X-Frame-Options` response header with
|
|
||||||
# the value `DENY`, informing browsers not to display the content of
|
|
||||||
# the web page in any frame.
|
|
||||||
#
|
|
||||||
# This might not be the best setting for everyone. You should read
|
|
||||||
# about the other two possible values the `X-Frame-Options` header
|
|
||||||
# field can have: `SAMEORIGIN` and `ALLOW-FROM`.
|
|
||||||
# https://tools.ietf.org/html/rfc7034#section-2.1.
|
|
||||||
#
|
|
||||||
# Keep in mind that while you could send the `X-Frame-Options` header
|
|
||||||
# for all of your website’s pages, this has the potential downside that
|
|
||||||
# it forbids even non-malicious framing of your content (e.g.: when
|
|
||||||
# users visit your website using a Google Image Search results page).
|
|
||||||
#
|
|
||||||
# Nonetheless, you should ensure that you send the `X-Frame-Options`
|
|
||||||
# header for all pages that allow a user to make a state changing
|
|
||||||
# operation (e.g: pages that contain one-click purchase links, checkout
|
|
||||||
# or bank-transfer confirmation pages, pages that make permanent
|
|
||||||
# configuration changes, etc.).
|
|
||||||
#
|
|
||||||
# Sending the `X-Frame-Options` header can also protect your website
|
|
||||||
# against more than just clickjacking attacks:
|
|
||||||
# https://cure53.de/xfo-clickjacking.pdf.
|
|
||||||
#
|
|
||||||
# https://tools.ietf.org/html/rfc7034
|
|
||||||
# http://blogs.msdn.com/b/ieinternals/archive/2010/03/30/combating-clickjacking-with-x-frame-options.aspx
|
|
||||||
# https://www.owasp.org/index.php/Clickjacking
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header set X-Frame-Options "DENY"
|
|
||||||
# # `mod_headers` cannot match based on the content-type, however,
|
|
||||||
# # the `X-Frame-Options` response header should be send only for
|
|
||||||
# # HTML documents and not for the other resources.
|
|
||||||
# <FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|woff2?|xloc|xml|xpi)$">
|
|
||||||
# Header unset X-Frame-Options
|
|
||||||
# </FilesMatch>
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Content Security Policy (CSP) |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Mitigate the risk of cross-site scripting and other content-injection
|
|
||||||
# attacks.
|
|
||||||
#
|
|
||||||
# This can be done by setting a `Content Security Policy` which
|
|
||||||
# whitelists trusted sources of content for your website.
|
|
||||||
#
|
|
||||||
# The example header below allows ONLY scripts that are loaded from the
|
|
||||||
# current website's origin (no inline scripts, no CDN, etc). That almost
|
|
||||||
# certainly won't work as-is for your website!
|
|
||||||
#
|
|
||||||
# For more details on how to craft a reasonable policy for your website,
|
|
||||||
# read: http://www.html5rocks.com/en/tutorials/security/content-security-policy/
|
|
||||||
# (or the specification: http://www.w3.org/TR/CSP11/). Also, to make
|
|
||||||
# things easier, you can use an online CSP header generator such as:
|
|
||||||
# http://cspisawesome.com/.
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header set Content-Security-Policy "script-src 'self'; object-src 'self'"
|
|
||||||
# # `mod_headers` cannot match based on the content-type, however,
|
|
||||||
# # the `Content-Security-Policy` response header should be send
|
|
||||||
# # only for HTML documents and not for the other resources.
|
|
||||||
# <FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|woff2?|xloc|xml|xpi)$">
|
|
||||||
# Header unset Content-Security-Policy
|
|
||||||
# </FilesMatch>
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | File access |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Block access to directories without a default document.
|
|
||||||
#
|
|
||||||
# You should leave the following uncommented, as you shouldn't allow
|
|
||||||
# anyone to surf through every directory on your server (which may
|
|
||||||
# includes rather private places such as the CMS's directories).
|
|
||||||
|
|
||||||
<IfModule mod_autoindex.c>
|
|
||||||
Options -Indexes
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Block access to all hidden files and directories with the exception of
|
|
||||||
# the visible content from within the `/.well-known/` hidden directory.
|
|
||||||
#
|
|
||||||
# These types of files usually contain user preferences or the preserved
|
|
||||||
# state of an utility, and can include rather private places like, for
|
|
||||||
# example, the `.git` or `.svn` directories.
|
|
||||||
#
|
|
||||||
# The `/.well-known/` directory represents the standard (RFC 5785) path
|
|
||||||
# prefix for "well-known locations" (e.g.: `/.well-known/manifest.json`,
|
|
||||||
# `/.well-known/keybase.txt`), and therefore, access to its visible
|
|
||||||
# content should not be blocked.
|
|
||||||
#
|
|
||||||
# https://www.mnot.net/blog/2010/04/07/well-known
|
|
||||||
# https://tools.ietf.org/html/rfc5785
|
|
||||||
|
|
||||||
<IfModule mod_rewrite.c>
|
|
||||||
RewriteEngine On
|
|
||||||
RewriteCond %{REQUEST_URI} "!(^|/)\.well-known/([^./]+./?)+$" [NC]
|
|
||||||
RewriteCond %{SCRIPT_FILENAME} -d [OR]
|
|
||||||
RewriteCond %{SCRIPT_FILENAME} -f
|
|
||||||
RewriteRule "(^|/)\." - [F]
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Block access to files that can expose sensitive information.
|
|
||||||
#
|
|
||||||
# By default, block access to backup and source files that may be
|
|
||||||
# left by some text editors and can pose a security risk when anyone
|
|
||||||
# has access to them.
|
|
||||||
#
|
|
||||||
# http://feross.org/cmsploit/
|
|
||||||
#
|
|
||||||
# (!) Update the `<FilesMatch>` regular expression from below to
|
|
||||||
# include any files that might end up on your production server and
|
|
||||||
# can expose sensitive information about your website. These files may
|
|
||||||
# include: configuration files, files that contain metadata about the
|
|
||||||
# project (e.g.: project dependencies), build scripts, etc..
|
|
||||||
|
|
||||||
<FilesMatch "(^#.*#|\.(bak|conf|dist|fla|in[ci]|log|psd|sh|sql|sw[op])|~)$">
|
|
||||||
|
|
||||||
# Apache < 2.3
|
|
||||||
<IfModule !mod_authz_core.c>
|
|
||||||
Order allow,deny
|
|
||||||
Deny from all
|
|
||||||
Satisfy All
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# Apache ≥ 2.3
|
|
||||||
<IfModule mod_authz_core.c>
|
|
||||||
Require all denied
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
</FilesMatch>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | HTTP Strict Transport Security (HSTS) |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Force client-side SSL redirection.
|
|
||||||
#
|
|
||||||
# If a user types `example.com` in their browser, even if the server
|
|
||||||
# redirects them to the secure version of the website, that still leaves
|
|
||||||
# a window of opportunity (the initial HTTP connection) for an attacker
|
|
||||||
# to downgrade or redirect the request.
|
|
||||||
#
|
|
||||||
# The following header ensures that browser will ONLY connect to your
|
|
||||||
# server via HTTPS, regardless of what the users type in the browser's
|
|
||||||
# address bar.
|
|
||||||
#
|
|
||||||
# (!) Remove the `includeSubDomains` optional directive if the website's
|
|
||||||
# subdomains are not using HTTPS.
|
|
||||||
#
|
|
||||||
# http://www.html5rocks.com/en/tutorials/security/transport-layer-security/
|
|
||||||
# https://tools.ietf.org/html/draft-ietf-websec-strict-transport-sec-14#section-6.1
|
|
||||||
# http://blogs.msdn.com/b/ieinternals/archive/2014/08/18/hsts-strict-transport-security-attacks-mitigations-deployment-https.aspx
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header set Strict-Transport-Security "max-age=16070400; includeSubDomains"
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Reducing MIME type security risks |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Prevent some browsers from MIME-sniffing the response.
|
|
||||||
#
|
|
||||||
# This reduces exposure to drive-by download attacks and cross-origin
|
|
||||||
# data leaks, and should be left uncommented, especially if the server
|
|
||||||
# is serving user-uploaded content or content that could potentially be
|
|
||||||
# treated as executable by the browser.
|
|
||||||
#
|
|
||||||
# http://www.slideshare.net/hasegawayosuke/owasp-hasegawa
|
|
||||||
# http://blogs.msdn.com/b/ie/archive/2008/07/02/ie8-security-part-v-comprehensive-protection.aspx
|
|
||||||
# http://msdn.microsoft.com/en-us/library/ie/gg622941.aspx
|
|
||||||
# https://mimesniff.spec.whatwg.org/
|
|
||||||
|
|
||||||
<IfModule mod_headers.c>
|
|
||||||
Header set X-Content-Type-Options "nosniff"
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Reflected Cross-Site Scripting (XSS) attacks |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# (1) Try to re-enable the cross-site scripting (XSS) filter built
|
|
||||||
# into most web browsers.
|
|
||||||
#
|
|
||||||
# The filter is usually enabled by default, but in some cases it
|
|
||||||
# may be disabled by the user. However, in Internet Explorer for
|
|
||||||
# example, it can be re-enabled just by sending the
|
|
||||||
# `X-XSS-Protection` header with the value of `1`.
|
|
||||||
#
|
|
||||||
# (2) Prevent web browsers from rendering the web page if a potential
|
|
||||||
# reflected (a.k.a non-persistent) XSS attack is detected by the
|
|
||||||
# filter.
|
|
||||||
#
|
|
||||||
# By default, if the filter is enabled and browsers detect a
|
|
||||||
# reflected XSS attack, they will attempt to block the attack
|
|
||||||
# by making the smallest possible modifications to the returned
|
|
||||||
# web page.
|
|
||||||
#
|
|
||||||
# Unfortunately, in some browsers (e.g.: Internet Explorer),
|
|
||||||
# this default behavior may allow the XSS filter to be exploited,
|
|
||||||
# thereby, it's better to inform browsers to prevent the rendering
|
|
||||||
# of the page altogether, instead of attempting to modify it.
|
|
||||||
#
|
|
||||||
# http://hackademix.net/2009/11/21/ies-xss-filter-creates-xss-vulnerabilities
|
|
||||||
#
|
|
||||||
# (!) Do not rely on the XSS filter to prevent XSS attacks! Ensure that
|
|
||||||
# you are taking all possible measures to prevent XSS attacks, the
|
|
||||||
# most obvious being: validating and sanitizing your website's inputs.
|
|
||||||
#
|
|
||||||
# http://blogs.msdn.com/b/ie/archive/2008/07/02/ie8-security-part-iv-the-xss-filter.aspx
|
|
||||||
# http://blogs.msdn.com/b/ieinternals/archive/2011/01/31/controlling-the-internet-explorer-xss-filter-with-the-x-xss-protection-http-header.aspx
|
|
||||||
# https://www.owasp.org/index.php/Cross-site_Scripting_%28XSS%29
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# # (1) (2)
|
|
||||||
# Header set X-XSS-Protection "1; mode=block"
|
|
||||||
# # `mod_headers` cannot match based on the content-type, however,
|
|
||||||
# # the `X-XSS-Protection` response header should be send only for
|
|
||||||
# # HTML documents and not for the other resources.
|
|
||||||
# <FilesMatch "\.(appcache|atom|bbaw|bmp|crx|css|cur|eot|f4[abpv]|flv|geojson|gif|htc|ico|jpe?g|js|json(ld)?|m4[av]|manifest|map|mp4|oex|og[agv]|opus|otf|pdf|png|rdf|rss|safariextz|svgz?|swf|topojson|tt[cf]|txt|vcard|vcf|vtt|webapp|web[mp]|woff2?|xloc|xml|xpi)$">
|
|
||||||
# Header unset X-XSS-Protection
|
|
||||||
# </FilesMatch>
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Server software information |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Prevent Apache from sending in the `Server` response header its
|
|
||||||
# exact version number, the description of the generic OS-type or
|
|
||||||
# information about its compiled-in modules.
|
|
||||||
#
|
|
||||||
# (!) The `ServerTokens` directive will only work in the main server
|
|
||||||
# configuration file, so don't try to enable it in the `.htaccess` file!
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/core.html#servertokens
|
|
||||||
|
|
||||||
# ServerTokens Prod
|
|
||||||
|
|
||||||
|
|
||||||
# ######################################################################
|
|
||||||
# # WEB PERFORMANCE #
|
|
||||||
# ######################################################################
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Compression |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
<IfModule mod_deflate.c>
|
|
||||||
|
|
||||||
# Force compression for mangled `Accept-Encoding` request headers
|
|
||||||
# https://developer.yahoo.com/blogs/ydn/pushing-beyond-gzipping-25601.html
|
|
||||||
|
|
||||||
<IfModule mod_setenvif.c>
|
|
||||||
<IfModule mod_headers.c>
|
|
||||||
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
|
|
||||||
RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
|
|
||||||
</IfModule>
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Compress all output labeled with one of the following media types.
|
|
||||||
#
|
|
||||||
# (!) For Apache versions below version 2.3.7 you don't need to
|
|
||||||
# enable `mod_filter` and can remove the `<IfModule mod_filter.c>`
|
|
||||||
# and `</IfModule>` lines as `AddOutputFilterByType` is still in
|
|
||||||
# the core directives.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_filter.html#addoutputfilterbytype
|
|
||||||
|
|
||||||
<IfModule mod_filter.c>
|
|
||||||
AddOutputFilterByType DEFLATE "application/atom+xml" \
|
|
||||||
"application/javascript" \
|
|
||||||
"application/json" \
|
|
||||||
"application/ld+json" \
|
|
||||||
"application/manifest+json" \
|
|
||||||
"application/rdf+xml" \
|
|
||||||
"application/rss+xml" \
|
|
||||||
"application/schema+json" \
|
|
||||||
"application/vnd.geo+json" \
|
|
||||||
"application/vnd.ms-fontobject" \
|
|
||||||
"application/x-font-ttf" \
|
|
||||||
"application/x-javascript" \
|
|
||||||
"application/x-web-app-manifest+json" \
|
|
||||||
"application/xhtml+xml" \
|
|
||||||
"application/xml" \
|
|
||||||
"font/eot" \
|
|
||||||
"font/opentype" \
|
|
||||||
"image/bmp" \
|
|
||||||
"image/svg+xml" \
|
|
||||||
"image/vnd.microsoft.icon" \
|
|
||||||
"image/x-icon" \
|
|
||||||
"text/cache-manifest" \
|
|
||||||
"text/css" \
|
|
||||||
"text/html" \
|
|
||||||
"text/javascript" \
|
|
||||||
"text/plain" \
|
|
||||||
"text/vcard" \
|
|
||||||
"text/vnd.rim.location.xloc" \
|
|
||||||
"text/vtt" \
|
|
||||||
"text/x-component" \
|
|
||||||
"text/x-cross-domain-policy" \
|
|
||||||
"text/xml"
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
||||||
|
|
||||||
# Map the following filename extensions to the specified
|
|
||||||
# encoding type in order to make Apache serve the file types
|
|
||||||
# with the appropriate `Content-Encoding` response header
|
|
||||||
# (do note that this will NOT make Apache compress them!).
|
|
||||||
#
|
|
||||||
# If these files types would be served without an appropriate
|
|
||||||
# `Content-Enable` response header, client applications (e.g.:
|
|
||||||
# browsers) wouldn't know that they first need to uncompress
|
|
||||||
# the response, and thus, wouldn't be able to understand the
|
|
||||||
# content.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_mime.html#addencoding
|
|
||||||
|
|
||||||
<IfModule mod_mime.c>
|
|
||||||
AddEncoding gzip svgz
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Content transformation |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Prevent intermediate caches or proxies (e.g.: such as the ones
|
|
||||||
# used by mobile network providers) from modifying the website's
|
|
||||||
# content.
|
|
||||||
#
|
|
||||||
# https://tools.ietf.org/html/rfc2616#section-14.9.5
|
|
||||||
#
|
|
||||||
# (!) If you are using `mod_pagespeed`, please note that setting
|
|
||||||
# the `Cache-Control: no-transform` response header will prevent
|
|
||||||
# `PageSpeed` from rewriting `HTML` files, and, if the
|
|
||||||
# `ModPagespeedDisableRewriteOnNoTransform` directive isn't set
|
|
||||||
# to `off`, also from rewriting other resources.
|
|
||||||
#
|
|
||||||
# https://developers.google.com/speed/pagespeed/module/configuration#notransform
|
|
||||||
|
|
||||||
# <IfModule mod_headers.c>
|
|
||||||
# Header merge Cache-Control "no-transform"
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | ETags |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Remove `ETags` as resources are sent with far-future expires headers.
|
|
||||||
#
|
|
||||||
# https://developer.yahoo.com/performance/rules.html#etags
|
|
||||||
# https://tools.ietf.org/html/rfc7232#section-2.3
|
|
||||||
|
|
||||||
# `FileETag None` doesn't work in all cases.
|
|
||||||
<IfModule mod_headers.c>
|
|
||||||
Header unset ETag
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
FileETag None
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Expires headers |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Serve resources with far-future expires headers.
|
|
||||||
#
|
|
||||||
# (!) If you don't control versioning with filename-based
|
|
||||||
# cache busting, you should consider lowering the cache times
|
|
||||||
# to something like one week.
|
|
||||||
#
|
|
||||||
# https://httpd.apache.org/docs/current/mod/mod_expires.html
|
|
||||||
|
|
||||||
<IfModule mod_expires.c>
|
|
||||||
|
|
||||||
ExpiresActive on
|
|
||||||
ExpiresDefault "access plus 1 month"
|
|
||||||
|
|
||||||
# CSS
|
|
||||||
ExpiresByType text/css "access plus 1 year"
|
|
||||||
|
|
||||||
# Data interchange
|
|
||||||
ExpiresByType application/atom+xml "access plus 1 hour"
|
|
||||||
ExpiresByType application/rdf+xml "access plus 1 hour"
|
|
||||||
ExpiresByType application/rss+xml "access plus 1 hour"
|
|
||||||
|
|
||||||
ExpiresByType application/json "access plus 0 seconds"
|
|
||||||
ExpiresByType application/ld+json "access plus 0 seconds"
|
|
||||||
ExpiresByType application/schema+json "access plus 0 seconds"
|
|
||||||
ExpiresByType application/vnd.geo+json "access plus 0 seconds"
|
|
||||||
ExpiresByType application/xml "access plus 0 seconds"
|
|
||||||
ExpiresByType text/xml "access plus 0 seconds"
|
|
||||||
|
|
||||||
# Favicon (cannot be renamed!) and cursor images
|
|
||||||
ExpiresByType image/vnd.microsoft.icon "access plus 1 week"
|
|
||||||
ExpiresByType image/x-icon "access plus 1 week"
|
|
||||||
|
|
||||||
# HTML
|
|
||||||
ExpiresByType text/html "access plus 0 seconds"
|
|
||||||
|
|
||||||
# JavaScript
|
|
||||||
ExpiresByType application/javascript "access plus 1 year"
|
|
||||||
ExpiresByType application/x-javascript "access plus 1 year"
|
|
||||||
ExpiresByType text/javascript "access plus 1 year"
|
|
||||||
|
|
||||||
# Manifest files
|
|
||||||
ExpiresByType application/manifest+json "access plus 1 year"
|
|
||||||
|
|
||||||
ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds"
|
|
||||||
ExpiresByType text/cache-manifest "access plus 0 seconds"
|
|
||||||
|
|
||||||
# Media files
|
|
||||||
ExpiresByType audio/ogg "access plus 1 month"
|
|
||||||
ExpiresByType image/bmp "access plus 1 month"
|
|
||||||
ExpiresByType image/gif "access plus 1 month"
|
|
||||||
ExpiresByType image/jpeg "access plus 1 month"
|
|
||||||
ExpiresByType image/png "access plus 1 month"
|
|
||||||
ExpiresByType image/svg+xml "access plus 1 month"
|
|
||||||
ExpiresByType video/mp4 "access plus 1 month"
|
|
||||||
ExpiresByType video/ogg "access plus 1 month"
|
|
||||||
ExpiresByType video/webm "access plus 1 month"
|
|
||||||
|
|
||||||
# Web fonts
|
|
||||||
|
|
||||||
# Embedded OpenType (EOT)
|
|
||||||
ExpiresByType application/vnd.ms-fontobject "access plus 1 month"
|
|
||||||
ExpiresByType font/eot "access plus 1 month"
|
|
||||||
|
|
||||||
# OpenType
|
|
||||||
ExpiresByType font/opentype "access plus 1 month"
|
|
||||||
|
|
||||||
# TrueType
|
|
||||||
ExpiresByType application/x-font-ttf "access plus 1 month"
|
|
||||||
|
|
||||||
# Web Open Font Format (WOFF) 1.0
|
|
||||||
ExpiresByType application/font-woff "access plus 1 month"
|
|
||||||
ExpiresByType application/x-font-woff "access plus 1 month"
|
|
||||||
ExpiresByType font/woff "access plus 1 month"
|
|
||||||
|
|
||||||
# Web Open Font Format (WOFF) 2.0
|
|
||||||
ExpiresByType application/font-woff2 "access plus 1 month"
|
|
||||||
|
|
||||||
# Other
|
|
||||||
ExpiresByType text/x-cross-domain-policy "access plus 1 week"
|
|
||||||
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | File concatenation |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# Allow concatenation from within specific files.
|
|
||||||
#
|
|
||||||
# e.g.:
|
|
||||||
#
|
|
||||||
# If you have the following lines in a file called, for
|
|
||||||
# example, `main.combined.js`:
|
|
||||||
#
|
|
||||||
# <!--#include file="js/jquery.js" -->
|
|
||||||
# <!--#include file="js/jquery.timer.js" -->
|
|
||||||
#
|
|
||||||
# Apache will replace those lines with the content of the
|
|
||||||
# specified files.
|
|
||||||
|
|
||||||
# <IfModule mod_include.c>
|
|
||||||
# <FilesMatch "\.combined\.js$">
|
|
||||||
# Options +Includes
|
|
||||||
# AddOutputFilterByType INCLUDES application/javascript \
|
|
||||||
# application/x-javascript \
|
|
||||||
# text/javascript
|
|
||||||
# SetOutputFilter INCLUDES
|
|
||||||
# </FilesMatch>
|
|
||||||
# <FilesMatch "\.combined\.css$">
|
|
||||||
# Options +Includes
|
|
||||||
# AddOutputFilterByType INCLUDES text/css
|
|
||||||
# SetOutputFilter INCLUDES
|
|
||||||
# </FilesMatch>
|
|
||||||
# </IfModule>
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
# | Filename-based cache busting |
|
|
||||||
# ----------------------------------------------------------------------
|
|
||||||
|
|
||||||
# If you're not using a build process to manage your filename version
|
|
||||||
# revving, you might want to consider enabling the following directives
|
|
||||||
# to route all requests such as `/style.12345.css` to `/style.css`.
|
|
||||||
#
|
|
||||||
# To understand why this is important and even a better solution than
|
|
||||||
# using something like `*.css?v231`, please see:
|
|
||||||
# http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/
|
|
||||||
|
|
||||||
# <IfModule mod_rewrite.c>
|
|
||||||
# RewriteEngine On
|
|
||||||
# RewriteCond %{REQUEST_FILENAME} !-f
|
|
||||||
# RewriteRule ^(.+)\.(\d+)\.(bmp|css|cur|gif|ico|jpe?g|js|png|svgz?|webp)$ $1.$3 [L]
|
|
||||||
# </IfModule>
|
|
@ -1,60 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<title>Page Not Found</title>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<style>
|
|
||||||
|
|
||||||
* {
|
|
||||||
line-height: 1.2;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
html {
|
|
||||||
color: #888;
|
|
||||||
display: table;
|
|
||||||
font-family: sans-serif;
|
|
||||||
height: 100%;
|
|
||||||
text-align: center;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
display: table-cell;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin: 2em auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
color: #555;
|
|
||||||
font-size: 2em;
|
|
||||||
font-weight: 400;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin: 0 auto;
|
|
||||||
width: 280px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media only screen and (max-width: 280px) {
|
|
||||||
|
|
||||||
body, p {
|
|
||||||
width: 95%;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 1.5em;
|
|
||||||
margin: 0 0 0.3em;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<h1>Page Not Found</h1>
|
|
||||||
<p>Sorry, but the page you were trying to view does not exist.</p>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
<!-- IE needs 512+ bytes: http://blogs.msdn.com/b/ieinternals/archive/2010/08/19/http-error-pages-in-internet-explorer.aspx -->
|
|
Binary file not shown.
Before Width: | Height: | Size: 3.9 KiB |
@ -1,12 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Please read: http://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
|
|
||||||
<browserconfig>
|
|
||||||
<msapplication>
|
|
||||||
<tile>
|
|
||||||
<square70x70logo src="tile.png"/>
|
|
||||||
<square150x150logo src="tile.png"/>
|
|
||||||
<wide310x150logo src="tile-wide.png"/>
|
|
||||||
<square310x310logo src="tile.png"/>
|
|
||||||
</tile>
|
|
||||||
</msapplication>
|
|
||||||
</browserconfig>
|
|
@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
|
|
||||||
<cross-domain-policy>
|
|
||||||
<!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
|
|
||||||
|
|
||||||
<!-- Most restrictive policy: -->
|
|
||||||
<site-control permitted-cross-domain-policies="none"/>
|
|
||||||
|
|
||||||
<!-- Least restrictive policy: -->
|
|
||||||
<!--
|
|
||||||
<site-control permitted-cross-domain-policies="all"/>
|
|
||||||
<allow-access-from domain="*" to-ports="*" secure="false"/>
|
|
||||||
<allow-http-request-headers-from domain="*" headers="*" secure="false"/>
|
|
||||||
-->
|
|
||||||
</cross-domain-policy>
|
|
7
web/static/css/bootstrap.min.css
vendored
7
web/static/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,77 +0,0 @@
|
|||||||
html {
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#head {
|
|
||||||
height:160px;
|
|
||||||
line-height: 160px;
|
|
||||||
font-size:200%;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Login */
|
|
||||||
#loginForm{
|
|
||||||
width:600px;
|
|
||||||
}
|
|
||||||
#invalidCredentials {
|
|
||||||
color: red;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Budgets */
|
|
||||||
.budget-item {
|
|
||||||
width: 11.3em;
|
|
||||||
height: 11.3em;
|
|
||||||
border: 1px solid dimgray;
|
|
||||||
border-radius: 0.707em;
|
|
||||||
display: inline-block;
|
|
||||||
margin: 1em;
|
|
||||||
}
|
|
||||||
.budget-item a {
|
|
||||||
margin: 8em auto 0.5em;
|
|
||||||
text-align: center;
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
.budget-item .time {
|
|
||||||
display: block;
|
|
||||||
text-align: center;
|
|
||||||
font-size: 70.7%;
|
|
||||||
}
|
|
||||||
|
|
||||||
#wrapper {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 300px auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
#sidebar {
|
|
||||||
margin: 1em;
|
|
||||||
font-size: 180%;
|
|
||||||
}
|
|
||||||
#sidebar ul {
|
|
||||||
padding: 0;
|
|
||||||
list-style: none;
|
|
||||||
font-size: 75%;
|
|
||||||
}
|
|
||||||
.two-valued {
|
|
||||||
display: table;
|
|
||||||
}
|
|
||||||
.two-valued * {
|
|
||||||
display: table-row;
|
|
||||||
}
|
|
||||||
.two-valued * * {
|
|
||||||
display: table-cell;
|
|
||||||
}
|
|
||||||
|
|
||||||
.right {
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Highlights */
|
|
||||||
.negative {
|
|
||||||
color: #d50000;
|
|
||||||
}
|
|
||||||
.zero {
|
|
||||||
color: #888888;
|
|
||||||
}
|
|
||||||
.future {
|
|
||||||
background-color: #cccccc;
|
|
||||||
}
|
|
427
web/static/css/normalize.css
vendored
427
web/static/css/normalize.css
vendored
@ -1,427 +0,0 @@
|
|||||||
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 1. Set default font family to sans-serif.
|
|
||||||
* 2. Prevent iOS text size adjust after orientation change, without disabling
|
|
||||||
* user zoom.
|
|
||||||
*/
|
|
||||||
|
|
||||||
html {
|
|
||||||
font-family: sans-serif; /* 1 */
|
|
||||||
-ms-text-size-adjust: 100%; /* 2 */
|
|
||||||
-webkit-text-size-adjust: 100%; /* 2 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove default margin.
|
|
||||||
*/
|
|
||||||
|
|
||||||
body {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* HTML5 display definitions
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Correct `block` display not defined for any HTML5 element in IE 8/9.
|
|
||||||
* Correct `block` display not defined for `details` or `summary` in IE 10/11
|
|
||||||
* and Firefox.
|
|
||||||
* Correct `block` display not defined for `main` in IE 11.
|
|
||||||
*/
|
|
||||||
|
|
||||||
article,
|
|
||||||
aside,
|
|
||||||
details,
|
|
||||||
figcaption,
|
|
||||||
figure,
|
|
||||||
footer,
|
|
||||||
header,
|
|
||||||
hgroup,
|
|
||||||
main,
|
|
||||||
menu,
|
|
||||||
nav,
|
|
||||||
section,
|
|
||||||
summary {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 1. Correct `inline-block` display not defined in IE 8/9.
|
|
||||||
* 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
|
|
||||||
*/
|
|
||||||
|
|
||||||
audio,
|
|
||||||
canvas,
|
|
||||||
progress,
|
|
||||||
video {
|
|
||||||
display: inline-block; /* 1 */
|
|
||||||
vertical-align: baseline; /* 2 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Prevent modern browsers from displaying `audio` without controls.
|
|
||||||
* Remove excess height in iOS 5 devices.
|
|
||||||
*/
|
|
||||||
|
|
||||||
audio:not([controls]) {
|
|
||||||
display: none;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address `[hidden]` styling not present in IE 8/9/10.
|
|
||||||
* Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
|
|
||||||
*/
|
|
||||||
|
|
||||||
[hidden],
|
|
||||||
template {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Links
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove the gray background color from active links in IE 10.
|
|
||||||
*/
|
|
||||||
|
|
||||||
a {
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Improve readability when focused and also mouse hovered in all browsers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
a:active,
|
|
||||||
a:hover {
|
|
||||||
outline: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Text-level semantics
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address styling not present in IE 8/9/10/11, Safari, and Chrome.
|
|
||||||
*/
|
|
||||||
|
|
||||||
abbr[title] {
|
|
||||||
border-bottom: 1px dotted;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
|
|
||||||
*/
|
|
||||||
|
|
||||||
b,
|
|
||||||
strong {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address styling not present in Safari and Chrome.
|
|
||||||
*/
|
|
||||||
|
|
||||||
dfn {
|
|
||||||
font-style: italic;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address variable `h1` font-size and margin within `section` and `article`
|
|
||||||
* contexts in Firefox 4+, Safari, and Chrome.
|
|
||||||
*/
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 2em;
|
|
||||||
margin: 0.67em 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address styling not present in IE 8/9.
|
|
||||||
*/
|
|
||||||
|
|
||||||
mark {
|
|
||||||
background: #ff0;
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address inconsistent and variable font size in all browsers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
small {
|
|
||||||
font-size: 80%;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Prevent `sub` and `sup` affecting `line-height` in all browsers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
sub,
|
|
||||||
sup {
|
|
||||||
font-size: 75%;
|
|
||||||
line-height: 0;
|
|
||||||
position: relative;
|
|
||||||
vertical-align: baseline;
|
|
||||||
}
|
|
||||||
|
|
||||||
sup {
|
|
||||||
top: -0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub {
|
|
||||||
bottom: -0.25em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Embedded content
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove border when inside `a` element in IE 8/9/10.
|
|
||||||
*/
|
|
||||||
|
|
||||||
img {
|
|
||||||
border: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Correct overflow not hidden in IE 9/10/11.
|
|
||||||
*/
|
|
||||||
|
|
||||||
svg:not(:root) {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Grouping content
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address margin not present in IE 8/9 and Safari.
|
|
||||||
*/
|
|
||||||
|
|
||||||
figure {
|
|
||||||
margin: 1em 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address differences between Firefox and other browsers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
hr {
|
|
||||||
-moz-box-sizing: content-box;
|
|
||||||
box-sizing: content-box;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Contain overflow in all browsers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pre {
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address odd `em`-unit font size rendering in all browsers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
code,
|
|
||||||
kbd,
|
|
||||||
pre,
|
|
||||||
samp {
|
|
||||||
font-family: monospace, monospace;
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Forms
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Known limitation: by default, Chrome and Safari on OS X allow very limited
|
|
||||||
* styling of `select`, unless a `border` property is set.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 1. Correct color not being inherited.
|
|
||||||
* Known issue: affects color of disabled elements.
|
|
||||||
* 2. Correct font properties not being inherited.
|
|
||||||
* 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
|
|
||||||
*/
|
|
||||||
|
|
||||||
button,
|
|
||||||
input,
|
|
||||||
optgroup,
|
|
||||||
select,
|
|
||||||
textarea {
|
|
||||||
color: inherit; /* 1 */
|
|
||||||
font: inherit; /* 2 */
|
|
||||||
margin: 0; /* 3 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address `overflow` set to `hidden` in IE 8/9/10/11.
|
|
||||||
*/
|
|
||||||
|
|
||||||
button {
|
|
||||||
overflow: visible;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address inconsistent `text-transform` inheritance for `button` and `select`.
|
|
||||||
* All other form control elements do not inherit `text-transform` values.
|
|
||||||
* Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
|
|
||||||
* Correct `select` style inheritance in Firefox.
|
|
||||||
*/
|
|
||||||
|
|
||||||
button,
|
|
||||||
select {
|
|
||||||
text-transform: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
|
|
||||||
* and `video` controls.
|
|
||||||
* 2. Correct inability to style clickable `input` types in iOS.
|
|
||||||
* 3. Improve usability and consistency of cursor style between image-type
|
|
||||||
* `input` and others.
|
|
||||||
*/
|
|
||||||
|
|
||||||
button,
|
|
||||||
html input[type="button"], /* 1 */
|
|
||||||
input[type="reset"],
|
|
||||||
input[type="submit"] {
|
|
||||||
-webkit-appearance: button; /* 2 */
|
|
||||||
cursor: pointer; /* 3 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Re-set default cursor for disabled elements.
|
|
||||||
*/
|
|
||||||
|
|
||||||
button[disabled],
|
|
||||||
html input[disabled] {
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove inner padding and border in Firefox 4+.
|
|
||||||
*/
|
|
||||||
|
|
||||||
button::-moz-focus-inner,
|
|
||||||
input::-moz-focus-inner {
|
|
||||||
border: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Address Firefox 4+ setting `line-height` on `input` using `!important` in
|
|
||||||
* the UA stylesheet.
|
|
||||||
*/
|
|
||||||
|
|
||||||
input {
|
|
||||||
line-height: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* It's recommended that you don't attempt to style these elements.
|
|
||||||
* Firefox's implementation doesn't respect box-sizing, padding, or width.
|
|
||||||
*
|
|
||||||
* 1. Address box sizing set to `content-box` in IE 8/9/10.
|
|
||||||
* 2. Remove excess padding in IE 8/9/10.
|
|
||||||
*/
|
|
||||||
|
|
||||||
input[type="checkbox"],
|
|
||||||
input[type="radio"] {
|
|
||||||
box-sizing: border-box; /* 1 */
|
|
||||||
padding: 0; /* 2 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fix the cursor style for Chrome's increment/decrement buttons. For certain
|
|
||||||
* `font-size` values of the `input`, it causes the cursor style of the
|
|
||||||
* decrement button to change from `default` to `text`.
|
|
||||||
*/
|
|
||||||
|
|
||||||
input[type="number"]::-webkit-inner-spin-button,
|
|
||||||
input[type="number"]::-webkit-outer-spin-button {
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 1. Address `appearance` set to `searchfield` in Safari and Chrome.
|
|
||||||
* 2. Address `box-sizing` set to `border-box` in Safari and Chrome
|
|
||||||
* (include `-moz` to future-proof).
|
|
||||||
*/
|
|
||||||
|
|
||||||
input[type="search"] {
|
|
||||||
-webkit-appearance: textfield; /* 1 */
|
|
||||||
-moz-box-sizing: content-box;
|
|
||||||
-webkit-box-sizing: content-box; /* 2 */
|
|
||||||
box-sizing: content-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove inner padding and search cancel button in Safari and Chrome on OS X.
|
|
||||||
* Safari (but not Chrome) clips the cancel button when the search input has
|
|
||||||
* padding (and `textfield` appearance).
|
|
||||||
*/
|
|
||||||
|
|
||||||
input[type="search"]::-webkit-search-cancel-button,
|
|
||||||
input[type="search"]::-webkit-search-decoration {
|
|
||||||
-webkit-appearance: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define consistent border, margin, and padding.
|
|
||||||
*/
|
|
||||||
|
|
||||||
fieldset {
|
|
||||||
border: 1px solid #c0c0c0;
|
|
||||||
margin: 0 2px;
|
|
||||||
padding: 0.35em 0.625em 0.75em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 1. Correct `color` not being inherited in IE 8/9/10/11.
|
|
||||||
* 2. Remove padding so people aren't caught out if they zero out fieldsets.
|
|
||||||
*/
|
|
||||||
|
|
||||||
legend {
|
|
||||||
border: 0; /* 1 */
|
|
||||||
padding: 0; /* 2 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove default vertical scrollbar in IE 8/9/10/11.
|
|
||||||
*/
|
|
||||||
|
|
||||||
textarea {
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Don't inherit the `font-weight` (applied by a rule above).
|
|
||||||
* NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
|
|
||||||
*/
|
|
||||||
|
|
||||||
optgroup {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Tables
|
|
||||||
========================================================================== */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove most spacing between table cells.
|
|
||||||
*/
|
|
||||||
|
|
||||||
table {
|
|
||||||
border-collapse: collapse;
|
|
||||||
border-spacing: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
td,
|
|
||||||
th {
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
1
web/static/css/normalize.min.css
vendored
1
web/static/css/normalize.min.css
vendored
@ -1 +0,0 @@
|
|||||||
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
|
|
Binary file not shown.
Before Width: | Height: | Size: 766 B |
Binary file not shown.
@ -1,288 +0,0 @@
|
|||||||
<?xml version="1.0" standalone="no"?>
|
|
||||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<metadata></metadata>
|
|
||||||
<defs>
|
|
||||||
<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
|
|
||||||
<font-face units-per-em="1200" ascent="960" descent="-240" />
|
|
||||||
<missing-glyph horiz-adv-x="500" />
|
|
||||||
<glyph horiz-adv-x="0" />
|
|
||||||
<glyph horiz-adv-x="400" />
|
|
||||||
<glyph unicode=" " />
|
|
||||||
<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
|
|
||||||
<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode=" " />
|
|
||||||
<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="650" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="1300" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="650" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="1300" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="433" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="325" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="216" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="216" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="162" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="260" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="72" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="260" />
|
|
||||||
<glyph unicode=" " horiz-adv-x="325" />
|
|
||||||
<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
|
|
||||||
<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
|
|
||||||
<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
|
|
||||||
<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
|
|
||||||
<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
|
|
||||||
<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
|
|
||||||
<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
|
|
||||||
<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
|
|
||||||
<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
|
|
||||||
<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
|
|
||||||
<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
|
|
||||||
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
|
|
||||||
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
|
|
||||||
<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
|
|
||||||
<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
|
|
||||||
<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
|
|
||||||
<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
|
|
||||||
<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
|
|
||||||
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
|
|
||||||
<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
|
|
||||||
<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
|
|
||||||
<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
|
|
||||||
<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
|
|
||||||
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
|
|
||||||
<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
|
|
||||||
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
|
|
||||||
<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
|
|
||||||
<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
|
|
||||||
<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
|
|
||||||
<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
|
|
||||||
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
|
|
||||||
<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
|
|
||||||
<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
|
|
||||||
<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
|
|
||||||
<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
|
|
||||||
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
|
|
||||||
<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
|
|
||||||
<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
|
|
||||||
<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
|
|
||||||
<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
|
|
||||||
<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
|
|
||||||
<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
|
|
||||||
<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
|
|
||||||
<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
|
|
||||||
<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
|
|
||||||
<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
|
|
||||||
<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
|
|
||||||
<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
|
|
||||||
<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
|
|
||||||
<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
|
|
||||||
<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
|
|
||||||
<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
|
|
||||||
<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
|
|
||||||
<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
|
|
||||||
<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
|
|
||||||
<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
|
|
||||||
<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
|
|
||||||
<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
|
|
||||||
<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
|
|
||||||
<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
|
|
||||||
<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
|
|
||||||
<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
|
|
||||||
<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
|
|
||||||
<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
|
|
||||||
<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
|
|
||||||
<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
|
|
||||||
<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
|
|
||||||
<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
|
|
||||||
<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
|
|
||||||
<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
|
|
||||||
<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
|
|
||||||
<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
|
|
||||||
<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
|
|
||||||
<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
|
|
||||||
<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
|
|
||||||
<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
|
|
||||||
<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
|
|
||||||
<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
|
|
||||||
<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
|
|
||||||
<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
|
|
||||||
<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
|
|
||||||
<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
|
|
||||||
<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
|
|
||||||
<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
|
|
||||||
<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
|
|
||||||
<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
|
|
||||||
<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
|
|
||||||
<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
|
|
||||||
<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
|
|
||||||
<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
|
|
||||||
<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
|
|
||||||
<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
|
|
||||||
<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
|
|
||||||
<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
|
|
||||||
<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
|
|
||||||
<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
|
|
||||||
<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
|
|
||||||
<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
|
|
||||||
<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
|
|
||||||
<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
|
|
||||||
<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
|
|
||||||
<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
|
|
||||||
<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
|
|
||||||
<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
|
|
||||||
<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
|
|
||||||
<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
|
|
||||||
<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
|
|
||||||
<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
|
|
||||||
<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
|
|
||||||
<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
|
|
||||||
<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
|
|
||||||
<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
|
|
||||||
<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
|
|
||||||
<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
|
|
||||||
<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
|
|
||||||
<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
|
|
||||||
<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
|
|
||||||
<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
|
|
||||||
<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
|
|
||||||
<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
|
|
||||||
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
|
|
||||||
<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
|
|
||||||
<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
|
|
||||||
<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
|
|
||||||
<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
|
|
||||||
<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
|
|
||||||
<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
|
|
||||||
<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
|
|
||||||
<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
|
|
||||||
<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
|
|
||||||
<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
|
|
||||||
<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
|
|
||||||
<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
|
|
||||||
<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
|
|
||||||
<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
|
|
||||||
<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
|
|
||||||
<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
|
|
||||||
<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
|
|
||||||
<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
|
|
||||||
<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
|
|
||||||
<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
|
|
||||||
<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
|
|
||||||
<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
|
|
||||||
<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
|
|
||||||
<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
|
|
||||||
<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
|
|
||||||
<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
|
|
||||||
<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
|
|
||||||
<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
|
|
||||||
<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
|
|
||||||
<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
|
|
||||||
<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
|
|
||||||
<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
|
|
||||||
<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
|
|
||||||
<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
|
|
||||||
<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
|
|
||||||
<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
|
|
||||||
<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
|
|
||||||
<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
|
|
||||||
<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
|
|
||||||
<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
|
|
||||||
<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
|
|
||||||
<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
|
|
||||||
<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
|
|
||||||
<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
|
|
||||||
<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
|
|
||||||
<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
|
|
||||||
<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
|
|
||||||
<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
|
|
||||||
<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
|
|
||||||
<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
|
|
||||||
</font>
|
|
||||||
</defs></svg>
|
|
Before Width: | Height: | Size: 106 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,15 +0,0 @@
|
|||||||
# humanstxt.org/
|
|
||||||
# The humans responsible & technology colophon
|
|
||||||
|
|
||||||
# TEAM
|
|
||||||
|
|
||||||
<name> -- <role> -- <twitter>
|
|
||||||
|
|
||||||
# THANKS
|
|
||||||
|
|
||||||
<name>
|
|
||||||
|
|
||||||
# TECHNOLOGY COLOPHON
|
|
||||||
|
|
||||||
HTML5, CSS3
|
|
||||||
jQuery, Modernizr
|
|
7
web/static/js/bootstrap.min.js
vendored
7
web/static/js/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
|||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
|
|
||||||
require('../../js/transition.js')
|
|
||||||
require('../../js/alert.js')
|
|
||||||
require('../../js/button.js')
|
|
||||||
require('../../js/carousel.js')
|
|
||||||
require('../../js/collapse.js')
|
|
||||||
require('../../js/dropdown.js')
|
|
||||||
require('../../js/modal.js')
|
|
||||||
require('../../js/tooltip.js')
|
|
||||||
require('../../js/popover.js')
|
|
||||||
require('../../js/scrollspy.js')
|
|
||||||
require('../../js/tab.js')
|
|
||||||
require('../../js/affix.js')
|
|
@ -1,24 +0,0 @@
|
|||||||
// Avoid `console` errors in browsers that lack a console.
|
|
||||||
(function() {
|
|
||||||
var method;
|
|
||||||
var noop = function () {};
|
|
||||||
var methods = [
|
|
||||||
'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
|
|
||||||
'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
|
|
||||||
'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
|
|
||||||
'timeline', 'timelineEnd', 'timeStamp', 'trace', 'warn'
|
|
||||||
];
|
|
||||||
var length = methods.length;
|
|
||||||
var console = (window.console = window.console || {});
|
|
||||||
|
|
||||||
while (length--) {
|
|
||||||
method = methods[length];
|
|
||||||
|
|
||||||
// Only stub undefined methods.
|
|
||||||
if (!console[method]) {
|
|
||||||
console[method] = noop;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}());
|
|
||||||
|
|
||||||
// Place any jQuery/helper plugins in here.
|
|
@ -1,12 +0,0 @@
|
|||||||
(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
|
|
||||||
a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
|
|
||||||
c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
|
|
||||||
"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
|
|
||||||
for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
|
|
||||||
|
|
||||||
/*! Respond.js v1.4.2: min/max-width media query polyfill
|
|
||||||
* Copyright 2014 Scott Jehl
|
|
||||||
* Licensed under MIT
|
|
||||||
* http://j.mp/respondjs */
|
|
||||||
|
|
||||||
!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='­<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){v(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))},g=function(a){return a.replace(c.regex.minmaxwh,"").match(c.regex.other)};if(c.ajax=f,c.queue=d,c.unsupportedmq=g,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,comments:/\/\*[^*]*\*+([^/][^*]*\*+)*\//gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\(\s*min\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,maxw:/\(\s*max\-width\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/,minmaxwh:/\(\s*m(in|ax)\-(height|width)\s*:\s*(\s*[0-9\.]+)(px|em)\s*\)/gi,other:/\([^\)]*\)/g},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var h,i,j,k=a.document,l=k.documentElement,m=[],n=[],o=[],p={},q=30,r=k.getElementsByTagName("head")[0]||l,s=k.getElementsByTagName("base")[0],t=r.getElementsByTagName("link"),u=function(){var a,b=k.createElement("div"),c=k.body,d=l.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=k.createElement("body"),c.style.background="none"),l.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&l.insertBefore(c,l.firstChild),a=b.offsetWidth,f?l.removeChild(c):c.removeChild(b),l.style.fontSize=d,e&&(c.style.fontSize=e),a=j=parseFloat(a)},v=function(b){var c="clientWidth",d=l[c],e="CSS1Compat"===k.compatMode&&d||k.body[c]||d,f={},g=t[t.length-1],p=(new Date).getTime();if(b&&h&&q>p-h)return a.clearTimeout(i),i=a.setTimeout(v,q),void 0;h=p;for(var s in m)if(m.hasOwnProperty(s)){var w=m[s],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?j||u():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?j||u():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(n[w.rules]))}for(var C in o)o.hasOwnProperty(C)&&o[C]&&o[C].parentNode===r&&r.removeChild(o[C]);o.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=k.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,r.insertBefore(E,g.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(k.createTextNode(F)),o.push(E)}},w=function(a,b,d){var e=a.replace(c.regex.comments,"").replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var h=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},i=!f&&d;b.length&&(b+="/"),i&&(f=1);for(var j=0;f>j;j++){var k,l,o,p;i?(k=d,n.push(h(a))):(k=e[j].match(c.regex.findStyles)&&RegExp.$1,n.push(RegExp.$2&&h(RegExp.$2))),o=k.split(","),p=o.length;for(var q=0;p>q;q++)l=o[q],g(l)||m.push({media:l.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:n.length-1,hasquery:l.indexOf("(")>-1,minw:l.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:l.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}v()},x=function(){if(d.length){var b=d.shift();f(b.href,function(c){w(c,b.href,b.media),p[b.href]=!0,a.setTimeout(function(){x()},0)})}},y=function(){for(var b=0;b<t.length;b++){var c=t[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!p[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(w(c.styleSheet.rawCssText,e,f),p[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!s||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}x()};y(),c.update=y,c.getEmValue=u,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
|
|
4
web/static/js/vendor/jquery-1.11.2.min.js
vendored
4
web/static/js/vendor/jquery-1.11.2.min.js
vendored
File diff suppressed because one or more lines are too long
@ -1,5 +0,0 @@
|
|||||||
# www.robotstxt.org/
|
|
||||||
|
|
||||||
# Allow crawling of all content
|
|
||||||
User-agent: *
|
|
||||||
Disallow:
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
Before Width: | Height: | Size: 3.4 KiB |
10
web/tailwind.config.js
Normal file
10
web/tailwind.config.js
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
module.exports = {
|
||||||
|
content: [
|
||||||
|
"./index.html",
|
||||||
|
"./src/**/*.{vue,js,ts,jsx,tsx}"
|
||||||
|
],
|
||||||
|
theme: {
|
||||||
|
extend: {},
|
||||||
|
},
|
||||||
|
plugins: [],
|
||||||
|
}
|
@ -2,8 +2,5 @@ package web
|
|||||||
|
|
||||||
import "embed"
|
import "embed"
|
||||||
|
|
||||||
//go:embed *.html *.tpl
|
//go:embed dist
|
||||||
var Templates embed.FS
|
|
||||||
|
|
||||||
//go:embed static
|
|
||||||
var Static embed.FS
|
var Static embed.FS
|
||||||
|
@ -1,54 +0,0 @@
|
|||||||
{{define "transaction-new"}}
|
|
||||||
<div id="newtransactionmodal" class="modal fade">
|
|
||||||
<div class="modal-dialog" role="document">
|
|
||||||
<script>
|
|
||||||
$(document).ready(function () {
|
|
||||||
$('#errorcreatingtransaction').hide();
|
|
||||||
$('#newtransactionform').ajaxForm({
|
|
||||||
error: function() {
|
|
||||||
$('#errorcreatingtransaction').show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
<div class="modal-content">
|
|
||||||
<div class="modal-header">
|
|
||||||
<h5 class="modal-title">New Transaction</h5>
|
|
||||||
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
|
|
||||||
<span aria-hidden="true">×</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<form id="newtransactionform" action="/api/v1/transaction/new" method="POST">
|
|
||||||
<div class="modal-body">
|
|
||||||
<input type="hidden" name="account_id" value="{{.Account.ID}}" />
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="category_id">Category</label>
|
|
||||||
<select name="category_id" class="form-control">
|
|
||||||
<option value="">-- none --</option>
|
|
||||||
{{range .Categories}}
|
|
||||||
<option value="{{.ID}}">{{.Group}} : {{.Name}}</option>
|
|
||||||
{{end}}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="date">Date</label>
|
|
||||||
<input type="date" name="date" class="form-control" value="{{now.Format "2006-01-02"}}" />
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="memo">Memo</label>
|
|
||||||
<input type="text" name="memo" class="form-control" />
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="amount">Amount</label>
|
|
||||||
<input type="number" name="amount" class="form-control" placeholder="0.00" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="modal-footer">
|
|
||||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
|
|
||||||
<input type="submit" class="btn btn-primary" value="Create" class="form-control" />
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user