Skip to content
Snippets Groups Projects

Resolve "Merge dashboard and dashboard-backend repos"

Merged Maarten de Waard requested to merge 71-merge-dashboard-and-dashboard-backend-repos into main

Closes #33 (closed) Addresses #71 (closed)

I'd like to make a second MR that updates the image references in the helm chart. The reason why I'd like to split those two, is that this MR includes 200 commits from another repository.

The only relevant changes I did is merging the .gitlab-ci.yml files from these two repositories. Other than that I only made a branch in the back-end repo that contains all the files inside a back-end folder, added that as a remote in this repo, and merged it into this branch. This way we keep commit history and authorship.

Edited by Maarten de Waard

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Maarten de Waard changed milestone to %2.1

    changed milestone to %2.1

  • added Doing label

  • Maarten de Waard added 200 commits

    added 200 commits

    • b8bdc465 - Initial commit
    • 4cd9db36 - Initial commit
    • cceff40e - Update gitignore
    • 89ba5c82 - add gitlab ci file to build docker container
    • 2c120886 - Merge branch '1-add-docker-build-pipeline' into 'main'
    • 86412a11 - Implemented initial communication with Kratos
    • eee1ba10 - Add renovate.json
    • c8eb76b3 - Fix kaniko build
    • 4c018985 - Update dependency Flask-JWT-Extended to v4.3.1
    • dd67ce77 - Update dependency cryptography to v3.4.8
    • 4dfbb196 - Update dependencies
    • a208b5f4 - Update dependencies
    • a81d14b4 - feat(Users): Implemented Kratos CRUD
    • 9f9fe43f - chore(deps): update python docker tag to v3.10
    • 38d94cd0 - chore(deps): update dependency cryptography to v35
    • 927ef220 - feat(Global): Implemented validation on requests and error handling
    • 65cb1a1c - fix(Dockerfile): Cleanup for dockerfile
    • ab0ef060 - chore(deps): update dependency regex to v2021.11.2
    • d7c9ed1b - chore(deps): update dependency jsonschema to v4.2.1
    • b24c1597 - chore(deps): update dependency pycparser to v2.21
    • 636ef898 - chore(deps): update dependency flask-expects-json to v1.7.0
    • 74f1a622 - Update jinja2
    • 2b2de012 - chore(deps): update dependency regex to v2021.11.10
    • 0bd9434d - feat(Global): Add health check api
    • e2082418 - chore(deps): update dependency typing-extensions to v4
    • ff564924 - chore(deps): update dependency cryptography to v36
    • b39fcd3e - Rename admin-backend to dashboard-backend
    • 9bfec06e - Add AGPL license
    • 073803d6 - chore(deps): update dependency charset-normalizer to v2.0.8
    • 9b3bd872 - chore(deps): update dependency typing-extensions to v4.0.1
    • 1250211c - chore(deps): update dependency install to v1.3.5
    • 776b2e6c - chore(deps): update dependency charset-normalizer to v2.0.9
    • 660a2b5a - - Add check for kratos port
    • 6122874e - chore(deps): update dependency tomli to v1.2.3
    • a33e1452 - chore(deps): update dependency cryptography to v36.0.1
    • d5e4ea2c - chore(deps): update dependency jsonschema to v4.3.1
    • 26ffb28a - chore(deps): update dependency jsonschema to v4.3.2
    • 2160f634 - Implemented oidc with hydra
    • 45728d13 - Take state from query param on hydra callback
    • 7e51c28c - Update ssh tunnel script
    • f0c08797 - Fix authorization_response param
    • 5290bedc - Fix authorization_response param
    • 34796a7d - Use code instead of authorization_response
    • f0d83c68 - Update get_token function
    • 816fb5ad - Update get_token function
    • f519a9d5 - Update get_token function
    • 9771ae80 - Update get_token function
    • 6c20ed66 - Update get_token function
    • bd6bebdb - Update dependency platformdirs to v2.4.1
    • 06a2767d - Update dependency attrs to v21.4.0
    • fd2aa0f6 - Update dependency jsonschema to v4.4.0
    • bf842ac7 - Update dependency requests to v2.27.1
    • d4097c3a - Update dependency charset-normalizer to v2.0.10
    • fff51025 - Update dependency urllib3 to v1.26.8
    • 2a84b486 - Update dependency pyrsistent to v0.18.1
    • 38b58093 - change dashboard to dashboard-local with `localhost:3000` as return URL
    • 4200f404 - Update dependency regex to v2022
    • 59f3cb98 - Update dependency requests-oauthlib to v1.3.1
    • 744e27e5 - Update dependency oauthlib to v3.2.0
    • 36e161cd - Update dependency black to v22
    • 17d5d3dd - Update dependency charset-normalizer to v2.0.11
    • 4a82c8f2 - Get user info from hydra
    • c483ef6a - Add Kratos user id to Hydra callback response
    • 184ce663 - Update dependency Werkzeug to v2.0.3
    • c0dcef75 - Update dependency platformdirs to v2.5.0
    • 289802a9 - Update dependency charset-normalizer to v2.0.12
    • be828e97 - Update dependency typing-extensions to v4.1.1
    • 63708d70 - Update dependency Flask to v2.0.3
    • f9abe85e - Update dependency MarkupSafe to v2.1.0
    • 477e915c - Update dependency itsdangerous to v2.1.0
    • d5e6d082 - Update dependency click to v8.0.4
    • a63c2e69 - Update dependency platformdirs to v2.5.1
    • 25b29025 - Update dependency itsdangerous to v2.1.1
    • 57096cea - Update dependency cryptography to v36.0.2
    • 096db8a7 - Update dependency MarkupSafe to v2.1.1
    • 78b4ec2e - Update dependency regex to v2022.3.15
    • 06c385d5 - Use custom renovate presets
    • e8063b1d - Create /web router for login panel parts
    • cb2d2a35 - Apply 1 suggestion(s) to 1 file(s)
    • 755cb03a - Modified login app to work in dashboard context
    • d09d9d77 - Removed circular import for DB
    • 24890b37 - Make static path under /web
    • 05579361 - Add requirements
    • ab231d74 - add hydr client dep
    • 2d877d91 - Add additional requirement
    • a4981c8c - Added CLI commands
    • 047b34bf - Add debugging
    • 77b6364c - Fix typo
    • 3291f780 - Add debugging
    • 617f4683 - Use getter to get value
    • e97d82c6 - Convert string object to dict
    • e5cb358f - Add additional debugging
    • 9fce6c8e - Add some debug
    • 62e5b0aa - Force version
    • 0074fee9 - Added documentation
    • a7fb3ab2 - Change KRATOS_URL to KRATOS_ADMIN_URL and HYDRA_URL to HYDRA_PUBLIC_URL for clarity
    • 2564f3aa - rename PUBLIC_URL to a more meaningful variable name
    • 3d704820 - try to add a Migrate call so we can migrate I hope
    • b53bffbc - add migrations from SSO repo
    • ce5a7d05 - fix: set new URLs for set-ssh-tunnel script
    • f377b4ce - Refactor integrations of sso
    • 76610888 - Convert role column to a new table
    • 10479a62 - Added new endpoint for roles and updated users endpoints to work with roles
    • b4946503 - Fix for put user
    • 932f3c4f - set role_id for all admin users so no admin role data gets lost during migration
    • 3c8c900d - Return role_id when callback is called
    • 0ef90ecc - Fix setrole cli function
    • 75b18bad - Rename app_role_id to role_id
    • 45a09828 - fix: roles in consent shoudl be role names, not Role objects
    • e284a511 - Merge branch 'main' into 19-integrate-flask-sso-panel-into-dashboard-flask-backend
    • caa7e000 - Auto-assign @luka to renovate MRs
    • c120ab60 - upgrade: make changes to be compatible with Kratos 0.9.0-alpha.3
    • bf98fbd7 - feat: add error handling for unaccepted passwords, add kratos error page
    • 684c461e - implement logout endpoint to be called by Hydra on logout
    • 8aadfb08 - add set-port-forward.sh which uses kubectl port-forward instead of ssh tunnels
    • efbc1b21 - docs: update documentation on starting the dev environment
    • 61e512c2 - Added new role management
    • bc85575e - Add app roles to userInfo when logging in
    • 09f1d2e0 - Optimize insert app role to user
    • 5206c789 - MR comments
    • 97d4f084 - fix issue with WordPress login
    • 732555ac - MR comments
    • 19802f56 - fix logic for roles
    • c153b04c - Added User and No access roles in DB
    • 2a28c4d5 - reject consent request
    • 62187e0b - Rename API to Stackspin
    • acd25c2e - Merge branch 'main' into feat/role-management-fixes
    • 7b5a3f9e - adde user role to DB
    • 603c1aa7 - Added migration script
    • b6f3765a - remove 'pass' from the end of downgrade
    • 907e0eca - add permission layer for admins for backend API
    • 19bc31e6 - MR comments
    • 8c8b2d27 - fix typo
    • 0fef211f - changed variable names to snake case
    • c1e62089 - added migration script for users to add 'No access' roles in app_roles
    • a7c0b0a6 - add apps migration
    • f6480d80 - deny app access if role_id is 3 (no access)
    • 3eea6ab2 - Merge branch 'main' into feat/api-role-permission-layer
    • c88d7ebc - Only allow Admins to add new users
    • 4c6a9bc8 - add check if the app exists in DB before creating it
    • 812fc41c - Fix checking if app exists before inserting into DB
    • 942e8177 - Docker based proxy
    • c4b9fe07 - Update dependency bitnami/kubectl to v1.24.2
    • e654e81a - Update dependency nginx to v1.23.0
    • 9c75d36b - if user has admin dashboard role allow admin access
    • 420c85cf - MR comments
    • 33ffc5a8 - wip - add batch create users
    • 8eacdc8d - prepare endpoint for batch create users
    • 53529cd7 - add me endpoint
    • 5b55c449 - non admin can't change app roles
    • 8bcccf41 - remove unused function
    • 3a129493 - Update dependency bitnami/kubectl to v1.24.3
    • cc7ff9d3 - modify user batch create
    • 310b7ed8 - merge with master
    • aa182459 - fix(cliapp): Show a message if a user can not be found
    • 80ba5da9 - added more information about user batch creation
    • 72f54df1 - chore(deps): update dependency nginx to v1.23.1
    • 685ddeff - send out a recovery email after a new user is created.
    • d140a1a6 - Merge branch 'main' into feat/batch-create-users
    • 66b44ae1 - MR comments
    • cc7fc5ab - replace tmp variable name, doc improvements
    • 2baae3e6 - Merge branch 'main' into feat/batch-create-users
    • cea3f5a3 - draft of installing apps and getting app status
    • 4dacbed5 - chore(deps): update bitnami/kubectl docker tag to v1.24.4
    • e27318f9 - Show user roles in CLI
    • d81afbec - chore(deps): update bitnami/kubectl docker tag to v1.25.0
    • 9a75ae59 - chore(deps): update bitnami/kubectl docker tag to v1.25.1
    • 0f36e955 - chore(deps): update bitnami/kubectl docker tag to v1.25.2
    • 84ca20ba - Split logout flow in two steps (kratos/hydra)
    • 11d14b82 - Apply 1 suggestion(s) to 1 file(s)
    • a22cd872 - Change back to new docker commands
    • 6529636b - Enable deleting apps by using CLI
    • 4c57f92c - Process feedback; make it possible to install monitoring
    • 6e427f27 - Merge branch '43-install-remove-app-from-cli' into 45-allow-database-to-have-external-apps
    • a2019a32 - CLI interface for external apps
    • fd28d5b7 - return domains of internal apps
    • 9e83dc31 - correctly return URLs for apps
    • 3e0e4ee8 - Apply 1 suggestion(s) to 1 file(s)
    • 5893ee39 - draft of installing apps and getting app status
    • caa9b2e7 - Enable deleting apps by using CLI
    • 8e41705d - Process feedback; make it possible to install monitoring
    • 2e55e2fa - Process lots of feedback
    • 82478e50 - fix a few bugs with app del uninstall and deletion
    • 5e5b8ce2 - raise exceptions instead of logging them and then failing relatively silently
    • 903f11cf - fix oauth secret creation for most apps
    • 7da5761d - Processed feedback
    • 95eb8db5 - improve uninstall documentation, remove None output in uninstall command
    • f68380a4 - Add an environment variable that defines which config to load
    • dd5d4f1a - Fix merge conflicts
    • 8eb8d83b - Code cleanups
    • c6aa2be2 - adding and removing functions as result of merge conflict
    • 4d94d389 - include status in apps endpoint
    • 808533fa - Merged two functions, improved comments
    • 5ac175e4 - allow deleting external applications
    • eeb2456f - add a line that adds Monitoring app ipp if it did not exist yet
    • 70790117 - remove unused imports, add a few docstrings
    • 4f8455c6 - Merge branch 'main' into 45-allow-database-to-have-external-apps
    • af6b0064 - Add nextcloud_redis_password to stackspin-nextcloud-variables template
    • 92ec7c65 - move everything to backend folder for migration to dashboard repository
    • 0cf5107a - Merge remote branch 'dashboard-backend/move-everything-to-backend-folder' into...

    Compare with previous version

  • added 1 commit

    • c402558e - Merge remote branch 'dashboard-backend/move-everything-to-backend-folder' into...

    Compare with previous version

  • Maarten de Waard changed the description

    changed the description

  • added 1 commit

    • db5c61e7 - Merge remote branch 'dashboard-backend/move-everything-to-backend-folder' into...

    Compare with previous version

  • Maarten de Waard marked this merge request as ready

    marked this merge request as ready

  • Maarten de Waard changed the description

    changed the description

  • mentioned in issue #71 (closed)

  • Varac requested review from @varac

    requested review from @varac

  • merged

  • Varac mentioned in commit e8997549

    mentioned in commit e8997549

  • Varac mentioned in issue stackspin#483

    mentioned in issue stackspin#483

Please register or sign in to reply
Loading