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

Full rework #1

Open
wants to merge 138 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
9ac5cb6
WIP
PhMemmel Sep 3, 2024
fbb2bbb
Add Dunja SCSS
PhMemmel Sep 4, 2024
cd98b0c
Remove exporting flavors in components
PhMemmel Sep 4, 2024
14a8b17
preview
sh-csg Sep 4, 2024
af77548
Fix icons on component buttons
PhMemmel Sep 4, 2024
3c61615
Fix preview
PhMemmel Sep 4, 2024
2fba150
Add managementlink to settingspage
TobiGa Sep 10, 2024
217e523
Add delivering styles from database
PhMemmel Sep 11, 2024
eb8c3ad
Begin management
TobiGa Sep 11, 2024
18d54bc
Add base class
TobiGa Sep 12, 2024
0b1f6ae
Add management forms
TobiGa Sep 12, 2024
4fbda76
Fix column name
sh-csg Sep 16, 2024
a77acc5
Fix field type
sh-csg Sep 16, 2024
5b1a108
Add strings and capability
sh-csg Sep 16, 2024
44675e8
Inject CSS to Tiny
sh-csg Sep 16, 2024
9f4f4c0
fix logic
TobiGa Sep 16, 2024
822a792
Add xml import and export
TobiGa Sep 16, 2024
8b9cbed
Use autocomplete for flavor / variant
sh-csg Sep 16, 2024
061798e
Update items with same name on import
TobiGa Sep 16, 2024
b1e9c3e
Import bugfix
TobiGa Sep 16, 2024
65bb495
Add timecreated
TobiGa Sep 16, 2024
baa7b78
Improve delivering of css, test caching
PhMemmel Sep 17, 2024
81adb32
Rework delivering of css
PhMemmel Sep 17, 2024
99f2938
Fix setting init
TobiGa Sep 17, 2024
d133bb2
Add filemanager to compcat form
TobiGa Sep 23, 2024
8cb91f6
Harden access
PhMemmel Sep 23, 2024
9c6b1c0
Fix button links
TobiGa Sep 23, 2024
64640a6
export to ZIP, fileupload
sh-csg Sep 23, 2024
9b6a3bd
A step towards working variants
sh-csg Sep 23, 2024
645f00a
Include variants in built css
sh-csg Sep 30, 2024
3a30e0b
Remove old variants and components
sh-csg Sep 30, 2024
1fd7513
Remove old code
sh-csg Sep 30, 2024
1048cbd
Remove old stuff
sh-csg Sep 30, 2024
cc5972f
Filter flavors
sh-csg Oct 6, 2024
68480cf
Fix import
sh-csg Oct 7, 2024
8a1129f
Skip empty array entries
sh-csg Oct 7, 2024
bb69748
Use editor in edit forms
sh-csg Oct 8, 2024
7b2251e
Change file import
sh-csg Oct 8, 2024
9743f77
Change file import
sh-csg Oct 8, 2024
fcf20fa
Change file import
sh-csg Oct 8, 2024
72f1f1e
Change editor button spacing
sh-csg Oct 8, 2024
17aaa1a
Add support for editor_codemirror
sh-csg Oct 9, 2024
6aa60fc
Merge branch 'editor' into develop_phmemmel
sh-csg Oct 9, 2024
888f8e1
Always select a category / flavor
sh-csg Oct 9, 2024
2222a0b
Fix variant preview
sh-csg Oct 10, 2024
52ec027
Remove langstring fetching
sh-csg Oct 11, 2024
ce71881
Add helper for images
sh-csg Oct 12, 2024
1894931
Respect displayorder
sh-csg Oct 12, 2024
261c4ad
Filter by flavor
sh-csg Oct 12, 2024
e77d469
Fix flavor-component filtering
sh-csg Oct 12, 2024
2f45e2e
Imageclass
sh-csg Oct 12, 2024
da59c80
Move button text
sh-csg Oct 12, 2024
18bbe28
Show variant immediately
sh-csg Oct 12, 2024
f93856a
Change import
sh-csg Oct 13, 2024
b3a4f49
Make sure pluginfile urls are encoded in export
sh-csg Oct 13, 2024
f066be1
Add new variables
sh-csg Oct 14, 2024
9eb1d15
Load right revision of css to the editor
sh-csg Oct 14, 2024
32854d8
Fix problem for categories without flavors
sh-csg Oct 14, 2024
ce97453
Change database structure
sh-csg Oct 14, 2024
1807305
Missing line
sh-csg Oct 14, 2024
fd83607
Fix install.xml
sh-csg Oct 14, 2024
aa16b12
Remaining work for new data structure
sh-csg Oct 14, 2024
c9b0e2d
Enable import of new table
sh-csg Oct 14, 2024
6db4811
Fix table name
sh-csg Oct 14, 2024
2064710
Fix table name another time
sh-csg Oct 14, 2024
33ea909
Change component edit form
sh-csg Oct 14, 2024
181a5fb
Add images and some logic to management
TobiGa Oct 14, 2024
c903f06
Add iconurl management
sh-csg Oct 14, 2024
1884e58
Fix icon generation
sh-csg Oct 14, 2024
83d9a53
Make clicking a bit easier
TobiGa Oct 15, 2024
1355439
Fix import
sh-csg Oct 15, 2024
d40fe8e
Fix management
sh-csg Oct 15, 2024
03bafd0
Fix url
sh-csg Oct 15, 2024
bcaf509
Fix css
sh-csg Oct 15, 2024
ee9e6bd
Various fixes
sh-csg Oct 15, 2024
246d315
Add missing column
sh-csg Oct 15, 2024
a096082
Respect displayorder
sh-csg Oct 15, 2024
f2162e1
Fix management edit clicks
TobiGa Oct 15, 2024
48934b5
Remember active compcat in management
TobiGa Oct 15, 2024
0e6966b
Change button sorting
sh-csg Oct 16, 2024
aa1a357
Fix management icon height
TobiGa Oct 16, 2024
a9adb9a
Fix button css for small icons
sh-csg Oct 16, 2024
3e312cd
Working version
sh-csg Oct 22, 2024
2b28f98
Missing files
sh-csg Oct 22, 2024
2831b76
wip
sh-csg Nov 4, 2024
8053ea3
Add upgrade step
sh-csg Nov 5, 2024
934e3a7
Remove unnecessary db query
sh-csg Nov 5, 2024
da3297d
Add isstudent and context
sh-csg Nov 5, 2024
e2c2a80
Adapt to mobile devices
sh-csg Nov 7, 2024
3245adc
add base data import
sh-csg Nov 7, 2024
1c0df30
Process component js
sh-csg Nov 17, 2024
7e95eda
Don't process JS/CSS on management page
sh-csg Nov 17, 2024
012e811
Variants, JS cache
sh-csg Nov 18, 2024
a9b2dc9
MBS-9486: Reload page only if necessary
TobiGa Nov 18, 2024
18b4b68
CS, bug fixes
sh-csg Nov 19, 2024
0fc6385
MBS-9494: Add unassigned items category and show variants
TobiGa Nov 19, 2024
19cf7e1
baseinstall
sh-csg Nov 19, 2024
58e6d54
Install bug
sh-csg Nov 19, 2024
873b6df
MBS-9486: Improve admin UI
TobiGa Nov 20, 2024
b2f703d
Add missing string
sh-csg Nov 21, 2024
1bb6d59
Use icon urls to show images on administration
TobiGa Nov 21, 2024
d29d735
Keep old iconurls
sh-csg Nov 20, 2024
df517c2
Add management css preview
TobiGa Nov 21, 2024
067e89b
avoid management problem
sh-csg Nov 23, 2024
cdd7678
avoid management problem
sh-csg Nov 23, 2024
4892e2f
Fix styles
sh-csg Nov 25, 2024
6afa26c
Fix styles
sh-csg Nov 25, 2024
4ac836d
Variants
sh-csg Nov 25, 2024
7f782de
Fix preview
sh-csg Nov 25, 2024
1d3e085
Fix preview url
sh-csg Nov 25, 2024
69ec07a
MBS-9489: Add option to hide items in editor for students
TobiGa Nov 26, 2024
ba9e7db
Fix bug in unassigned and delete flavor
TobiGa Nov 28, 2024
cce5523
MBS-9770: add junction table for components and variants
Dec 2, 2024
6b6d4e2
Change column name
sh-csg Dec 4, 2024
dfcd0ce
Fix flavor update
sh-csg Dec 4, 2024
52bdb0a
Add update step
sh-csg Dec 4, 2024
3f77558
Merge branch 'MBS-9770_add_table_for_components_to_variants' into dev…
sh-csg Dec 4, 2024
cf39b05
Show variant state
sh-csg Dec 4, 2024
c44112e
Make functions sensitive to context
sh-csg Dec 4, 2024
f721001
Change navigation to dropdown navtabs
TobiGa Dec 5, 2024
50e78c5
Fix issues with new navigation
TobiGa Dec 5, 2024
84d5db2
Change editor styling
TobiGa Dec 6, 2024
192ba6c
First try to deliver base components
sh-csg Dec 6, 2024
b6f3895
Fix highlighted dropdown-item
TobiGa Dec 6, 2024
afbf73a
No object
sh-csg Dec 6, 2024
d6965d1
New base.zip
sh-csg Dec 6, 2024
fcb30a5
Add files via upload
FrauSpeckner Dec 8, 2024
3ea74cb
Merge pull request #2 from FrauSpeckner/develop_phmemmel
sh-csg Dec 8, 2024
1c6d376
Fix context id
sh-csg Dec 9, 2024
cbf5d36
Don't show plugin if missing permission
sh-csg Dec 9, 2024
80fc334
Avoid error when there are no categories yet
sh-csg Dec 9, 2024
eac0a18
Fix import
sh-csg Dec 9, 2024
7ae47c8
Show icons for components without flavors
sh-csg Dec 9, 2024
7a58005
Fix variant editing
sh-csg Dec 9, 2024
fa9bf1f
Coding style
sh-csg Dec 12, 2024
4038de0
Some Code docs
PM84 Jan 4, 2025
5d785a4
Fix variant buttons
sh-csg Jan 4, 2025
e94a496
Remove components from scss
sh-csg Jan 5, 2025
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
71 changes: 36 additions & 35 deletions .github/workflows/moodle-ci.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,41 @@
name: Moodle Plugin CI

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

