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.

Sign up for GitHub

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

Jump to bottom

Titus tasks for gerolstein #512

Merged
merged 36 commits into from
Oct 20, 2023
Merged

Titus tasks for gerolstein #512

merged 36 commits into from
Oct 20, 2023

Conversation

TitusKirch
Copy link
Contributor

N/A

@TitusKirch TitusKirch added the enhancement New feature or request label Oct 14, 2023
@TitusKirch TitusKirch linked an issue Oct 14, 2023 that may be closed by this pull request
Update ModuleGerolsteinSeeder #329
Closed
@TitusKirch TitusKirch changed the base branch from main to dev October 14, 2023 12:23
@TitusKirch TitusKirch marked this pull request as draft October 14, 2023 12:23
@TitusKirch TitusKirch added this to the Version 2.3.x milestone Oct 14, 2023
This was linked to issues Oct 14, 2023
Add random generator (backend) #223
Closed
Add random generator (frontend admin view) #225
Closed
Update EventsGerolsteinSeeder #328
Closed
@TitusKirch TitusKirch marked this pull request as ready for review October 14, 2023 14:11
simonostendorf
simonostendorf approved these changes Oct 16, 2023
View reviewed changes
Copy link
Member

@simonostendorf simonostendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

simonostendorf
simonostendorf reviewed Oct 20, 2023
View reviewed changes
Copy link
Member

@simonostendorf simonostendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to add role admin and super admin to a super admin user my comments are irrelevant :)

app/Http/Controllers/DashboardController.php Show resolved Hide resolved
app/Http/Middleware/IsLoggedInAdmin.php Show resolved Hide resolved
app/Http/Middleware/IsLoggedInTutor.php Show resolved Hide resolved
app/Http/Middleware/RedirectIfTutor.php Show resolved Hide resolved
resources/js/pages/Dashboard/Index.vue Show resolved Hide resolved
@TitusKirch
Copy link
Contributor Author

If you want to add role admin and super admin to a super admin user my comments are irrelevant :)

This is exactly what we do, super admin was currently only used to prevent removal.

