diff --git a/etc/art/vbrick.png b/etc/art/vbrick.png new file mode 100644 index 0000000..ae6580c Binary files /dev/null and b/etc/art/vbrick.png differ diff --git a/etc/art/virtubrick.blend b/etc/art/virtubrick.blend new file mode 100644 index 0000000..138eb91 Binary files /dev/null and b/etc/art/virtubrick.blend differ diff --git a/etc/cert/RootCA.crt b/etc/cert/RootCA.crt index 2253aff..9138fdc 100644 --- a/etc/cert/RootCA.crt +++ b/etc/cert/RootCA.crt @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDRzCCAi+gAwIBAgIURJTrNof9lM8yv+OAHaWFPOgomlMwDQYJKoZIhvcNAQEL -BQAwMzELMAkGA1UEBhMCVVMxJDAiBgNVBAMMG0dyYXBoaWN0b3JpYS1EZXZlbG9w -bWVudC1DQTAeFw0yMjA0MTUwMjMzMzNaFw0yNTAyMDIwMjMzMzNaMDMxCzAJBgNV -BAYTAlVTMSQwIgYDVQQDDBtHcmFwaGljdG9yaWEtRGV2ZWxvcG1lbnQtQ0EwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjARnva6VgZ5jGWsHSMgR03GTv -rKXq0YGIkfsliFFkVMXpH7B2orU5Zt9I23vJ7NX5bsm8977NWCqt80lC0wt4Ld58 -0JYjFkM/qgzDip6dUDTcQWdS81kq4zg0yMIiMaEddGBRmhJOsngX3iDNAypZ3XJQ -qZZ+ENTtDIh9+pqrt4+QFDMKTLNrcANdFlxfkriVhwQX/JmktGKIxCyG+4hSvuw4 -pCvsVPso0+7lGr9GNIzEXBD2Jvwtr2buXYg4yg0wx92PMeaSLU0OKKS7BfEPdikm -rKanuNzXNcAPQHplLeXzfgO1m6Hi3thNIaDmrqGcnQ6vfKv2j6LaZaWp649lAgMB -AAGjUzBRMB0GA1UdDgQWBBTH+uxCWs1TcDYNFptpXWMESc+MejAfBgNVHSMEGDAW -gBTH+uxCWs1TcDYNFptpXWMESc+MejAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQB6nHMSv+3rfO50t/e4pc613nIYbDv9/PnPouFwt8AiYk5ifpIa -WUZmupwY6Yl2JynzSHFFpe1afimd039LblUetlfDbv2Z+H4IBJ8lgCZE8GIskKNN -wpWF9Ovog0995fubUQdG9QU0JeCrlLDVlaDYhz1ImjP3KdOSZHZRWDdrzicwH6nQ -GZe0CgSML4S/YMPX/1BiEawpugcnAbDW3ZPh0md9FlsNt/rdL1PZiv0y9PM9cd8k -mqfVgPD7OAwihrjGVzFtmKzis0PbNpaydmpzII1j8OaHc8lLMSpIuGykbrfocD3O -p7zJ6bVvpr9PohKjIbslj2gkrMb7gq9EH4Tv +MIIDNzCCAh+gAwIBAgIUeRbZ6wwayGbn2Ava8XTPh6reXu0wDQYJKoZIhvcNAQEL +BQAwKzELMAkGA1UEBhMCVVMxHDAaBgNVBAMME1ZpcnR1QnJpY2stTG9jYWwtQ0Ew +HhcNMjIxMjI0MDQwNzM1WhcNMjUxMDEzMDQwNzM1WjArMQswCQYDVQQGEwJVUzEc +MBoGA1UEAwwTVmlydHVCcmljay1Mb2NhbC1DQTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAJdBvaTyxCo7+nJV3pSMVKFXc4VOLhlg0BZrAytZR64lC2jg +0JOI1qwQKeBRFKVN+ZsmfEOyIg82Hbtu+7ZzbvX1wKdcU/m9FT8JgEZ0rT8koN4C +S2idiTbNSiNXKkicbSjw6CfZEEL+LZaziR+Qt1hh/PMC6U5haz0bUtm8cKV1tfv8 +aGs/GXyoZ35cUJq6YNWlE0Bxyt7LvEH7C/H5c2TIrUOLp+zTcMlWTxelkeBp51x9 +cgOP5fILPOgs7IZ2wi8yUjfGBSfVWt6VyDp7vaws7/HozWta/tiGiLRImbulJeAw +BhPesBz6VUnaDeovHiwIFuFJHugPqv4TKNdXoOMCAwEAAaNTMFEwHQYDVR0OBBYE +FLo8qb1zkIVtEwu1whODHUf4Lq5dMB8GA1UdIwQYMBaAFLo8qb1zkIVtEwu1whOD +HUf4Lq5dMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADqVAf8P +aZ2M8YmmJnCxyKNmH1eeWwvPQB8+3H15auPDPXblqN48lw+pbN1dciBFlvpRSCEU +Ykdodo2W+Jyy1h8/zCVT4Vjz6OuQvKQSs/7sbxnx7txZ+3UTf0JJELXhyYtn4Sx+ ++z9IjULy2zy+8QgK7c/QliBCXkTgStg0NayNhqVNM9lKAphpYJM99cgdiW7Mun+R +hMFj/QORCMOKGNYsR3ktlYPzXb8qzGhgX94RAY8wYfRtqCXbOq+Mpi8BRNF2G/0n +n+Pay/7yfdhiTtORrSjewsjSTElS9QzXrk26PreWWJWTAYuPa6l09Vxd4r8bYcqa +Nk9CdC6FVWP6x/I= -----END CERTIFICATE----- diff --git a/etc/cert/RootCA.key b/etc/cert/RootCA.key index 2597609..c865417 100644 --- a/etc/cert/RootCA.key +++ b/etc/cert/RootCA.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjARnva6VgZ5jG -WsHSMgR03GTvrKXq0YGIkfsliFFkVMXpH7B2orU5Zt9I23vJ7NX5bsm8977NWCqt -80lC0wt4Ld580JYjFkM/qgzDip6dUDTcQWdS81kq4zg0yMIiMaEddGBRmhJOsngX -3iDNAypZ3XJQqZZ+ENTtDIh9+pqrt4+QFDMKTLNrcANdFlxfkriVhwQX/JmktGKI -xCyG+4hSvuw4pCvsVPso0+7lGr9GNIzEXBD2Jvwtr2buXYg4yg0wx92PMeaSLU0O -KKS7BfEPdikmrKanuNzXNcAPQHplLeXzfgO1m6Hi3thNIaDmrqGcnQ6vfKv2j6La -ZaWp649lAgMBAAECggEADgCbd31uBqbHkSx9L18EEnzXP957Hz2RjMeLhTkdUsrU -eHb0K/DEtBJh9mqCSwGJDQUHF/BJR+79tZUrUy35c4CvNtYdO5TfQIINWCPZhcZ8 -z/nfVBka7Qv5SVGAmbrdLgBQANqFHZUHq3c1pp7Rvcf/2K2Ew74S6G0V8Yp8TGlU -RrRtM5ovdePPFTx//V5DhktofjSlPNOO4g4oaXdR9DOlD9iTp9/WbgfE17Qc4Vz7 -4Xc5qXn/q6MSPkejkMzTtTGpfCRO4rWrs2fJwj8CEuHIKL1cJw88rv1i2MT95buR -XEficvcD5jwFXoDAnyaMwqKmBr3inlmTnqlHkr9OiQKBgQC4FDNYoUNvuq4ZKrDK -BYAR9tLaNKfiwIDYn1trB2obL9WaojmWDFJM89IZlWqDePPCyVw+eItLi0/ZBvDl -3UjTa7ET4BEwbdSYAVlJlI5viAnyu57tU3aMg1QvnP0wZh7nBRBRlk4rWBDUs7X9 -vo8YXXVejDyJh6LQ5uM3FWIKvQKBgQDisP4blS8YSIh76YAPhX/HZEknO+q1cAQ2 -/5wBTWDddt9NftUa7i/YA4vquu0ssc4babteXe3aPFJN8SkutjR6jmFArB/nMeIp -9+G1TGEBUtzhdnpOakLweOSJ7OBA1bD89c6CE2nA1VC+TyWJFSFqedpjcQwHdRD+ -uyOn+hg1yQKBgADr2PXwmK3OeWCW3huku2dbnOKKsOxpmjt7ULHQb6+DJcaIWVFu -7lqEPeDy5n2R9WZcK6IEaG4QXG3xovMDkIG+YDyBOpTLd+zq1M+RdsUIIUSdu8Xk -TQuW/KzgVEQRvsXZOKOv5ORCpJLr81U5xu2QSi4W9Zaany38edakvMDhAoGAcn7s -yWevMren39YO7UgDQuU/IYbcxClAp7qww+OeMh1RKeYOopx9I8Ce0b75/eIMdMIR -dddBREHFXEKbB1HV7bSuICkPsAj87y+ZG6XpNO7ySxo5KhP3nVeiLpuqpHSKASnx -1LcTaecT8hstnTBEAXBsQl+dsMKLA+3nU3c49SkCgYApyJ8XCv1uZDInFimJo3Hq -MXLkhxkzj9PJBWqps9ps6/QjthHGFYT9WMdcF2iNSTxoS5p1/O7wofQ3EHDiNlaz -uhOKhYeA01l52vZmgm8bCInLa9fcAe0oGnfyQI7oyBHq0J3FoVTmpG92GC7e3/cc -pPVAfmA8k77J9R/XWJylkA== +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXQb2k8sQqO/py +Vd6UjFShV3OFTi4ZYNAWawMrWUeuJQto4NCTiNasECngURSlTfmbJnxDsiIPNh27 +bvu2c2719cCnXFP5vRU/CYBGdK0/JKDeAktonYk2zUojVypInG0o8Ogn2RBC/i2W +s4kfkLdYYfzzAulOYWs9G1LZvHCldbX7/GhrPxl8qGd+XFCaumDVpRNAccrey7xB ++wvx+XNkyK1Di6fs03DJVk8XpZHgaedcfXIDj+XyCzzoLOyGdsIvMlI3xgUn1Vre +lcg6e72sLO/x6M1rWv7Yhoi0SJm7pSXgMAYT3rAc+lVJ2g3qLx4sCBbhSR7oD6r+ +EyjXV6DjAgMBAAECggEAJTi80fwZ0Ojcm0lNUlHsO535JBtWldEws+uWppK8ZHri +QWddfIjmhwYdQAHD6l/zZj5EwyXxYrvm+ip4D/B9JFLbG3RJiAIDWfVdFzl8Lrc1 +TRzUcMSfsRg4v9Sh56dy52nNP40Xhtzk3BqHSnjC3aGTbTvQrQSlLq7sJv/L2rNp +YmE3yyQ3evXEw2GHXbhd2kE1e6vI/C1U5h91NSYk2D8DvK54gB3xcOzHG6xfUger +i4gUjAFexEQoBMHcmSgYiaGvkbp7O9IjHyKQOsIOYw5i9fQPqs4IlzAi8HBB88BJ +WUEIwil06mz+IKKK/2weZkddB3ZmIwbHm8jkpzAUiQKBgQC7LD8U1xqKhmOU+TNW +UTDcTlLhz4bX8Jl09fqwGlbK19gJFFTAMuVWWx2au4ATJic+UGPLA6hs7q7kKsrU +tP17afZTNuFBFBzQPfDgzRZOfJWmRSE7PFbVA7nRNtIW8e549cIg9PhuDQjEdyr7 +/1Zk6LqnKIYrMYo8aVe+Gu10mwKBgQDO4H4PUygQhtU2UITVcN43suqrlvJJuC6H ++WXfXlcf2YITHwtEGcyNvOETBbs85M0x+AzLJnJGNzqIE3F8FT4a2EduBi/G26he +CNW9st66u+yfnduuTDpvxDNICn71E7pbRQuI3FqyarW0s/lO63jDYkaEw8t1aJ2I +ouYwaFI1WQKBgFgFgtTmI5EpigMw/jeFjxjLrKaM1bkPaNtcIjxW5qIVx37dlM2e +IcPurYlqy9w1gRcI7yU13yr7RDwA88n8I4i6WCDiGiRktPgpaPIPAIKAjE/ZCru0 +sJEUY3pD8aDgvWkdCeI90ebPMmRSNmCzv4lM+RpLMG13qq6mS6EXQLwpAoGAIPCH +weLotzDw0/QgImgVSeMYEHg5XdmQtx/Tw6wezThxyJ+hyJcfBdZ0M/YuqPR5Y6Ju +Tw5xFZMHo9EMucgcGmQjg3ZCtzQUa9yWQ90uL6dqdsPIzcjfaRphW/An5NfeTVgC +DSmg21W4VuxtHs7JbLrCJbOTOr+Mjcv6QOzrYgkCgYEAt6T0WimGNXumAdGyIi8j +zWC/Oa7tSYwLrgpnXYdtBKa4oxJDQr3L2zkTZ0K76J5dQuTM3q/IKbGmP9p8K9MB +Nx5U5BlFFpeUC1pPt7noJwmG4KcCt9GekPIhV0+44hLOvIEFznugc5/Y5XvqDFGq +ZSEy8mDXVww7JCsG4avq0Fk= -----END PRIVATE KEY----- diff --git a/etc/cert/RootCA.pem b/etc/cert/RootCA.pem index 2253aff..9138fdc 100644 --- a/etc/cert/RootCA.pem +++ b/etc/cert/RootCA.pem @@ -1,20 +1,20 @@ -----BEGIN CERTIFICATE----- -MIIDRzCCAi+gAwIBAgIURJTrNof9lM8yv+OAHaWFPOgomlMwDQYJKoZIhvcNAQEL -BQAwMzELMAkGA1UEBhMCVVMxJDAiBgNVBAMMG0dyYXBoaWN0b3JpYS1EZXZlbG9w -bWVudC1DQTAeFw0yMjA0MTUwMjMzMzNaFw0yNTAyMDIwMjMzMzNaMDMxCzAJBgNV -BAYTAlVTMSQwIgYDVQQDDBtHcmFwaGljdG9yaWEtRGV2ZWxvcG1lbnQtQ0EwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjARnva6VgZ5jGWsHSMgR03GTv -rKXq0YGIkfsliFFkVMXpH7B2orU5Zt9I23vJ7NX5bsm8977NWCqt80lC0wt4Ld58 -0JYjFkM/qgzDip6dUDTcQWdS81kq4zg0yMIiMaEddGBRmhJOsngX3iDNAypZ3XJQ -qZZ+ENTtDIh9+pqrt4+QFDMKTLNrcANdFlxfkriVhwQX/JmktGKIxCyG+4hSvuw4 -pCvsVPso0+7lGr9GNIzEXBD2Jvwtr2buXYg4yg0wx92PMeaSLU0OKKS7BfEPdikm -rKanuNzXNcAPQHplLeXzfgO1m6Hi3thNIaDmrqGcnQ6vfKv2j6LaZaWp649lAgMB -AAGjUzBRMB0GA1UdDgQWBBTH+uxCWs1TcDYNFptpXWMESc+MejAfBgNVHSMEGDAW -gBTH+uxCWs1TcDYNFptpXWMESc+MejAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQB6nHMSv+3rfO50t/e4pc613nIYbDv9/PnPouFwt8AiYk5ifpIa -WUZmupwY6Yl2JynzSHFFpe1afimd039LblUetlfDbv2Z+H4IBJ8lgCZE8GIskKNN -wpWF9Ovog0995fubUQdG9QU0JeCrlLDVlaDYhz1ImjP3KdOSZHZRWDdrzicwH6nQ -GZe0CgSML4S/YMPX/1BiEawpugcnAbDW3ZPh0md9FlsNt/rdL1PZiv0y9PM9cd8k -mqfVgPD7OAwihrjGVzFtmKzis0PbNpaydmpzII1j8OaHc8lLMSpIuGykbrfocD3O -p7zJ6bVvpr9PohKjIbslj2gkrMb7gq9EH4Tv +MIIDNzCCAh+gAwIBAgIUeRbZ6wwayGbn2Ava8XTPh6reXu0wDQYJKoZIhvcNAQEL +BQAwKzELMAkGA1UEBhMCVVMxHDAaBgNVBAMME1ZpcnR1QnJpY2stTG9jYWwtQ0Ew +HhcNMjIxMjI0MDQwNzM1WhcNMjUxMDEzMDQwNzM1WjArMQswCQYDVQQGEwJVUzEc +MBoGA1UEAwwTVmlydHVCcmljay1Mb2NhbC1DQTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAJdBvaTyxCo7+nJV3pSMVKFXc4VOLhlg0BZrAytZR64lC2jg +0JOI1qwQKeBRFKVN+ZsmfEOyIg82Hbtu+7ZzbvX1wKdcU/m9FT8JgEZ0rT8koN4C +S2idiTbNSiNXKkicbSjw6CfZEEL+LZaziR+Qt1hh/PMC6U5haz0bUtm8cKV1tfv8 +aGs/GXyoZ35cUJq6YNWlE0Bxyt7LvEH7C/H5c2TIrUOLp+zTcMlWTxelkeBp51x9 +cgOP5fILPOgs7IZ2wi8yUjfGBSfVWt6VyDp7vaws7/HozWta/tiGiLRImbulJeAw +BhPesBz6VUnaDeovHiwIFuFJHugPqv4TKNdXoOMCAwEAAaNTMFEwHQYDVR0OBBYE +FLo8qb1zkIVtEwu1whODHUf4Lq5dMB8GA1UdIwQYMBaAFLo8qb1zkIVtEwu1whOD +HUf4Lq5dMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBADqVAf8P +aZ2M8YmmJnCxyKNmH1eeWwvPQB8+3H15auPDPXblqN48lw+pbN1dciBFlvpRSCEU +Ykdodo2W+Jyy1h8/zCVT4Vjz6OuQvKQSs/7sbxnx7txZ+3UTf0JJELXhyYtn4Sx+ ++z9IjULy2zy+8QgK7c/QliBCXkTgStg0NayNhqVNM9lKAphpYJM99cgdiW7Mun+R +hMFj/QORCMOKGNYsR3ktlYPzXb8qzGhgX94RAY8wYfRtqCXbOq+Mpi8BRNF2G/0n +n+Pay/7yfdhiTtORrSjewsjSTElS9QzXrk26PreWWJWTAYuPa6l09Vxd4r8bYcqa +Nk9CdC6FVWP6x/I= -----END CERTIFICATE----- diff --git a/etc/cert/domains.ext b/etc/cert/domains.ext index 3a39b14..f0be047 100644 --- a/etc/cert/domains.ext +++ b/etc/cert/domains.ext @@ -4,6 +4,6 @@ keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment subjectAltName = @alt_names [alt_names] DNS.1 = localhost -DNS.2 = gtoria.local -DNS.3 = *.gtoria.local -DNS.4 = *.*.gtoria.local \ No newline at end of file +DNS.2 = virtubrick.local +DNS.3 = *.virtubrick.local +DNS.4 = *.*.virtubrick.local \ No newline at end of file diff --git a/etc/cert/gen.bat b/etc/cert/gen.bat new file mode 100644 index 0000000..3ccb7ee --- /dev/null +++ b/etc/cert/gen.bat @@ -0,0 +1,4 @@ +openssl req -x509 -nodes -new -sha256 -days 1024 -newkey rsa:2048 -keyout RootCA.key -out RootCA.pem -subj "/C=US/CN=VirtuBrick-Local-CA" +openssl x509 -outform pem -in RootCA.pem -out RootCA.crt +openssl req -new -nodes -newkey rsa:2048 -keyout vbrick.key -out vbrick.csr -subj "/C=US/ST=California/L=San Mateo/O=VirtuBrick Local Test/CN=virtubrick.local" +openssl x509 -req -sha256 -days 1024 -in vbrick.csr -CA RootCA.pem -CAkey RootCA.key -CAcreateserial -extfile domains.ext -out vbrick.crt \ No newline at end of file diff --git a/etc/cert/localhost.crt b/etc/cert/localhost.crt deleted file mode 100644 index b1c5df2..0000000 --- a/etc/cert/localhost.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID0TCCArmgAwIBAgIUbUj9EBw3CYxjAyrsJy1LVn6r0q0wDQYJKoZIhvcNAQEL -BQAwMzELMAkGA1UEBhMCVVMxJDAiBgNVBAMMG0dyYXBoaWN0b3JpYS1EZXZlbG9w -bWVudC1DQTAeFw0yMjA0MTUwMjM1NTNaFw0yNTAyMDIwMjM1NTNaMG4xCzAJBgNV -BAYTAlVTMRIwEAYDVQQIDAlZb3VyU3RhdGUxETAPBgNVBAcMCFlvdXJDaXR5MSEw -HwYDVQQKDBhHcmFwaGljdG9yaWEtRGV2ZWxvcG1lbnQxFTATBgNVBAMMDGd0b3Jp -YS5sb2NhbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALYo89k+V6a9 -VX2BiMEiRQbRuqxYbhcafI5Pr1eUuv99IFuHFUV/fA5QiQ3j9woTr3/VdURkr4C0 -ZWjEW4yd+8p+PjM/vAx9LZp2zhYyGu9wa+fsciOXmF0zhC6nuSIhcLlHwInwJ0cv -SabXV59GmoC9zxe0xoreSAU6hggLfuEXifn0dfdJTcXwfYgrneYr7ZFS/f0lCuEh -T19/FLBChw0Hch9axPJM1N1OGmUQxPx0NJTEOp7GGTjq1VlOTpnEx+OdpWBIb0JN -fFlpDkWGD53lnf/fhio68wz9hsIv+XyNXfw7XPa1AkZWVnoTZNxwcJKC0ltVxwUG -h/uvJpi9gvUCAwEAAaOBoTCBnjAfBgNVHSMEGDAWgBTH+uxCWs1TcDYNFptpXWME -Sc+MejAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBEBgNVHREEPTA7gglsb2NhbGhv -c3SCDGd0b3JpYS5sb2NhbIIOKi5ndG9yaWEubG9jYWyCECouKi5ndG9yaWEubG9j -YWwwHQYDVR0OBBYEFIL06aX5T1tU7ozj1wC46e4qNW3wMA0GCSqGSIb3DQEBCwUA -A4IBAQBTZt4Pw6rzRNMPoPVOeAheLcd1JbO4Z+H3LW9MTerOp0JuaU7Q/LSbBBEp -/sP6aXzaIuepkiZk/pFlaXxDZ/XXrBy0sxGvMRI3K1hgU8evN3tiwTmLz1Vs2ffF -QEVUT3ytVxa/wP2A4uDhpZqqNjKvlxYesqXnSO7B20uO2IyYjliDwG1/dK6b6N64 -XerbG+/sWjsNlpHLDu5qz7YYV78F6LO1bT24uVTWToXFFGuoJsf+3WrGp5Fg2RwN -FPBvLd+HbjWnkKN3BoMGP1fodAHTRhkiNOH3xMAOi4kxzArmxfg4gF+ABu6NO+67 -iCBnuBC+ZyIkc24xsajDuU4csSho ------END CERTIFICATE----- diff --git a/etc/cert/localhost.csr b/etc/cert/localhost.csr deleted file mode 100644 index 92e1a70..0000000 --- a/etc/cert/localhost.csr +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICszCCAZsCAQAwbjELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCVlvdXJTdGF0ZTER -MA8GA1UEBwwIWW91ckNpdHkxITAfBgNVBAoMGEdyYXBoaWN0b3JpYS1EZXZlbG9w -bWVudDEVMBMGA1UEAwwMZ3RvcmlhLmxvY2FsMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAtijz2T5Xpr1VfYGIwSJFBtG6rFhuFxp8jk+vV5S6/30gW4cV -RX98DlCJDeP3ChOvf9V1RGSvgLRlaMRbjJ37yn4+Mz+8DH0tmnbOFjIa73Br5+xy -I5eYXTOELqe5IiFwuUfAifAnRy9JptdXn0aagL3PF7TGit5IBTqGCAt+4ReJ+fR1 -90lNxfB9iCud5ivtkVL9/SUK4SFPX38UsEKHDQdyH1rE8kzU3U4aZRDE/HQ0lMQ6 -nsYZOOrVWU5OmcTH452lYEhvQk18WWkORYYPneWd/9+GKjrzDP2Gwi/5fI1d/Dtc -9rUCRlZWehNk3HBwkoLSW1XHBQaH+68mmL2C9QIDAQABoAAwDQYJKoZIhvcNAQEL -BQADggEBAA/DMwmDDB989uhYGgpBiFENiqQBV4ApyWVSpf4p+egdVTgoa/1v1k2w -5dy2/z0x/MCzS+LTb8vwHoRXPWhLGerSXP5MgLtGWgFVrBvdfJ1QZCEc6OpihqFh -xHzKPD9Wbr3B9shUFURIsvl5qCYzwoePHPsEyrrgvF9wkmjV6ENJfIkaIi2U2ll6 -H76GF3tN3ybR+NBcvRyc/xl+P8Hac4XAhvMNlDIvuFFvIMiZREnguoU0MSscSH61 -3eJKZqGJx4kf81RXZw7bdAGG/OGfmF77s9EhBtxxGGKu6xcyfCzhdn0X1NsMvJXD -zIYiOCaou7k8Yu2A3VsLMsgLAV4PcH4= ------END CERTIFICATE REQUEST----- diff --git a/etc/cert/localhost.key b/etc/cert/localhost.key deleted file mode 100644 index 450a0d4..0000000 --- a/etc/cert/localhost.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC2KPPZPlemvVV9 -gYjBIkUG0bqsWG4XGnyOT69XlLr/fSBbhxVFf3wOUIkN4/cKE69/1XVEZK+AtGVo -xFuMnfvKfj4zP7wMfS2ads4WMhrvcGvn7HIjl5hdM4Qup7kiIXC5R8CJ8CdHL0mm -11efRpqAvc8XtMaK3kgFOoYIC37hF4n59HX3SU3F8H2IK53mK+2RUv39JQrhIU9f -fxSwQocNB3IfWsTyTNTdThplEMT8dDSUxDqexhk46tVZTk6ZxMfjnaVgSG9CTXxZ -aQ5Fhg+d5Z3/34YqOvMM/YbCL/l8jV38O1z2tQJGVlZ6E2TccHCSgtJbVccFBof7 -ryaYvYL1AgMBAAECggEAB97gcmGG3gB47NGnpq35YjW2UB4IsQeG8YswiKM3f98t -17vlcmRIvZbt5Q4VgszznJ1iJ2YGTemoJreykPJ+ikhGyGYXlPPlADM5QleV4a9E -1PeFaFOeKgtrdFdGNjBQXjZjHlKkZSdTklmO7VCFT8y5DE2A9UfCFYpqzMwvsOqw -YA/EZdQvswnDScG8Dfu5kOGB/qAxrNGLrXcefCbYpubXBfs/duYcJ2uadTLa79sj -AK878G6Ql9LkiXx/yyq0LnUQqA0zrQeJMF9CEdNLA6O1n9BRjO9kKcR0LspKa2vp -Ygi4ISzgwJ5oR7iABcj3o/Tv2cmLdlSJp0DRuygFgQKBgQDtQl/m3Ic/7xQ/efN+ -V6vPUCF/lXfw2Ep/qE5oEasCUqvcmeBOrqB8Uprl0dnLCxDz5c1jDnDaxeJpN9L7 -RjHGLxqIV7F3ZfCn+neI3Ju0vbzTGkCcs6C1cbgTfrF9flgirkfR+cB0peWhEA/g -poAQW9X+jnOl3m+9JHtflpdcYQKBgQDEjGngPD7yk53c4duf7b+Im594EIHzZlv+ -uczXHbP75/AwOPCsQPBycL7J0sWnsw+jyOOuCY1aj4b1VUBD1kGrgN4zziuHtMaV -wgStbAwAJOSaPcWaXXmQpTC4u9eTX7nnvnezri5E3XrnToUfK9B7+aEAZT39XHiZ -ItwOAnFPFQKBgC30i0rWMERL9KoO3wD7zkWLidGCjAbUfimX2ggCVBNRHATQsUfM -Pz2VandVXFAdxpzXSB8FrwpRBffHXlBZWk6+1O7PvYoY7rI6q2iRAn/RuH9TOGyh -xmEes77i7VIXZM7i3vpm28Y8U+wMhmbHGUsR3rM9uFzKZu5F4Le1HYBBAoGAL8lr -3IcJTvUxBokrWsD1NoOPzCNHVSRn7ZDDCvI/1llX/oF5koffbhOXb359a/6PKOUo -5iGQappG19M4YsXvBYG5hKL11nLPbY3UkU2ZxVcy9YVbS+K6Mb7YD7IsAbreekfG -1rrcqQWoYiCnISMH93yD9pKm9bjL4X+mPQm+/tkCgYEAjwdfAFSYnzUdxB8zTsXx -+p2daNJlY00YK0kf//qg4WhXkW6//jILoJFOD8lFMaVz+H30bGsHtOqAoTZ/+Ozk -Jwzlie9J2gWrInXu9zqnw2jAfIQZGZRFMNpxOoRT3yvh2fnArIXKtBdP107p2yLl -2w2vr0QHVij28jWQpsRGG0U= ------END PRIVATE KEY----- diff --git a/etc/cert/vbrick.crt b/etc/cert/vbrick.crt new file mode 100644 index 0000000..9aa5f85 --- /dev/null +++ b/etc/cert/vbrick.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2DCCAsCgAwIBAgIUSs0NnP/ZRmvsjJWv0ULFldiMwfowDQYJKoZIhvcNAQEL +BQAwKzELMAkGA1UEBhMCVVMxHDAaBgNVBAMME1ZpcnR1QnJpY2stTG9jYWwtQ0Ew +HhcNMjIxMjI0MDQwNzM4WhcNMjUxMDEzMDQwNzM4WjBxMQswCQYDVQQGEwJVUzET +MBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJU2FuIE1hdGVvMR4wHAYDVQQK +DBVWaXJ0dUJyaWNrIExvY2FsIFRlc3QxGTAXBgNVBAMMEHZpcnR1YnJpY2subG9j +YWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjIun15WSkYDojtmUM +TOhSvCNZiMFADx7SFtZ9BmT94aURmJkQ/OU9vEBiaPBigNaByNEjp9FyKK+oCbgC +zdZjCtHnYeOTKpK8huHYFM0PE5MmMmmEf0M6ERrSpJ0IjAjoOhBC6iz3ouDeaRaa +Ha9GuB54RF1Jo4e0nX5A8OcUuzZA1DTdlZ1wrRFymgsjYPqE9b1If9Ni9ABehlNA ++6BUtwuef1jEyKTyXSd9hK/ngo2t/wKurxsjOOZiaNDZjdY0btGVSMQS0pqxVpiz +DI7RqqkdbRhHe/3hGKvCPXs0p6RjXINKeY6lhI+Tv3qogpnHqjfrnN/mfJMt7NW2 +D9VJAgMBAAGjga0wgaowHwYDVR0jBBgwFoAUujypvXOQhW0TC7XCE4MdR/gurl0w +CQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwUAYDVR0RBEkwR4IJbG9jYWxob3N0ghB2 +aXJ0dWJyaWNrLmxvY2FsghIqLnZpcnR1YnJpY2subG9jYWyCFCouKi52aXJ0dWJy +aWNrLmxvY2FsMB0GA1UdDgQWBBQIQHg8iyx/ED9q8mtu9VKSPxBwYzANBgkqhkiG +9w0BAQsFAAOCAQEAKmwhDHvhytS81dDOWjzYXaQXzxOn3/6NSuL0FogY2sM8Nt3L +cT9JQQqqxevG2vbnUrODC2eGMSApnoBI1mJuP2SkyZGCVbi1QLca5WII/We/HPAs +OaC6CLKs1ywpClBV0GoFO7aNWEtSbQ0haNiGoEQsk8kvPFA3kLSCUF3SN0csFOc4 +vcU8GwqrbO53hpclP3SZrwjzh1VlW985EMaWGd14/e/ASYu/+FSnIjbkZmha8CXu +8dI8BPAZ6D0nVj4kBICEy3bonzdJP/MhentCrE6WH2Eg5SqA2a14sSVx5K025OmS +QLjrqRLxlwMGYC+pQ+RHPmAl/ZVrJc7vli4CsA== +-----END CERTIFICATE----- diff --git a/etc/cert/vbrick.csr b/etc/cert/vbrick.csr new file mode 100644 index 0000000..1cb56a7 --- /dev/null +++ b/etc/cert/vbrick.csr @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICtjCCAZ4CAQAwcTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx +EjAQBgNVBAcMCVNhbiBNYXRlbzEeMBwGA1UECgwVVmlydHVCcmljayBMb2NhbCBU +ZXN0MRkwFwYDVQQDDBB2aXJ0dWJyaWNrLmxvY2FsMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAoyLp9eVkpGA6I7ZlDEzoUrwjWYjBQA8e0hbWfQZk/eGl +EZiZEPzlPbxAYmjwYoDWgcjRI6fRciivqAm4As3WYwrR52HjkyqSvIbh2BTNDxOT +JjJphH9DOhEa0qSdCIwI6DoQQuos96Lg3mkWmh2vRrgeeERdSaOHtJ1+QPDnFLs2 +QNQ03ZWdcK0RcpoLI2D6hPW9SH/TYvQAXoZTQPugVLcLnn9YxMik8l0nfYSv54KN +rf8Crq8bIzjmYmjQ2Y3WNG7RlUjEEtKasVaYswyO0aqpHW0YR3v94Rirwj17NKek +Y1yDSnmOpYSPk796qIKZx6o365zf5nyTLezVtg/VSQIDAQABoAAwDQYJKoZIhvcN +AQELBQADggEBAH9T2qdl5mWAEkNh0mHc7io7EqKCAwGSkWudj+QqWse9cn3AELLv +VbXUcE/GkcCTYiLyY8mJxwYaGiRa/tLcl4IHgXtG/a4oAoMdB5moQorT9YiWlXrs +3bzl/vZJaSmp12k2gN0Mu8H4ED5Eg4trKIcORzRsQV6zzYhF/4oUllr3cFg30CCl +nm7Mwwk6k4yB/zNuoPm6laukeMi99TLQ8LK57odi4Wqz4mZvd5lryhGEm6dZ6Cz+ +Cahdba8vzvN3RIAWMhDubMxNfaAQvV1Z0yEZ6fcmEDWzof1tD1VtA82al5YJvLy3 +RZcycbaB90F0XUhb20iElnxzig2XDNcbWR0= +-----END CERTIFICATE REQUEST----- diff --git a/etc/cert/vbrick.key b/etc/cert/vbrick.key new file mode 100644 index 0000000..2d7f9bd --- /dev/null +++ b/etc/cert/vbrick.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjIun15WSkYDoj +tmUMTOhSvCNZiMFADx7SFtZ9BmT94aURmJkQ/OU9vEBiaPBigNaByNEjp9FyKK+o +CbgCzdZjCtHnYeOTKpK8huHYFM0PE5MmMmmEf0M6ERrSpJ0IjAjoOhBC6iz3ouDe +aRaaHa9GuB54RF1Jo4e0nX5A8OcUuzZA1DTdlZ1wrRFymgsjYPqE9b1If9Ni9ABe +hlNA+6BUtwuef1jEyKTyXSd9hK/ngo2t/wKurxsjOOZiaNDZjdY0btGVSMQS0pqx +VpizDI7RqqkdbRhHe/3hGKvCPXs0p6RjXINKeY6lhI+Tv3qogpnHqjfrnN/mfJMt +7NW2D9VJAgMBAAECggEABDCrSFAUiWF/v/2sbPT0Vw+snsOaJxf17cwW+HSEfb4U +D2m9rYe5Wzngs3mVI9dbhLWqPYHoqZR6Jbt3xcaqSRzBiHGYtuWpVpZ/6lA0D70s +ErD8lqHukZxX3CCZq4460/Anc8VWoCOt8x7i4DsYwem/vc1C673IbtV7i5Wq2C4h +e9rTlYE87D7mHfCIFwlV4JOqkqPYbR6sr8cf5rdAdy5L73bU/0ff4+TwY9UxnufM +crdvhf2nWJIQHh7zCfQapFTwUIlrsyAu6t30lRkdxNje2JVxpPDaEqHnDh/Nuni5 +m4t4OUXZTvLhWblIIw5iwX/M9le9MmobHWSu5odd2wKBgQDcRh/DRv57adXInweX +AVL599H1LywjQAI/2eOV9BghBHb1Ln2LTidUS59pap+RZ2NL2OnKHhDX8u1UJi2G +DGibOHQep9pE56Gq/u1WJMpKnetIGr/hMSn7Uglg01BzmopiJ5OyN3cO7KdXH71J +oySKjISI7m0D+yrp93/O74YDgwKBgQC9mGmdBKYfv3sNYwoAQFCwKKcFYxlmaY5V +u7P1ViR0V+fkh7TW844FLXtI8cI9EbE3r6huM0YMlmL6fXb1zVoQgJUtT87pTMIf +ZcAq3kzHwkIA3vwFGZ8B1MsOKDybN379a8Ev3FM+Afyr1lrv/B4L14ZWcK2QbsNi +NJ3M2HlOQwKBgDdEFNYO6uyV+kByvhnCCEqVRgVpR360oZvZlENcUe1+zEXp2y/n +dPCuZJmzWcPGl+BA1S+T6Y/08FzLk2JtnJVNTb0fSiE9qI9ZlLynUGX2R0D5DSl4 +B1t6EsZLXoUSwiOsYF83kVSaRcYTPY/LMfDdHqeogoucKgE3ysZlzE73AoGAT3dr +hPmm25W5cOH7FiHe8AcKAnMH+Wny07Jp+kHR48XYl2vd+154P2lRzEAwpsIconeI +xC/Pg4UhFVazHtGkl1gdrrFNy3F1yA0w34bvbabZXV4ZCdY0VGMpfNSWmoRHQNcC +URoq9cmFa0zcLsxgl5wNXXu689fJIwdkwLBXH9sCgYB52keZwt6rRu6n1q03tFWV +hZzxpxHX1hlw3jtLvWERpF8gLp5CRwX9xoMTciS82f3W/AUBx+eIiQ1HOUJ5W1S1 +3GJBqCkWD8oipPxVW9XvKCdRHiY+2Jc+dKN2KTHjZSZLWDAZYkHL3/LC+gmQhM5j +bIyBpf2Yn45e1NIxAngLCw== +-----END PRIVATE KEY----- diff --git a/web/.env.example b/web/.env.example index c98b2d1..fe2832f 100644 --- a/web/.env.example +++ b/web/.env.example @@ -1,9 +1,11 @@ -APP_NAME=Graphictoria +APP_NAME=VirtuBrick APP_ENV=local APP_KEY= APP_DEBUG=true -APP_URL=http://gtoria.net -MIX_APP_URL=http://gtoria.net +APP_URL=http://virtubrick.net +MIX_APP_URL=http://virtubrick.net + +IS_TEST_ENVIRONMENT=true GAMESERVER_IP=127.0.0.1 THUMBNAILER_IP=127.0.0.1 @@ -18,7 +20,7 @@ RECAPTCHA_SECRET_KEY=ServerKeyHere DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_PORT=3306 -DB_DATABASE=gtoria +DB_DATABASE=virtubrick DB_USERNAME=root DB_PASSWORD= diff --git a/web/Dockerfile b/web/Dockerfile index ebca3b9..735b802 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -5,7 +5,7 @@ COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules COPY --from=node /usr/local/bin/node /usr/local/bin/node RUN ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm -WORKDIR /gtoria +WORKDIR /vbrick COPY . . diff --git a/web/app/Grid/SoapService.php b/web/app/Grid/SoapService.php index 4d6390f..41d0144 100644 --- a/web/app/Grid/SoapService.php +++ b/web/app/Grid/SoapService.php @@ -1,7 +1,7 @@ cookie('gt_constraint') && + $request->cookie('vb_constraint') && MaintenanceModeBypassCookie::isValid( - $request->cookie('gt_constraint'), + $request->cookie('vb_constraint'), $data['secret'] ); } diff --git a/web/app/Helpers/MarkdownHelper.php b/web/app/Helpers/MarkdownHelper.php index 0cb076a..33343a1 100644 --- a/web/app/Helpers/MarkdownHelper.php +++ b/web/app/Helpers/MarkdownHelper.php @@ -1,7 +1,7 @@ header('Content-Type', 'text/plain'); } } diff --git a/web/app/Http/Controllers/Api/CommentsController.php b/web/app/Http/Controllers/Api/CommentsController.php index 4de98f2..b1cc2b7 100644 --- a/web/app/Http/Controllers/Api/CommentsController.php +++ b/web/app/Http/Controllers/Api/CommentsController.php @@ -49,7 +49,7 @@ class CommentsController extends Controller // TODO: XlXi: user profile link $poster = [ 'name' => $comment->user->username, - 'thumbnail' => 'https://www.gtoria.local/images/testing/headshot.png', + 'thumbnail' => 'https://www.virtubrick.local/images/testing/headshot.png', 'url' => $comment->user->getProfileUrl() ]; diff --git a/web/app/Http/Controllers/Api/FeedController.php b/web/app/Http/Controllers/Api/FeedController.php index 77179e4..4e72fca 100644 --- a/web/app/Http/Controllers/Api/FeedController.php +++ b/web/app/Http/Controllers/Api/FeedController.php @@ -41,7 +41,7 @@ class FeedController extends Controller $poster = [ 'type' => 'User', 'name' => $user->username, - 'thumbnail' => 'https://www.gtoria.local/images/testing/headshot.png', + 'thumbnail' => 'https://www.virtubrick.local/images/testing/headshot.png', 'url' => $user->getProfileUrl() ]; } diff --git a/web/app/Http/Controllers/Api/MaintenanceController.php b/web/app/Http/Controllers/Api/MaintenanceController.php new file mode 100644 index 0000000..fd3c87b --- /dev/null +++ b/web/app/Http/Controllers/Api/MaintenanceController.php @@ -0,0 +1,67 @@ +all(), [ + 'password' => ['required'], + 'buttons' => ['required'] + ]); + + if($validator->fails()) + return ValidationHelper::generateValidatorError($validator); + + $valid = $validator->valid(); + $password = $valid['password']; + $buttons = $valid['buttons']; + + $mtconf = json_decode(DynamicWebConfiguration::whereName('MaintenancePassword')->first()->value); + + if(file_exists(storage_path('framework/down')) && $password == $mtconf->password) + { + $btns = array_slice($buttons, -count($mtconf->combination)); + $data = json_decode(file_get_contents(storage_path('framework/down')), true); + + if(isset($data['secret']) && $btns === $mtconf->combination) + { + $trustedHosts = explode(',', env('TRUSTED_HOSTS')); + $origin = join('.', array_slice(explode('.', explode('//', $request->headers->get('origin'))[1]), -2)); + $passCheck = false; + + foreach($trustedHosts as &$host) + { + if(str_ends_with($origin, $host)) + $passCheck = true; + } + + $expiresAt = Carbon::now()->addHours(24); + $bypassCookie = new Cookie('vb_constraint', base64_encode(json_encode([ + 'expires_at' => $expiresAt->getTimestamp(), + 'mac' => hash_hmac('SHA256', $expiresAt->getTimestamp(), $data['secret']), + ])), $expiresAt); + $bypassCookie = $bypassCookie->withSameSite('none'); + + if($passCheck) + $bypassCookie = $bypassCookie->withDomain('.' . $origin); + + return response('') + ->withCookie($bypassCookie); + } + } + + $validator->errors()->add('password', 'Bad Request.'); + return ValidationHelper::generateValidatorError($validator); + } +} diff --git a/web/app/Http/Controllers/Web/AdminController.php b/web/app/Http/Controllers/Web/AdminController.php index 8653685..6c2684d 100644 --- a/web/app/Http/Controllers/Web/AdminController.php +++ b/web/app/Http/Controllers/Web/AdminController.php @@ -6,6 +6,8 @@ use Illuminate\Http\Request; use App\Http\Controllers\Controller; use App\Models\DynamicWebConfiguration; +use App\Models\User; +use App\Models\UserIp; class AdminController extends Controller { @@ -20,11 +22,60 @@ class AdminController extends Controller } // Moderator+ + + // GET admin.dashboard function dashboard() { return view('web.admin.dashboard'); } + // GET admin.usersearch + function userSearch() + { + return view('web.admin.usersearch'); + } + + // POST admin.usersearch + function userSearchQuery(Request $request) + { + if($request->has('userid-button')) + { + $request->validate([ + 'userid-search' => ['required', 'int'] + ]); + return view('web.admin.usersearch')->with('users', User::where('id', $request->get('userid-search'))->get()); + } + + if($request->has('username-button')) + { + $request->validate([ + 'username-search' => ['required', 'string'] + ]); + return view('web.admin.usersearch')->with('users', User::where('username', 'like', '%' . $request->get('username-search') . '%')->get()); + } + + if($request->has('ipaddress-button')) + { + $request->validate([ + 'ipaddress-search' => ['required', 'ip'] + ]); + + $result = UserIp::where('ipAddress', $request->get('ipaddress-search')) + ->join('users', 'users.id', '=', 'user_ips.userId') + ->orderBy('users.id', 'desc'); + + return view('web.admin.usersearch')->with('users', $result->get())->with('isIpSearch', true); + } + + return view('web.admin.usersearch')->with('error', 'Input validation failed.'); + } + + // GET admin.autoupload + function autoUpload() + { + return view('web.admin.autoupload'); + } + // Admin+ function metricsVisualization() { diff --git a/web/app/Http/Controllers/Web/MaintenanceController.php b/web/app/Http/Controllers/Web/MaintenanceController.php new file mode 100644 index 0000000..3fdd059 --- /dev/null +++ b/web/app/Http/Controllers/Web/MaintenanceController.php @@ -0,0 +1,16 @@ + !isset($data['secret'])]); + } +} diff --git a/web/app/Http/Controllers/Web/TestController.php b/web/app/Http/Controllers/Web/TestController.php index e80d0f0..b897ffb 100644 --- a/web/app/Http/Controllers/Web/TestController.php +++ b/web/app/Http/Controllers/Web/TestController.php @@ -19,7 +19,7 @@ class TestController extends Controller // mrgrey = https://www.roblox.com/asset/?id=1785197 $test = new SoapService('Thumbnail'); - $result = $test->OpenJob(GridHelper::JobTemplate('test', 10, 0, 0, 'test render', 'place', ['http://www.roblox.com/asset/?id=444204653', 'PNG', 1920, 1080, 'https://www.gtoria.local/', 169618721])); + $result = $test->OpenJob(GridHelper::JobTemplate('test', 10, 0, 0, 'test render', 'place', ['http://www.roblox.com/asset/?id=444204653', 'PNG', 1920, 1080, 'https://www.virtubrick.local/', 169618721])); return response(base64_decode($result->OpenJobExResult->LuaValue[0]->value)) ->header('Content-Type', 'image/png'); diff --git a/web/app/Http/Controllers/Web/TestSiteController.php b/web/app/Http/Controllers/Web/TestSiteController.php new file mode 100644 index 0000000..a4d4786 --- /dev/null +++ b/web/app/Http/Controllers/Web/TestSiteController.php @@ -0,0 +1,14 @@ + [ + \App\Http\Middleware\PreventRequestsDuringMaintenance::class, + // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, ], diff --git a/web/app/Http/Middleware/LastSeenMiddleware.php b/web/app/Http/Middleware/LastSeenMiddleware.php index bc8668e..fb5ffdc 100644 --- a/web/app/Http/Middleware/LastSeenMiddleware.php +++ b/web/app/Http/Middleware/LastSeenMiddleware.php @@ -7,6 +7,8 @@ use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use App\Models\UserIp; + class LastSeenMiddleware { /** @@ -23,6 +25,8 @@ class LastSeenMiddleware $user->last_seen = Carbon::now(); $user->timestamps = false; $user->save(); + + $user->saveIp($request->ip()); } return $next($request); diff --git a/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php index 74cbd9a..2e361c0 100644 --- a/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php +++ b/web/app/Http/Middleware/PreventRequestsDuringMaintenance.php @@ -2,16 +2,48 @@ namespace App\Http\Middleware; -use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware; +use App\Helpers\MaintenanceHelper; -class PreventRequestsDuringMaintenance extends Middleware +use Closure; +use Illuminate\Support\Facades\Route; +use Illuminate\Http\Request; + +class PreventRequestsDuringMaintenance { - /** - * The URIs that should be reachable while maintenance mode is enabled. - * - * @var array - */ - protected $except = [ - // - ]; + public function handle(Request $request, Closure $next) + { + if(MaintenanceHelper::isDown($request)) + { + if(str_starts_with($request->route()->getName(), 'maintenance.')) + return $next($request); + + if(in_array('api', $request->route()->middleware())) + { + if($request->route()->getName() == 'content') // cdn.virtubrick.net + return $next($request); + + return response(['errors' => [['code' => 503, 'message' => 'ServiceUnavailable']]], 503) + ->header('Cache-Control', 'private') + ->header('Content-Type', 'application/json; charset=utf-8'); + } + + // Not an API route. + if($request->route()->uri() != 'maintenance') + return redirect('/maintenance?ReturnUrl=' . urlencode(url()->full())); + } + else + { + if(str_starts_with($request->route()->getName(), 'maintenance.')) + { + $returnUrl = $request->input('ReturnUrl'); + + if(!$returnUrl) + $returnUrl = '/'; + + return redirect($returnUrl); + } + } + + return $next($request); + } } diff --git a/web/app/Jobs/AppDeployment.php b/web/app/Jobs/AppDeployment.php index 333acdd..4e8572c 100644 --- a/web/app/Jobs/AppDeployment.php +++ b/web/app/Jobs/AppDeployment.php @@ -55,15 +55,15 @@ class AppDeployment implements ShouldQueue switch($this->deployment->app) { case 'client': - $appArchive = 'Graphictoria.zip'; - $appName = 'GraphictoriaPlayer.exe'; - $bootstrapperName = 'GraphictoriaPlayerLauncher.exe'; + $appArchive = 'VirtuBrick.zip'; + $appName = 'VirtuBrickPlayer.exe'; + $bootstrapperName = 'VirtuBrickPlayerLauncher.exe'; $bootstrapperVersionName = 'BootstrapperVersion.txt'; break; case 'studio': - $appArchive = 'GraphictoriaStudio.zip'; - $appName = 'GraphictoriaStudio.exe'; - $bootstrapperName = 'GraphictoriaStudioLauncherBeta.exe'; + $appArchive = 'VirtuBrickStudio.zip'; + $appName = 'VirtuBrickStudio.exe'; + $bootstrapperName = 'VirtuBrickStudioLauncherBeta.exe'; $bootstrapperVersionName = 'BootstrapperQTStudioVersion.txt'; break; } diff --git a/web/app/Jobs/ArbiterRender.php b/web/app/Jobs/ArbiterRender.php index f64fb86..ce415fb 100644 --- a/web/app/Jobs/ArbiterRender.php +++ b/web/app/Jobs/ArbiterRender.php @@ -2,6 +2,7 @@ namespace App\Jobs; +use claviska\SimpleImage; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldBeUnique; use Illuminate\Contracts\Queue\ShouldQueue; @@ -83,10 +84,10 @@ class ArbiterRender implements ShouldQueue { // TODO: XlXi: User avatar/closeup render support. $arguments = [ - url(sprintf('/asset?id=%d', $this->assetId)), // TODO: XlXi: Move url() to route() once the route actually exists. + route('client.asset', ['id' => $this->assetId]), ($this->is3D ? 'OBJ' : 'PNG'), - 840, // Width - 840, // Height + 420*4, // Width // XlXi: These get scaled down by 4. + 420*4, // Height // XlXi: These get scaled down by 4. url('/') . '/' ]; switch($this->type) { @@ -177,7 +178,13 @@ class ArbiterRender implements ShouldQueue $this->tracker->targetObj->set3DHash(CdnHelper::SaveContent(json_encode($result), 'text/plain')); } else { - $this->tracker->targetObj->set2DHash(CdnHelper::SaveContentB64($result, 'image/png')); + $image = new SimpleImage(); + $image = $image + ->fromString(base64_decode($result)) + ->resize($arguments[2]/4, $arguments[3]/4) + ->toString(); + + $this->tracker->targetObj->set2DHash(CdnHelper::SaveContentB64(base64_encode($image), 'image/png')); } $this->tracker->delete(); diff --git a/web/app/Models/User.php b/web/app/Models/User.php index 91a7ad0..25fd96a 100644 --- a/web/app/Models/User.php +++ b/web/app/Models/User.php @@ -48,6 +48,7 @@ class User extends Authenticatable implements MustVerifyEmail protected $casts = [ 'email_verified_at' => 'datetime', 'next_reward' => 'datetime', + 'created_at' => 'datetime', 'last_seen' => 'datetime', ]; @@ -91,6 +92,17 @@ class User extends Authenticatable implements MustVerifyEmail return $this->created_at->isoFormat('ll'); } + public function getCensoredEmail() + { + $email = $this->email; + + $bits = explode('@', $email); + $name = implode('@', array_slice($bits, 0, count($bits) - 1)); + $length = floor(strlen($name) / 2); + + return substr($name, 0, $length) . str_repeat('*', $length) . "@" . end($bits); + } + // XlXi: TODO: Replace this with detailed presence // like what game the user is in or // what place they're editing. @@ -99,6 +111,27 @@ class User extends Authenticatable implements MustVerifyEmail return ($this->last_seen >= Carbon::now()->subMinutes(2)); } + public function getRolesets() + { + return UserRoleset::where('User_id', $this->id); + } + + public function saveIp($ip) + { + $ipExists = UserIp::where('userId', $this->id) + ->where('ipAddress', $ip) + ->exists(); + if(!$ipExists) + { + return UserIp::create([ + 'userId' => $this->id, + 'ipAddress' => $ip + ]); + } + + return false; + } + public function _hasRolesetInternal($roleName) { $roleset = Roleset::where('Name', $roleName)->first(); diff --git a/web/app/Models/UserIp.php b/web/app/Models/UserIp.php new file mode 100644 index 0000000..06f6f0c --- /dev/null +++ b/web/app/Models/UserIp.php @@ -0,0 +1,26 @@ + + */ + protected $fillable = [ + 'userId', + 'ipAddress' + ]; + + public function user() + { + return $this->belongsTo(User::class, 'userId'); + } +} diff --git a/web/app/Models/asset.php b/web/app/Models/asset.php index 7aacfda..84e0707 100644 --- a/web/app/Models/asset.php +++ b/web/app/Models/asset.php @@ -128,7 +128,7 @@ class Asset extends Model $thumbnail = Http::get(route('thumbnails.v1.asset', ['id' => $renderId, 'type' => '2d'])); if($thumbnail->json('status') == 'loading') - return ($this->assetTypeId == 9 ? 'https://gtoria.local/images/busy/game.png' : 'https://gtoria.local/images/busy/asset.png'); + return ($this->assetTypeId == 9 ? 'https://virtubrick.local/images/busy/game.png' : 'https://virtubrick.local/images/busy/asset.png'); return $thumbnail->json('data'); } diff --git a/web/app/Notifications/ResetPasswordNotification.php b/web/app/Notifications/ResetPasswordNotification.php index 4d4a5dc..b17f1eb 100644 --- a/web/app/Notifications/ResetPasswordNotification.php +++ b/web/app/Notifications/ResetPasswordNotification.php @@ -44,7 +44,7 @@ class ResetPasswordNotification extends Notification */ public function toMail($notifiable) { - $title = 'Graphictoria Password Reset'; + $title = config('app.name') . ' Password Reset'; return (new MailMessage) ->subject($title) diff --git a/web/app/Providers/AppServiceProvider.php b/web/app/Providers/AppServiceProvider.php index e99fd19..4bc63ad 100644 --- a/web/app/Providers/AppServiceProvider.php +++ b/web/app/Providers/AppServiceProvider.php @@ -37,6 +37,14 @@ class AppServiceProvider extends ServiceProvider return get_class($validator) != UriValidator::class; }); + Blade::directive('nonav', function() { + return ''; + }); + + Blade::directive('nofooter', function() { + return ''; + }); + Blade::directive('owner', function() { return 'hasRoleset(\'Owner\')): ?>'; }); diff --git a/web/app/Providers/RouteServiceProvider.php b/web/app/Providers/RouteServiceProvider.php index 4fd99ec..193e149 100644 --- a/web/app/Providers/RouteServiceProvider.php +++ b/web/app/Providers/RouteServiceProvider.php @@ -32,7 +32,7 @@ class RouteServiceProvider extends ServiceProvider $this->routes(function () { // - // Domain: gtoria.net + // Domain: virtubrick.net // Route::domain(DomainHelper::TopLevelDomain()) ->middleware('web') @@ -40,7 +40,7 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/web.php')); // - // Domain: www.gtoria.net + // Domain: www.virtubrick.net // Route::domain('www.' . DomainHelper::TopLevelDomain()) ->middleware('web') @@ -48,7 +48,7 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/web.php')); // - // Domain: www.gtoria.net + // Domain: www.virtubrick.net // Route::domain('blog.' . DomainHelper::TopLevelDomain()) ->middleware('web') @@ -57,7 +57,7 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/blog.php')); // - // Domain: api.gtoria.net + // Domain: api.virtubrick.net // Route::domain('api.' . DomainHelper::TopLevelDomain()) ->middleware('api') @@ -65,7 +65,7 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/api.php')); // - // Domain: cdn.gtoria.net + // Domain: cdn.virtubrick.net // Route::domain('cdn.' . DomainHelper::TopLevelDomain()) ->middleware('api') @@ -73,7 +73,7 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/cdn.php')); // - // Domain: setup.gtoria.net + // Domain: setup.virtubrick.net // Route::domain('setup.' . DomainHelper::TopLevelDomain()) ->middleware('api') diff --git a/web/app/Rules/AppDeploymentFilenameRule.php b/web/app/Rules/AppDeploymentFilenameRule.php index e1dea43..6de0460 100644 --- a/web/app/Rules/AppDeploymentFilenameRule.php +++ b/web/app/Rules/AppDeploymentFilenameRule.php @@ -50,8 +50,8 @@ class AppDeploymentFilenameRule implements Rule { array_push($files, ...[ 'playerpdb.zip', - 'graphictoria.zip', - 'graphictoriaplayerlauncher.exe' + 'virtubrick.zip', + 'virtubrickplayerlauncher.exe' ]); } elseif($this->appType == 'studio') @@ -61,8 +61,8 @@ class AppDeploymentFilenameRule implements Rule 'imageformats.zip', 'content-scripts.zip', 'studiopdb.zip', - 'graphictoriastudio.zip', - 'graphictoriastudiolauncherbeta.exe' + 'virtubrickstudio.zip', + 'virtubrickstudiolauncherbeta.exe' ]); } diff --git a/web/app/View/Components/Admin/UserSearchInput.php b/web/app/View/Components/Admin/UserSearchInput.php new file mode 100644 index 0000000..bd618bf --- /dev/null +++ b/web/app/View/Components/Admin/UserSearchInput.php @@ -0,0 +1,28 @@ +=5.6.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "claviska": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cory LaViska", + "homepage": "http://www.abeautifulsite.net/", + "role": "Developer" + } + ], + "description": "A PHP class that makes working with images as simple as possible.", + "support": { + "issues": "https://github.com/claviska/SimpleImage/issues", + "source": "https://github.com/claviska/SimpleImage/tree/3.7.2" + }, + "funding": [ + { + "url": "https://github.com/claviska", + "type": "github" + } + ], + "time": "2022-12-12T14:31:53+00:00" + }, { "name": "dflydev/dot-access-data", "version": "v3.0.1", @@ -1324,6 +1373,64 @@ }, "time": "2022-03-23T12:38:24+00:00" }, + { + "name": "league/color-extractor", + "version": "0.3.2", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/color-extractor.git", + "reference": "837086ec60f50c84c611c613963e4ad2e2aec806" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/color-extractor/zipball/837086ec60f50c84c611c613963e4ad2e2aec806", + "reference": "837086ec60f50c84c611c613963e4ad2e2aec806", + "shasum": "" + }, + "require": { + "ext-gd": "*", + "php": ">=5.4.0" + }, + "replace": { + "matthecat/colorextractor": "*" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2", + "phpunit/phpunit": "~5" + }, + "type": "library", + "autoload": { + "psr-4": { + "": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mathieu Lechat", + "email": "math.lechat@gmail.com", + "homepage": "http://matthecat.com", + "role": "Developer" + } + ], + "description": "Extract colors from an image as a human would do.", + "homepage": "https://github.com/thephpleague/color-extractor", + "keywords": [ + "color", + "extract", + "human", + "image", + "palette" + ], + "support": { + "issues": "https://github.com/thephpleague/color-extractor/issues", + "source": "https://github.com/thephpleague/color-extractor/tree/master" + }, + "time": "2016-12-15T09:30:02+00:00" + }, { "name": "league/commonmark", "version": "2.3.0", diff --git a/web/config/app.php b/web/config/app.php index 476cf8b..48f6473 100644 --- a/web/config/app.php +++ b/web/config/app.php @@ -15,7 +15,7 @@ return [ | */ - 'name' => env('APP_NAME', 'Graphictoria'), + 'name' => env('APP_NAME', 'VirtuBrick'), /* |-------------------------------------------------------------------------- @@ -54,7 +54,7 @@ return [ | */ - 'url' => env('APP_URL', 'http://gtoria.net'), + 'url' => env('APP_URL', 'http://virtubrick.net'), 'asset_url' => env('ASSET_URL'), @@ -212,5 +212,16 @@ return [ 'aliases' => Facade::defaultAliases()->merge([ // 'ExampleClass' => App\Example\ExampleClass::class, ])->toArray(), + + /* + |-------------------------------------------------------------------------- + | Testing Environment Mode + |-------------------------------------------------------------------------- + | + | When test environment mode is enabled, the site will display a + | banner explaining that it's not the real site. + | + */ + 'testenv' => (bool) env('IS_TEST_ENVIRONMENT', true), ]; diff --git a/web/config/arbiter.php b/web/config/arbiter.php index 36a02f9..41eb7c2 100644 --- a/web/config/arbiter.php +++ b/web/config/arbiter.php @@ -4,7 +4,7 @@ return [ /* |-------------------------------------------------------------------------- - | Graphictoria Arbiter Configuration + | VirtuBrick Arbiter Configuration |-------------------------------------------------------------------------- | | This file holds various IP configurations for the games relay/thumbnail diff --git a/web/config/cors.php b/web/config/cors.php index 8bb9f8c..47d1704 100644 --- a/web/config/cors.php +++ b/web/config/cors.php @@ -19,7 +19,7 @@ return [ 'allowed_methods' => ['*'], - 'allowed_origins' => ['*.gtoria.net','*.gtoria.local'], + 'allowed_origins' => ['*.virtubrick.net','*.virtubrick.local'], 'allowed_origins_patterns' => [], diff --git a/web/config/session.php b/web/config/session.php index f1b555b..5804048 100644 --- a/web/config/session.php +++ b/web/config/session.php @@ -128,7 +128,7 @@ return [ 'cookie' => env( 'SESSION_COOKIE', - 'GTSession' + 'VBSession' ), /* diff --git a/web/database/migrations/2022_11_20_171206_create_negotiation_tickets_table.php b/web/database/migrations/2022_11_20_171206_create_negotiation_tickets_table.php index 9bc43dd..06175ff 100644 --- a/web/database/migrations/2022_11_20_171206_create_negotiation_tickets_table.php +++ b/web/database/migrations/2022_11_20_171206_create_negotiation_tickets_table.php @@ -18,6 +18,7 @@ return new class extends Migration $table->string('ticket'); $table->unsignedBigInteger('userId'); $table->boolean('used')->default(false); + $table->boolean('maintenanceBypass')->default(false); $table->timestamps(); }); } diff --git a/web/database/migrations/2022_11_23_213543_create_deployments_table.php b/web/database/migrations/2022_11_23_213543_create_deployments_table.php index 79965ef..0ce88a6 100644 --- a/web/database/migrations/2022_11_23_213543_create_deployments_table.php +++ b/web/database/migrations/2022_11_23_213543_create_deployments_table.php @@ -18,7 +18,7 @@ return new class extends Migration $table->string('version'); $table->string('app'); $table->string('type'); - $table->int('step')->default(0); + $table->integer('step')->default(0); $table->string('error')->nullable(); $table->timestamps(); }); diff --git a/web/database/migrations/2022_12_28_023027_create_user_ips_table.php b/web/database/migrations/2022_12_28_023027_create_user_ips_table.php new file mode 100644 index 0000000..3211777 --- /dev/null +++ b/web/database/migrations/2022_12_28_023027_create_user_ips_table.php @@ -0,0 +1,35 @@ +id(); + + $table->string('ipAddress'); + $table->unsignedBigInteger('userId'); + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('user_ips'); + } +}; diff --git a/web/docker-compose.yml b/web/docker-compose.yml index 68d7edd..60a4867 100644 --- a/web/docker-compose.yml +++ b/web/docker-compose.yml @@ -10,7 +10,7 @@ services: environment: MYSQL_ROOT_PASSWORD: 'test' volumes: - - database-data:/graphictoria + - database-data:/virtubrick volumes: database-data: \ No newline at end of file diff --git a/web/public/favicon.ico b/web/public/favicon.ico index 48a8d6d..a8bb1de 100644 Binary files a/web/public/favicon.ico and b/web/public/favicon.ico differ diff --git a/web/public/images/logo-256x256.png b/web/public/images/logo-256x256.png new file mode 100644 index 0000000..1c3df91 Binary files /dev/null and b/web/public/images/logo-256x256.png differ diff --git a/web/public/images/logo.png b/web/public/images/logo.png index 6786fb3..b52251b 100644 Binary files a/web/public/images/logo.png and b/web/public/images/logo.png differ diff --git a/web/public/models/virtubrickpart.glb b/web/public/models/virtubrickpart.glb new file mode 100644 index 0000000..cdc5975 Binary files /dev/null and b/web/public/models/virtubrickpart.glb differ diff --git a/web/resources/js/app.js b/web/resources/js/app.js index 5b9c57b..4646c10 100644 --- a/web/resources/js/app.js +++ b/web/resources/js/app.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ diff --git a/web/resources/js/bootstrap.js b/web/resources/js/bootstrap.js index 7b935ae..1d8e640 100644 --- a/web/resources/js/bootstrap.js +++ b/web/resources/js/bootstrap.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ diff --git a/web/resources/js/components/Comments.js b/web/resources/js/components/Comments.js index 549cee4..4f0f52f 100644 --- a/web/resources/js/components/Comments.js +++ b/web/resources/js/components/Comments.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -114,7 +113,7 @@ class Comments extends Component { { this.state.error != '' ? -
{ this.state.error }
+
{ this.state.error }
: null } @@ -140,7 +139,7 @@ class Comments extends Component {
this.setState({ mouseHover: index }) } onMouseLeave={ () => this.setState({ mouseHover: -1 }) }>
- { + {
diff --git a/web/resources/js/components/Deployer.js b/web/resources/js/components/Deployer.js index 8b3bb9c..c315603 100644 --- a/web/resources/js/components/Deployer.js +++ b/web/resources/js/components/Deployer.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -175,7 +174,7 @@ class RevertDeploymentCard extends Component {
Revert Deployment

Select a previous deployment below to roll back the { this.props.index } version.

- { this.state.deployments.map((deployment, index) => ( @@ -232,8 +231,8 @@ class PushDeploymentCard extends Component { case 'client': this.neededFiles = this.neededFiles.concat([ 'PlayerPdb.zip', - 'Graphictoria.zip', - 'GraphictoriaPlayerLauncher.exe' + 'VirtuBrick.zip', + 'VirtuBrickPlayerLauncher.exe' ]); break; case 'studio': @@ -242,8 +241,8 @@ class PushDeploymentCard extends Component { 'imageformats.zip', 'content-scripts.zip', 'StudioPdb.zip', - 'GraphictoriaStudio.zip', - 'GraphictoriaStudioLauncherBeta.exe' + 'VirtuBrickStudio.zip', + 'VirtuBrickStudioLauncherBeta.exe' ]); break; } @@ -377,7 +376,7 @@ class PushDeploymentCard extends Component { } return ( -
+
@@ -424,13 +423,13 @@ class PushDeploymentCard extends Component {
Optional Configuration

Only change if you've updated the security settings on the client/rcc. Shutting down game servers will delay deployment by 10 minutes.

- - + +
- - this.setOptions('rccAccessKey', changeEvent.target.value) } /> - - this.setOptions('versionCompatiblityFuzzyKey', changeEvent.target.value) } /> + + this.setOptions('rccAccessKey', changeEvent.target.value) } /> + + this.setOptions('versionCompatiblityFuzzyKey', changeEvent.target.value) } /> : null @@ -592,10 +591,10 @@ class Deployer extends Component {
Deployment Options
- this.trySetDeployType(e, 'deploy') } checked={ this.state.deployType == 'deploy' } /> - - this.trySetDeployType(e, 'revert') } checked={ this.state.deployType == 'revert' } /> - + this.trySetDeployType(e, 'deploy') } checked={ this.state.deployType == 'deploy' } /> + + this.trySetDeployType(e, 'revert') } checked={ this.state.deployType == 'revert' } /> +