services:
postgres:
image: postgres:13
env:
POSTGRES_USER: 'postgres'
POSTGRES_HOST_AUTH_METHOD: 'trust'
ports:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3

mariadb:
image: mariadb:10.5
image: mariadb:10
env:
MYSQL_USER: 'root'
MYSQL_ALLOW_EMPTY_PASSWORD: "true"
MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3

strategy:
fail-fast: false
matrix:
php: ['7.4', '8.0']
moodle-branch: ['MOODLE_401_STABLE']
database: [mariadb]
php: ['8.1', '8.3']
moodle-branch: ['main', 'MOODLE_405_STABLE', 'MOODLE_404_STABLE']
database: [pgsql, mariadb]

steps:
- name: Check out repository code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: plugin

Expand All @@ -35,65 +45,56 @@ jobs:
php-version: ${{ matrix.php }}
extensions: ${{ matrix.extensions }}
ini-values: max_input_vars=5000
# If you are not using code coverage, keep "none". Otherwise, use "pcov" (Moodle 3.10 and up) or "xdebug".
# If you try to use code coverage with "none", it will fallback to phpdbg (which has known problems).
coverage: none

- name: Initialise moodle-plugin-ci
run: |
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^4
echo $(cd ci/bin; pwd) >> $GITHUB_PATH
echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
sudo locale-gen en_AU.UTF-8
echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV

