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.

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

2.x feature 2.x develop | Updated: session keys in env #233

Merged
merged 163 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
a71d415
Updated: language strings and categories
we-alam-a001 Dec 16, 2023
829f41e
Updated: localization in pages and store of users
we-alam-a001 Dec 16, 2023
80205f4
Updated: localization of sidebar menu
we-alam-a001 Dec 16, 2023
a342173
Added: search field in localization page
we-alam-a001 Dec 16, 2023
228395e
Updated: seeds of response in users page
we-alam-a001 Dec 18, 2023
e674f1e
Updated: seeds in controller and model of users
we-alam-a001 Dec 18, 2023
8cc1e07
Updated: validation string of users
we-alam-a001 Dec 18, 2023
8890e17
Updated: all response from users page
we-alam-a001 Dec 19, 2023
5b568ed
Updated: language strings and categories
we-alam-a001 Dec 16, 2023
0127ee9
Updated: localization in pages and store of users
we-alam-a001 Dec 16, 2023
4da72b3
Updated: localization of sidebar menu
we-alam-a001 Dec 16, 2023
11de2db
Added: search field in localization page
we-alam-a001 Dec 16, 2023
5af81fb
Updated: seeds of response in users page
we-alam-a001 Dec 18, 2023
ce3eb92
Updated: seeds in controller and model of users
we-alam-a001 Dec 18, 2023
6454011
Updated: validation string of users
we-alam-a001 Dec 18, 2023
bf7af05
Updated: all response from users page
we-alam-a001 Dec 19, 2023
0e944cb
Merge remote-tracking branch 'origin/2.x-feature/update-users-localiz…
we-alam-a001 Dec 21, 2023
030a26b
Fixed: error in users store
we-alam-a001 Dec 21, 2023
48ff804
Updated: label of add custom field link
we-alam-a001 Dec 21, 2023
de4e947
Updated: users language string
we-alam-a001 Dec 26, 2023
01059da
Updated: setup configuration and account page
we-vikram-wri231 Dec 30, 2023
59753e3
Updated: env app name to session prefix and session cookie
we-vikram-wri231 Dec 30, 2023
f751d53
Updated: rebuild assets
we-vikram-wri231 Dec 30, 2023
880270d
Updated: restricted action
we-vikram-wri231 Dec 30, 2023
06f45e8
Updated: restricted action in bulk action
we-vikram-wri231 Dec 30, 2023
f0a0697
Updated: restricted action
we-vikram-wri231 Dec 30, 2023
56e1d4c
Fixed: permission seeds of taxonomy section
we-vikram-wri231 Dec 30, 2023
65855d8
Updated: restricted action for bulk action
we-vikram-wri231 Dec 30, 2023
5db5249
Updated: Active all logic
we-vikram-wri231 Dec 30, 2023
04e11d4
Fixed: role permission active all logic
we-vikram-wri231 Dec 30, 2023
7f3ec11
Updated: language strings and categories
we-alam-a001 Dec 16, 2023
ec75743
Updated: localization in pages and store of users
we-alam-a001 Dec 16, 2023
885410c
Updated: localization of sidebar menu
we-alam-a001 Dec 16, 2023
01ddf8b
Added: search field in localization page
we-alam-a001 Dec 16, 2023
389c2bb
Updated: seeds of response in users page
we-alam-a001 Dec 18, 2023
1bd79f1
Updated: seeds in controller and model of users
we-alam-a001 Dec 18, 2023
81560b5
Updated: validation string of users
we-alam-a001 Dec 18, 2023
8c85321
Updated: all response from users page
we-alam-a001 Dec 19, 2023
fee0a59
Updated: validation and placeholder text
we-vikram-wri231 Jan 3, 2024
49948b2
Updated: rebuild assets
we-vikram-wri231 Jan 3, 2024
da5a2cc
Updated: language strings and categories
we-alam-a001 Dec 16, 2023
fd3eb5e
Updated: localization in pages and store of users
we-alam-a001 Dec 16, 2023
9e02e60
Updated: seeds of response in users page
we-alam-a001 Dec 18, 2023
8f6fdc3
Updated: seeds in controller and model of users
we-alam-a001 Dec 18, 2023
648dd38
Updated: validation string of users
we-alam-a001 Dec 18, 2023
8602399
Updated: all response from users page
we-alam-a001 Dec 19, 2023
c3f47b8
Fixed: error in users store
we-alam-a001 Dec 21, 2023
5c9932d
Updated: label of add custom field link
we-alam-a001 Dec 21, 2023
25542f0
Updated: users language string
we-alam-a001 Dec 26, 2023
fb6a4e2
Merge remote-tracking branch 'origin/2.x-feature/update-users-localiz…
we-alam-a001 Jan 3, 2024
af07ede
Updated: conditional if for language string
we-alam-a001 Jan 3, 2024
a6aa73e
Updated: users store
we-alam-a001 Jan 3, 2024
f49007c
Updated: localizations search placeholder
we-alam-a001 Jan 4, 2024
e8a9154
Updated: localizations search placeholder
we-alam-a001 Jan 4, 2024
6ac461b
Merge remote-tracking branch 'origin/2.x-feature/update-users-localiz…
we-alam-a001 Jan 4, 2024
b42cb16
Updated: users store
we-alam-a001 Jan 4, 2024
2b0e020
Updated: conditional if for language string
we-alam-a001 Jan 4, 2024
ffd8438
Updated: form button position
we-vikram-wri231 Jan 4, 2024
0a0a9fd
Updated: view role condition
we-alam-a001 Jan 4, 2024
59a35a8
Merge remote-tracking branch 'origin/2.x-feature/update-users-localiz…
we-alam-a001 Jan 4, 2024
eaf3bac
Updated: language string of label
we-alam-a001 Jan 4, 2024
d42dddd
Updated: avatar accessor
we-vikram-wri231 Jan 4, 2024
0b43041
Updated: image url condition
we-vikram-wri231 Jan 4, 2024
21b0f59
Merge pull request #218 from webreinvent/2.x-feature/update-users-loc…
themodernpk Jan 4, 2024
54d8938
build: assets
themodernpk Jan 4, 2024
6b067a4
Merge branch '2.x-release/v2.2.3' into 2.x
themodernpk Jan 4, 2024
38bd749
updated: changelog
themodernpk Jan 4, 2024
279cfe2
Merge branch '2.x' into 2.x-develop
themodernpk Jan 4, 2024
d14427a
Updated: setup configuration and account page
we-vikram-wri231 Dec 30, 2023
9def8d7
Updated: env app name to session prefix and session cookie
we-vikram-wri231 Dec 30, 2023
7f97cf8
Updated: rebuild assets
we-vikram-wri231 Dec 30, 2023
2192d6d
Updated: validation and placeholder text
we-vikram-wri231 Jan 3, 2024
a25e661
Updated: rebuild assets
we-vikram-wri231 Jan 3, 2024
280e6b3
Merge remote-tracking branch 'origin/2.x-feature/session-fixes' into …
we-vikram-wri231 Jan 4, 2024
616a6e8
Updated: localization of dashboard page
we-alam-a001 Jan 4, 2024
2e507db
Updated: sidebar menu label extend and dashboard
we-alam-a001 Jan 4, 2024
dc686ff
Added: conditional if for language string
we-alam-a001 Jan 4, 2024
39accb1
Fixed: login error while language is fr
we-alam-a001 Jan 4, 2024
0e7a2c2
Updated: extend controller for label
we-alam-a001 Jan 4, 2024
f9aca85
Fixed: to show bold text
we-alam-a001 Jan 5, 2024
233ab41
Updated: sidebar menu label extend and dashboard
we-alam-a001 Jan 5, 2024
f677137
Merge remote-tracking branch 'origin/2.x-feature/update-dashbaord-loc…
we-alam-a001 Jan 5, 2024
ccf53dc
Updated: dashboard language string
we-alam-a001 Jan 5, 2024
0b79f93
Removed: unused line
we-alam-a001 Jan 5, 2024
cc2a2c5
Updated: restricted action
we-vikram-wri231 Dec 30, 2023
c81b95e
Updated: restricted action in bulk action
we-vikram-wri231 Dec 30, 2023
5dd3e50
Updated: restricted action
we-vikram-wri231 Dec 30, 2023
13fcb46
Fixed: permission seeds of taxonomy section
we-vikram-wri231 Dec 30, 2023
39ef299
Updated: restricted action for bulk action
we-vikram-wri231 Dec 30, 2023
1cc03d2
Updated: Active all logic
we-vikram-wri231 Dec 30, 2023
41c85d3
Fixed: role permission active all logic
we-vikram-wri231 Dec 30, 2023
e4d40d4
Merge remote-tracking branch 'origin/2.x-feature/added-restricted-act…
we-vikram-wri231 Jan 6, 2024
297c4cf
Updated: view role bulk function
we-vikram-wri231 Jan 6, 2024
d81f670
Updated: bulk all condition
we-vikram-wri231 Jan 6, 2024
aad4ff7
Updated: roles bulk actions
we-vikram-wri231 Jan 6, 2024
a62c2e8
Added: functions to get language string
we-alam-a001 Jan 8, 2024
020caf0
Added: run migrations and seeders after installed
we-alam-a001 Jan 9, 2024
eff4778
Updated: setup stores
we-alam-a001 Jan 9, 2024
005149d
Updated: run seeders method
we-alam-a001 Jan 9, 2024
c7b313b
Updated: run migrations and seeders after installed
we-alam-a001 Jan 9, 2024
bd05184
Updated: function in setup store
we-alam-a001 Jan 9, 2024
d87c98f
Added: run seeder functionality in localization
we-alam-a001 Jan 9, 2024
b872b31
Added: functions to get language string
we-alam-a001 Jan 9, 2024
94ad323
Merge remote-tracking branch 'origin/2.x-feature/generate-language-fi…
we-alam-a001 Jan 9, 2024
4330c01
Updated: naming of language strings
we-alam-a001 Jan 10, 2024
c455a89
Updated: naming convention
we-alam-a001 Jan 10, 2024
945a0ef
Updated: if condition in users actions
we-alam-a001 Jan 11, 2024
4cd6c72
Updated: if condition in users form and view
we-alam-a001 Jan 11, 2024
d588432
Updated: users assets language string
we-alam-a001 Jan 12, 2024
2b70394
Updated: conditions for language string error
we-alam-a001 Jan 12, 2024
afe5d1a
Updated: label of extend
we-alam-a001 Jan 12, 2024
e045755
Updated: condition when no strings provided
we-alam-a001 Jan 12, 2024
3aed7ca
Added: watch for looking store assets loaded
we-alam-a001 Jan 12, 2024
d89128d
Updated: users title
we-alam-a001 Jan 12, 2024
ff41a29
Merge pull request #241 from webreinvent/2.x-feature/added-restricted…
themodernpk Jan 12, 2024
6cae5b9
Updated: dashboard language strings
we-alam-a001 Jan 12, 2024
eeac38b
Fixed: registration not found error message
we-alam-a001 Jan 12, 2024
d6024b6
Added: functions to get language string
we-alam-a001 Jan 8, 2024
6348105
Added: run migrations and seeders after installed
we-alam-a001 Jan 9, 2024
c95e0b6
Updated: setup stores
we-alam-a001 Jan 9, 2024
e3ad41e
Updated: run seeders method
we-alam-a001 Jan 9, 2024
aa5b7e0
Updated: run migrations and seeders after installed
we-alam-a001 Jan 9, 2024
deb8967
Updated: function in setup store
we-alam-a001 Jan 9, 2024
899c146
Added: run seeder functionality in localization
we-alam-a001 Jan 9, 2024
6048d65
Updated: naming of language strings
we-alam-a001 Jan 10, 2024
958d731
Updated: naming convention
we-alam-a001 Jan 10, 2024
d3c0c36
Updated: if condition in users actions
we-alam-a001 Jan 11, 2024
3ad9956
Updated: if condition in users form and view
we-alam-a001 Jan 11, 2024
afc636e
Updated: users assets language string
we-alam-a001 Jan 12, 2024
bdf640f
Updated: conditions for language string error
we-alam-a001 Jan 12, 2024
9ec4791
Updated: label of extend
we-alam-a001 Jan 12, 2024
a5c02fd
Updated: condition when no strings provided
we-alam-a001 Jan 12, 2024
5469172
Added: watch for looking store assets loaded
we-alam-a001 Jan 12, 2024
a3f672b
Updated: users title
we-alam-a001 Jan 12, 2024
1e10a0b
Fixed: registration not found error message
we-alam-a001 Jan 12, 2024
6f6239e
Merge remote-tracking branch 'origin/2.x-feature/generate-language-fi…
we-vikram-wri231 Jan 13, 2024
4ec900d
Updated: page title strings
we-alam-a001 Jan 13, 2024
de3402c
Merge remote-tracking branch 'origin/2.x-feature/generate-language-fi…
we-alam-a001 Jan 13, 2024
b8f764f
Updated: style overflow
we-vikram-wri231 Jan 13, 2024
25923d0
Merge pull request #244 from webreinvent/2.x-feature/fixx-notificatio…
themodernpk Jan 15, 2024
fd0fca6
Merge pull request #243 from webreinvent/2.x-feature/generate-languag…
themodernpk Jan 15, 2024
1882ae5
Updated: language string of label
we-alam-a001 Jan 4, 2024
bf5827e
Updated: sidebar menu label extend and dashboard
we-alam-a001 Jan 4, 2024
5a0c3ca
Added: conditional if for language string
we-alam-a001 Jan 4, 2024
7cc0aa9
Fixed: login error while language is fr
we-alam-a001 Jan 4, 2024
4ffe099
Updated: extend controller for label
we-alam-a001 Jan 4, 2024
a69b94d
Fixed: to show bold text
we-alam-a001 Jan 5, 2024
72ca26a
Updated: dashboard language string
we-alam-a001 Jan 5, 2024
cc44817
Removed: unused line
we-alam-a001 Jan 5, 2024
91b5abc
Updated: dashboard language strings
we-alam-a001 Jan 12, 2024
6f99b4b
Merge remote-tracking branch 'origin/2.x-feature/update-dashbaord-loc…
we-alam-a001 Jan 16, 2024
97a2151
Updated: language strings after rebase
we-alam-a001 Jan 16, 2024
8f903c9
Merge pull request #239 from webreinvent/2.x-feature/update-dashbaord…
themodernpk Jan 19, 2024
b10382d
Updated: setup configuration and account page
we-vikram-wri231 Dec 30, 2023
33ab1d8
Updated: env app name to session prefix and session cookie
we-vikram-wri231 Dec 30, 2023
764dc90
Updated: rebuild assets
we-vikram-wri231 Dec 30, 2023
3a8b164
Updated: validation and placeholder text
we-vikram-wri231 Jan 3, 2024
532d568
Updated: rebuild assets
we-vikram-wri231 Jan 3, 2024
c4800f2
Updated: setup configuration and account page
we-vikram-wri231 Dec 30, 2023
366956d
Updated: rebuild assets
we-vikram-wri231 Dec 30, 2023
10fb87c
Updated: validation and placeholder text
we-vikram-wri231 Jan 3, 2024
42ea23e
Updated: rebuild assets
we-vikram-wri231 Jan 3, 2024
35af503
Merge remote-tracking branch 'origin/2.x-feature/session-fixes' into …
we-vikram-wri231 Jan 19, 2024
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
4 changes: 2 additions & 2 deletions Resources/assets/backend/vaahtwo/build/Sidebar.js

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions Resources/assets/backend/vaahtwo/build/main.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Resources/views/templates/env.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@

