Skip to content

Commit

Permalink
Merge pull request #1069 from LukasKalbertodt/redesign
Browse files Browse the repository at this point in the history
Implement Redesign of whole application
  • Loading branch information
JulianKniephoff authored Aug 24, 2023
2 parents 901acb2 + cf08afb commit 3cd10b1
Show file tree
Hide file tree
Showing 111 changed files with 17,193 additions and 35,714 deletions.
28 changes: 28 additions & 0 deletions .babelrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
'use strict';

module.exports = {
parserOpts: {
strictMode: true,
},
plugins: ['@emotion'],
presets: [
['@babel/preset-env', {
// Set to `true` to show which transforms will be run
// during the build
debug: false,
}],
[
'@babel/preset-typescript',
{
allowDeclareFields: true,
},
],
[
'@babel/preset-react',
{
runtime: 'automatic',
importSource: '@emotion/react',
},
],
],
};
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ root = true
indent_style = space
indent_size = 2
max_line_length = 100
quote_type = single
quote_type = double

# We recommend you to keep these unchanged
end_of_line = lf
Expand Down
2 changes: 0 additions & 2 deletions .env

This file was deleted.

57 changes: 15 additions & 42 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,19 @@
{
"extends": ["react-app", "plugin:react/recommended"],
"plugins": ["@babel"],

"extends": ["@opencast/eslint-config-ts-react"],
"rules": {
"no-tabs": "error",
"react/jsx-pascal-case": "off",
"react/prop-types": 0,
"react/no-unknown-property": ["error", { "ignore": ["sx"] }],
"react/jsx-curly-spacing": "warn",
"no-unused-expressions": "off",
"@babel/no-unused-expressions": "warn",
"quotes": ["warn", "single", { "avoidEscape": true }],

"arrow-parens": ["error", "as-needed"],
"arrow-spacing": "error",
"block-spacing": ["error", "always"],
"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
"comma-dangle": ["warn", "only-multiline"],
"comma-spacing": "warn",
"comma-style": "warn",
"curly": "warn",
"eol-last": ["error", "always"],
"func-call-spacing": ["error", "never"],
"indent": ["error", 2, { "SwitchCase": 1, "MemberExpression": "off" }],
"jsx-quotes": ["error", "prefer-double"],
"keyword-spacing": "warn",
"linebreak-style": ["error", "unix"],
"max-len": ["error", { "code": 120, "ignoreUrls": true }],
"no-multi-spaces": ["warn", { "ignoreEOLComments": true }],
"no-trailing-spaces": "error",
"object-curly-spacing": ["error", "always", { "arraysInObjects": false, "objectsInObjects": false }],
"semi": ["error", "always"],
"semi-spacing": "warn",
"space-before-function-paren": ["error", "never"],
"space-before-blocks": "warn",
"space-infix-ops": "error",
"space-in-parens": "warn"
"@typescript-eslint/member-delimiter-style": "warn"
},
"settings": {
"react": {
"pragma": "jsx",
"version": "detect"
}
}
"overrides": [
{
"files": ["./webpack.config.ts"],
"parserOptions": {
"project": false
}
}
],
"ignorePatterns": [
"node_modules",
"old-src",
"build"
]
}
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
node-version: 16
- run: npm ci
- run: npx eslint src --max-warnings=0
- run: npm run build
- run: npm test
- run: npm run build:dev
- run: npm run typecheck


# Prepare test deployment
Expand All @@ -35,7 +35,7 @@ jobs:
fi
deploydir="/$(echo "${deploydir}" | LC_ALL=C sed -e 's/[^a-zA-Z0-9\-_]/-/g')"
echo ${deploydir} > deploydir.tmp
PUBLIC_URL=${deploydir} npm run build
PUBLIC_PATH=${deploydir} npm run build:release
- name: Archive test deployment files as artifact
uses: actions/upload-artifact@v3
Expand All @@ -53,7 +53,7 @@ jobs:
REACT_APP_INCLUDE_LEGAL_NOTICES: 1
run: |
rm -rf build
PUBLIC_URL="/" npm run build
PUBLIC_PATH="/" npm run build:release
- name: Archive prod deployment files as artifact
if: github.repository_owner == 'elan-ev' && github.ref == 'refs/heads/master'
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

tsconfig.tsbuildinfo
22 changes: 0 additions & 22 deletions CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,28 +169,6 @@ further below for information on that.
# Note: this setting can ONLY be set via `settings.toml` and not via GET
# parameter.
#allowedDomains = ["mylms.myuniversity.de"]

[theme]
# You can add here your own CSS
customCSS = """
/* Sample pink theme */
#root {
--theme-ui-colors-primary: #b03c7e;
--theme-ui-colors-btn-hover: #93326a;
}
/* Sample dark theme */
/*
:root {
--theme-ui-colors-background: #303238;
--theme-ui-colors-text: #FFF;
}
#root {
--theme-ui-colors-info: #737373;
--theme-ui-colors-gray-3: #797676;
}
*/
"""
```


Expand Down
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
16 changes: 0 additions & 16 deletions doc/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,6 @@ If a pull request relates to an existing issue, please also link that issue.
If you want to make us happy, please also provide this reasoning as part of your git commit messages.


Tests
-----

Opencast Studio comes with a set of tests.
Passing these tests is a requirement for all contributions.
These tests are also run automatically on our CI system.

To run tests locally, use::

npm test

If the CI tests on your pull request fail and you are sure it is not caused by your patch, please complain.
Errors happen and we can easily trigger a new build.
Your patch cannot be merged without these tests passing.


Documentation
-------------

Expand Down
Loading

0 comments on commit 3cd10b1

Please sign in to comment.