From c2207e337abee6f78edcf6bfa718b96a757ba1db Mon Sep 17 00:00:00 2001 From: Simon Giesel Date: Mon, 5 Jun 2023 18:05:25 +0200 Subject: [PATCH] feat(core): change branding --- .drone.yml | 2 +- .vscode/settings.json | 4 +++- README.md | 10 +++++----- server/go.mod | 12 +++++------- server/go.sum | 19 ++++++++----------- server/main.go | 2 +- webapp/index.html | 2 +- webapp/package.json | 4 ++-- webapp/pnpm-lock.yaml | 8 ++++---- webapp/src/assets/logo.png | Bin 0 -> 28551 bytes webapp/src/assets/svg/logo_black.svg | 1 - webapp/src/assets/svg/logo_white.svg | 1 - webapp/src/components/atoms/AtomLogo.vue | 13 ++++--------- 13 files changed, 34 insertions(+), 44 deletions(-) create mode 100644 webapp/src/assets/logo.png delete mode 100644 webapp/src/assets/svg/logo_black.svg delete mode 100644 webapp/src/assets/svg/logo_white.svg 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 0000000000000000000000000000000000000000..8c52de516e014c635afdf12d0d97903c7baa1552 GIT binary patch literal 28551 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 Awg3PC literal 0 HcmV?d00001 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 @@