@TitusKirch TitusKirch merged commit fa63d92 into dev Oct 20, 2023
@TitusKirch TitusKirch deleted the feat/titus-gerolstein branch October 20, 2023 21:16
TitusKirch added a commit that referenced this pull request Oct 30, 2023
@TitusKirch @dependabot
@simonostendorf @DontEdit @PhilPinsdorf
Merge dev in main (#540)
5c1e6c4 
* Bump @formkit/themes from 1.0.0-beta.9-f64c966 to 1.1.0 (#480)

Bumps [@formkit/themes](https://github.com/formkit/formkit/tree/HEAD/packages/themes) from 1.0.0-beta.9-f64c966 to 1.1.0.
- [Release notes](https://github.com/formkit/formkit/releases)
- [Commits](https://github.com/formkit/formkit/commits/1.1.0/packages/themes)

---
updated-dependencies:
- dependency-name: "@formkit/themes"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/login-action from 2 to 3 (#463)

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump docker/build-push-action from 4 to 5 (#462)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @tailwindcss/typography from 0.5.9 to 0.5.10 (#461)

Bumps [@tailwindcss/typography](https://github.com/tailwindcss/typography) from 0.5.9 to 0.5.10.
- [Release notes](https://github.com/tailwindcss/typography/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md)
- [Commits](tailwindlabs/tailwindcss-typography@v0.5.9...v0.5.10)

---
updated-dependencies:
- dependency-name: "@tailwindcss/typography"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Revert "Bump docker/login-action from 2 to 3 (#463)" (#482)

This reverts commit fa703e2.

* Bump @formkit/vue from 1.0.0-beta.9-f64c966 to 1.1.0 (#479)

Bumps [@formkit/vue](https://github.com/formkit/formkit/tree/HEAD/packages/rules) from 1.0.0-beta.9-f64c966 to 1.1.0.
- [Release notes](https://github.com/formkit/formkit/releases)
- [Commits](https://github.com/formkit/formkit/commits/1.1.0/packages/rules)

---
updated-dependencies:
- dependency-name: "@formkit/vue"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @formkit/addons from 1.0.0-beta.9-f64c966 to 1.1.0 (#478)

Bumps [@formkit/addons](https://github.com/formkit/formkit/tree/HEAD/packages/addons) from 1.0.0-beta.9-f64c966 to 1.1.0.
- [Release notes](https://github.com/formkit/formkit/releases)
- [Commits](https://github.com/formkit/formkit/commits/1.1.0/packages/addons)

---
updated-dependencies:
- dependency-name: "@formkit/addons"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix(readme): kubernetes link (#506)

* fix(readme): kubernetes link

* fix(readme): kubernetes link

* feat(readme): add devcontainer section (#507)

* feat(deploy): add aws s3 (#508)

* Titus tasks for gerolstein (#512)

* Update ddates

* Improve Module seeder logic

* Fix naming

* Add state logic

* Add modules to inertia share

* Linting

* Add random generaot backend

* Generate components

* Sort user by firstname

* Proof of Concept up and download from s3

* Image to s3 nearly done (req to controller not working)

* s3 Image Upload in user register and s3 show image funciton ready for use

* Remove outdated docs

* Add spatie permissions

* Remove dev code

* Migrate to rbac

* Update routes

* Fix drop col

* All comments implemented

* Add super admin role to prevent erros

* Add edit view

* Add link to old register/assigne page

* Add special role

* Add disabled flag

* Fix namings

* Add public api

* Improve user view

* Add missing if

* Add missing dependencies

* Improve S3 Implmentation

* Improvee admin ui

* Fix s3 logic

* Fix S3 logic

* Allow to edit super admins (except roles)

---------

Co-authored-by: DontEdit <vitor.macedo@outlook.de>
Co-authored-by: DontEdit <115659871+DontEdit@users.noreply.github.com>

* feat(github_actions): add docker e2e test (#513)

* feat(github_actions): add docker e2e test

* fix(github_actions/docker-e2e): event name typo

* fix(github_actions/docker-e2e): env file creation typo

* fix(docker-compose): adjust db connection typo

* fix(github_actions/docker-e2e): add missing env vars

* feat(github_actions/docker-e2e): change naming

* debug(github_actions/docker-e2e): add debug steps

* debug(github_actions/docker-e2e): remove redis connection

* update(docker): roadrunner (#519)

* fix(database/seeders): invalid and missing seeders (#520)

* fix(database/seeders): missing students seeder

* fix(database/seeders): bracket inside tutor seeder

* feat(database/seeders/tutor): switch delimiter and add disabled (#521)

* Fix/darkmode (#533)

* Fix darkmode

* lint code

* Feat/phil frontend (#532)

* Init Commit

* Pair programming
Co-authored-by: PhilPinsdorf

* Added Random Generator Frontend

* Removed Scaleup Animation because it is not used

* Fixed Font

* Fixed AvatarCard

* Fixed Transition Component

* Fixed single-file component element order

* Added Name for Display Route

* Set new Location for AvatarCard

* Fixed isFetchingRandomGenerator

* Fixed Naming

* Fixed Transiotin, Audio and added Riser

---------

Co-authored-by: Titus Kirch <titus.kirch@kirch.dev>

* Feat/add score system (#534)

* Init Commit

* Pair programming
Co-authored-by: PhilPinsdorf

* Added Random Generator Frontend

* Removed Scaleup Animation because it is not used

* Fix darkmode

* lint code

* Fixed Font

* Add scoresystem

* Fixed AvatarCard

* Fixed Transition Component

* Fixed single-file component element order

* Added Name for Display Route

* Set new Location for AvatarCard

* Fixed isFetchingRandomGenerator

* Fixed Naming

* Fixed Transiotin, Audio and added Riser

* Adjust display of name

* Regenerate components file

* Lint code and fix typo

---------

Co-authored-by: Phil Pinsdorf <philemon.pinsdorf@live.de>

* feat/add user delete feature (#536)

* Add delete feature for super admins

* Fix message

* Add missing redirect back

* Feat/update authors in readme md #335 (#432)

* Add Martin Philemon Pinsdorf

* Fix typo

* Add Vitor

* Changed Gif (#537)

* Feat/improve audio (#538)

* Lint

* Fade out audio

* Update event data (#539)

* Update event data

* Fix wording

* Fix/hotfix 1 (#542)

* Remove >

* Fix naming of file

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Simon Ostendorf <github@simon-ostendorf.de>
Co-authored-by: DontEdit <vitor.macedo@outlook.de>
Co-authored-by: DontEdit <115659871+DontEdit@users.noreply.github.com>
Co-authored-by: Phil Pinsdorf <62160426+PhilPinsdorf@users.noreply.github.com>
Co-authored-by: Phil Pinsdorf <philemon.pinsdorf@live.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonostendorf simonostendorf simonostendorf approved these changes

@PhilPinsdorf PhilPinsdorf Awaiting requested review from PhilPinsdorf

@tijavo tijavo Awaiting requested review from tijavo

@DontEdit DontEdit Awaiting requested review from DontEdit

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
Version 2.3.x
3 participants
@TitusKirch @simonostendorf @DontEdit