Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit dedd153
Author: vnugent <[email protected]>
Date:   Tue Jul 23 19:56:16 2024 -0400

    reset login status token temporary fix

commit 073e472
Author: vnugent <[email protected]>
Date:   Tue Jul 23 19:32:27 2024 -0400

    chore: Package updates & compose build config

commit 1b7964c
Merge: 8ed4663 f77ff50
Author: vnugent <[email protected]>
Date:   Fri Jun 7 15:46:25 2024 -0400

    Merge branch 'master' into develop

commit 8ed4663
Author: vnugent <[email protected]>
Date:   Fri Jun 7 15:43:48 2024 -0400

    fix: invalid chars in status cookie name

commit 9d1df65
Author: vnugent <[email protected]>
Date:   Thu Jun 6 21:31:30 2024 -0400

    fix: Some container fixes and compatability

commit 5ecd6b3
Author: vnugent <[email protected]>
Date:   Thu Jun 6 17:19:48 2024 -0400

    Update and expose storage config for container

commit 3a62baf
Author: vnugent <[email protected]>
Date:   Thu Jun 6 16:18:36 2024 -0400

    ci: build admin lib before building front-end

commit 35920ad
Author: vnugent <[email protected]>
Date:   Thu Jun 6 15:56:36 2024 -0400

    ci: Local vite config, force set lib versions

commit 3c228b3
Author: vnugent <[email protected]>
Date:   Wed Jun 5 19:55:39 2024 -0400

    ci: Update packages and add container build

commit 21d2719
Author: vnugent <[email protected]>
Date:   Wed Jun 5 15:58:07 2024 -0400

    fix: #1 new channel page when hitting new button

commit eefba88
Author: vnugent <[email protected]>
Date:   Wed Jun 5 15:26:15 2024 -0400

    chore: Package updates

commit 9eed402
Author: vnugent <[email protected]>
Date:   Wed Jun 5 14:44:08 2024 -0400

    ci: Stage blocking changes
  • Loading branch information
VnUgE committed Jul 24, 2024
1 parent f77ff50 commit 166df63
Show file tree
Hide file tree
Showing 10 changed files with 1,601 additions and 823 deletions.
5 changes: 5 additions & 0 deletions Module.Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ version: '3'

tasks:

package-update:
cmds:
- for: [ front-end/, lib/admin/, lib/client/ ]
cmd: cd {{.ITEM}} && task package-update

#update project source code
update:
cmds:
Expand Down
4 changes: 2 additions & 2 deletions back-end/src/Content.Publishing.Blog.Admin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentFTP" Version="50.0.1" />
<PackageReference Include="Minio" Version="6.0.2" />
<PackageReference Include="FluentFTP" Version="50.1.0" />
<PackageReference Include="Minio" Version="6.0.3" />
<PackageReference Include="VNLib.Plugins.Extensions.Loading" Version="0.1.0-ci0064" />
<PackageReference Include="VNLib.Plugins.Extensions.Validation" Version="0.1.0-ci0064" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ci/config-templates/Essentials.Accounts-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
//Path/domain for all security cookies
"cookie_domain": "",
"cookie_path": "/",
"status_cookie_name": "cmnli", //front-end cookie name must match to detect login status
"status_cookie_name": "li", //front-end cookie name must match to detect login status
"otp_header_name": "X-Web-Token", //Front-end header name must match
"otp_time_diff_sec": 30,
"otp_key_size": 64,
Expand Down
2 changes: 2 additions & 0 deletions ci/container/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ version: '3.6'

services:
cmnext:
build:
context: .
image: vnuge/cmnext
container_name: cmnext
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion front-end/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ VITE_CORS_ENABLED=false

#The VNLib.Plugins.Essentials.Accounts plugin security header value
VITE_WEB_TOKEN_HEADER="X-Web-Token"
VITE_LOGIN_COOKIE_ID="cmnli"
VITE_LOGIN_COOKIE_ID="li"

VITE_PKI_ENABLED=true

Expand Down
5 changes: 5 additions & 0 deletions front-end/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ version: '3'

tasks:

package-update:
dir: '{{.USER_WORKING_DIR}}'
cmds:
- npm update

build:
cmds:
- cmd: npm version {{ .BUILD_VERSION }}
Expand Down
Loading

0 comments on commit 166df63

Please sign in to comment.