mirror of
https://gitlab.com/omair-personal/exchange.git
synced 2026-08-19 12:34:13 +00:00
Merge branch 'arief/admin-setting-frontend' into 'master'
Arief/admin setting frontend See merge request CIEFWorldwideSdnBhd/exchange!29
This commit is contained in:
Jack Goh
Generated
+80
-80
@@ -1063,16 +1063,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/framework",
|
||||
"version": "v5.6.25",
|
||||
"version": "v5.6.26",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/framework.git",
|
||||
"reference": "a15efe4fbcd6b38ea76edc5c8939ffde4f4c7b7f"
|
||||
"reference": "7047df295e77cecb6a2f84736a732af66cc6789c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/a15efe4fbcd6b38ea76edc5c8939ffde4f4c7b7f",
|
||||
"reference": "a15efe4fbcd6b38ea76edc5c8939ffde4f4c7b7f",
|
||||
"url": "https://api.github.com/repos/laravel/framework/zipball/7047df295e77cecb6a2f84736a732af66cc6789c",
|
||||
"reference": "7047df295e77cecb6a2f84736a732af66cc6789c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1198,7 +1198,7 @@
|
||||
"framework",
|
||||
"laravel"
|
||||
],
|
||||
"time": "2018-06-12T14:39:24+00:00"
|
||||
"time": "2018-06-20T14:21:11+00:00"
|
||||
},
|
||||
{
|
||||
"name": "laravel/socialite",
|
||||
@@ -1327,16 +1327,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravelcollective/html",
|
||||
"version": "v5.6.9",
|
||||
"version": "v5.6.10",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/LaravelCollective/html.git",
|
||||
"reference": "fda9d3dad85ecea609ef9c6323d6923536cf5643"
|
||||
"reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/fda9d3dad85ecea609ef9c6323d6923536cf5643",
|
||||
"reference": "fda9d3dad85ecea609ef9c6323d6923536cf5643",
|
||||
"url": "https://api.github.com/repos/LaravelCollective/html/zipball/974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
|
||||
"reference": "974605fcd22a7e4d19f0b2ef635a0d1d7400387d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1391,7 +1391,7 @@
|
||||
],
|
||||
"description": "HTML and Form Builders for the Laravel Framework",
|
||||
"homepage": "https://laravelcollective.com",
|
||||
"time": "2018-05-30T16:09:07+00:00"
|
||||
"time": "2018-06-18T15:04:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "lcobucci/jwt",
|
||||
@@ -1441,7 +1441,7 @@
|
||||
{
|
||||
"name": "Luís Otávio Cobucci Oblonczyk",
|
||||
"email": "lcobucci@gmail.com",
|
||||
"role": "developer"
|
||||
"role": "Developer"
|
||||
}
|
||||
],
|
||||
"description": "A simple library to work with JSON Web Token and JSON Web Signature",
|
||||
@@ -2295,16 +2295,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/console",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/console.git",
|
||||
"reference": "2d5d973bf9933d46802b01010bd25c800c87c242"
|
||||
"reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/2d5d973bf9933d46802b01010bd25c800c87c242",
|
||||
"reference": "2d5d973bf9933d46802b01010bd25c800c87c242",
|
||||
"url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f",
|
||||
"reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2359,11 +2359,11 @@
|
||||
],
|
||||
"description": "Symfony Console Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-30T07:26:09+00:00"
|
||||
"time": "2018-05-31T10:17:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/css-selector",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/css-selector.git",
|
||||
@@ -2416,16 +2416,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/debug",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/debug.git",
|
||||
"reference": "449f8b00b28ab6e6912c3e6b920406143b27193b"
|
||||
"reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/449f8b00b28ab6e6912c3e6b920406143b27193b",
|
||||
"reference": "449f8b00b28ab6e6912c3e6b920406143b27193b",
|
||||
"url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
|
||||
"reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2468,11 +2468,11 @@
|
||||
],
|
||||
"description": "Symfony Debug Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-16T14:33:22+00:00"
|
||||
"time": "2018-06-08T09:39:36+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
@@ -2535,16 +2535,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
"reference": "087e2ee0d74464a4c6baac4e90417db7477dc238"
|
||||
"reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/087e2ee0d74464a4c6baac4e90417db7477dc238",
|
||||
"reference": "087e2ee0d74464a4c6baac4e90417db7477dc238",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
|
||||
"reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2580,20 +2580,20 @@
|
||||
],
|
||||
"description": "Symfony Finder Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-16T14:33:22+00:00"
|
||||
"time": "2018-06-19T21:38:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-foundation",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-foundation.git",
|
||||
"reference": "a916c88390fb861ee21f12a92b107d51bb68af99"
|
||||
"reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/a916c88390fb861ee21f12a92b107d51bb68af99",
|
||||
"reference": "a916c88390fb861ee21f12a92b107d51bb68af99",
|
||||
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
|
||||
"reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2634,20 +2634,20 @@
|
||||
],
|
||||
"description": "Symfony HttpFoundation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-25T14:55:38+00:00"
|
||||
"time": "2018-06-19T21:38:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/http-kernel",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/http-kernel.git",
|
||||
"reference": "b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90"
|
||||
"reference": "29c094a1c4f8209b7e033f612cbbd69029e38955"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90",
|
||||
"reference": "b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90",
|
||||
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/29c094a1c4f8209b7e033f612cbbd69029e38955",
|
||||
"reference": "29c094a1c4f8209b7e033f612cbbd69029e38955",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2655,13 +2655,13 @@
|
||||
"psr/log": "~1.0",
|
||||
"symfony/debug": "~3.4|~4.0",
|
||||
"symfony/event-dispatcher": "~4.1",
|
||||
"symfony/http-foundation": "~4.1",
|
||||
"symfony/http-foundation": "^4.1.1",
|
||||
"symfony/polyfill-ctype": "~1.8"
|
||||
},
|
||||
"conflict": {
|
||||
"symfony/config": "<3.4",
|
||||
"symfony/dependency-injection": "<4.1",
|
||||
"symfony/var-dumper": "<4.1",
|
||||
"symfony/var-dumper": "<4.1.1",
|
||||
"twig/twig": "<1.34|<2.4,>=2"
|
||||
},
|
||||
"provide": {
|
||||
@@ -2682,7 +2682,7 @@
|
||||
"symfony/stopwatch": "~3.4|~4.0",
|
||||
"symfony/templating": "~3.4|~4.0",
|
||||
"symfony/translation": "~3.4|~4.0",
|
||||
"symfony/var-dumper": "~4.1"
|
||||
"symfony/var-dumper": "^4.1.1"
|
||||
},
|
||||
"suggest": {
|
||||
"symfony/browser-kit": "",
|
||||
@@ -2721,7 +2721,7 @@
|
||||
],
|
||||
"description": "Symfony HttpKernel Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-30T12:52:34+00:00"
|
||||
"time": "2018-06-25T13:06:45+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
@@ -3002,16 +3002,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/process",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/process.git",
|
||||
"reference": "73445bd33b0d337c060eef9652b94df72b6b3434"
|
||||
"reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/73445bd33b0d337c060eef9652b94df72b6b3434",
|
||||
"reference": "73445bd33b0d337c060eef9652b94df72b6b3434",
|
||||
"url": "https://api.github.com/repos/symfony/process/zipball/1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
|
||||
"reference": "1d1677391ecf00d1c5b9482d6050c0c27aa3ac3a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3047,20 +3047,20 @@
|
||||
],
|
||||
"description": "Symfony Process Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-30T07:26:09+00:00"
|
||||
"time": "2018-05-31T10:17:53+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/routing",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/routing.git",
|
||||
"reference": "180b51c66d10f09e562c9ebc395b39aacb2cf8a2"
|
||||
"reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/180b51c66d10f09e562c9ebc395b39aacb2cf8a2",
|
||||
"reference": "180b51c66d10f09e562c9ebc395b39aacb2cf8a2",
|
||||
"url": "https://api.github.com/repos/symfony/routing/zipball/b38b9797327b26ea2e4146a40e6e2dc9820a6932",
|
||||
"reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3073,7 +3073,6 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"doctrine/annotations": "~1.0",
|
||||
"doctrine/common": "~2.2",
|
||||
"psr/log": "~1.0",
|
||||
"symfony/config": "~3.4|~4.0",
|
||||
"symfony/dependency-injection": "~3.4|~4.0",
|
||||
@@ -3125,20 +3124,20 @@
|
||||
"uri",
|
||||
"url"
|
||||
],
|
||||
"time": "2018-05-30T07:26:09+00:00"
|
||||
"time": "2018-06-19T21:38:16+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/translation",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/translation.git",
|
||||
"reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a"
|
||||
"reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a",
|
||||
"reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a",
|
||||
"url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
|
||||
"reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3194,20 +3193,20 @@
|
||||
],
|
||||
"description": "Symfony Translation Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2018-05-30T07:26:09+00:00"
|
||||
"time": "2018-06-22T08:59:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/var-dumper",
|
||||
"version": "v4.1.0",
|
||||
"version": "v4.1.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/var-dumper.git",
|
||||
"reference": "bc88ad53e825ebacc7b190bbd360781fce381c64"
|
||||
"reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/bc88ad53e825ebacc7b190bbd360781fce381c64",
|
||||
"reference": "bc88ad53e825ebacc7b190bbd360781fce381c64",
|
||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
|
||||
"reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3269,7 +3268,7 @@
|
||||
"debug",
|
||||
"dump"
|
||||
],
|
||||
"time": "2018-04-29T07:56:09+00:00"
|
||||
"time": "2018-06-23T12:23:56+00:00"
|
||||
},
|
||||
{
|
||||
"name": "tijsverkoyen/css-to-inline-styles",
|
||||
@@ -3798,20 +3797,20 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/dusk",
|
||||
"version": "v3.0.8",
|
||||
"version": "v3.0.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/dusk.git",
|
||||
"reference": "c6201427e63b869b0c1ee83d91c1d1958b71968e"
|
||||
"reference": "48215ab0028d759e5fd7cc8989f4b6c58050841d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/dusk/zipball/c6201427e63b869b0c1ee83d91c1d1958b71968e",
|
||||
"reference": "c6201427e63b869b0c1ee83d91c1d1958b71968e",
|
||||
"url": "https://api.github.com/repos/laravel/dusk/zipball/48215ab0028d759e5fd7cc8989f4b6c58050841d",
|
||||
"reference": "48215ab0028d759e5fd7cc8989f4b6c58050841d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"facebook/webdriver": "~1.0",
|
||||
"facebook/webdriver": "~1.3",
|
||||
"illuminate/console": "~5.6",
|
||||
"illuminate/support": "~5.6",
|
||||
"nesbot/carbon": "~1.20",
|
||||
@@ -3855,7 +3854,7 @@
|
||||
"testing",
|
||||
"webdriver"
|
||||
],
|
||||
"time": "2018-04-29T19:15:23+00:00"
|
||||
"time": "2018-06-20T13:47:27+00:00"
|
||||
},
|
||||
{
|
||||
"name": "mockery/mockery",
|
||||
@@ -3973,16 +3972,16 @@
|
||||
},
|
||||
{
|
||||
"name": "nunomaduro/collision",
|
||||
"version": "v2.0.2",
|
||||
"version": "v2.0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nunomaduro/collision.git",
|
||||
"reference": "245958b02c6a9edf24627380f368333ac5413a51"
|
||||
"reference": "b1f606399ae77e9479b5597cd1aa3d8ea0078176"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/245958b02c6a9edf24627380f368333ac5413a51",
|
||||
"reference": "245958b02c6a9edf24627380f368333ac5413a51",
|
||||
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/b1f606399ae77e9479b5597cd1aa3d8ea0078176",
|
||||
"reference": "b1f606399ae77e9479b5597cd1aa3d8ea0078176",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -3993,7 +3992,8 @@
|
||||
},
|
||||
"require-dev": {
|
||||
"laravel/framework": "5.6.*",
|
||||
"phpunit/phpunit": "~7.0"
|
||||
"phpstan/phpstan": "^0.9.2",
|
||||
"phpunit/phpunit": "~7.2"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
@@ -4031,7 +4031,7 @@
|
||||
"php",
|
||||
"symfony"
|
||||
],
|
||||
"time": "2018-03-21T20:11:24+00:00"
|
||||
"time": "2018-06-16T22:05:52+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phar-io/manifest",
|
||||
@@ -4601,16 +4601,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "7.2.4",
|
||||
"version": "7.2.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "00bc0b93f0ff4f557e9ea766557fde96da9a03dd"
|
||||
"reference": "400a3836ee549ae6f665323ac3f21e27eac7155f"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/00bc0b93f0ff4f557e9ea766557fde96da9a03dd",
|
||||
"reference": "00bc0b93f0ff4f557e9ea766557fde96da9a03dd",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/400a3836ee549ae6f665323ac3f21e27eac7155f",
|
||||
"reference": "400a3836ee549ae6f665323ac3f21e27eac7155f",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -4626,7 +4626,7 @@
|
||||
"php": "^7.1",
|
||||
"phpspec/prophecy": "^1.7",
|
||||
"phpunit/php-code-coverage": "^6.0.7",
|
||||
"phpunit/php-file-iterator": "^2.0",
|
||||
"phpunit/php-file-iterator": "^2.0.1",
|
||||
"phpunit/php-text-template": "^1.2.1",
|
||||
"phpunit/php-timer": "^2.0",
|
||||
"sebastian/comparator": "^3.0",
|
||||
@@ -4681,7 +4681,7 @@
|
||||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2018-06-05T03:40:05+00:00"
|
||||
"time": "2018-06-21T13:13:39+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/code-unit-reverse-lookup",
|
||||
|
||||
@@ -1,16 +1,24 @@
|
||||
<template>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" role="button"
|
||||
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
{{ locales[locale] }}
|
||||
</a>
|
||||
<div class="dropdown-menu">
|
||||
<a v-for="(value, key) in locales" :key="key" class="dropdown-item" href="#"
|
||||
@click.prevent="setLocale(key)">
|
||||
{{ value }}
|
||||
<div>
|
||||
<ul class="nav navbar-nav">
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" role="button"
|
||||
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
{{ locales[locale] }}
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
<div class="dropdown-menu">
|
||||
<a v-for="(value, key) in locales" :key="key" class="dropdown-item" href="#"
|
||||
@click.prevent="setLocale(key)">
|
||||
{{ value }}
|
||||
</a>
|
||||
</div>
|
||||
</li>
|
||||
<li><a class="nav-link" href="#" role="button">Update Rate</a></li>
|
||||
<li><a class="nav-link" href="#" role="button">Complete Order</a></li>
|
||||
<li><a class="nav-link" href="#" role="button">Transaction History</a></li>
|
||||
<li><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
@@ -3,7 +3,7 @@ import store from '~/store'
|
||||
export default async (to, from, next) => {
|
||||
if (!store.getters['auth/check']) {
|
||||
next({ name: 'login' })
|
||||
} else if (store.getters['auth/role'] == 'admin') {
|
||||
} else if (store.getters['auth/role'] === 'admin') {
|
||||
next({ name: 'admin.home' })
|
||||
} else {
|
||||
next()
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div>
|
||||
<div class="top-right links">
|
||||
<template v-if="authenticated">
|
||||
<router-link :to="{ name: 'home' }">
|
||||
<router-link :to="{ name: 'admin/home' }">
|
||||
{{ $t('home') }}
|
||||
</router-link>
|
||||
</template>
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
<div class="text-center">
|
||||
<div class="title mb-4">
|
||||
This is admin
|
||||
This index
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -32,7 +32,7 @@ export default {
|
||||
layout: 'basic',
|
||||
|
||||
metaInfo () {
|
||||
return { title: this.$t('home') }
|
||||
// return { title: this.$t('admin.home') }
|
||||
},
|
||||
|
||||
data: () => ({
|
||||
@@ -51,8 +51,3 @@ export default {
|
||||
right: 10px;
|
||||
top: 18px;
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: 85px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
<template>
|
||||
<el-table :data="tableData" border style="width: 100%">
|
||||
<el-table-column prop="comp_name" label="Company Name" width="180"></el-table-column>
|
||||
<el-table-column prop="reg_no" label="Registration No" width="180"></el-table-column>
|
||||
<el-table-column prop="gst_no" label="GST No"></el-table-column>
|
||||
<el-table-column prop="bank_name" label="Bank Name"></el-table-column>
|
||||
<el-table-column prop="account_no" label="Account No"></el-table-column>
|
||||
<el-table-column label="Action">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small">Edit</el-button>
|
||||
<el-button type="text" size="small">Delete</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
|
||||
|
||||
</el-table>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
tableData: [{
|
||||
comp_name: 'CIEF',
|
||||
reg_no: '2134241',
|
||||
gst_no: '214',
|
||||
bank_name: 'myabank',
|
||||
account_no: '1242521',
|
||||
}, {
|
||||
comp_name: 'iPhone',
|
||||
reg_no: '123214',
|
||||
gst_no: '3532',
|
||||
bank_name: 'adyabank',
|
||||
account_no: '21421421',
|
||||
}]
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -37,7 +37,27 @@ export default {
|
||||
icon: 'lock',
|
||||
name: this.$t('password'),
|
||||
route: 'settings.password'
|
||||
}
|
||||
},
|
||||
{
|
||||
icon: 'user',
|
||||
name: this.$t('Supplier'),
|
||||
route: 'settings.admin-supplier'
|
||||
},
|
||||
{
|
||||
icon: 'cog',
|
||||
name: this.$t('Credit Setting'),
|
||||
route: 'settings.admin-credit-setting'
|
||||
},
|
||||
{
|
||||
icon: 'flag',
|
||||
name: this.$t('CIEF China Bank'),
|
||||
route: 'settings.admin-china-bank'
|
||||
},
|
||||
{
|
||||
icon: 'building',
|
||||
name: this.$t('Bank Setting'),
|
||||
route: 'settings.admin-bank-setting'
|
||||
},
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import FontAwesomeIcon from '@fortawesome/vue-fontawesome'
|
||||
// import { } from '@fortawesome/fontawesome-free-regular/shakable.es'
|
||||
|
||||
import {
|
||||
faUser, faLock, faSignOutAlt, faCog
|
||||
faUser, faLock, faSignOutAlt, faCog, faFlag, faBuilding
|
||||
} from '@fortawesome/fontawesome-free-solid/shakable.es'
|
||||
|
||||
import {
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
} from '@fortawesome/fontawesome-free-brands/shakable.es'
|
||||
|
||||
fontawesome.library.add(
|
||||
faUser, faLock, faSignOutAlt, faCog, faGithub
|
||||
faUser, faLock, faSignOutAlt, faCog, faFlag, faBuilding, faGithub
|
||||
)
|
||||
|
||||
Vue.component('fa', FontAwesomeIcon)
|
||||
|
||||
@@ -9,7 +9,13 @@ const Home = () => import('~/pages/home').then(m => m.default || m)
|
||||
const Settings = () => import('~/pages/settings/index').then(m => m.default || m)
|
||||
const SettingsProfile = () => import('~/pages/settings/profile').then(m => m.default || m)
|
||||
const SettingsPassword = () => import('~/pages/settings/password').then(m => m.default || m)
|
||||
const SettingsAdminSupplier = () => import('~/pages/settings/admin-supplier').then(m => m.default || m)
|
||||
const SettingsAdminCreditSetting = () => import('~/pages/settings/admin-credit-setting').then(m => m.default || m)
|
||||
const SettingsAdminChinaBank = () => import('~/pages/settings/admin-china-bank').then(m => m.default || m)
|
||||
const SettingsAdminBankSetting = () => import('~/pages/settings/admin-bank-setting').then(m => m.default || m)
|
||||
|
||||
// const Admin = () => import('~/pages/admin/adminhome').then(m => m.default || m)
|
||||
const Admin = () => import('~/pages/admin/index').then(m => m.default || m)
|
||||
// Booking
|
||||
const Upload = () => import('~/pages/booking/uploadUserBankSlip').then(m => m.default || m)
|
||||
const Confirmation = () => import('~/pages/booking/confirmation').then(m => m.default || m)
|
||||
@@ -41,7 +47,11 @@ export default [
|
||||
children: [
|
||||
{ path: '', redirect: { name: 'settings.profile' } },
|
||||
{ path: 'profile', name: 'settings.profile', component: SettingsProfile },
|
||||
{ path: 'password', name: 'settings.password', component: SettingsPassword }
|
||||
{ path: 'password', name: 'settings.password', component: SettingsPassword },
|
||||
{ path: 'admin-supplier', name: 'settings.admin-supplier', component: SettingsAdminSupplier },
|
||||
{ path: 'admin-credit-setting', name: 'settings.admin-credit-setting', component: SettingsAdminCreditSetting },
|
||||
{ path: 'admin-china-bank', name: 'settings.admin-china-bank', component: SettingsAdminChinaBank },
|
||||
{ path: 'admin-bank-setting', name: 'settings.admin-bank-setting', component: SettingsAdminBankSetting }
|
||||
] },
|
||||
|
||||
// Booking
|
||||
@@ -52,6 +62,13 @@ export default [
|
||||
{ path: '/booking/:id/po-complete', name: 'booking.user.pocomplete', component: PoComplete },
|
||||
{ path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
|
||||
|
||||
{ path: '/admin',
|
||||
component: Admin,
|
||||
children: [
|
||||
{ path: '', redirect: { name: 'admin.index' } },
|
||||
{ path: 'index', name: 'admin.index', component: Admin },
|
||||
{ path: 'home', name: 'admin.home', component: AdminHome }
|
||||
] },
|
||||
// Admin booking
|
||||
{ path: '/booking/:id/verification', name: 'booking.admin.verification', component: Verification },
|
||||
{ path: '/booking/:id/supplier', name: 'booking.admin.supplier', component: Supplier },
|
||||
|
||||
Reference in New Issue
Block a user