@@ -604,7 +603,7 @@ class Deployer extends Component {
{ this.state.showTypeSwitchError ? -
Remove your { this.state.deployType == 'deploy' ? 'deployments' : 'reversions' } to change the uploader type.
+
Remove your { this.state.deployType == 'deploy' ? 'deployments' : 'reversions' } to change the uploader type.
: null } diff --git a/web/resources/js/components/Feed.js b/web/resources/js/components/Feed.js index 5ed1ce4..8ead372 100644 --- a/web/resources/js/components/Feed.js +++ b/web/resources/js/components/Feed.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -104,7 +103,7 @@ class Feed extends Component { { this.state.error != '' ? -
{ this.state.error }
+
{ this.state.error }
: null } @@ -126,7 +125,7 @@ class Feed extends Component {
{ poster.type == 'User' ? - { : + { : { } diff --git a/web/resources/js/components/Games.js b/web/resources/js/components/Games.js index f585a91..167b279 100644 --- a/web/resources/js/components/Games.js +++ b/web/resources/js/components/Games.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -34,7 +33,7 @@ class GameItemCard extends Component { render() { return ( this.setState({hovered: true})} onMouseLeave={() => this.setState({hovered: false})} @@ -47,7 +46,7 @@ class GameItemCard extends Component { className='img-fluid' />
-

{ this.props.item.Name }

+

{ this.props.item.Name }

{commaSeparate(this.props.item.Playing)} Playing

{ this.state.hovered ? - +

@@ -157,7 +156,7 @@ class Games extends Component { } { !this.state.pageLoaded ? -

+
: @@ -181,7 +180,7 @@ class Games extends Component {
    • -
  • +
  • Page   of { this.state.pageCount || '???' } diff --git a/web/resources/js/components/Loader.js b/web/resources/js/components/Loader.js index bf5b6a9..354fce2 100644 --- a/web/resources/js/components/Loader.js +++ b/web/resources/js/components/Loader.js @@ -1,11 +1,10 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ const Loader = () => { return ( -
    +
    ); }; diff --git a/web/resources/js/components/Main.js b/web/resources/js/components/Main.js index 9158bd0..7dceb20 100644 --- a/web/resources/js/components/Main.js +++ b/web/resources/js/components/Main.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -15,7 +14,7 @@ import SearchBar from './SearchBar'; axios.defaults.withCredentials = true; -const searchBarId = 'graphictoria-nav-searchbar'; +const searchBarId = 'virtubrick-nav-searchbar'; $(document).ready(function() { var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); diff --git a/web/resources/js/components/PlaceButtons.js b/web/resources/js/components/PlaceButtons.js index 526d35b..f0bc3fe 100644 --- a/web/resources/js/components/PlaceButtons.js +++ b/web/resources/js/components/PlaceButtons.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -14,7 +13,7 @@ import Loader from './Loader'; axios.defaults.withCredentials = true; -const playerProtocol = 'graphictoria-player'; +const playerProtocol = 'virtubrick-player'; class PlaceLoadingModal extends Component { constructor(props) { @@ -70,14 +69,14 @@ class PlaceLoadingModal extends Component { { this.state.showDownloadScreen ? <> -
    Download Graphictoria
    -

    Download Graphictoria to get access to thousands of community-driven games.

    -     Download +
    Download VirtuBrick
    +

    Download VirtuBrick to get access to thousands of community-driven games.

    + Download : <> -

    Starting Graphictoria

    +

    Starting VirtuBrick

    }
    • @@ -118,7 +117,7 @@ class PlaceLoadingErrorModal extends Component {
    -
    An error occurred while starting Graphictoria.
    +
    An error occurred while starting VirtuBrick.

    Error Detail: { this.props.message }

    @@ -167,7 +166,7 @@ class PlaceButtons extends Component { let protocol = playerProtocol; let domainSplit = getCurrentDomain().split('.'); - if(getCurrentDomain() == 'gtoria.local') + if(getCurrentDomain() == 'virtubrick.local') { protocol += '-dev'; } @@ -187,7 +186,7 @@ class PlaceButtons extends Component { .catch(function(error) { this.setModal(); - //alert('Error while starting Graphictoria: ' + error.message); + //alert('Error while starting VirtuBrick: ' + error.message); }.bind(this)); } diff --git a/web/resources/js/components/PurchaseButton.js b/web/resources/js/components/PurchaseButton.js index 2351eff..aa789e6 100644 --- a/web/resources/js/components/PurchaseButton.js +++ b/web/resources/js/components/PurchaseButton.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -7,7 +6,7 @@ import { createRef, Component } from 'react'; import classNames from 'classnames/bind'; -const itemId = 'gt-item'; +const itemId = 'vb-item'; class PurchaseConfirmationModal extends Component { constructor(props) { @@ -54,7 +53,7 @@ class PurchaseConfirmationModal extends Component {
    -

    Would you like to purchase the { this.state.assetType } { this.state.assetName } from { this.state.assetCreator } for { this.state.assetPrice }?

    +

    Would you like to purchase the { this.state.assetType } { this.state.assetName } from { this.state.assetCreator } for { this.state.assetPrice }?

    {
    @@ -63,7 +62,7 @@ class PurchaseConfirmationModal extends Component {  
    -

    You will have { Math.max(0, (this.state.userTokens - this.state.assetPrice)) } after this purchase.

    +

    You will have { Math.max(0, (this.state.userTokens - this.state.assetPrice)) } after this purchase.

    @@ -114,7 +113,7 @@ class NotEnoughTokensModal extends Component {
    -

    You need { this.state.assetPrice - this.state.userTokens } more to purchase this item.

    +

    You need { this.state.assetPrice - this.state.userTokens } more to purchase this item.

    diff --git a/web/resources/js/components/SearchBar.js b/web/resources/js/components/SearchBar.js index 914d371..98af10c 100644 --- a/web/resources/js/components/SearchBar.js +++ b/web/resources/js/components/SearchBar.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -69,16 +68,16 @@ const SearchBar = () => { return ( <> - setSearchQuery(changeEvent.target.value) } value={ searchQuery }/> + setSearchQuery(changeEvent.target.value) } value={ searchQuery }/> { searchQuery.length !== 0 ? -
    -
      +
      +
        { dropdownLinks.map(({ area, urlbase }, index) =>
      • - setSearchQuery('') } href={ urlbase + encodeURIComponent(searchQuery) }>Search {searchQuery} in {area} + setSearchQuery('') } href={ urlbase + encodeURIComponent(searchQuery) }>Search {searchQuery} in {area}
        • ) } diff --git a/web/resources/js/components/Shop.js b/web/resources/js/components/Shop.js index 2986c20..2195e2b 100644 --- a/web/resources/js/components/Shop.js +++ b/web/resources/js/components/Shop.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -176,14 +175,14 @@ class ShopCategories extends Component { render() { return ( -
        +
        Category
          { Object.keys(shopCategories).map((categoryName, index) =>
        • - { categoryName } + { categoryName }
            • @@ -216,7 +215,7 @@ class ShopItemCard extends Component { return ( this.setState({hovered: true})} onMouseLeave={() => this.setState({hovered: false})} @@ -231,14 +230,14 @@ class ShopItemCard extends Component {

            { item.Name }

            { item.OnSale ? -

            {commaSeparate(item.Price)}

            +

            {commaSeparate(item.Price)}

            :

            Offsale

            }
            { this.state.hovered ? - +

            Creator: { item.Creator.Name } @@ -364,7 +363,7 @@ class Shop extends Component { } { !this.state.pageLoaded ? -

            +
            : @@ -389,7 +388,7 @@ class Shop extends Component {
            • -
          • +
          • Page   of { this.state.pageCount || '???' } diff --git a/web/resources/js/components/ThumbnailTool.js b/web/resources/js/components/ThumbnailTool.js index 49925ee..3aeac27 100644 --- a/web/resources/js/components/ThumbnailTool.js +++ b/web/resources/js/components/ThumbnailTool.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -51,6 +50,7 @@ const Scene = ({json}) => { camera.position.set(thumbnailCameraPosition.x, thumbnailCameraPosition.y, thumbnailCameraPosition.z); camera.lookAt(pointToLookat); + camera.translateZ(0.5); // lighting // FIXME: XlXi: if you toggle 3d on and off it'll create these twice @@ -119,7 +119,7 @@ class ThumbnailTool extends Component { this.setState({ initialLoading: false }); - if(this.renderable3d && localStorage.getItem('gt-use-3d-thumbnails') === 'true') + if(this.renderable3d && localStorage.getItem('vb-use-3d-thumbnails') === 'true') this.toggle3D(); } } @@ -169,7 +169,7 @@ class ThumbnailTool extends Component { let is3d = !this.state.is3d; this.setState({ loading: true, is3d: is3d, seed3d: Math.random() }); - localStorage.setItem('gt-use-3d-thumbnails', is3d); + localStorage.setItem('vb-use-3d-thumbnails', is3d); if(is3d) { this.loadThumbnail(`thumbnails/v1/asset?id=${this.assetId}&type=3D`, true); diff --git a/web/resources/js/pages/AppDeployer.js b/web/resources/js/pages/AppDeployer.js index 06b39bb..012457e 100644 --- a/web/resources/js/pages/AppDeployer.js +++ b/web/resources/js/pages/AppDeployer.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -10,7 +9,7 @@ import { render } from 'react-dom'; import Deployer from '../components/Deployer'; -const deployerId = 'gt-deployer'; +const deployerId = 'vb-deployer'; $(document).ready(function() { if (document.getElementById(deployerId)) { diff --git a/web/resources/js/pages/Blog.js b/web/resources/js/pages/Blog.js index 39d8da1..1845ff0 100644 --- a/web/resources/js/pages/Blog.js +++ b/web/resources/js/pages/Blog.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -7,8 +6,8 @@ import $ from 'jquery'; import * as Bootstrap from 'bootstrap'; import React from 'react'; -const navId = 'gt-blog-nav'; -const hideClass = 'graphictoria-blognav-hide'; +const navId = 'vb-blog-nav'; +const hideClass = 'virtubrick-blognav-hide'; function scrollChanged() { const nav = document.getElementById(navId); diff --git a/web/resources/js/pages/Dashboard.js b/web/resources/js/pages/Dashboard.js index e1787eb..fc7c75f 100644 --- a/web/resources/js/pages/Dashboard.js +++ b/web/resources/js/pages/Dashboard.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -10,7 +9,7 @@ import { render } from 'react-dom'; import Feed from '../components/Feed'; -const feedId = 'gt-dash-feed'; +const feedId = 'vb-dash-feed'; $(document).ready(function() { if (document.getElementById(feedId)) { diff --git a/web/resources/js/pages/Games.js b/web/resources/js/pages/Games.js index 4c230a5..ad3c072 100644 --- a/web/resources/js/pages/Games.js +++ b/web/resources/js/pages/Games.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -10,7 +9,7 @@ import { render } from 'react-dom'; import Games from '../components/Games'; -const gamesId = 'gt-games-main'; +const gamesId = 'vb-games-main'; $(document).ready(function() { if (document.getElementById(gamesId)) { diff --git a/web/resources/js/pages/Item.js b/web/resources/js/pages/Item.js index 7563d45..df22823 100644 --- a/web/resources/js/pages/Item.js +++ b/web/resources/js/pages/Item.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -12,9 +11,9 @@ import Comments from '../components/Comments'; import PurchaseButton from '../components/PurchaseButton'; import ThumbnailTool from '../components/ThumbnailTool'; -const purchaseId = 'gt-purchase-button'; -const commentsId = 'gt-comments'; -const thumbnailId = 'gt-thumbnail'; +const purchaseId = 'vb-purchase-button'; +const commentsId = 'vb-comments'; +const thumbnailId = 'vb-thumbnail'; $(document).ready(function() { if (document.getElementById(commentsId)) { diff --git a/web/resources/js/pages/Maintenance.js b/web/resources/js/pages/Maintenance.js index 620613b..56157aa 100644 --- a/web/resources/js/pages/Maintenance.js +++ b/web/resources/js/pages/Maintenance.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -22,7 +21,7 @@ const randomEuler = () => [Math.random() * Math.PI, Math.random() * Math.PI, Mat const randomData = Array.from({ length: 2000 }, (r = 200) => ({ random: Math.random(), position: randomVector(r), rotation: randomEuler() })); function Scene() { - const { nodes, materials } = useGLTF('/models/graphictoriapart.glb'); + const { nodes, materials } = useGLTF('/models/virtubrickpart.glb'); return ( <> @@ -71,8 +70,8 @@ function Camera({ ...props }){ let ButtonHistory = [] function attemptBypass() { - axios.post(buildGenericApiUrl('apis', 'v1/maintenance/bypass'), { - 'password': $('#gt_mt_buttons > input').val(), + axios.post(buildGenericApiUrl('api', 'maintenance/v1/bypass'), { + 'password': $('#vbrick_mt_buttons > input').val(), 'buttons': ButtonHistory.slice(-40) }) .then((response) => { @@ -87,11 +86,11 @@ $(document).ready(function() { ), - document.getElementsByClassName('gtoria-maintenance-background')[0] + document.getElementsByClassName('vbrick-maintenance-background')[0] ); - $('#gt_mt_buttons').on('click', 'button', function() { - let ButtonId = parseInt(this.getAttribute('name').substr(8)); //gt_mtbtnX + $('#vbrick_mt_buttons').on('click', 'button', function() { + let ButtonId = parseInt(this.getAttribute('name').substr(8)); //vb_mtbtnX ButtonHistory.push(ButtonId); attemptBypass(); diff --git a/web/resources/js/pages/Place.js b/web/resources/js/pages/Place.js index d77204a..e67da71 100644 --- a/web/resources/js/pages/Place.js +++ b/web/resources/js/pages/Place.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -12,9 +11,9 @@ import Comments from '../components/Comments'; import ThumbnailTool from '../components/ThumbnailTool'; import PlaceButtons from '../components/PlaceButtons'; -const thumbnailId = 'gt-thumbnail'; -const buttonsId = 'gt-place-buttons'; -const commentsId = 'gt-comments'; +const thumbnailId = 'vb-thumbnail'; +const buttonsId = 'vb-place-buttons'; +const commentsId = 'vb-comments'; $(document).ready(function() { if (document.getElementById(thumbnailId)) { diff --git a/web/resources/js/pages/Shop.js b/web/resources/js/pages/Shop.js index 5a77189..f83a805 100644 --- a/web/resources/js/pages/Shop.js +++ b/web/resources/js/pages/Shop.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ @@ -10,7 +9,7 @@ import { render } from 'react-dom'; import Shop from '../components/Shop'; -const shopId = 'gt-shop-main'; +const shopId = 'vb-shop-main'; $(document).ready(function() { if (document.getElementById(shopId)) { diff --git a/web/resources/js/pages/SiteConfiguration.js b/web/resources/js/pages/SiteConfiguration.js index b57d371..ef5797e 100644 --- a/web/resources/js/pages/SiteConfiguration.js +++ b/web/resources/js/pages/SiteConfiguration.js @@ -1,11 +1,10 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ import $ from 'jquery'; -const configId = 'gt-config-values'; +const configId = 'vb-config-values'; $(document).ready(function() { if (document.getElementById(configId)) { diff --git a/web/resources/js/util/HTTP.js b/web/resources/js/util/HTTP.js index b1c0eb7..ca477fb 100644 --- a/web/resources/js/util/HTTP.js +++ b/web/resources/js/util/HTTP.js @@ -1,5 +1,4 @@ /* - Graphictoria 5 (https://gtoria.net) Copyright © XlXi 2022 */ diff --git a/web/resources/sass/Bootstrap.scss b/web/resources/sass/Bootstrap.scss new file mode 100644 index 0000000..7087ff1 --- /dev/null +++ b/web/resources/sass/Bootstrap.scss @@ -0,0 +1,45 @@ +// XlXi: Loads bootstrap without utilities/api. + +// scss-docs-start import-stack +// Configuration +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/utilities"; + +// Layout & components +@import "~bootstrap/scss/root"; +@import "~bootstrap/scss/reboot"; +@import "~bootstrap/scss/type"; +@import "~bootstrap/scss/images"; +@import "~bootstrap/scss/containers"; +@import "~bootstrap/scss/grid"; +@import "~bootstrap/scss/tables"; +@import "~bootstrap/scss/forms"; +@import "~bootstrap/scss/buttons"; +@import "~bootstrap/scss/transitions"; +@import "~bootstrap/scss/dropdown"; +@import "~bootstrap/scss/button-group"; +@import "~bootstrap/scss/nav"; +@import "~bootstrap/scss/navbar"; +@import "~bootstrap/scss/card"; +@import "~bootstrap/scss/accordion"; +@import "~bootstrap/scss/breadcrumb"; +@import "~bootstrap/scss/pagination"; +@import "~bootstrap/scss/badge"; +@import "~bootstrap/scss/alert"; +@import "~bootstrap/scss/progress"; +@import "~bootstrap/scss/list-group"; +@import "~bootstrap/scss/close"; +@import "~bootstrap/scss/toasts"; +@import "~bootstrap/scss/modal"; +@import "~bootstrap/scss/tooltip"; +@import "~bootstrap/scss/popover"; +@import "~bootstrap/scss/carousel"; +@import "~bootstrap/scss/spinners"; +@import "~bootstrap/scss/offcanvas"; +@import "~bootstrap/scss/placeholders"; + +// Helpers +@import "~bootstrap/scss/helpers"; +// scss-docs-end import-stack diff --git a/web/resources/sass/Variables.scss b/web/resources/sass/Variables.scss index 2b2715a..1dace50 100644 --- a/web/resources/sass/Variables.scss +++ b/web/resources/sass/Variables.scss @@ -1,5 +1,4 @@ // © XlXi 2021 -// Graphictoria 5 @function tint-color($color, $percent){ @return mix(white, $color, $percent); @@ -12,7 +11,7 @@ // Lumen 5.0.1 // Bootswatch -$theme: "graphictoria" !default; +$theme: "virtubrick" !default; // // Color system @@ -30,19 +29,20 @@ $gray-800: #333 !default; $gray-900: #222 !default; $black: #000 !default; -$gtblue: #348aff !default; -$blue: #158cba !default; -$indigo: #6610f2 !default; -$purple: #6f42c1 !default; -$pink: #e83e8c !default; -$red: #ff4136 !default; -$orange: #fd7e14 !default; -$yellow: #ff851b !default; -$green: #28b62c !default; -$teal: #20c997 !default; -$cyan: #75caeb !default; +$gtblue: #348aff !default; +$blue: #158cba !default; +$indigo: #6610f2 !default; +$purple: #6f42c1 !default; +$pink: #e83e8c !default; +$red: #ff4136 !default; +$orange: #fd7e14 !default; +$yellow: #ff851b !default; +$realyellow: #ffde1b !default; +$green: #28b62c !default; +$teal: #20c997 !default; +$cyan: #75caeb !default; -$graphictoria: $gtblue !default; +$virtubrick: $gtblue !default; $primary: $blue !default; $secondary: $gray-200 !default; $success: $green !default; diff --git a/web/resources/sass/Graphictoria.scss b/web/resources/sass/VirtuBrick.scss similarity index 82% rename from web/resources/sass/Graphictoria.scss rename to web/resources/sass/VirtuBrick.scss index 5112221..00eba3c 100644 --- a/web/resources/sass/Graphictoria.scss +++ b/web/resources/sass/VirtuBrick.scss @@ -1,13 +1,10 @@ // © XlXi 2021 -// Graphictoria 5 @use "sass:math"; // Lumen 5.0.1 // Bootswatch -@import "Variables"; -@import "~bootstrap/scss/bootstrap"; @import "./scss/fontawesome.scss"; @import "./scss/brands.scss"; @import "./scss/duotone.scss"; @@ -16,6 +13,14 @@ @import "./scss/solid.scss"; @import "./scss/thin.scss"; +@import "Variables"; +@import "Bootstrap"; + +// XlXi: Edit utilities API. +// Border is removed because of how stupidly it's handled by Bootstrap. It completely breaks our dark theme. +$utilities: map-remove($utilities, "border", "border-top", "border-end", "border-bottom", "border-start"); +@import "~bootstrap/scss/utilities/api"; + // Variables $web-font-path: "https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" !default; @@ -40,7 +45,7 @@ img.twemoji { // Shop -.graphictoria-tokens { +.virtubrick-tokens { background: 0 1px/contain no-repeat url("/images/symbols/token.svg"); color: #e59800!important; font-weight: bold; @@ -72,22 +77,22 @@ img.twemoji { } } -.graphictoria-asset-thumbnail { +.virtubrick-asset-thumbnail { width: 420px; height: 420px; } -.graphictoria-game-thumbnail { +.virtubrick-game-thumbnail { width: 640px; height: 360px; } -.graphictoria-smaller-page { +.virtubrick-smaller-page { max-width: 1096px; margin: 0 auto 0 auto; } -.graphictoria-list-dropdown::after { +.virtubrick-list-dropdown::after { @include caret-down(); content: ""; @@ -96,7 +101,7 @@ img.twemoji { vertical-align: 0.255em; } -.graphictoria-item-card { +.virtubrick-item-card { text-decoration: none!important; font-weight: 400!important; display: inline-block; @@ -124,7 +129,7 @@ img.twemoji { color: inherit!important; } -.graphictoria-item-details { +.virtubrick-item-details { position: relative; display: flex; @@ -144,12 +149,12 @@ img.twemoji { } } -.graphictoria-item-card > span > img { +.virtubrick-item-card > span > img { background: url("/Images/Item-Image-Vignette.png"); background-size: cover; } -.graphictoria-game-card { +.virtubrick-game-card { @media (max-width: 576px) { width: math.div(100%, 2) } @@ -171,7 +176,7 @@ img.twemoji { } } -.graphictoria-shop-overlay { +.virtubrick-shop-overlay { position: absolute; width: 100%; height: 100%; @@ -182,19 +187,19 @@ img.twemoji { z-index: 10; } -.graphictoria-shop-overlay > .gtoria-loader { +.virtubrick-shop-overlay > .vbrick-loader { margin: auto; } -.graphictoria-shop-categories { +.virtubrick-shop-categories { border: 0; @media (min-width: 768px) { - html.gtoria-light & { + html.vbrick-light & { border-right: 2px solid #dee2e6!important; } - html.gtoria-dark & { + html.vbrick-dark & { border-right: 2px solid #333!important; } @@ -206,19 +211,19 @@ img.twemoji { // Maintenance -.gtoria-maintenance-background { +.vbrick-maintenance-background { position: absolute; width: 100%; height: 100%; z-index: -9999; } -.gtoria-maintenance-form { - html.gtoria-light & { +.vbrick-maintenance-form { + html.vbrick-light & { background: radial-gradient($gray-100 5%, transparent 65%); } - html.gtoria-dark & { + html.vbrick-dark & { background: radial-gradient(shade-color($gray-900, 30%) 5%, transparent 65%); } @@ -242,7 +247,7 @@ img.twemoji { } .modal-content { - html.gtoria-dark & { + html.vbrick-dark & { background-color: #222 !important; } } @@ -257,11 +262,11 @@ img.twemoji { // Loader -.gtoria-loader-center { +.vbrick-loader-center { margin: auto; } -.gtoria-loader { +.vbrick-loader { display: inline-block; position: relative; margin: auto auto 0 auto; @@ -269,43 +274,43 @@ img.twemoji { height: 80px; } -.gtoria-loader div { +.vbrick-loader div { position: absolute; top: 33px; width: 13px; height: 13px; border-radius: 50%; - html.gtoria-light & { + html.vbrick-light & { background-color: $dark; } - html.gtoria-dark & { + html.vbrick-dark & { background-color: $light; } } -.gtoria-loader div:nth-child(1) { +.vbrick-loader div:nth-child(1) { left: 8px; - animation: gtoria-ld-p1 0.5s infinite; + animation: vbrick-ld-p1 0.5s infinite; } -.gtoria-loader div:nth-child(2) { +.vbrick-loader div:nth-child(2) { left: 8px; - animation: gtoria-ld-p2 0.5s infinite; + animation: vbrick-ld-p2 0.5s infinite; } -.gtoria-loader div:nth-child(3) { +.vbrick-loader div:nth-child(3) { left: 32px; - animation: gtoria-ld-p2 0.5s infinite; + animation: vbrick-ld-p2 0.5s infinite; } -.gtoria-loader div:nth-child(4) { +.vbrick-loader div:nth-child(4) { left: 56px; - animation: gtoria-ld-p3 0.5s infinite; + animation: vbrick-ld-p3 0.5s infinite; } -@keyframes gtoria-ld-p1 { +@keyframes vbrick-ld-p1 { 0% { transform: scale(0); } @@ -314,7 +319,7 @@ img.twemoji { } } -@keyframes gtoria-ld-p3 { +@keyframes vbrick-ld-p3 { 0% { transform: scale(1); } @@ -323,7 +328,7 @@ img.twemoji { } } -@keyframes gtoria-ld-p2 { +@keyframes vbrick-ld-p2 { 0% { transform: translate(0, 0); } @@ -334,31 +339,31 @@ img.twemoji { // Background -html, body, #gtoria-root { +html, body, #vbrick-root { height: 100%; background: transparent; color: inherit; } html { - &.gtoria-light { + &.vbrick-light { background-color: $gray-100; color: $gray-900; } - &.gtoria-dark { + &.vbrick-dark { background-color: shade-color($gray-900, 30%); color: $gray-100; } } -#gtoria-root { +#vbrick-root { display: flex; flex-direction: column; height: 100%; } -.graphictoria-home { +.virtubrick-home { background-image: url("/Images/Backgrounds/Home.png"); background-size: cover; background-repeat: no-repeat; @@ -367,7 +372,7 @@ html { display: flex; } -.graphictoria-home-about { +.virtubrick-home-about { background-image: url("/Images/Backgrounds/About.png"); background-size: cover; background-repeat: no-repeat; @@ -375,7 +380,7 @@ html { min-height: 500px; } -.graphictoria-home-about-card { +.virtubrick-home-about-card { color: #fff; background: #000000ad; border-radius: 5px; @@ -385,21 +390,21 @@ html { border-width: 0 0 2px; } -.graphictoria-nojs { +.virtubrick-nojs { background-image: url("/Images/Backgrounds/NoJs.png"); background-size: cover; background-repeat: no-repeat; background-position: center; } -.graphictoria-admin { +.virtubrick-admin { background-image: url("/Images/Backgrounds/stars.jpg"); background-size: cover; background-repeat: no-repeat; background-position: center; } -.graphictoria-blog { +.virtubrick-blog { /* XlXi: I LOVE CSS I LOVE CSS I LOVE CSS I LOVE CSS I LOVE CSS I LOVE CSS */ background-image: url("/Images/Backgrounds/Blog.png")!important; background-size: cover!important; @@ -411,27 +416,27 @@ html { // Home Page -.graphictoria-homepage-header { +.virtubrick-homepage-header { font-size: 4rem; font-weight: bold; } -.graphictoria-homepage-fine-print { +.virtubrick-homepage-fine-print { font-size: .6rem; opacity: 70%; } -.graphictoria-small-aligned-text { +.virtubrick-small-aligned-text { font-size: .6rem; vertical-align: middle; } -.graphictoria-home-shadow { +.virtubrick-home-shadow { text-shadow: 0 0 4px $gray-700; } // Character -.gt-charimg { +.vb-charimg { max-height: 300px; max-width: 300px; @media (max-width: 768px) { @@ -440,13 +445,13 @@ html { } } -.graphictora-user-circle { +.virtubrick-user-circle { border-radius: 50%; background: url("/Images/User-Image-Vignette.png"); background-size: cover; } -.graphictora-feed-user-circle { +.virtubrick-feed-user-circle { border-radius: 50%; background: url("/Images/User-Image-Vignette.png"); background-size: cover; @@ -457,11 +462,75 @@ html { // Border .border { - html.gtoria-dark & { - border-color: $gray-700!important; + html.vbrick-dark & { + border: 1px solid $gray-700; } - html.gtoria-light & { - border-color: $border-color!important; + html.vbrick-light & { + border: 1px solid $border-color; + } + + &-top { + html.vbrick-dark & { + border-top: $gray-700; + } + html.vbrick-light & { + border-top: $border-color; + } + } + + &-end { + html.vbrick-dark & { + border-right: $gray-700; + } + html.vbrick-light & { + border-right: $border-color; + } + } + + &-bottom { + html.vbrick-dark & { + border-bottom: $gray-700; + } + html.vbrick-light & { + border-bottom: $border-color; + } + } + + &-start { + html.vbrick-dark & { + border-left: $gray-700; + } + html.vbrick-light & { + border-left: $border-color; + } + } + + &-top-0 { + border-top: 0!important; + } + + &-end-0 { + border-end: 0!important; + } + + &-bottom-0 { + border-bottom: 0!important; + } + + &-start-0 { + border-start: 0!important; + } + + &-vb-online-website { + border-color: #22acff!important; + } + + &-vb-in-game { + border-color: #00d926!important; + } + + &-vb-in-studio { + border-color: #ff8f00!important; } } @@ -477,11 +546,11 @@ html { } } -.bg-graphictoria { - background-color: $graphictoria; +.bg-virtubrick { + background-color: $virtubrick; } -.graphictoria-navbar { +.virtubrick-navbar { background-color: $white; border-color: shade-color($white, 10%); border-style: solid; @@ -490,7 +559,7 @@ html { padding-top: 4px; padding-bottom: 4px; - html.gtoria-light & { + html.vbrick-light & { background-color: $white; border-color: shade-color($white, 10%); @@ -543,7 +612,7 @@ html { } } - html.gtoria-dark & { + html.vbrick-dark & { background-color: $gray-900; border-color: tint-color($gray-900, 10%); @@ -596,32 +665,32 @@ html { } } -.graphictoria-blognav { +.virtubrick-blognav { transition: background 100ms, border-color 100ms; transition-timing-function: ease-out; } -.graphictoria-blognav-hide { +.virtubrick-blognav-hide { background: #ffffff00!important; border-color: #ffffff00!important; } -.graphictoria-nav-margin { +.virtubrick-nav-margin { margin-top: 63px; } -.graphictoria-nav-splitter { +.virtubrick-nav-splitter { margin-top: 16px; margin-bottom: 16px !important; } -.graphictoria-user-dropdown::after { +.virtubrick-user-dropdown::after { position: absolute; top: 50%; right: 0; } -.graphictoria-search, #graphictoria-search-dropdown { +.virtubrick-search, #virtubrick-search-dropdown { position: absolute; @media (max-width: 992px) { display: none; @@ -636,11 +705,11 @@ html { } } -.graphictoria-search { +.virtubrick-search { font-family: "FontAwesome", $font-family-sans-serif; } -.graphictoria-search-dropdown-truncate { +.virtubrick-search-dropdown-truncate { @media (min-width: 992px) { max-width: 5.375rem; } @@ -651,21 +720,21 @@ html { margin-bottom: -0.35rem; } -#graphictoria-search-dropdown > .dropdown-menu { +#virtubrick-search-dropdown > .dropdown-menu { width: 100%; left: 0; } // Cards -.graphictoria-small-card { +.virtubrick-small-card { @media (min-width: 992px) { max-width: 50%; margin: auto; } } -.graphictoria-moderation-card { +.virtubrick-moderation-card { @media (min-width: 992px) { max-width: 70%; margin: auto; @@ -674,7 +743,7 @@ html { .card { @include shadow(); - html.gtoria-dark & { + html.vbrick-dark & { background-color: #222; } } @@ -686,7 +755,7 @@ html { overflow-y: auto !important; } -.graphictoria-center-vh { +.virtubrick-center-vh { margin-top: auto; margin-left: auto; margin-right: auto; @@ -731,7 +800,7 @@ html { &-secondary { border-color: shade-color($secondary, 10%); - html.gtoria-dark & { + html.vbrick-dark & { color: $white; background-color: $dark; border-color: shade-color($dark, 10%); @@ -787,11 +856,11 @@ html { background: transparent; border: 0; - html.gtoria-light & { + html.vbrick-light & { color: rgba(var(--bs-black-rgb),var(--bs-text-opacity)); } - html.gtoria-dark & { + html.vbrick-dark & { color: rgba(var(--bs-light-rgb),var(--bs-text-opacity)); } @@ -810,11 +879,11 @@ html { background: transparent; border: 0; - html.gtoria-light & { + html.vbrick-light & { color: rgba(var(--bs-black-rgb),var(--bs-text-opacity)); } - html.gtoria-dark & { + html.vbrick-dark & { color: rgba(var(--bs-light-rgb),var(--bs-text-opacity)); } @@ -833,11 +902,11 @@ html { background: transparent; border: 0; - html.gtoria-light & { + html.vbrick-light & { color: rgba(var(--bs-black-rgb),var(--bs-text-opacity)); } - html.gtoria-dark & { + html.vbrick-dark & { color: rgba(var(--bs-light-rgb),var(--bs-text-opacity)); } @@ -876,7 +945,7 @@ html { } input { - html.gtoria-dark & { + html.vbrick-dark & { background-color: $gray-800; color: $gray-100; border-color: $gray-700; @@ -948,13 +1017,13 @@ input { border-top-width: 1px; @include box-shadow(none); - html.gtoria-dark & { + html.vbrick-dark & { color: $gray-100; background-color: $gray-800; border-color: $gray-700; } - html.gtoria-light & { + html.vbrick-light & { color: $gray-500; background-color: $white; border-color: $gray-400; @@ -962,7 +1031,7 @@ input { } .dropdown-item { - html.gtoria-dark & { + html.vbrick-dark & { color: $gray-100; &:not(.disabled):hover { @@ -971,7 +1040,7 @@ input { } } -.graphictoria-nav-dropdown { +.virtubrick-nav-dropdown { margin-top: 11px !important; border-top: 0; border-radius: 0 0 0.25rem 0.25rem; @@ -1041,11 +1110,11 @@ input { } } -.graphictoria-paginator * { +.virtubrick-paginator * { display: inline-block; } -.graphictoria-paginator > input { +.virtubrick-paginator > input { width: 35px; text-align: center; padding: 0; @@ -1098,6 +1167,11 @@ input { background-color: $warning; border-color: shade-color($warning, 10%); } + + &-yellow { + background-color: $realyellow; + border-color: shade-color($realyellow, 10%); + } &-dark { background-color: $dark; @@ -1125,7 +1199,7 @@ input { } } -.graphictoria-alert { +.virtubrick-alert { border-radius: 0; text-align: center; margin-bottom: 0; @@ -1133,7 +1207,7 @@ input { padding-bottom: 0.35rem; } -.graphictoria-alert > .btn-close { +.virtubrick-alert > .btn-close { padding-top: 0.75rem; padding-bottom: 0.75rem; } @@ -1222,10 +1296,10 @@ a.list-group-item { // Footer .footer { - html.gtoria-dark & { + html.vbrick-dark & { background-color: $gray-900 !important; } - html.gtoria-light & { + html.vbrick-light & { background-color: $white !important; } } @@ -1433,7 +1507,7 @@ p { align-items: center !important; } -.graphictoria-error-popup { +.virtubrick-error-popup { margin-bottom: 10px; border-radius: 10px; @@ -1447,12 +1521,12 @@ p { } // Voting -.graphictoria-vote-bar { +.virtubrick-vote-bar { // border - html.gtoria-dark & { + html.vbrick-dark & { border-color: $gray-700; } - html.gtoria-light & { + html.vbrick-light & { border-color: $border-color; } @@ -1471,3 +1545,44 @@ p { position: relative; height: 10px; } + +// Tables +table { + html.vbrick-light & { + color: rgba(var(--bs-black-rgb),var(--bs-text-opacity)); + } + + html.vbrick-dark & { + color: rgba(var(--bs-light-rgb),var(--bs-text-opacity)); + } +} + +.table>:not(:first-child) { + html.vbrick-dark & { + border-top: 1px solid $gray-700; + } + html.vbrick-light & { + border-top: 1px solid $border-color; + } +} + +table > tbody > tr > th { + font-weight: normal; +} + +.virtubrick-table { + margin-bottom: 0; +} + +.virtubrick-table > tbody > tr:last-child > th { + border: unset; +} + +.virtubrick-table > thead { + html.vbrick-dark & { + background-color: #ffffff0f; + } + html.vbrick-light & { + background-color: #0000000f; + } +} \ No newline at end of file diff --git a/web/resources/views/components/admin/nav-list-card.blade.php b/web/resources/views/components/admin/nav-list-card.blade.php index 6adb029..0d2438c 100644 --- a/web/resources/views/components/admin/nav-list-card.blade.php +++ b/web/resources/views/components/admin/nav-list-card.blade.php @@ -5,7 +5,7 @@ ]) @if(Auth::check() && Auth::user()->hasRoleset($roleset)) -
            +
            {{ $name }}
            diff --git a/web/resources/views/components/admin/nav-list-title.blade.php b/web/resources/views/components/admin/nav-list-title.blade.php index f67e7dc..a81fb70 100644 --- a/web/resources/views/components/admin/nav-list-title.blade.php +++ b/web/resources/views/components/admin/nav-list-title.blade.php @@ -2,7 +2,7 @@ 'name' ]) -{{ $name }} -
              +{{ $name }} +
                {{ $slot }}
              \ No newline at end of file diff --git a/web/resources/views/components/admin/usage-bar.blade.php b/web/resources/views/components/admin/usage-bar.blade.php index 415b0e9..ff74f06 100644 --- a/web/resources/views/components/admin/usage-bar.blade.php +++ b/web/resources/views/components/admin/usage-bar.blade.php @@ -2,7 +2,7 @@ 'stat' ]) -
              +
              @php $usage_bar_color = 'bg-primary'; $usage_bar_usage = $stat * 100; @@ -15,7 +15,7 @@ $usage_bar_color = 'bg-danger'; // Red @endphp
              \ No newline at end of file diff --git a/web/resources/views/components/admin/user-search-input.blade.php b/web/resources/views/components/admin/user-search-input.blade.php new file mode 100644 index 0000000..6128851 --- /dev/null +++ b/web/resources/views/components/admin/user-search-input.blade.php @@ -0,0 +1,15 @@ +@props([ + 'id', + 'definition' +]) + +
              + +
              + @csrf +
              + + +
              +
              +
              \ No newline at end of file diff --git a/web/resources/views/components/card.blade.php b/web/resources/views/components/card.blade.php index b445434..372d228 100644 --- a/web/resources/views/components/card.blade.php +++ b/web/resources/views/components/card.blade.php @@ -1,5 +1,5 @@ @php - $classes = ['card', 'graphictoria-small-card', 'shadow-sm']; + $classes = ['card', 'virtubrick-small-card', 'shadow-sm']; if(isset($attributes['class'])) $classes = array_merge($classes, explode(' ', $attributes['class'])); diff --git a/web/resources/views/components/loader.blade.php b/web/resources/views/components/loader.blade.php index d2663a8..d940eff 100644 --- a/web/resources/views/components/loader.blade.php +++ b/web/resources/views/components/loader.blade.php @@ -1 +1 @@ -
              \ No newline at end of file +
              \ No newline at end of file diff --git a/web/resources/views/components/user-circle.blade.php b/web/resources/views/components/user-circle.blade.php new file mode 100644 index 0000000..391d71b --- /dev/null +++ b/web/resources/views/components/user-circle.blade.php @@ -0,0 +1,35 @@ +@props([ + 'user', + 'statusIndicator', + 'size' +]) + +@php + // 37x37 Default + $size = isset($size) ? $size : 37; + $showStatus = (!isset($statusIndicator) || $statusIndicator); + $classes = [ + 'img-fluid', + 'border', + 'me-1', + 'virtubrick-user-circle' + ]; + + if($showStatus) + { + // TODO: XlXi: Advanced user presence. (in games, in studio, etc) + if($user->isOnline()) + $classes = array_merge($classes, ['border-vb-online-website', 'border-2']); + } +@endphp + + + {{-- TODO: XlXi: User headshots --}} + +

              {{ $user->username }}

              +               \ No newline at end of file diff --git a/web/resources/views/emails/password-reset.blade.php b/web/resources/views/emails/password-reset.blade.php index 92d43ef..6ad2ef9 100644 --- a/web/resources/views/emails/password-reset.blade.php +++ b/web/resources/views/emails/password-reset.blade.php @@ -1,6 +1,6 @@ @extends('layouts.email') -@section('title', 'Graphictoria Password Reset') +@section('title', config('app.name') . ' Password Reset') @section('content')

              Hello, {{ $user }}!

              diff --git a/web/resources/views/errors/400.blade.php b/web/resources/views/errors/400.blade.php index c6dce28..3c498c1 100644 --- a/web/resources/views/errors/400.blade.php +++ b/web/resources/views/errors/400.blade.php @@ -3,10 +3,10 @@ @section('title', 'Bad Request') @section('content') -
              +
              - There was a problem with your request. If you believe this is an error on our part, contact us at support@gtoria.net! + There was a problem with your request. If you believe this is an error on our part, contact us at support@virtubrick.net!
              diff --git a/web/resources/views/errors/401.blade.php b/web/resources/views/errors/401.blade.php index e47f8cd..57baa11 100644 --- a/web/resources/views/errors/401.blade.php +++ b/web/resources/views/errors/401.blade.php @@ -3,11 +3,11 @@ @section('title', 'Unauthorized') @section('content') -
              +
              - You're missing the proper authentication to view this page. If you believe this is an error, contact us at support@gtoria.net! + You're missing the proper authentication to view this page. If you believe this is an error, contact us at support@virtubrick.net!
              Home diff --git a/web/resources/views/errors/403.blade.php b/web/resources/views/errors/403.blade.php index cb2b061..bbe3fd9 100644 --- a/web/resources/views/errors/403.blade.php +++ b/web/resources/views/errors/403.blade.php @@ -3,10 +3,10 @@ @section('title', 'Forbidden') @section('content') -
              +
              - You don't have permission to view this page. If you believe this is an error, contact us at support@gtoria.net! + You don't have permission to view this page. If you believe this is an error, contact us at support@virtubrick.net!
              diff --git a/web/resources/views/errors/404.blade.php b/web/resources/views/errors/404.blade.php index 554fad8..3080075 100644 --- a/web/resources/views/errors/404.blade.php +++ b/web/resources/views/errors/404.blade.php @@ -7,10 +7,10 @@ $errorTitles = ['OH NOES!!!', 'BZZT', 'ERROR', 'UH OH.']; @section('title', 'Not Found') @section('content') -
              +
              - We've looked far and wide and weren't able to find the page you were looking for. If you believe this is an error, contact us at support@gtoria.net! + We've looked far and wide and weren't able to find the page you were looking for. If you believe this is an error, contact us at support@virtubrick.net!
              diff --git a/web/resources/views/errors/500.blade.php b/web/resources/views/errors/500.blade.php index 26217ba..3addd92 100644 --- a/web/resources/views/errors/500.blade.php +++ b/web/resources/views/errors/500.blade.php @@ -3,10 +3,10 @@ @section('title', 'Internal Server Error') @section('content') -
              +
              - Oops, we ran into an issue while trying to process your request, please try again later in a few minutes. If the issue persists after a few minutes, please contact us at support@gtoria.net. + Oops, we ran into an issue while trying to process your request, please try again later in a few minutes. If the issue persists after a few minutes, please contact us at support@virtubrick.net.
              diff --git a/web/resources/views/errors/501.blade.php b/web/resources/views/errors/501.blade.php index c1e4dad..04dc7fe 100644 --- a/web/resources/views/errors/501.blade.php +++ b/web/resources/views/errors/501.blade.php @@ -3,7 +3,7 @@ @section('title', 'Not Implemented') @section('content') -
              +
              todo diff --git a/web/resources/views/layouts/admin.blade.php b/web/resources/views/layouts/admin.blade.php index a5770fc..9b2ade3 100644 --- a/web/resources/views/layouts/admin.blade.php +++ b/web/resources/views/layouts/admin.blade.php @@ -2,7 +2,7 @@ @section('extra-headers') diff --git a/web/resources/views/layouts/app.blade.php b/web/resources/views/layouts/app.blade.php index aa55c94..73b2abd 100644 --- a/web/resources/views/layouts/app.blade.php +++ b/web/resources/views/layouts/app.blade.php @@ -1,18 +1,18 @@ @php - $slogan = (View::hasSection('description') ? View::getSection('description') . ' ' : '') . 'Graphictoria is an online social platform for those looking to relive the classic Roblox experience. So what are you waiting for? Join 8k+ other users in reliving the good ol\' days! Graphictoria is not affiliated with or sponsored by Roblox Corporation, all Roblox related indica and slogans belong to Roblox Corporation.'; + $slogan = (View::hasSection('description') ? View::getSection('description') . ' ' : '') . config('app.name') . ' is an online social platform for those looking to relive the classic Roblox experience. So what are you waiting for? Join 8k+ other users in reliving the good ol\' days! ' . config('app.name') . ' is not affiliated with or sponsored by Roblox Corporation, all Roblox related indica and slogans belong to Roblox Corporation.'; @endphp - + - Graphictoria{{ View::hasSection('title') ? ' | ' . View::getSection('title') : '' }} + {{ config('app.name') }}{{ View::hasSection('title') ? ' | ' . View::getSection('title') : '' }} - + - - - + + + @@ -22,14 +22,14 @@ @once - + @endonce @yield('extra-headers') @yield('page-specific') -
              +
              @if(!isset($noNav)) @include('layouts.nav') @endif diff --git a/web/resources/views/layouts/blog.blade.php b/web/resources/views/layouts/blog.blade.php index def4b42..9baba8b 100644 --- a/web/resources/views/layouts/blog.blade.php +++ b/web/resources/views/layouts/blog.blade.php @@ -1,18 +1,18 @@ @php - $slogan = (View::hasSection('description') ? View::getSection('description') . ' ' : '') . 'Graphictoria is an online social platform for those looking to relive the classic Roblox experience. So what are you waiting for? Join 8k+ other users in reliving the good ol\' days! Graphictoria is not affiliated with or sponsored by Roblox Corporation, all Roblox related indica and slogans belong to Roblox Corporation.'; + $slogan = (View::hasSection('description') ? View::getSection('description') . ' ' : '') . config('app.name') . ' is an online social platform for those looking to relive the classic Roblox experience. So what are you waiting for? Join 8k+ other users in reliving the good ol\' days! ' . config('app.name') . ' is not affiliated with or sponsored by Roblox Corporation, all Roblox related indica and slogans belong to Roblox Corporation.'; @endphp - + - Graphictoria Blog{{ View::hasSection('title') ? ' | ' . View::getSection('title') : '' }} + {{ config('app.name') }} Blog{{ View::hasSection('title') ? ' | ' . View::getSection('title') : '' }} - + - - - + + + @@ -22,14 +22,14 @@ @once - + @endonce @yield('extra-headers') @yield('page-specific') -
              +
              @include('layouts.blog.nav') @yield('content') diff --git a/web/resources/views/layouts/blog/nav.blade.php b/web/resources/views/layouts/blog/nav.blade.php index c14b9d0..3cd3752 100644 --- a/web/resources/views/layouts/blog/nav.blade.php +++ b/web/resources/views/layouts/blog/nav.blade.php @@ -1,20 +1,20 @@ -
              -