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

[Feature] Allow admins to create an Organization. #99

Merged
merged 80 commits into from
Dec 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
92104e5
updated models
sinamics Aug 22, 2023
6cb3123
new admin menu tab
sinamics Aug 22, 2023
4872fc0
Merge branch 'main' into organization
sinamics Nov 17, 2023
b1f7b4e
org
sinamics Nov 17, 2023
c52ffd8
organization db model
sinamics Nov 18, 2023
ae17ca3
icon
sinamics Nov 18, 2023
97290b3
header
sinamics Nov 18, 2023
14be1b5
nav
sinamics Nov 19, 2023
78ed609
fetch orgs
sinamics Nov 19, 2023
124af6a
socket
sinamics Nov 19, 2023
90ea9e2
Merge branch 'main' into organization
sinamics Nov 19, 2023
1a22fac
trpc wss server
sinamics Nov 19, 2023
6d3cadd
org network
sinamics Nov 24, 2023
2fb757a
websocket
sinamics Nov 24, 2023
52b94f8
update nextjs, next-intl websocket
sinamics Nov 24, 2023
24f908e
change url path
sinamics Nov 24, 2023
653f4f9
positioning
sinamics Nov 24, 2023
d93ca54
removed central beta
sinamics Nov 24, 2023
9a19a84
lint
sinamics Nov 24, 2023
139a6c5
org dashboard
sinamics Nov 24, 2023
ad2ca64
beta note
sinamics Nov 24, 2023
f5c264a
user activity log
sinamics Nov 25, 2023
00796fe
logfooter
sinamics Nov 25, 2023
96b64d6
chat icons
sinamics Nov 25, 2023
d96be6d
user color
sinamics Nov 25, 2023
72cc802
logging
sinamics Nov 25, 2023
4d6abdd
routing
sinamics Nov 26, 2023
f74d432
user invitation
sinamics Nov 26, 2023
7439ef6
email template
sinamics Nov 26, 2023
a522eb4
leave org, modals, invite
sinamics Nov 27, 2023
fe6ea9e
org layout
sinamics Nov 27, 2023
d5ebf56
logging
sinamics Nov 27, 2023
b2c0513
sidebar active tab
sinamics Nov 27, 2023
49e00bc
cascade when deleting a org.
sinamics Nov 27, 2023
c55c196
permissions
sinamics Nov 27, 2023
1aae85c
descption
sinamics Nov 27, 2023
1d2cc70
intl
sinamics Nov 27, 2023
6f5e2da
new build
sinamics Nov 28, 2023
baa5941
update tests
sinamics Nov 28, 2023
a011f05
updated tests
sinamics Nov 28, 2023
d9f076a
test
sinamics Nov 28, 2023
cd6142e
modal
sinamics Nov 28, 2023
bfa817a
layout
sinamics Nov 28, 2023
d8a5d6d
layout
sinamics Nov 30, 2023
02ffb4c
error message
sinamics Nov 30, 2023
4d92507
org meta
sinamics Nov 30, 2023
11a5c6b
org user edit
sinamics Nov 30, 2023
0c820df
org id object
sinamics Nov 30, 2023
6863f7c
add user description
sinamics Nov 30, 2023
649c8d7
msg notification system
sinamics Dec 1, 2023
1d12252
chat
sinamics Dec 1, 2023
4cc69e8
lint
sinamics Dec 1, 2023
6a9e713
remove NEXTAUTH_URL_INTERNAL
sinamics Dec 1, 2023
bf31716
lint
sinamics Dec 1, 2023
e7b98db
docs
sinamics Dec 1, 2023
653ef97
crud network
sinamics Dec 1, 2023
d11ed9b
error handling
sinamics Dec 1, 2023
47f9735
role
sinamics Dec 1, 2023
c4af2d3
permissions
sinamics Dec 1, 2023
49676cf
permissions
sinamics Dec 1, 2023
867fea2
translations
sinamics Dec 1, 2023
40ca267
Merge branch 'main' into organization
sinamics Dec 2, 2023
c4dcb70
biome linting
sinamics Dec 2, 2023
cadc72b
translations
sinamics Dec 2, 2023
faa88cd
translations
sinamics Dec 2, 2023
c12fb92
org form
sinamics Dec 2, 2023
ba922bf
update prisma
sinamics Dec 2, 2023
cc04ab8
translations
sinamics Dec 3, 2023
044c931
translations
sinamics Dec 3, 2023
3f10d54
translations
sinamics Dec 3, 2023
4542468
cascade logs
sinamics Dec 3, 2023
3160911
delete network org id
sinamics Dec 3, 2023
bbfe514
scrollintoView
sinamics Dec 3, 2023
aa4c07f
translations
sinamics Dec 3, 2023
fde58d2
translations
sinamics Dec 3, 2023
9208ff8
translations
sinamics Dec 3, 2023
cad36f0
lint
sinamics Dec 3, 2023
a549bf9
lint
sinamics Dec 3, 2023
fd4378e
translations
sinamics Dec 3, 2023
0d0dedc
translations
sinamics Dec 3, 2023
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: 1 addition & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose
{
"name": "ztnet dev",
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
Expand Down Expand Up @@ -35,7 +33,7 @@
"bourhaouta.tailwindshades",
"Gruntfuggly.todo-tree",
"yoavbls.pretty-ts-errors",
"rome.rome",
"biomejs.biome",
"GitHub.copilot"
]
}
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"recommendations": [
"prisma.prisma",
"rome.rome",
"biomejs.biome",
"bradlc.vscode-tailwindcss"
]
}
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ ENV NODE_ENV production
# Disable telemetry during runtime.
ENV NEXT_TELEMETRY_DISABLED 1

