diff --git a/package.json b/package.json index 0145141..efda4c1 100755 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "description": "HTML Admin Template", "scripts": { - "start": "npm run build && node server.js", + "start": "webpack-dashboard -t 'Project' -- webpack-dev-server", "dev": "webpack-dashboard -t 'Project' -- webpack-dev-server", "clean": "shx rm -rf ./build", "build": "npm run clean && cross-env NODE_ENV=\"production\" webpack", diff --git a/server.js b/server.js deleted file mode 100644 index 16c5e1d..0000000 --- a/server.js +++ /dev/null @@ -1,12 +0,0 @@ -const express = require('express'); - -const app = express(); - -app.use(express.static('public')); - -// start the server with the build folder. -app.use('/', express.static(__dirname + '/build')); - -const server = app.listen(process.env.PORT || 3000, function () { - console.log('Server started at http://localhost:%s', server.address().port); -}); diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index f3c00f5..ff83d64 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -17,6 +17,7 @@ angular.module('NomitWisp', 'nwSignup', 'nwHistory', 'nwUserAdd', + 'nwUsers', ngRoute ]) @@ -56,10 +57,14 @@ angular.module('NomitWisp', controller: 'UserAddController', templateUrl: 'assets/scripts/user-add/user-add.html' }) - // .when('/users', { - // controller: 'UsersController', - // templateUrl: '' - // }) + .when('/users', { + controller: 'UsersController', + templateUrl: 'assets/scripts/users/users.html' + }) + .when('/users/:id',{ + controller: 'UserDetailsController', + templateUrl: 'assets/scripts/user-details/user-details.html' + }) // .when('/companies', { // controller: 'CompaniesController', // templateUrl: '' diff --git a/src/assets/scripts/avatar-initials.js b/src/assets/scripts/avatar-initials.js deleted file mode 100644 index 43a165e..0000000 --- a/src/assets/scripts/avatar-initials.js +++ /dev/null @@ -1,6 +0,0 @@ -import Avatar from 'avatar-initials'; -const avatar = new Avatar(document.getElementById('avatar'), { - 'useGravatar': false, - 'initials': 'MC', -}); - diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index c3caee2..902f7dd 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -1,4 +1,4 @@ -
+
@@ -82,7 +82,7 @@
New Registered Users
- +
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index 423a5ce..97be6d3 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -30,5 +30,6 @@ import './signup'; import './history'; import './trumbowyg'; import './user-add'; +import './users'; import './app'; \ No newline at end of file diff --git a/src/assets/scripts/logout/controller.js b/src/assets/scripts/logout/controller.js index 496fa65..f1a22ef 100644 --- a/src/assets/scripts/logout/controller.js +++ b/src/assets/scripts/logout/controller.js @@ -6,6 +6,7 @@ const LogoutController = ($scope, $location, LogoutService, $cookies, UserServic $cookies.remove('access_token'); UserService.loadUser(); $location.path('/'); + window.location.reload(false); } }; diff --git a/src/assets/scripts/nwLogin/controller.js b/src/assets/scripts/nwLogin/controller.js index d25beeb..3d33ff7 100644 --- a/src/assets/scripts/nwLogin/controller.js +++ b/src/assets/scripts/nwLogin/controller.js @@ -2,7 +2,7 @@ const LoginController = ($scope, $cookies, $location, LoginService, UserService) // load the user if already logged in, for all controllers UserService.loadUser(); - + $scope.userLogin = async (isValid) => { if(isValid){ let result = await LoginService.loginUserService($scope.user); @@ -12,7 +12,10 @@ const LoginController = ($scope, $cookies, $location, LoginService, UserService) $cookies.put('access_token', result.token); UserService.loadUser(); $location.path('/'); - $scope.$apply(); + // temporary solution + //window.location.reload(false); + $scope.$emit('needReload'); + } else { alert(result); } diff --git a/src/assets/scripts/nwLogin/index.js b/src/assets/scripts/nwLogin/index.js index e299548..03a5264 100644 --- a/src/assets/scripts/nwLogin/index.js +++ b/src/assets/scripts/nwLogin/index.js @@ -12,6 +12,6 @@ angular.module('NomitWisp-Login', [ngCookies]) function nwLogin(){ return { restrict: 'E', - templateUrl: 'assets/scripts/nwLogin/nwLogin.html' + templateUrl: 'assets/scripts/nwLogin/nwLogin.html', }; } \ No newline at end of file diff --git a/src/assets/scripts/nwSidebar/nwSidebar.html b/src/assets/scripts/nwSidebar/nwSidebar.html index 69db95c..9c8bfda 100644 --- a/src/assets/scripts/nwSidebar/nwSidebar.html +++ b/src/assets/scripts/nwSidebar/nwSidebar.html @@ -229,7 +229,7 @@ -
  • +
  • @@ -247,7 +247,7 @@
    • -
  • +
  • @@ -265,7 +265,7 @@
    • -
  • +
  • diff --git a/src/assets/scripts/nwTopbar/nwTopbar.html b/src/assets/scripts/nwTopbar/nwTopbar.html index 5cd4a7a..2ce4b76 100644 --- a/src/assets/scripts/nwTopbar/nwTopbar.html +++ b/src/assets/scripts/nwTopbar/nwTopbar.html @@ -8,17 +8,18 @@
    • -
  • +
    • -
  • +
  • + ADD NEW USER @@ -38,10 +39,10 @@
  • - {{user.role}} - {{user.fullname}} + {{user.role}} + {{user.fullname}}
    -
    +
    diff --git a/src/assets/scripts/nwTopbar/topbar.controller.js b/src/assets/scripts/nwTopbar/topbar.controller.js index 131b569..e9394fe 100644 --- a/src/assets/scripts/nwTopbar/topbar.controller.js +++ b/src/assets/scripts/nwTopbar/topbar.controller.js @@ -1,7 +1,7 @@ import functionSearch from '../search'; +import Avatar from 'avatar-initials'; /** @ngInject */ -import Avatar from 'avatar-initials'; const TopbarController = ($scope, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { @@ -13,6 +13,11 @@ const TopbarController = ($scope, UserService) => { 'initials': 'CC', }); + $scope.$on('needReload', function(event){ + console.log("NEED RELOAD!"); + // Refresh topbar... + }) + UserService.loadUser(); functionSearch(); } diff --git a/src/assets/scripts/user-details/index.js b/src/assets/scripts/user-details/index.js new file mode 100644 index 0000000..cb35324 --- /dev/null +++ b/src/assets/scripts/user-details/index.js @@ -0,0 +1,10 @@ +import * as angular from 'angular'; +import UserDetailsController from './user-details.controller'; +import UserDetailsService from './user-details.service'; + +angular.module('nwUsers', []) + .config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.withCredentials = true; + }]) + .controller(UserDetailsController.name, UserDetailsController) + .factory(UserDetailsService.name, UserDetailsService); \ No newline at end of file diff --git a/src/assets/scripts/user-details/user-details.controller.js b/src/assets/scripts/user-details/user-details.controller.js new file mode 100644 index 0000000..ed14728 --- /dev/null +++ b/src/assets/scripts/user-details/user-details.controller.js @@ -0,0 +1,12 @@ +/** @ngInject */ +const UsersController = ($scope, UsersService, UserService) => { + $scope.$on('loadUserSuccess', function (event, user) { + $scope.user = user; + UsersService.fetchUsersService() + .then( (result) => { $scope.userDetails = result; }) + .catch( (error) => { console.log(error); }) + }); + UserService.loadUser(); +} + +export default UsersController; \ No newline at end of file diff --git a/src/assets/scripts/user-details/user-details.service.js b/src/assets/scripts/user-details/user-details.service.js new file mode 100644 index 0000000..00d4886 --- /dev/null +++ b/src/assets/scripts/user-details/user-details.service.js @@ -0,0 +1,12 @@ +const UserDetailsService = ($http) => { + let serv = {}; + + serv.fetchUserDetails = (route) =>{ + return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/'+route.id) + .then( (result) => { return result.data; }) + .catch( (error) => { return error; }) + } + return serv; +} + +export default UserDetailsService; \ No newline at end of file diff --git a/src/assets/scripts/users/index.js b/src/assets/scripts/users/index.js new file mode 100644 index 0000000..248c2d2 --- /dev/null +++ b/src/assets/scripts/users/index.js @@ -0,0 +1,10 @@ +import * as angular from 'angular'; +import UsersController from './users.controller'; +import UsersService from './users.service'; + +angular.module('nwUsers', []) + .config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.withCredentials = true; + }]) + .controller(UsersController.name, UsersController) + .factory(UsersService.name, UsersService); \ No newline at end of file diff --git a/src/assets/scripts/users/users.controller.js b/src/assets/scripts/users/users.controller.js new file mode 100644 index 0000000..9a764a4 --- /dev/null +++ b/src/assets/scripts/users/users.controller.js @@ -0,0 +1,12 @@ +/** @ngInject */ +const UsersController = ($scope, UsersService, UserService) => { + $scope.$on('loadUserSuccess', function (event, user) { + $scope.user = user; + UsersService.fetchUsersService() + .then( (result) => { $scope.users = result; }) + .catch( (error) => { console.log(error); }) + }); + UserService.loadUser(); +} + +export default UsersController; \ No newline at end of file diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html index 6492d77..ee8c21d 100644 --- a/src/assets/scripts/users/users.html +++ b/src/assets/scripts/users/users.html @@ -1,4 +1,4 @@ -
    +

    Users

    @@ -8,32 +8,25 @@
    -
    +
    -
    -
    - -
    -
    David James
    -
    Victoria
    -
    Mobile: 0414987654
    -
    -
    -
    -
    - - -
    -
    + +
    +
    {{user.fullname}}
    +
    Victoria
    +
    Mobile: 0414987654
    + view user profile + ban + user
    -
    -
    +
    +
    @@ -45,30 +38,20 @@
    -
    - -
    -
    - -
    -
    David James
    -
    Victoria
    -
    Mobile: 0414987654
    -
    -
    -
    -
    -
    - - - - -
    -
    -
    -
    -
    + + + +
    +
    diff --git a/src/assets/scripts/users/users.service.js b/src/assets/scripts/users/users.service.js new file mode 100644 index 0000000..ba011a7 --- /dev/null +++ b/src/assets/scripts/users/users.service.js @@ -0,0 +1,13 @@ +/** @ngInject */ +const UsersService = ($http) => { + let serv = {}; + + serv.fetchUsersService = () =>{ + return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/user', { withCredentials: true }) + .then( (result) => { console.log(result.data); return result.data; }) + .catch( (error) => { return error; }); + } + return serv; +} + +export default UsersService; \ No newline at end of file diff --git a/src/index.html b/src/index.html index 55bb2da..65170d1 100755 --- a/src/index.html +++ b/src/index.html @@ -83,11 +83,12 @@
    +
    - +
    diff --git a/webpack/devServer.js b/webpack/devServer.js index 7fa9655..01b4ce1 100755 --- a/webpack/devServer.js +++ b/webpack/devServer.js @@ -17,7 +17,7 @@ const const devServer = { contentBase : manifest.IS_PRODUCTION ? manifest.paths.build : manifest.paths.src, historyApiFallback : true, - port : manifest.IS_PRODUCTION ? 3001 : 3000, + port : manifest.IS_PRODUCTION ? process.env.PORT || 3001 : process.env.PORT || 3000, compress : manifest.IS_PRODUCTION, inline : !manifest.IS_PRODUCTION, watchContentBase: true,