maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

browser: Update ui-assets and fix the copyright header. (#3790)

Browse source
This commit is contained in:
Harshavardhana 2017-02-22 17:27:26 -08:00 committed by GitHub
parent 52d6678bf0
commit 25b5a0534f
28 changed files with 90 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/app/index.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/__tests__/jsonrpc-test.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/actions.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/Browse.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

4
browser/app/js/components/BrowserDropdown.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016, 2017 Minio, Inc.
* Minio Cloud Storage (C) 2016, 2017 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -27,7 +27,7 @@ let BrowserDropdown = ({fullScreenFunc, aboutFunc, settingsFunc, logoutFunc}) =>
</Dropdown.Toggle>
<Dropdown.Menu className="dropdown-menu-right">
<li>
<a target="_blank" href="https://github.com/minio/miniobrowser">Github <i className="fa fa-github"></i></a>
<a target="_blank" href="https://github.com/minio/minio">Github <i className="fa fa-github"></i></a>
</li>
<li>
<a href="" onClick={ fullScreenFunc }>Fullscreen <i className="fa fa-expand"></i></a>

2
browser/app/js/components/BrowserUpdate.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/ConfirmModal.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/Dropzone.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/InputGroup.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/Login.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/ObjectsList.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/Path.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/SettingsModal.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/SideBar.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/UploadModal.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/components/__tests__/Login-test.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/constants.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/jsonrpc.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/mime.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/reducers.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/utils.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

2
browser/app/js/web.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

6
browser/build.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -70,9 +70,9 @@ async.waterfall([
commitId = stdout.replace('\n', '')
if (commitId.length !== 40) throw new Error('commitId invalid : ' + commitId)
assetsFileName = 'ui-assets.go';
var cmd = 'go-bindata-assetfs -pkg miniobrowser -nocompress=true production/...'
var cmd = 'go-bindata-assetfs -pkg browser -nocompress=true production/...'
if (!isProduction) {
cmd = 'go-bindata-assetfs -pkg miniobrowser -nocompress=true dev/...'
cmd = 'go-bindata-assetfs -pkg browser -nocompress=true dev/...'
}
console.log('Running', cmd)
exec(cmd, cb)

8
browser/package.json
View file

@ -1,5 +1,5 @@
{
"name": "minio-browser",
"name": "browser",
"version": "0.0.1",
"description": "Minio Browser",
"scripts": {
@ -11,14 +11,14 @@
},
"repository": {
"type": "git",
"url": "https://github.com/minio/miniobrowser"
"url": "https://github.com/minio/minio"
},
"author": "Minio Inc",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/minio/miniobrowser/issues"
"url": "https://github.com/minio/minio/issues"
},
"homepage": "https://github.com/minio/miniobrowser",
"homepage": "https://github.com/minio/minio",
"devDependencies": {
"async": "^1.5.2",
"babel-cli": "^6.14.0",

80
browser/ui-assets.go
View file

File diff suppressed because one or more lines are too long

2
browser/webpack.config.js
View file

@ -1,5 +1,5 @@
/*
* Minio Browser (C) 2016 Minio, Inc.
* Minio Cloud Storage (C) 2016 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

32
cmd/web-handlers.go
View file

@ -84,7 +84,7 @@ func (web *webAPIHandlers) ServerInfo(r *http.Request, args *WebGenericArgs, rep
reply.MinioMemory = mem
reply.MinioPlatform = platform
reply.MinioRuntime = goruntime
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -104,7 +104,7 @@ func (web *webAPIHandlers) StorageInfo(r *http.Request, args *AuthRPCArgs, reply
return toJSONError(errAuthentication)
}
reply.StorageInfo = objectAPI.StorageInfo()
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -128,7 +128,7 @@ func (web *webAPIHandlers) MakeBucket(r *http.Request, args *MakeBucketArgs, rep
if err := objectAPI.MakeBucket(args.BucketName); err != nil {
return toJSONError(err, args.BucketName)
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -166,7 +166,7 @@ func (web *webAPIHandlers) ListBuckets(r *http.Request, args *WebGenericArgs, re
CreationDate: bucket.Created,
})
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -200,7 +200,7 @@ type WebObjectInfo struct {
// ListObjects - list objects api.
func (web *webAPIHandlers) ListObjects(r *http.Request, args *ListObjectsArgs, reply *ListObjectsRep) error {
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
objectAPI := web.ObjectAPI()
if objectAPI == nil {
return toJSONError(errServerNotInitialized)
@ -272,7 +272,7 @@ func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs,
if err := objectAPI.DeleteObject(args.BucketName, args.ObjectName); err != nil {
if isErrObjectNotFound(err) {
// Ignore object not found error.
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
return toJSONError(err, args.BucketName, args.ObjectName)
@ -290,7 +290,7 @@ func (web *webAPIHandlers) RemoveObject(r *http.Request, args *RemoveObjectArgs,
},
})
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -317,7 +317,7 @@ func (web *webAPIHandlers) Login(r *http.Request, args *LoginArgs, reply *LoginR
}
reply.Token = token
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -335,7 +335,7 @@ func (web webAPIHandlers) GenerateAuth(r *http.Request, args *WebGenericArgs, re
cred := newCredential()
reply.AccessKey = cred.AccessKey
reply.SecretKey = cred.SecretKey
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -416,7 +416,7 @@ func (web *webAPIHandlers) SetAuth(r *http.Request, args *SetAuthArgs, reply *Se
}
reply.Token = token
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -435,7 +435,7 @@ func (web *webAPIHandlers) GetAuth(r *http.Request, args *WebGenericArgs, reply
creds := serverConfig.GetCredential()
reply.AccessKey = creds.AccessKey
reply.SecretKey = creds.SecretKey
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -663,7 +663,7 @@ func (web *webAPIHandlers) GetBucketPolicy(r *http.Request, args *GetBucketPolic
return toJSONError(err, args.BucketName)
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
reply.Policy = policy.GetPolicy(policyInfo.Statements, args.BucketName, args.Prefix)
return nil
@ -702,7 +702,7 @@ func (web *webAPIHandlers) ListAllBucketPolicies(r *http.Request, args *ListAllB
return toJSONError(err, args.BucketName)
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
for prefix, policy := range policy.GetPolicies(policyInfo.Statements, args.BucketName) {
reply.Policies = append(reply.Policies, bucketAccessPolicy{
Prefix: prefix,
@ -747,7 +747,7 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
if err != nil {
return toJSONError(err, args.BucketName)
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
data, err := json.Marshal(policyInfo)
@ -766,7 +766,7 @@ func (web *webAPIHandlers) SetBucketPolicy(r *http.Request, args *SetBucketPolic
}
return toJSONError(err, args.BucketName)
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
return nil
}
@ -803,7 +803,7 @@ func (web *webAPIHandlers) PresignedGet(r *http.Request, args *PresignedGetArgs,
Message: "Bucket and Object are mandatory arguments.",
}
}
reply.UIVersion = miniobrowser.UIVersion
reply.UIVersion = browser.UIVersion
reply.URL = presignedGet(args.HostName, args.BucketName, args.ObjectName, args.Expiry)
return nil
}

6
cmd/web-router.go
View file

@ -47,9 +47,9 @@ const assetPrefix = "production"
func assetFS() *assetfs.AssetFS {
return &assetfs.AssetFS{
Asset: miniobrowser.Asset,
AssetDir: miniobrowser.AssetDir,
AssetInfo: miniobrowser.AssetInfo,
Asset: browser.Asset,
AssetDir: browser.AssetDir,
AssetInfo: browser.AssetInfo,
Prefix: assetPrefix,
}
}