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

Fix required fields check on csv upload #618

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
056d9c6
Prevent self user delete
beastafk Aug 30, 2024
2bb8467
Merge pull request #1 from etkecc/prevent-self-delete
aine-etke Aug 31, 2024
49d67f9
update CI and readme
aine-etke Aug 31, 2024
94ccd3a
Merge pull request #2 from etkecc/add-ci
aine-etke Aug 31, 2024
ec0b980
fix ci
aine-etke Aug 31, 2024
c4b54c4
Merge pull request #3 from etkecc/fix-ci
aine-etke Aug 31, 2024
0d5e95f
add checkout
aine-etke Aug 31, 2024
7286aba
Merge pull request #4 from etkecc/fix-ci
aine-etke Aug 31, 2024
5acf304
set fetch-depth
aine-etke Aug 31, 2024
e6dcbcb
Merge pull request #5 from etkecc/fix-ci
aine-etke Aug 31, 2024
e2194f5
update links, allow working without tags
aine-etke Aug 31, 2024
9dd6940
Merge pull request #6 from etkecc/fix-ci
aine-etke Aug 31, 2024
2ae5930
Bump micromatch from 4.0.5 to 4.0.8
dependabot[bot] Aug 31, 2024
b1d3340
Merge pull request #7 from etkecc/dependabot/npm_and_yarn/micromatch-…
aine-etke Aug 31, 2024
c7e275d
Create CONTRIBUTING.md
aine-etke Aug 31, 2024
7016e5a
Update CONTRIBUTING.md
aine-etke Aug 31, 2024
88e88fb
add CDN
aine-etke Aug 31, 2024
35322fa
fix ci
aine-etke Aug 31, 2024
4c4e3a0
fix ci
aine-etke Aug 31, 2024
40c6eb0
fix ci
aine-etke Aug 31, 2024
15c8a30
fix ci
aine-etke Aug 31, 2024
b5b5939
remove configure steps
aine-etke Aug 31, 2024
265b515
Fix user's Edit action defualt Tab not being shown
beastafk Sep 2, 2024
4a4fae1
Merge pull request #8 from etkecc/fix-users-edit-tab
aine-etke Sep 3, 2024
678867e
v0.10.3-etke2
aine-etke Sep 3, 2024
7747dc7
Add identifier when authorizing with password
aine-etke Sep 3, 2024
50c96cf
Add ability to toggle whether to show locked users
aine-etke Sep 3, 2024
6bc760a
Fix user's display name in header on user's page
aine-etke Sep 3, 2024
311cc2a
Merge pull request #9 from etkecc/fix-user-names-in-header
aine-etke Sep 3, 2024
51297b4
v0.10.3-etke5
aine-etke Sep 3, 2024
2142770
Fix footer overlapping content
aine-etke Sep 3, 2024
317df5a
switch from nginx to SWS for serving the app (docker image)
aine-etke Sep 3, 2024
3c6259c
Revert "switch from nginx to SWS for serving the app (docker image)",…
aine-etke Sep 3, 2024
c8246a1
try ci artifacts
aine-etke Sep 3, 2024
f183938
fix ci
aine-etke Sep 3, 2024
c9a3294
use different path
aine-etke Sep 3, 2024
1967546
enable docker action to see how it goes
aine-etke Sep 3, 2024
4cbea6f
enable cdn
aine-etke Sep 3, 2024
85b305d
ensure the latest version is checked out
aine-etke Sep 3, 2024
8eaaaa5
cleanup .dockerignore
aine-etke Sep 3, 2024
eff17a0
Fix redirect URL after user creation (#16)
beastafk Sep 5, 2024
fb1a049
[skip ci] add justfile
aine-etke Sep 5, 2024
390aab5
Display actual synapse errors (#17)
beastafk Sep 5, 2024
e093bd8
Fix base_url being undefined on unsuccessful login (#18)
beastafk Sep 5, 2024
01e3947
add missing translations
aine-etke Sep 5, 2024
1474b46
Put version into the manifest.json on CI builds (Docker, CDN, etc.)
aine-etke Sep 5, 2024
cceae77
fix ci
aine-etke Sep 5, 2024
0bf3440
Federation page improvements for dark mode and last_entry without a d…
beastafk Sep 5, 2024
7de9166
Add UI option to block deleted rooms from being rejoined (#26)
beastafk Sep 14, 2024
90a6c7d
switch to tag-based build
aine-etke Sep 14, 2024
264d2ff
add on-tags CI build
aine-etke Sep 14, 2024
8282bb0
add github release CI step
aine-etke Sep 14, 2024
f639a1c
rename release artifact file
aine-etke Sep 14, 2024
332e98a
add dev stack
aine-etke Sep 17, 2024
83b9791
Fix required fields check on Bulk registration CSV upload, fixes #29
aine-etke Sep 17, 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
13 changes: 0 additions & 13 deletions .dockerignore

This file was deleted.

16 changes: 16 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Contributing to [etkecc/synapse-admin](https://github.com/etkecc/synapse-admin)

While etke.cc fork is intended to accept more QoL changes and features,
it's good idea to open PR into the upstream repo: [Awesome-Technologies/Synapse-Admin](https://github.com/Awesome-Technologies/synapse-admin).

1. Use the etkecc/synapse-admin **master** branch as your branch upstream: `git checkout master; git pull; git checkout -b my-new-feature`
2. Once your changes are ready, please, open **2** PRs: one from your branch to `Awesome-Technologies/Synapse-Admin` **master**, and another one to `etkecc/synapse-admin` **main**
3. Once PR is accepted in the `etkecc/synapse-admin`, update `README.md` file (either directly in the `main` branch, or via another PR) to add link to the merged PR in the [Fork differences](https://github.com/etkecc/synapse-admin#fork-differences) section

### Why?

The upstream project may not want to accept all the changes, so to ensure they are not lost, we will gladly add them to the etke.cc fork.
Unfortunately, it's challenging to keep changes separated, so to avoid messing upstream and fork changes (e.g., CI changes that should not be pushed to the upstream, as they intended for this fork specifically), there are 2 branches:

* `master` - read-only copy of upstream's master branch to easily sync changes, and use it as base for new PRs
* `main` - fork-own branch with all changes
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
liberapay: etkecc
20 changes: 0 additions & 20 deletions .github/dependabot.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/build-test.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/docker-release.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .github/workflows/edge_ghpage.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/github-release.yml

This file was deleted.

119 changes: 119 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
name: CI
on:
push:
branches: [ "main" ]
tags: [ "v*" ]
env:
bunny_version: v0.1.0
base_path: ./
permissions:
checks: write
contents: write
packages: write
pull-requests: read
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: yarn
- name: Install dependencies
run: yarn install --immutable --network-timeout=300000
- name: Set version into manifest.json
run: |
TAG=$(git describe --tags --abbrev=0 || echo "latest")
sed -i "s|\"icons\"|\"version\": \"$TAG\",\\n \"icons\"|g" public/manifest.json
- name: Build
run: yarn build --base=${{ env.base_path }}
- uses: actions/upload-artifact@v4
with:
path: dist/
name: dist
if-no-files-found: error
retention-days: 1
compression-level: 0
overwrite: true
include-hidden-files: true

docker:
name: Docker
needs: build
runs-on: self-hosted
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: dist
path: dist/
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to ghcr.io
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ github.repository }}
registry.etke.cc/${{ github.repository }}
tags: |
type=raw,value=latest,enable=${{ github.ref_name == 'main' }}
type=semver,pattern={{raw}}
- name: Build and push
uses: docker/build-push-action@v6
with:
platforms: linux/amd64,linux/arm64
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

cdn:
name: CDN
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: dist
path: dist/
- name: Upload
run: |
wget -O bunny-upload.tar.gz https://github.com/etkecc/bunny-upload/releases/download/${{ env.bunny_version }}/bunny-upload_Linux_x86_64.tar.gz
tar -xzf bunny-upload.tar.gz
echo "${{ secrets.BUNNY_CONFIG }}" > bunny-config.yaml
./bunny-upload -c bunny-config.yaml

github-release:
name: Github Release
needs: build
if: ${{ startsWith(github.ref, 'refs/tags/') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: dist
path: dist/
- name: Prepare release
run: |
mv dist synapse-admin
tar chvzf synapse-admin.tar.gz synapse-admin
- uses: softprops/action-gh-release@v2
with:
files: synapse-admin.tar.gz
generate_release_notes: true
make_latest: "true"
draft: false
prerelease: false
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,6 @@ sketch
# .pnp.*

# End of https://www.toptal.com/developers/gitignore/api/node,yarn,react,visualstudiocode

/testdata/synapse.data
/testdata/postgres.data
27 changes: 3 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,5 @@
# Builder
FROM node:lts as builder
LABEL org.opencontainers.image.url=https://github.com/Awesome-Technologies/synapse-admin org.opencontainers.image.source=https://github.com/Awesome-Technologies/synapse-admin
# Base path for synapse admin
ARG BASE_PATH=./
FROM ghcr.io/static-web-server/static-web-server:2

WORKDIR /src
ENV SERVER_ROOT=/app

# Copy .yarn directory to the working directory (must be on a separate line!)
# Use https://docs.docker.com/engine/reference/builder/#copy---parents when available
COPY .yarn .yarn
COPY package.json .yarnrc.yml yarn.lock ./

# Disable telemetry and install packages
RUN yarn config set enableTelemetry 0 && yarn install --immutable --network-timeout=300000

COPY . /src
RUN yarn build --base=$BASE_PATH

# App
FROM nginx:stable-alpine

COPY --from=builder /src/dist /app

RUN rm -rf /usr/share/nginx/html \
&& ln -s /app /usr/share/nginx/html
COPY ./dist /app
Loading