BROADCAST_DRIVER=log
CACHE_DRIVER=file
CACHE_PREFIX={{$data->app_name ? strtolower($data->app_name): '' }}
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_COOKIE={{$data->app_name ? strtolower($data->app_name): '' }}
SESSION_LIFETIME=120

REDIS_HOST=127.0.0.1
Expand Down
1 change: 0 additions & 1 deletion Vue/vaahtwo/pages/public/setup/intall/Account.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ onMounted(async () => {
:suggestions="store.filtered_country_codes"
:completeOnFocus="store.autocomplete_on_focus"
@complete="store.searchCountryCode"
@blur="store.setFocusDropDownToTrue"
@item-select="store.onSelectCountryCode"
placeholder="Enter Your Country"
optionLabel="name"
Expand Down
4 changes: 3 additions & 1 deletion Vue/vaahtwo/pages/public/setup/intall/Configuration.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,13 @@ onMounted(async () => {
<h5 class="text-left p-1 title is-6">App/Website Name</h5>
<div class="p-input">
<InputText v-model="store.config.env.app_name"
placeholder="App/Website Name"
placeholder="VaahCMS"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@we-vikram-wri231 the place should remain: Enter your website name or app name, and a helper message and validation for Only Alpha Numeric value are allowed

name="config-app_name"
class="p-inputtext-sm" id="app-name"
data-testid="configuration-app_name"
required
@update:modelValue="store.onUpdateAppName"
@keydown.space.prevent
/>
<div class="required-field hidden"></div>
</div>
Expand Down
14 changes: 9 additions & 5 deletions Vue/vaahtwo/stores/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const useSetupStore = defineStore({

},
env:{
app_name: "VaahCMS",
app_name: null,
app_key: null,
app_debug: 'true',
app_env: null,
Expand Down Expand Up @@ -584,7 +584,7 @@ export const useSetupStore = defineStore({

},
env:{
app_name: "VaahCMS",
app_name: null,
app_key: null,
app_debug: 'true',
app_env: null,
Expand Down Expand Up @@ -619,12 +619,12 @@ export const useSetupStore = defineStore({

setTimeout(() => {
if (!event.query.trim().length) {
this.filtered_country_codes = this.assets.country_calling_codes;
this.filtered_country_codes = vaah().clone(this.assets.country_calling_codes);
}
else {
this.filtered_country_codes = this.assets.country_calling_codes.filter((country) => {
this.filtered_country_codes = vaah().clone(this.assets.country_calling_codes.filter((country) => {
return country.name.toLowerCase().startsWith(event.query.toLowerCase());
});
}));
}
}, 250);
},
Expand Down Expand Up @@ -652,6 +652,10 @@ export const useSetupStore = defineStore({
this.config.count_installed_progress = 100;
},
//---------------------------------------------------------------------
onUpdateAppName: function (value) {
this.config.env.app_name = value.replace(/\s/g,'');
},
//---------------------------------------------------------------------

//---------------------------------------------------------------------
async installDependencies() {
Expand Down