mirror of
https://github.com/documize/community.git
synced 2025-07-19 05:09:42 +02:00
moved emberjs to gui folder
This commit is contained in:
Harvey Kandola
parent
6a18d18f91
commit
dc49dbbeff
999 changed files with 677 additions and 651 deletions
26
.gitignore
vendored
26
.gitignore
vendored
|
|
@ -18,8 +18,8 @@ _convert
|
||||||
bin/*
|
bin/*
|
||||||
dist/*
|
dist/*
|
||||||
embed/bindata/*
|
embed/bindata/*
|
||||||
app/dist/*
|
gui/dist/*
|
||||||
app/dist-prod/*
|
gui/dist-prod/*
|
||||||
|
|
||||||
# Architecture specific extensions/prefixes
|
# Architecture specific extensions/prefixes
|
||||||
*.[568vq]
|
*.[568vq]
|
||||||
|
|
@ -38,17 +38,17 @@ _testmain.go
|
||||||
/plugin-libreoffice/plugin-libreoffice-osx
|
/plugin-libreoffice/plugin-libreoffice-osx
|
||||||
|
|
||||||
# Ember specific
|
# Ember specific
|
||||||
/app/dist
|
/gui/dist
|
||||||
/app/dist-prod
|
/gui/dist-prod
|
||||||
/app/tmp
|
/gui/tmp
|
||||||
/app/bower_components
|
/gui/bower_components
|
||||||
/app/node_modules
|
/gui/node_modules
|
||||||
/app/.sass-cache
|
/gui/.sass-cache
|
||||||
/app/connect.lock
|
/gui/connect.lock
|
||||||
/app/coverage/*
|
/gui/coverage/*
|
||||||
/app/libpeerconnection.log
|
/gui/libpeerconnection.log
|
||||||
/app/npm-debug.log
|
/gui/npm-debug.log
|
||||||
/app/testem.log
|
/gui/testem.log
|
||||||
node_modules
|
node_modules
|
||||||
|
|
||||||
# Misc.
|
# Misc.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
app/public/tinymce/**
|
gui/public/tinymce/**
|
||||||
app/public/tinymce/
|
gui/public/tinymce/
|
||||||
app/public/tinymce
|
gui/public/tinymce
|
||||||
|
|
||||||
|
|
|
||||||
14
build.sh
14
build.sh
|
|
@ -4,19 +4,19 @@ NOW=$(date)
|
||||||
echo "Build process started $NOW"
|
echo "Build process started $NOW"
|
||||||
|
|
||||||
echo "Building Ember assets..."
|
echo "Building Ember assets..."
|
||||||
cd app
|
cd gui
|
||||||
ember b -o dist-prod/ --environment=production
|
ember b -o dist-prod/ --environment=production
|
||||||
|
|
||||||
echo "Copying Ember assets..."
|
echo "Copying Ember assets..."
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf embed/bindata/public
|
rm -rf embed/bindata/public
|
||||||
mkdir -p embed/bindata/public
|
mkdir -p embed/bindata/public
|
||||||
cp -r app/dist-prod/assets embed/bindata/public
|
cp -r gui/dist-prod/assets embed/bindata/public
|
||||||
cp -r app/dist-prod/codemirror embed/bindata/public/codemirror
|
cp -r gui/dist-prod/codemirror embed/bindata/public/codemirror
|
||||||
cp -r app/dist-prod/tinymce embed/bindata/public/tinymce
|
cp -r gui/dist-prod/tinymce embed/bindata/public/tinymce
|
||||||
cp -r app/dist-prod/sections embed/bindata/public/sections
|
cp -r gui/dist-prod/sections embed/bindata/public/sections
|
||||||
cp app/dist-prod/*.* embed/bindata
|
cp gui/dist-prod/*.* embed/bindata
|
||||||
cp app/dist-prod/favicon.ico embed/bindata/public
|
cp gui/dist-prod/favicon.ico embed/bindata/public
|
||||||
rm -rf embed/bindata/mail
|
rm -rf embed/bindata/mail
|
||||||
mkdir -p embed/bindata/mail
|
mkdir -p embed/bindata/mail
|
||||||
cp core/api/mail/*.html embed/bindata/mail
|
cp core/api/mail/*.html embed/bindata/mail
|
||||||
|
|
|
||||||
|
|
@ -31,14 +31,14 @@ func (p *Persister) AddAccount(account entity.Account) (err error) {
|
||||||
defer streamutil.Close(stmt)
|
defer streamutil.Close(stmt)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errors.Wrap(err, "Unable to prepare insert for account")
|
err = errors.Wrap(err, "unable to prepare insert for account")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = stmt.Exec(account.RefID, account.OrgID, account.UserID, account.Admin, account.Editor, account.Active, account.Created, account.Revised)
|
_, err = stmt.Exec(account.RefID, account.OrgID, account.UserID, account.Admin, account.Editor, account.Active, account.Created, account.Revised)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errors.Wrap(err, "Unable to execute insert for account")
|
err = errors.Wrap(err, "unable to execute insert for account")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
3
core/env/logger.go
vendored
3
core/env/logger.go
vendored
|
|
@ -12,8 +12,11 @@
|
||||||
// Package env provides runtime, server level setup and configuration
|
// Package env provides runtime, server level setup and configuration
|
||||||
package env
|
package env
|
||||||
|
|
||||||
|
import "github.com/jmoiron/sqlx"
|
||||||
|
|
||||||
// Logger provides the interface for Documize compatible loggers.
|
// Logger provides the interface for Documize compatible loggers.
|
||||||
type Logger interface {
|
type Logger interface {
|
||||||
Info(message string)
|
Info(message string)
|
||||||
Error(message string, err error)
|
Error(message string, err error)
|
||||||
|
SetDB(db *sqlx.DB)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
core/env/runtime.go
vendored
2
core/env/runtime.go
vendored
|
|
@ -15,7 +15,7 @@ package env
|
||||||
import "github.com/jmoiron/sqlx"
|
import "github.com/jmoiron/sqlx"
|
||||||
|
|
||||||
// Runtime provides access to database, logger and other server-level scoped objects.
|
// 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 {
|
type Runtime struct {
|
||||||
Db *sqlx.DB
|
Db *sqlx.DB
|
||||||
Log Logger
|
Log Logger
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ import (
|
||||||
"github.com/documize/community/core/env"
|
"github.com/documize/community/core/env"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
var environment = "Non-production"
|
var environment = "Non-production"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
0
app/.gitignore → gui/.gitignore
vendored
0
app/.gitignore → gui/.gitignore
vendored
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue