From 518cfa909072910af508e6b3e229fe9d04131944 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sun, 30 May 2021 23:22:12 +0800 Subject: [PATCH] no message --- resources/assets/js/language/index.js | 2 +- resources/assets/js/language/language.js | 3 + resources/assets/js/pages/index.vue | 4 +- .../assets/js/pages/{users => }/login.vue | 0 resources/assets/js/pages/manage.vue | 66 ++++++++ .../index.vue => manage/dashboard.vue} | 0 .../detail.vue => manage/project-detail.vue} | 7 +- resources/assets/js/routes.js | 32 ++-- resources/lang/en/auth.php | 20 +++ resources/lang/en/pagination.php | 19 +++ resources/lang/en/passwords.php | 22 +++ resources/lang/en/validation.php | 155 ++++++++++++++++++ resources/lang/language.js | 2 - 13 files changed, 314 insertions(+), 18 deletions(-) create mode 100644 resources/assets/js/language/language.js rename resources/assets/js/pages/{users => }/login.vue (100%) create mode 100644 resources/assets/js/pages/manage.vue rename resources/assets/js/pages/{dashboard/index.vue => manage/dashboard.vue} (100%) rename resources/assets/js/pages/{project/detail.vue => manage/project-detail.vue} (69%) create mode 100644 resources/lang/en/auth.php create mode 100644 resources/lang/en/pagination.php create mode 100644 resources/lang/en/passwords.php create mode 100644 resources/lang/en/validation.php delete mode 100644 resources/lang/language.js diff --git a/resources/assets/js/language/index.js b/resources/assets/js/language/index.js index 336ff217..476ecc9e 100644 --- a/resources/assets/js/language/index.js +++ b/resources/assets/js/language/index.js @@ -70,7 +70,7 @@ export default { if (this.languageInit === false) { this.languageInit = true; // - this.addLanguageData(require("../../../lang/language.js").default); + this.addLanguageData(require("./language.js").default); // languageListenerObjects.push((lang) => { this.languageType = lang; diff --git a/resources/assets/js/language/language.js b/resources/assets/js/language/language.js new file mode 100644 index 00000000..f264e928 --- /dev/null +++ b/resources/assets/js/language/language.js @@ -0,0 +1,3 @@ +exports.default = [ + {"CN": "登录", "EN": "Log in", "TC": "登錄", "KM": "ចូល", "TH": "เข้าสู่ระบบ", "KO": "로그인", "JA": "ログインする"}, +]; diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue index d1e1dfe5..84dc77d5 100644 --- a/resources/assets/js/pages/index.vue +++ b/resources/assets/js/pages/index.vue @@ -9,9 +9,9 @@ export default { }, mounted() { if (this.usrLogin) { - this.goForward({path: '/dashboard'}, true); + this.goForward({path: '/manage/dashboard'}, true); } else { - this.goForward({path: '/users/login'}, true); + this.goForward({path: '/login'}, true); } }, deactivated() { diff --git a/resources/assets/js/pages/users/login.vue b/resources/assets/js/pages/login.vue similarity index 100% rename from resources/assets/js/pages/users/login.vue rename to resources/assets/js/pages/login.vue diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue new file mode 100644 index 00000000..d222b840 --- /dev/null +++ b/resources/assets/js/pages/manage.vue @@ -0,0 +1,66 @@ + + + + + + diff --git a/resources/assets/js/pages/dashboard/index.vue b/resources/assets/js/pages/manage/dashboard.vue similarity index 100% rename from resources/assets/js/pages/dashboard/index.vue rename to resources/assets/js/pages/manage/dashboard.vue diff --git a/resources/assets/js/pages/project/detail.vue b/resources/assets/js/pages/manage/project-detail.vue similarity index 69% rename from resources/assets/js/pages/project/detail.vue rename to resources/assets/js/pages/manage/project-detail.vue index f9baaf76..4f1ca823 100644 --- a/resources/assets/js/pages/project/detail.vue +++ b/resources/assets/js/pages/manage/project-detail.vue @@ -1,13 +1,16 @@ diff --git a/resources/assets/js/routes.js b/resources/assets/js/routes.js index b3211cb9..df2d2f65 100755 --- a/resources/assets/js/routes.js +++ b/resources/assets/js/routes.js @@ -5,19 +5,29 @@ export default [ component: () => import('./pages/index.vue') }, { - name: 'dashboard', - path: '/dashboard', - component: () => import('./pages/dashboard/index.vue'), + name: 'manage', + path: '/manage', + meta: { + slide: false + }, + component: () => import('./pages/manage.vue'), + children: [ + { + name: 'manage-dashboard', + path: 'dashboard', + component: () => import('./pages/manage/dashboard.vue'), + }, + { + name: 'manage-project-detail', + path: 'project/:id', + component: () => import('./pages/manage/project-detail.vue'), + }, + ] }, { - name: 'project-detail', - path: '/project/:id', - component: () => import('./pages/project/detail.vue'), - }, - { - name: 'users-login', - path: '/users/login', - component: () => import('./pages/users/login.vue'), + name: 'login', + path: '/login', + component: () => import('./pages/login.vue'), }, { name: '404', diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php new file mode 100644 index 00000000..6598e2c0 --- /dev/null +++ b/resources/lang/en/auth.php @@ -0,0 +1,20 @@ + 'These credentials do not match our records.', + 'password' => 'The provided password is incorrect.', + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + +]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php new file mode 100644 index 00000000..d4814118 --- /dev/null +++ b/resources/lang/en/pagination.php @@ -0,0 +1,19 @@ + '« Previous', + 'next' => 'Next »', + +]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php new file mode 100644 index 00000000..2345a56b --- /dev/null +++ b/resources/lang/en/passwords.php @@ -0,0 +1,22 @@ + 'Your password has been reset!', + 'sent' => 'We have emailed your password reset link!', + 'throttled' => 'Please wait before retrying.', + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that email address.", + +]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php new file mode 100644 index 00000000..49e3388b --- /dev/null +++ b/resources/lang/en/validation.php @@ -0,0 +1,155 @@ + 'The :attribute must be accepted.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', + 'alpha' => 'The :attribute must only contain letters.', + 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.', + 'alpha_num' => 'The :attribute must only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'between' => [ + 'numeric' => 'The :attribute must be between :min and :max.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', + ], + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'date' => 'The :attribute is not a valid date.', + 'date_equals' => 'The :attribute must be a date equal to :date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'ends_with' => 'The :attribute must end with one of the following: :values.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => 'The :attribute must be a file.', + 'filled' => 'The :attribute field must have a value.', + 'gt' => [ + 'numeric' => 'The :attribute must be greater than :value.', + 'file' => 'The :attribute must be greater than :value kilobytes.', + 'string' => 'The :attribute must be greater than :value characters.', + 'array' => 'The :attribute must have more than :value items.', + ], + 'gte' => [ + 'numeric' => 'The :attribute must be greater than or equal :value.', + 'file' => 'The :attribute must be greater than or equal :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal :value characters.', + 'array' => 'The :attribute must have :value items or more.', + ], + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'ipv4' => 'The :attribute must be a valid IPv4 address.', + 'ipv6' => 'The :attribute must be a valid IPv6 address.', + 'json' => 'The :attribute must be a valid JSON string.', + 'lt' => [ + 'numeric' => 'The :attribute must be less than :value.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', + ], + 'lte' => [ + 'numeric' => 'The :attribute must be less than or equal :value.', + 'file' => 'The :attribute must be less than or equal :value kilobytes.', + 'string' => 'The :attribute must be less than or equal :value characters.', + 'array' => 'The :attribute must not have more than :value items.', + ], + 'max' => [ + 'numeric' => 'The :attribute must not be greater than :max.', + 'file' => 'The :attribute must not be greater than :max kilobytes.', + 'string' => 'The :attribute must not be greater than :max characters.', + 'array' => 'The :attribute must not have more than :max items.', + ], + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ + 'numeric' => 'The :attribute must be at least :min.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', + ], + 'multiple_of' => 'The :attribute must be a multiple of :value.', + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => 'The :attribute format is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'password' => 'The password is incorrect.', + 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values are present.', + 'required_without' => 'The :attribute field is required when :values is not present.', + 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'prohibited' => 'The :attribute field is prohibited.', + 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.', + 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.', + 'same' => 'The :attribute and :other must match.', + 'size' => [ + 'numeric' => 'The :attribute must be :size.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', + ], + 'starts_with' => 'The :attribute must start with one of the following: :values.', + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid zone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :attribute format is invalid.', + 'uuid' => 'The :attribute must be a valid UUID.', + + /* + |-------------------------------------------------------------------------- + | Custom Validation Language Lines + |-------------------------------------------------------------------------- + | + | Here you may specify custom validation messages for attributes using the + | convention "attribute.rule" to name the lines. This makes it quick to + | specify a specific custom language line for a given attribute rule. + | + */ + + 'custom' => [ + 'attribute-name' => [ + 'rule-name' => 'custom-message', + ], + ], + + /* + |-------------------------------------------------------------------------- + | Custom Validation Attributes + |-------------------------------------------------------------------------- + | + | The following language lines are used to swap our attribute placeholder + | with something more reader friendly such as "E-Mail Address" instead + | of "email". This simply helps us make our message more expressive. + | + */ + + 'attributes' => [], + +]; diff --git a/resources/lang/language.js b/resources/lang/language.js deleted file mode 100644 index 49e15457..00000000 --- a/resources/lang/language.js +++ /dev/null @@ -1,2 +0,0 @@ -exports.default = [ -];