diff --git a/.drone.yml b/.drone.yml index f97198c..46300c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: image: plugins/docker settings: registry: registry.cliffbreak.de - repo: registry.cliffbreak.de/kispi-core + repo: registry.cliffbreak.de/hgoe-sas username: from_secret: docker_username password: diff --git a/.vscode/settings.json b/.vscode/settings.json index 2ad0f6f..2cbee69 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,9 +8,11 @@ "daisyui", "esnext", "Gitea", + "github", "godotenv", "heroicons", - "kispi", + "hgoe", + "HGOE", "pnpm", "pocketbase", "tailwindcss", diff --git a/README.md b/README.md index 45b292b..596644f 100755 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -

🔥 Core - Kinderspielstadt Öhringen 🔥

-

Personal data administration, user check in and a banking system

+

🔥 Schule als Staat - Hohenlohe Gymnasium Öhringen 🔥

+

User administration, user check and customs, banking system, employer portal and an admin portal

screenshot

-This is our repository containing all required resources to run the "Core" WebApp from the "Kinderspielstadt Öhringen". +This is our repository containing all required resources to run the "Core" WebApp from the "Hohenlohe Gymnasium Öhringen - Schule als Staat" project. This repository also contains all the required Pocketbase files to run the backend server. ## 🚀 Getting Started @@ -22,13 +22,13 @@ Also `Go` is required to run the built in server. At first clone this repository to your local machine by using ``` -git clone https://git.cliffbreak.de/Kispi/Core.git +git clone https://git.cliffbreak.de/SimGie/HGOE-SaS.git ``` Change to the cloned repository ``` -cd Core +cd HGOE-Sas ``` Copy the example environment file diff --git a/server/go.mod b/server/go.mod index 54c976a..243fd81 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,10 +1,10 @@ -module kinderspielstadt.de/core-server +module cliffbreak.de/hgoe-sas-server go 1.20 require ( github.com/joho/godotenv v1.5.1 - github.com/pocketbase/pocketbase v0.16.3 + github.com/pocketbase/pocketbase v0.16.4 github.com/pterm/pterm v0.12.62 ) @@ -12,11 +12,9 @@ require ( atomicgo.dev/cursor v0.1.1 // indirect atomicgo.dev/keyboard v0.2.9 // indirect atomicgo.dev/schedule v0.0.2 // indirect - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/iam v0.13.0 // indirect github.com/AlecAivazis/survey/v2 v2.3.6 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go v1.44.273 // indirect + github.com/aws/aws-sdk-go v1.44.275 // indirect github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect @@ -81,7 +79,7 @@ require ( golang.org/x/term v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.9.2 // indirect + golang.org/x/tools v0.9.3 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.125.0 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -95,7 +93,7 @@ require ( modernc.org/mathutil v1.5.0 // indirect modernc.org/memory v1.5.0 // indirect modernc.org/opt v0.1.3 // indirect - modernc.org/sqlite v1.22.1 // indirect + modernc.org/sqlite v1.23.0 // indirect modernc.org/strutil v1.1.3 // indirect modernc.org/token v1.1.0 // indirect ) diff --git a/server/go.sum b/server/go.sum index 35c88a2..2e280a5 100644 --- a/server/go.sum +++ b/server/go.sum @@ -47,7 +47,6 @@ cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFO cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= cloud.google.com/go v0.109.0/go.mod h1:2sYycXt75t/CSB5R9M2wPU1tJmire7AQZTPtITcGBVE= cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o= @@ -225,7 +224,6 @@ cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQE cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= cloud.google.com/go/iam v0.10.0/go.mod h1:nXAECrMt2qHpF6RZUZseteD6QyanL68reN4OXPw0UWM= cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= @@ -561,8 +559,8 @@ github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4 github.com/aws/aws-sdk-go v1.44.156/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.187/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go v1.44.200/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= -github.com/aws/aws-sdk-go v1.44.273 h1:CX8O0gK+cGrgUyv7bgJ6QQP9mQg7u5mweHdNzULH47c= -github.com/aws/aws-sdk-go v1.44.273/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.275 h1:VqRULgqrigvQLll4e4hXuc568EQAtZQ6jmBzLlQHzSI= +github.com/aws/aws-sdk-go v1.44.275/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.17.4/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2 v1.18.0 h1:882kkTpSFhdgYRKVZ/VCgf7sd0ru57p2JCxz4/oN5RY= @@ -1055,7 +1053,6 @@ github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= @@ -1655,8 +1652,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pocketbase/dbx v1.10.0 h1:58VIT7r6T+BnVbYVosvGBsPjQEic3/VFRYGT823vWSQ= github.com/pocketbase/dbx v1.10.0/go.mod h1:xXRCIAKTHMgUCyCKZm55pUOdvFziJjQfXaWKhu2vhMs= -github.com/pocketbase/pocketbase v0.16.3 h1:SNqetzRe7xhtLReSEffVduW1p3sK0KiLUQo/Q+GJ+mw= -github.com/pocketbase/pocketbase v0.16.3/go.mod h1:xB/AeuNFhYyfs3WV5yqk70nM8I1IlSgwKiHvT7GS+Ic= +github.com/pocketbase/pocketbase v0.16.4 h1:0uBsypcKNGevEcims96LjKkjISqqfCvYgLa3EVTrmZM= +github.com/pocketbase/pocketbase v0.16.4/go.mod h1:1phZCUz5pdiuANI0twBshq7Gf2SfsKH5znm0qQYjvSA= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= @@ -2531,8 +2528,8 @@ golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc= -golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= +golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2954,8 +2951,8 @@ modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.22.1 h1:P2+Dhp5FR1RlVRkQ3dDfCiv3Ok8XPxqpe70IjYVA9oE= -modernc.org/sqlite v1.22.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= +modernc.org/sqlite v1.23.0 h1:MWTFBI5H1WLnXpNBh/BTruBVqzzoh28DA0iOnlkkRaM= +modernc.org/sqlite v1.23.0/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY= diff --git a/server/main.go b/server/main.go index 99e98fe..0d12bd2 100644 --- a/server/main.go +++ b/server/main.go @@ -1,9 +1,9 @@ package main import ( + "cliffbreak.de/hgoe-sas-server/pkg/utils" "github.com/pocketbase/pocketbase" "github.com/pterm/pterm" - "kinderspielstadt.de/core-server/pkg/utils" ) func main() { diff --git a/webapp/index.html b/webapp/index.html index 5597f15..51ff0e6 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -11,7 +11,7 @@ - Kinderspielstadt Öhringen + Schule als Staat | Hohenlohe Gymnasium Öhringen diff --git a/webapp/package.json b/webapp/package.json index 12c9590..ef62c17 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,5 +1,5 @@ { - "name": "kispi-core", + "name": "hgoe-sas", "private": true, "author": "Simon Giesel", "version": "0.0.0", @@ -15,7 +15,7 @@ "@heroicons/vue": "^2.0.18", "@vueuse/core": "^10.1.2", "canvas-confetti": "^1.6.0", - "daisyui": "^3.0.2", + "daisyui": "^3.0.3", "pocketbase": "^0.15.1", "vue": "^3.3.4", "vue-router": "4.2.2" diff --git a/webapp/pnpm-lock.yaml b/webapp/pnpm-lock.yaml index ae1da6d..0e8176b 100644 --- a/webapp/pnpm-lock.yaml +++ b/webapp/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: ^1.6.0 version: 1.6.0 daisyui: - specifier: ^3.0.2 - version: 3.0.2(postcss@8.4.24) + specifier: ^3.0.3 + version: 3.0.3(postcss@8.4.24) pocketbase: specifier: ^0.15.1 version: 0.15.1 @@ -1182,8 +1182,8 @@ packages: /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} - /daisyui@3.0.2(postcss@8.4.24): - resolution: {integrity: sha512-0X+0PkgTIWevt5m4AZCCgvqI5pKRormTEhdfmc31dwfLNq6uY4wENCXAtcXzZMKt7JBKcVTWlj/uDrOjj6XpUQ==} + /daisyui@3.0.3(postcss@8.4.24): + resolution: {integrity: sha512-RSbXsEBj2LonvjOKEI0I64F5xFJrFrthPgxRNeAZKmACQ3NoIoP45lO6UXLW3bm8PVOUGpKf1Br2SWwc1NqnHQ==} peerDependencies: postcss: ^8 dependencies: diff --git a/webapp/src/assets/logo.png b/webapp/src/assets/logo.png new file mode 100644 index 0000000..8c52de5 Binary files /dev/null and b/webapp/src/assets/logo.png differ diff --git a/webapp/src/assets/svg/logo_black.svg b/webapp/src/assets/svg/logo_black.svg deleted file mode 100644 index b768284..0000000 --- a/webapp/src/assets/svg/logo_black.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/webapp/src/assets/svg/logo_white.svg b/webapp/src/assets/svg/logo_white.svg deleted file mode 100644 index a01e991..0000000 --- a/webapp/src/assets/svg/logo_white.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/webapp/src/components/atoms/AtomLogo.vue b/webapp/src/components/atoms/AtomLogo.vue index 99c3766..520d0ec 100644 --- a/webapp/src/components/atoms/AtomLogo.vue +++ b/webapp/src/components/atoms/AtomLogo.vue @@ -1,18 +1,13 @@