- name: Install moodle-plugin-ci
run: |
moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
env:
DB: ${{ matrix.database }}
MOODLE_BRANCH: ${{ matrix.moodle-branch }}

- name: PHP Lint
if: ${{ always() }}
if: ${{ !cancelled() }}
run: moodle-plugin-ci phplint

- name: PHP Copy/Paste Detector
continue-on-error: true # This step will show errors but will not fail
if: ${{ always() }}
run: moodle-plugin-ci phpcpd

- name: PHP Mess Detector
continue-on-error: true # This step will show errors but will not fail
if: ${{ always() }}
run: moodle-plugin-ci phpmd

- name: Moodle Code Checker
if: ${{ always() }}
run: moodle-plugin-ci codechecker --max-warnings 0
if: ${{ !cancelled() }}
run: moodle-plugin-ci phpcs --max-warnings 0

- name: Moodle PHPDoc Checker
if: ${{ always() }}
run: moodle-plugin-ci phpdoc
if: ${{ !cancelled() }}
run: moodle-plugin-ci phpdoc --max-warnings 0

- name: Validating
if: ${{ always() }}
if: ${{ !cancelled() }}
run: moodle-plugin-ci validate

- name: Check upgrade savepoints
if: ${{ always() }}
if: ${{ !cancelled() }}
run: moodle-plugin-ci savepoints

- name: Mustache Lint
if: ${{ always() }}
if: ${{ !cancelled() }}
run: moodle-plugin-ci mustache

- name: Grunt
if: ${{ matrix.moodle-branch == 'master' }}
run: moodle-plugin-ci grunt
if: ${{ !cancelled() }}
run: moodle-plugin-ci grunt --max-lint-warnings 0

- name: PHPUnit tests
if: ${{ always() }}
run: moodle-plugin-ci phpunit
if: ${{ !cancelled() }}
run: moodle-plugin-ci phpunit --fail-on-warning

- name: Behat features
if: ${{ always() }}
run: moodle-plugin-ci behat --profile chrome
- name: Mark cancelled jobs as failed.
if: ${{ cancelled() }}
run: exit 1
2 changes: 1 addition & 1 deletion amd/build/commands.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion amd/build/common.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading