1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-18 20:59:43 +02:00

moved emberjs to gui folder

This commit is contained in:
Harvey Kandola 2017-07-19 14:48:33 +01:00
parent 6a18d18f91
commit dc49dbbeff
999 changed files with 677 additions and 651 deletions

26
.gitignore vendored
View file

@ -18,8 +18,8 @@ _convert
bin/*
dist/*
embed/bindata/*
app/dist/*
app/dist-prod/*
gui/dist/*
gui/dist-prod/*
# Architecture specific extensions/prefixes
*.[568vq]
@ -38,17 +38,17 @@ _testmain.go
/plugin-libreoffice/plugin-libreoffice-osx
# Ember specific
/app/dist
/app/dist-prod
/app/tmp
/app/bower_components
/app/node_modules
/app/.sass-cache
/app/connect.lock
/app/coverage/*
/app/libpeerconnection.log
/app/npm-debug.log
/app/testem.log
/gui/dist
/gui/dist-prod
/gui/tmp
/gui/bower_components
/gui/node_modules
/gui/.sass-cache
/gui/connect.lock
/gui/coverage/*
/gui/libpeerconnection.log
/gui/npm-debug.log
/gui/testem.log
node_modules
# Misc.

View file

@ -1,4 +1,4 @@
app/public/tinymce/**
app/public/tinymce/
app/public/tinymce
gui/public/tinymce/**
gui/public/tinymce/
gui/public/tinymce

View file

@ -4,19 +4,19 @@ NOW=$(date)
echo "Build process started $NOW"
echo "Building Ember assets..."
cd app
cd gui
ember b -o dist-prod/ --environment=production
echo "Copying Ember assets..."
cd ..
rm -rf embed/bindata/public
mkdir -p embed/bindata/public
cp -r app/dist-prod/assets embed/bindata/public
cp -r app/dist-prod/codemirror embed/bindata/public/codemirror
cp -r app/dist-prod/tinymce embed/bindata/public/tinymce
cp -r app/dist-prod/sections embed/bindata/public/sections
cp app/dist-prod/*.* embed/bindata
cp app/dist-prod/favicon.ico embed/bindata/public
cp -r gui/dist-prod/assets embed/bindata/public
cp -r gui/dist-prod/codemirror embed/bindata/public/codemirror
cp -r gui/dist-prod/tinymce embed/bindata/public/tinymce
cp -r gui/dist-prod/sections embed/bindata/public/sections
cp gui/dist-prod/*.* embed/bindata
cp gui/dist-prod/favicon.ico embed/bindata/public
rm -rf embed/bindata/mail
mkdir -p embed/bindata/mail
cp core/api/mail/*.html embed/bindata/mail

View file

@ -31,14 +31,14 @@ func (p *Persister) AddAccount(account entity.Account) (err error) {
defer streamutil.Close(stmt)
if err != nil {
errors.Wrap(err, "Unable to prepare insert for account")
err = errors.Wrap(err, "unable to prepare insert for account")
return
}
_, err = stmt.Exec(account.RefID, account.OrgID, account.UserID, account.Admin, account.Editor, account.Active, account.Created, account.Revised)
if err != nil {
errors.Wrap(err, "Unable to execute insert for account")
err = errors.Wrap(err, "unable to execute insert for account")
return
}

3
core/env/logger.go vendored
View file

@ -12,8 +12,11 @@
// Package env provides runtime, server level setup and configuration
package env
import "github.com/jmoiron/sqlx"
// Logger provides the interface for Documize compatible loggers.
type Logger interface {
Info(message string)
Error(message string, err error)
SetDB(db *sqlx.DB)
}

2
core/env/runtime.go vendored
View file

@ -15,7 +15,7 @@ package env
import "github.com/jmoiron/sqlx"
// Runtime provides access to database, logger and other server-level scoped objects.
// Do not share per-request data -- use Context for per-request values.
// Use Context for per-request values.
type Runtime struct {
Db *sqlx.DB
Log Logger

View file

@ -23,6 +23,7 @@ import (
"github.com/documize/community/core/env"
)
var environment = "Non-production"
func init() {

File diff suppressed because one or more lines are too long

View file

Some files were not shown because too many files have changed in this diff Show more