-
+
70}
initialLoad={false} useWindow={false} loadMore={this.loadMore.bind(this)} threshold={100}>
-
+
@@ -225,14 +240,9 @@ export class FilesPage extends React.Component {
-
+
-
- Oops!
- It seems this directory doesn't exist
- {JSON.stringify(this.state.error)}
-
diff --git a/client/pages/filespage/thing-existing.js b/client/pages/filespage/thing-existing.js
index 71935089..fc16849c 100644
--- a/client/pages/filespage/thing-existing.js
+++ b/client/pages/filespage/thing-existing.js
@@ -408,7 +408,7 @@ class LazyLoadImage extends React.Component {
error: false
};
this.$scroll = document.querySelector(props.scroller);
- this.onScroll = debounce(this.onScroll.bind(this), 100);
+ this.onScroll = debounce(this.onScroll.bind(this), 250);
}
componentDidMount(){
diff --git a/client/pages/homepage.js b/client/pages/homepage.js
index 226497d8..810917fe 100644
--- a/client/pages/homepage.js
+++ b/client/pages/homepage.js
@@ -13,10 +13,14 @@ export class HomePage extends React.Component {
}
componentDidMount(){
- Session.isLoggedIn()
+ Session.currentUser()
.then((res) => {
- if(res === true){
- this.setState({redirection: "/files"});
+ if(res && res.is_authenticated === true){
+ let url = "/files"
+ if(res.home){
+ url += res.home
+ }
+ this.setState({redirection: url});
}else{
this.setState({redirection: "/login"});
}
diff --git a/client/pages/viewerpage.js b/client/pages/viewerpage.js
index ce9adcab..5284a99e 100644
--- a/client/pages/viewerpage.js
+++ b/client/pages/viewerpage.js
@@ -4,7 +4,7 @@ import Path from 'path';
import './viewerpage.scss';
import './error.scss';
import { Files } from '../model/';
-import { BreadCrumb, Bundle, NgIf, Loader, Container, EventReceiver, EventEmitter } from '../components/';
+import { BreadCrumb, Bundle, NgIf, Loader, Container, EventReceiver, EventEmitter, LoggedInOnly , ErrorPage } from '../components/';
import { debounce, opener, notify } from '../helpers/';
import { AudioPlayer, FileDownloader, ImageViewer, PDFViewer } from './viewerpage/';
@@ -19,6 +19,8 @@ const IDE = (props) => (
);
+@ErrorPage
+@LoggedInOnly
@EventReceiver
export class ViewerPage extends React.Component {
constructor(props){
@@ -31,8 +33,7 @@ export class ViewerPage extends React.Component {
content: null,
needSaving: false,
isSaving: false,
- loading: true,
- error: null
+ loading: true
};
this.props.subscribe('file.select', this.onPathUpdate.bind(this));
}
@@ -41,10 +42,10 @@ export class ViewerPage extends React.Component {
this.setState({
path: props.match.url.replace('/view', '') + (location.hash || ""),
filename: Path.basename(props.match.url.replace('/view', '')) || 'untitled.dat'
- }, () => { this.componentWillMount(); });
+ }, () => { this.componentDidMount(); });
}
- componentWillMount(){
+ componentDidMount(){
const metadata = () => {
return new Promise((done, err) => {
let app_opener = opener(this.state.path);
@@ -54,7 +55,7 @@ export class ViewerPage extends React.Component {
opener: app_opener
}, () => done(app_opener));
}).catch(error => {
- notify.send(err, 'error');
+ this.props.error(error);
err(error);
});
});
@@ -67,15 +68,14 @@ export class ViewerPage extends React.Component {
if(err && err.code === 'BINARY_FILE'){
this.setState({opener: 'download', loading: false});
}else{
- this.setState({error: err});
+ this.props.error(err);
}
});
- }else{
- this.setState({loading: false});
+ return;
}
+ this.setState({loading: false});
};
- return metadata()
- .then(data_fetch);
+ return metadata().then(data_fetch);
}
componentWillUnmount() {
@@ -106,7 +106,7 @@ export class ViewerPage extends React.Component {
if(err && err.code === 'CANCELLED'){ return; }
this.setState({isSaving: false});
notify.send(err, 'error');
- return Promise.reject();
+ return Promise.reject(err);
});
}
@@ -125,7 +125,7 @@ export class ViewerPage extends React.Component {
-
+
-
+
-
- Oops!
- There is nothing in here
- {JSON.stringify(this.state.error)}
-
);
diff --git a/server/common/utils.go b/server/common/utils.go
index e0d37a7a..56c56ca7 100644
--- a/server/common/utils.go
+++ b/server/common/utils.go
@@ -19,6 +19,9 @@ func NewBool(t bool) *bool {
}
func NewString(t string) *string {
+ if t == "" {
+ return nil
+ }
return &t
}
diff --git a/server/ctrl/files.go b/server/ctrl/files.go
index 22b71c8d..1d2efdbc 100644
--- a/server/ctrl/files.go
+++ b/server/ctrl/files.go
@@ -56,6 +56,13 @@ func FileLs(ctx App, res http.ResponseWriter, req *http.Request) {
}
func FileCat(ctx App, res http.ResponseWriter, req *http.Request) {
+ http.SetCookie(res, &http.Cookie{
+ Name: "download",
+ Value: "",
+ MaxAge: -1,
+ Path: "/",
+ })
+
path, err := pathBuilder(ctx, req.URL.Query().Get("path"))
if err != nil {
SendErrorResult(res, err)
@@ -71,13 +78,6 @@ func FileCat(ctx App, res http.ResponseWriter, req *http.Request) {
return
}
- http.SetCookie(res, &http.Cookie{
- Name: "download",
- Value: "",
- MaxAge: -1,
- Path: "/",
- })
-
file, err = services.ProcessFileBeforeSend(file, &ctx, req, &res)
if err != nil {
SendErrorResult(res, err)
diff --git a/server/ctrl/session.go b/server/ctrl/session.go
index 800f593a..e1591e05 100644
--- a/server/ctrl/session.go
+++ b/server/ctrl/session.go
@@ -8,21 +8,28 @@ import (
"time"
)
-func SessionIsValid(ctx App, res http.ResponseWriter, req *http.Request) {
+type Session struct {
+ Home *string `json:"home,omitempty"`
+ IsAuth bool `json:"is_authenticated"`
+}
+
+func SessionGet(ctx App, res http.ResponseWriter, req *http.Request) {
+ r := Session {
+ IsAuth: false,
+ }
+
if ctx.Backend == nil {
- SendSuccessResult(res, false)
+ SendSuccessResult(res, r)
return
}
- if _, err := ctx.Backend.Ls("/"); err != nil {
- SendSuccessResult(res, false)
+ home, err := model.GetHome(ctx.Backend)
+ if err != nil {
+ SendSuccessResult(res, r)
return
}
- home, _ := model.GetHome(ctx.Backend)
- if home == "" {
- SendSuccessResult(res, true)
- return
- }
- SendSuccessResult(res, true)
+ r.IsAuth = true
+ r.Home = NewString(home)
+ SendSuccessResult(res, r)
}
func SessionAuthenticate(ctx App, res http.ResponseWriter, req *http.Request) {
diff --git a/server/ctrl/share.go b/server/ctrl/share.go
index 1488ad00..91fbe7a6 100644
--- a/server/ctrl/share.go
+++ b/server/ctrl/share.go
@@ -5,7 +5,6 @@ import (
. "github.com/mickael-kerjean/nuage/server/common"
"github.com/mickael-kerjean/nuage/server/model"
"net/http"
- "log"
)
func ShareList(ctx App, res http.ResponseWriter, req *http.Request) {
@@ -29,7 +28,6 @@ func ShareGet(ctx App, res http.ResponseWriter, req *http.Request) {
func ShareUpsert(ctx App, res http.ResponseWriter, req *http.Request) {
s := extractParams(req, &ctx)
- log.Println("EXPIRE::", s.Expire, ctx.Body["expire"])
s.Path = NewStringFromInterface(ctx.Body["path"])
if err := model.ShareUpsert(&s); err != nil {
diff --git a/server/router/index.go b/server/router/index.go
index d826945d..898ccbf1 100644
--- a/server/router/index.go
+++ b/server/router/index.go
@@ -14,7 +14,7 @@ func Init(a *App) *http.Server {
// API
session := r.PathPrefix("/api/session").Subrouter()
- session.HandleFunc("", APIHandler(SessionIsValid, *a)).Methods("GET")
+ session.HandleFunc("", APIHandler(SessionGet, *a)).Methods("GET")
session.HandleFunc("", APIHandler(SessionAuthenticate, *a)).Methods("POST")
session.HandleFunc("", APIHandler(SessionLogout, *a)).Methods("DELETE")
session.Handle("/auth/{service}", APIHandler(SessionOAuthBackend, *a)).Methods("GET")
diff --git a/webpack.config.js b/webpack.config.js
index 4e646a52..dc4bb9d5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,8 +19,7 @@ let config = {
chunkFilename: "assets/js/chunk_[name]_[id]_[chunkhash].js"
},
module: {
- rules: [
- {
+ rules: [{
test: path.join(__dirname, 'client'),
use: ['babel-loader'],
exclude: /node_modules/
@@ -29,6 +28,10 @@ let config = {
test: /\.html$/,
loader: 'html-loader'
},
+ {
+ test: /\.woff2$/,
+ loader: 'woff-loader'
+ },
{
test: /\.scss$/,
loaders: ['style-loader', 'css-loader', 'sass-loader']
@@ -55,20 +58,21 @@ let config = {
new webpack.optimize.OccurrenceOrderPlugin(),
new HtmlWebpackPlugin({
template: path.join(__dirname, 'client', 'index.html'),
- inject:true
+ inject: true
}),
new CopyWebpackPlugin([
{ from: 'manifest.json', to: "assets/" },
{ from: 'worker/*.js', to: "assets/" },
{ from: 'assets/logo/*' },
- { from: 'assets/icons/*' }
+ { from: 'assets/icons/*' },
+ { from: 'assets/fonts/*' }
], { context: path.join(__dirname, 'client') }),
//new BundleAnalyzerPlugin()
]
};
-if(process.env.NODE_ENV === 'production'){
+if (process.env.NODE_ENV === 'production') {
config.plugins.push(new UglifyJSPlugin({
sourceMap: false
}));
@@ -79,8 +83,8 @@ if(process.env.NODE_ENV === 'production'){
threshold: 0,
minRatio: 0.8
}));
-}else{
+} else {
config.devtool = '#inline-source-map';
}
-module.exports = config;
+module.exports = config;
\ No newline at end of file