# adding internal url. https://github.com/sinamics/ztnet/issues/105
ENV NEXTAUTH_URL_INTERNAL http://localhost:3000

RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs
RUN apt update && apt install -y curl sudo postgresql-client && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
3 changes: 2 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"files": {
"ignore": [
"**/*.js",
"install.ztnet/**/*"
"install.ztnet/**/*",
".devcontainer/**/*"
]
},
"formatter": {
Expand Down
23 changes: 13 additions & 10 deletions docs/ztnet/docs/Installation/docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,16 @@ Please note that while admins have visibility over registered accounts, they **c
## Ztnet Environment Variables
The following environment variables are available for configuration. They can be set in the `.env` file or passed directly to the docker-compose.yml file.

- **ZT_ADDR** zerotier controller address. Defaults to `http://zerotier:9993` for docker environment, and `http://127.0.0.1:9993` for standalone.
- **ZT_SECRET** zerotier controller secret. Defaults to the content of `/var/lib/zerotier-one/authtoken.secret`.
- **NEXT_PUBLIC_SITE_NAME** Site name. Defaults to `ZTNET`.
- **POSTGRES_HOST** Default: postgres
- **POSTGRES_PORT** Default: 5432
- **POSTGRES_USER** Default: postgres
- **POSTGRES_PASSWORD** Default: postgres
- **POSTGRES_DB** Default: ztnet
- **NEXTAUTH_URL** Default: "http://localhost:3000" # Change `localhost` to your production domain when deploying.
- **NEXTAUTH_SECRET** Default: "random_secret", change this to a random string for security.
```bash
ZT_ADDR # zerotier controller address. Defaults to `http://zerotier:9993` for docker environment, and `http://127.0.0.1:9993` for standalone.
ZT_SECRET #zerotier controller secret. Defaults to the content of `/var/lib/zerotier-one/authtoken.secret`.
NEXT_PUBLIC_SITE_NAME #Site name. Defaults to `ZTNET`.
POSTGRES_HOST #Default: postgres
POSTGRES_PORT #Default: 5432
POSTGRES_USER #Default: postgres
POSTGRES_PASSWORD #Default: postgres
POSTGRES_DB #Default: ztnet
NEXTAUTH_URL #Default: "http://localhost:3000" # Change `localhost` to your production domain when deploying.
NEXTAUTH_URL_INTERNAL #Default: "http://localhost:3000" # Change `localhost` to your production domain when deploying.
NEXTAUTH_SECRET #Default: "random_secret", change this to a random string for security.
```
Loading
Loading