Skip to content

Commit

Permalink
Simplify the project structure
Browse files Browse the repository at this point in the history
With the refactoring of the development servers done in opencast#398
and indirectly opencast#394, there is an opportunity to boil down
the project structure a bit.

This PR does nothing but move files around and make the necessary
changes to keep everything working. (Fingers crossed.)
  • Loading branch information
JulianKniephoff committed May 23, 2024
1 parent 04741aa commit 79bf416
Show file tree
Hide file tree
Showing 732 changed files with 26 additions and 94 deletions.
4 changes: 2 additions & 2 deletions .crowdin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ base_path: .
preserve_hierarchy: true

files:
- source: '/app/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json'
translation: '/app/src/i18n/org/opencastproject/adminui/languages/lang-%locale_with_underscore%.json'
- source: '/src/i18n/org/opencastproject/adminui/languages/lang-en_US.json'
translation: '/src/i18n/org/opencastproject/adminui/languages/lang-%locale_with_underscore%.json'
2 changes: 1 addition & 1 deletion .github/build-release.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Build integrated version
cd ../app
cd ..
rm -rf build/
export PUBLIC_URL=/admin-ui
CI=false npm run build
Expand Down
3 changes: 1 addition & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ updates:

# Javascript
- package-ecosystem: npm
directory: "/app"
directory: /
schedule:
interval: monthly
time: "04:00"
open-pull-requests-limit: 15
labels:
- dependencies
6 changes: 2 additions & 4 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@ jobs:

- name: download dependencies
run: npm ci
working-directory: ./app

- name: create release tarball
run: ../.github/build-release.sh
working-directory: ./app
run: ./.github/build-release.sh

- name: create new release
uses: softprops/action-gh-release@v2
with:
files: ./app/oc-admin-ui-*.tar.gz
files: ./oc-admin-ui-*.tar.gz
draft: true
fail_on_unmatched_files: true
generate_release_notes: true
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@ jobs:
node-version: 20

- name: download dependencies
working-directory: ./app
run: npm ci

- name: build project
working-directory: ./app
env:
CI: false
run: npm run build
4 changes: 2 additions & 2 deletions .github/workflows/update-translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
crowdin download --config .crowdin.yaml -b admin-ui-picard
- name: add new translations
run: |
git add /app/src/i18n/org/opencastproject/adminui/languages/
git add /src/i18n/org/opencastproject/adminui/languages/
- name: update language list
working-directory: /app/src/i18n/org/opencastproject/adminui/languages/
working-directory: /src/i18n/org/opencastproject/adminui/languages/
run: |
echo -n '[ "' > locales.json
echo -n ??-??.json | sed 's/ */", "/g' >> locales.json
Expand Down
23 changes: 0 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,2 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vscode
16 changes: 0 additions & 16 deletions .vscode/launch.json

This file was deleted.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ To get a local copy of the admin UI to test or develop on, you can do the follow
git clone [email protected]:opencast/opencast-admin-interface.git opencast-admin-interface-demo
cd opencast-admin-interface-demo
git switch my-branch # or otherwise check out, pull, merge, etc. whatever branch you want to test/hack on
cd app
npm ci
```

Expand Down
23 changes: 0 additions & 23 deletions app/.gitignore

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
Loading

0 comments on commit 79bf416

Please sign in to comment.