Skip to content

Commit

Permalink
feat: turn off 2FA function + switch to pnpm + update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
NGPixel committed Oct 8, 2023
1 parent 7f9c351 commit a181579
Show file tree
Hide file tree
Showing 20 changed files with 13,639 additions and 19,703 deletions.
3 changes: 3 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ RUN apt-get update \
# Clean up
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /root/.gnupg /tmp/library-scripts

# Enable PNPM
RUN sudo corepack enable \
&& corepack prepare pnpm@latest --activate

EXPOSE 3000

Expand Down
10 changes: 4 additions & 6 deletions .devcontainer/app-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@ git config oh-my-zsh.hide-info 1
echo "Waiting for DB container to come online..."
/usr/local/bin/wait-for localhost:5432 -- echo "DB ready"

npm install -g npm-check-updates

echo "Installing dependencies..."
cd server
npm install
pnpm install
cd ../ux
npm install
pnpm install
cd ../blocks
npm install
npm run build
pnpm install
pnpm build
cd ..

echo "Ready!"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ npm/node_modules
.node_repl_history
npm-debug.log*
/.yarn
/.pnpm-store

# Generated assets
/assets
Expand Down
20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ The current stable release (2.x) is available at https://js.wiki
1. Two terminals will launch in split-screen mode at the bottom of the screen. **Server** on the left and **UX** on the right.
1. In the right-side terminal (UX), run the command:
```sh
npm run build
pnpm build
```
1. In the left-side terminal (Server), run the command:
```sh
npm run start
pnpm start
```
1. Open your browser to `http://localhost:3000`
1. Login using the default administrator user:
Expand All @@ -80,7 +80,7 @@ The current stable release (2.x) is available at https://js.wiki
From the left-side terminal (Server), run the command:

```sh
npm run dev
pnpm dev
```

This will launch the server and automatically restart upon modification of any server files.
Expand All @@ -94,7 +94,7 @@ Only precompiled client assets are served in this mode. See the sections below o
If you wish to modify any frontend content (under `/ux`), you need to start the Quasar Dev Server in the right-side terminal (UX):

```sh
npm run dev
pnpm dev
```

You can then access the site at `http://localhost:3001`. Notice the port being `3001` rather than `3000`. The app runs in a SPA (single-page application) mode and automatically hot-reload any modified component. Any requests made to the `/graphql` endpoint are automatically forwarded to the server running on port `3000`, which is why both must be running at the same time.
Expand All @@ -117,8 +117,9 @@ The server **dev** should already be available under **Servers**. If that's not
### Requirements
- PostgreSQL **11** or later *(**16** or later recommended)*
- Node.js **18.x** or later
- PostgreSQL **11** or later
- [pnpm](https://pnpm.io/installation#using-corepack)
### Usage
Expand All @@ -128,10 +129,13 @@ The server **dev** should already be available under **Servers**. If that's not
1. Run the following commands to install dependencies and generate the client assets:
```sh
cd server
npm install
pnpm install
cd ../ux
npm install
npm run build
pnpm install
pnpm build
cd ../blocks
pnpm install
pnpm build
cd ..
```
1. Run this command to start the server:
Expand Down
Loading

0 comments on commit a181579

Please sign in to comment.