Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

General improvements #21

Merged
merged 27 commits into from
Mar 19, 2017
Merged

General improvements #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
00681e7
Started using sass, added config file
euvl Mar 11, 2017
d48a892
Added styles for sticky navigation
euvl Mar 11, 2017
651c8a7
Removed unused copilot js file
euvl Mar 11, 2017
f4d7a7b
Removed private google analytics token
euvl Mar 11, 2017
a39a8f6
Added hideLogoOnMobile flag that will hide logo on screens < 768px
euvl Mar 11, 2017
9d4927c
Removed unsupported VueRouter with axios
euvl Mar 11, 2017
8871fc2
Removed unused vue logo, moved demo data into separate demo file
euvl Mar 11, 2017
a449301
Minor refactoring and improvements
euvl Mar 11, 2017
525cc3a
Minor refactoring and improvements [2]
euvl Mar 11, 2017
089401c
Minor refactoring and improvements [3]
euvl Mar 12, 2017
37799fe
Renamed config.stickyNav => config.fixedLayout
euvl Mar 12, 2017
2f9b15c
Moved sidebar-menu into separate file
euvl Mar 13, 2017
803b6c7
Updated Settings example, icons are aligned and the same width
euvl Mar 13, 2017
cb356fe
Cleaned Access page
euvl Mar 13, 2017
0f55a09
Renamed unclear /dash/ page to /views/
euvl Mar 13, 2017
bd0d1c8
module.exports => export default (#20)
euvl Mar 13, 2017
ab6df64
Fixed bug where serialized string from the local storage was compared…
euvl Mar 13, 2017
79d5490
Removed extra semicolons, set default config flags to "false"
euvl Mar 13, 2017
e444b7f
Fixed bug with profile picture in sidebar-menu not being rendered
euvl Mar 13, 2017
827f41f
Added an example of tree-view menu item to the sidebar menu
euvl Mar 13, 2017
a7e035a
Added vuex-router-sync module which literally syncs vue-router state …
euvl Mar 15, 2017
6f20aa5
Changed absolute paths with trailing "/" to relative (read description)
euvl Mar 15, 2017
2d833e9
Moved store mutations and actions into separate files
euvl Mar 17, 2017
f530102
Cleaned some templates
euvl Mar 17, 2017
d579e5c
Used {mapState} vuex api to get the userInfo state, cleaned more temp…
euvl Mar 17, 2017
b3833c9
Fixed last commits (oops)
euvl Mar 17, 2017
a21c614
Cleaned up api calls in Repos and Login pages
euvl Mar 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@
<script src="/static/js/plugins/bootstrap/bootstrap.min.js"></script>
<script src="/static/js/plugins/AdminLTE/app.min.js"></script>
<script src="/static/js/plugins/pace/pace.min.js"></script>
<script src="/static/js/copilot.js"></script>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
// analytics section
ga('create', 'UA-76862457-1', 'auto')
ga('create', 'YOUR_SHIT_HERE', 'auto')
ga('send', 'pageview')
</script>
</body>
Expand Down
124 changes: 64 additions & 60 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"deploy": "netlify deploy dist"
},
"dependencies": {
"axios": "^0.15.3",
"babel-runtime": "^5.8.0",
"chart.js": "2.3.0",
"datatables.net": "^1.10.11",
Expand All @@ -27,69 +28,72 @@
"vue-date-picker": "^1.0.2",
"vue-resource": "^1.0.3",
"vue-router": "^2.0.1",
"vuex": "^2.0.0"
"vuex": "^2.0.0",
"vuex-router-sync": "^4.1.2"
},
"devDependencies": {
"autoprefixer": "^6.4.0",
"babel-core": "^6.0.0",
"babel-eslint": "^7.0.0",
"babel-loader": "^6.0.0",
"babel-plugin-transform-runtime": "^6.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-stage-2": "^6.0.0",
"babel-register": "^6.0.0",
"chalk": "^1.1.3",
"connect-history-api-fallback": "^1.1.0",
"css-loader": "^0.25.0",
"eslint": "^3.7.1",
"eslint-friendly-formatter": "^2.0.5",
"eslint-loader": "^1.5.0",
"eslint-plugin-html": "^1.3.0",
"eslint-config-standard": "6.2.1",
"eslint-plugin-promise": "3.3.0",
"eslint-plugin-standard": "^2.0.1",
"eventsource-polyfill": "^0.9.6",
"express": "^4.13.3",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"function-bind": "^1.0.2",
"html-webpack-plugin": "^2.8.1",
"http-proxy-middleware": "^0.17.2",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.2.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sinon-chai": "^1.2.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "0.0.26",
"karma-webpack": "^1.7.0",
"lolex": "^1.4.0",
"mocha": "^3.1.0",
"chai": "^3.5.0",
"sinon": "^1.17.3",
"sinon-chai": "^2.8.0",
"inject-loader": "^2.0.1",
"isparta-loader": "^2.0.0",
"phantomjs-prebuilt": "^2.1.3",
"chromedriver": "^2.21.2",
"cross-spawn": "^4.0.2",
"nightwatch": "^0.9.8",
"selenium-server": "2.53.1",
"semver": "^5.3.0",
"opn": "^4.0.2",
"ora": "^0.3.0",
"shelljs": "^0.7.4",
"url-loader": "^0.5.7",
"vue-loader": "^9.4.0",
"vue-style-loader": "^1.0.0",
"webpack": "^1.13.2",
"webpack-dev-middleware": "^1.8.3",
"webpack-hot-middleware": "^2.12.2",
"webpack-merge": "^0.14.1"
"babel-core": "^6.0.0",
"babel-eslint": "^7.0.0",
"babel-loader": "^6.0.0",
"babel-plugin-transform-runtime": "^6.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-preset-stage-2": "^6.0.0",
"babel-register": "^6.0.0",
"chai": "^3.5.0",
"chalk": "^1.1.3",
"chromedriver": "^2.21.2",
"connect-history-api-fallback": "^1.1.0",
"cross-spawn": "^4.0.2",
"css-loader": "^0.25.0",
"eslint": "^3.7.1",
"eslint-config-standard": "6.2.1",
"eslint-friendly-formatter": "^2.0.5",
"eslint-loader": "^1.5.0",
"eslint-plugin-html": "^1.3.0",
"eslint-plugin-promise": "3.3.0",
"eslint-plugin-standard": "^2.0.1",
"eventsource-polyfill": "^0.9.6",
"express": "^4.13.3",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"function-bind": "^1.0.2",
"html-webpack-plugin": "^2.8.1",
"http-proxy-middleware": "^0.17.2",
"inject-loader": "^2.0.1",
"isparta-loader": "^2.0.0",
"json-loader": "^0.5.4",
"karma": "^1.3.0",
"karma-coverage": "^1.1.1",
"karma-mocha": "^1.2.0",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sinon-chai": "^1.2.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "0.0.26",
"karma-webpack": "^1.7.0",
"lolex": "^1.4.0",
"mocha": "^3.1.0",
"nightwatch": "^0.9.8",
"node-sass": "^4.5.0",
"opn": "^4.0.2",
"ora": "^0.3.0",
"phantomjs-prebuilt": "^2.1.3",
"sass-loader": "^6.0.3",
"selenium-server": "2.53.1",
"semver": "^5.3.0",
"shelljs": "^0.7.4",
"sinon": "^1.17.3",
"sinon-chai": "^2.8.0",
"url-loader": "^0.5.7",
"vue-loader": "^9.4.0",
"vue-style-loader": "^1.0.0",
"webpack": "^1.13.2",
"webpack-dev-middleware": "^1.8.3",
"webpack-hot-middleware": "^2.12.2",
"webpack-merge": "^0.14.1"
},
"engines": {
"node": ">= 4.0.0",
"npm": ">= 3.0.0"
}
"node": ">= 4.0.0",
"npm": ">= 3.0.0"
}
}
19 changes: 19 additions & 0 deletions src/api/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import axios from 'axios'
import config from '../config'

export default {
request (method, uri, data = null) {
if (!method) {
console.error('API function call requires method argument')
return
}

if (!uri) {
console.error('API function call requires uri argument')
return
}

var url = config.serverURI + uri
return axios({ method, url, data })
}
}
0 static/js/copilot.js → src/assets/.gitkeep
View file
Open in desktop
File renamed without changes.
Binary file removed src/assets/logo.png
View file
Open in desktop
Binary file not shown.
22 changes: 4 additions & 18 deletions src/components/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,19 @@
<template>
<div>
<div id="app">
<router-view></router-view>
<div id="app"></div>
</div>
</template>

<script>
export default {
name: 'App',
data: function () {
data () {
return {
section: 'Head',
version: '0.10.0',
callingAPI: false,
serverURI: 'http://10.110.1.10:8080',
caller: this.$http
section: 'Head'
}
},
methods: {
callAPI: function (method, url, data) {
this.callingAPI = true
url = url || this.serverURI // if no url is passed then inheret local server URI
return this.caller({
url: url,
method: method,
data: data
})
},
logout: function () {
logout () {
this.$store.commit('SET_USER', null)
this.$store.commit('SET_TOKEN', null)

Expand Down
Loading