diff --git a/inc/include.php b/inc/include.php index 74f295b..2479d70 100644 --- a/inc/include.php +++ b/inc/include.php @@ -27,9 +27,8 @@ use \pvv\side\Agenda; $agenda = new \pvv\side\Agenda([ // new \pvv\side\social\NerdepitsaActivity, // new \pvv\side\social\AnimekveldActivity, - // new \pvv\side\social\HackekveldActivity, - // new \pvv\side\social\BrettspillActivity, - new \pvv\side\social\DriftkveldActivity, + new \pvv\side\social\HackekveldActivity, + new \pvv\side\social\DriftkveldActivity, new \pvv\side\DBActivity($pdo), ]); diff --git a/src/pvv/side/social/brettspillactivity.php b/src/pvv/side/social/brettspillactivity.php index a5353ef..7242f36 100644 --- a/src/pvv/side/social/brettspillactivity.php +++ b/src/pvv/side/social/brettspillactivity.php @@ -8,24 +8,20 @@ use \DateInterval; class BrettspillActivity implements Activity { public function nextDate(DateTimeImmutable $date) { - if ($date->format('H') > 17 || $date->format('H') == 16 && $date->format('i') > 15) - return $this->nextDate($date->add(new DateInterval('P1D'))->setTime(16, 15, 0)); - $date = $date->setTime(16, 15, 0); - if ($date->format('N') != 6) + if ($date->format('H') > 20 || $date->format('H') == 19 && $date->format('i') > 30) + return $this->nextDate($date->add(new DateInterval('P1D'))->setTime(19, 30, 0)); + $date = $date->setTime(19, 30, 0); + if ($date->format('N') != 4) return $this->nextDate($date->add(new DateInterval('P1D'))); - if ($date->format('W') % 4 - 3) - return $this->nextDate($date->add(new DateInterval('P7D'))); return $date; } public function prevDate(DateTimeImmutable $date) { - if ($date->format('H') < 16 || $date->format('H') == 17 && $date->format('i') < 15) - return $this->prevDate($date->sub(new DateInterval('P1D'))->setTime(16, 15, 0)); - $date = $date->setTime(16, 15, 0); - if ($date->format('N') != 6) + if ($date->format('H') < 19 || $date->format('H') == 20 && $date->format('i') < 30) + return $this->prevDate($date->sub(new DateInterval('P1D'))->setTime(19, 30, 0)); + $date = $date->setTime(19, 30, 0); + if ($date->format('N') != 4) return $this->prevDate($date->sub(new DateInterval('P1D'))); - if ($date->format('W') % 4 - 3) - return $this->nextDate($date->add(new DateInterval('P7D'))); return $date; } diff --git a/src/pvv/side/social/brettspillevent.php b/src/pvv/side/social/brettspillevent.php index 79d6b1c..7f0266d 100644 --- a/src/pvv/side/social/brettspillevent.php +++ b/src/pvv/side/social/brettspillevent.php @@ -16,11 +16,11 @@ class BrettspillEvent extends Event { } public function getLocation() /* : Location */ { - return "Programvareverkstedet"; + return "Koserommet"; } public function getOrganiser() /* : User */ { - return "Programvareverkstedet"; + return "Robert Maikher"; } public function getURL() /* : string */ { @@ -33,8 +33,8 @@ class BrettspillEvent extends Event { public function getDescription() { return [ - 'Er du en hardcore brettspillentusiast eller en nybegynner som har så vidt spilt ludo? '. - 'Da er vår brettspillkveld noe for deg! ' . + 'Er du en hardcore brettspillentusiast eller en nybegynner som har så vidt spilt ludo?'. + 'Da er vår brettspillkveld noe for deg!' . 'Vi tar ut et par spill fra vårt samling of spiller så mye vi orker. Kom innom!', '', '## Vår samling', diff --git a/www/css/landing.css b/www/css/landing.css index f0b1ea9..dd6a09e 100644 --- a/www/css/landing.css +++ b/www/css/landing.css @@ -1,157 +1,154 @@ header.landing { - display: block; - margin: 0; - margin-top: 3em; - padding: 3vh 15vw; - width: 70vw; - background-color: #002244; - color: #fff; + display:block; + margin: 0; + margin-top: 3em; + padding: 3vh 10vw; + width: 80vw; + background-color: #002244; + color: #fff; } header.landing .logo { - display: block; - width: 24vh; - height: 24vh; - margin: auto; + display: block; + width: 24vh; + height: 24vh; + margin: auto; } main { - margin-top: 0; + margin-top: 0; } .info { - text-align: center; - width: 100%; - padding: 0; - margin: 0; + text-align: center; + width: 100%; + padding: 0; + margin: 0; - overflow-y: hidden; + overflow-y: hidden; } .essentials { - width: 100%; - margin: 1em 0; - padding: 0; - list-style: none; - display: flex; - align-items: center; - justify-content: center; + width: 100%; + margin: 1em 0; + padding: 0; + list-style: none; + display: flex; + align-items: center; + justify-content: center; } .essentials li { - display: inline-block; + display: inline-block; } .essentials a { - margin: 0 2em; - height: 100%; + margin: 0 2em; + height: 100%; } .essentials .focus { - padding: 0.8em; - font-size: 1.2em; + padding: 0.8em; + font-size: 1.2em; } img.float-right { - float: right; - max-width: 12em; - max-height: 12em; - vertical-align: baseline; + float: right; + max-width: 12em; + max-height: 12em; + vertical-align: baseline; } .calendar-events { - padding: 0; - margin-bottom: 1.5em; - list-style: none; + padding: 0; + margin-bottom: 1.5em; + list-style: none; } .calendar-events ul li :not(.date):not(.time) { - display: inline-block; - width: calc(100% - 7em); - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + display: inline-block; + width: calc(100% - 7em); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .calendar-events ul .date { - color: rgba(0, 0, 0, 0.5); - font-size: 0.8em; - margin-top: 0.2em; + color: rgba(0,0,0,.5); + font-size: 0.8em; + margin-top: .2em; } .calendar-events > li > p { - border-bottom: 0.1em dotted rgba(0, 0, 0, 0.2); + border-bottom: .1em dotted rgba(0,0,0,.2); } .calendar-events ul { - list-style: none; - padding: 0; + list-style: none; + padding: 0; } -.calendar-events a, -#ticker a { - text-decoration: none; - font-weight: bold; - color: black; +.calendar-events a, #ticker a { + text-decoration: none; + font-weight: bold; + color: black; } -.calendar-events a:hover, -#ticker a:hover { - text-decoration: underline; +.calendar-events a:hover, #ticker a:hover { + text-decoration: underline; } .calendar-events ul .time { - color: rgba(0, 0, 0, 0.5); - float: right; + color: rgba(0,0,0,.5); + float: right; } -.calendar-events ul .icon, -.calendar-events ul .date { - float: right; - margin-right: 0.5em; +.calendar-events ul .icon, .calendar-events ul .date { + float: right; + margin-right: .5em; } main.contentsplit { - padding-top: 1em; + padding-top: 1em; } .contentsplit { - display: grid; - grid-template-columns: 2.5fr 2fr; + display: grid; + grid-template-columns: 2.5fr 2fr; } .gridr { - border-left: 0; + border-left: 0; } @media screen and (max-width: 50rem) { - .essentials { - flex-direction: column; - } + .essentials { + flex-direction: column; + } - .essentials a { - margin: 0.2em 0; - } + .essentials a { + margin: .2em 0; + } } @media screen and (max-width: 65rem) { - .contentsplit { - display: block; - } + .contentsplit { + display: block; + } - .gridr { - height: auto; - padding: 0; - margin-left: 0; - margin-bottom: 3em; - } + .gridr { + height: auto; + padding: 0; + margin-left: 0; + margin-bottom: 3em; + } - .gridr br { - margin: 0; - height: 0px; - } + .gridr br { + margin: 0; + height: 0px; + } - .gridl { - margin-top: 0; - padding: 0; - } + .gridl { + margin-top: 0; + padding: 0; + } } diff --git a/www/index.php b/www/index.php index 48fb531..263b42a 100644 --- a/www/index.php +++ b/www/index.php @@ -40,10 +40,30 @@ $doorTime = date("H:i", $doorEntry->time);
-
- - -
+ + +
+ +

Velkommen til Programvare­verkstedet

Programvareverkstedet (PVV) er en studentorganisasjon ved NTNU som vil skape et miljø for datainteresserte personer tilknyttet universitetet.

diff --git a/www/tjenester/index.php b/www/tjenester/index.php index a24f9c2..082c1b8 100644 --- a/www/tjenester/index.php +++ b/www/tjenester/index.php @@ -170,7 +170,7 @@ require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc'

Minecraft

Vi har en egen Minecraft-server for medlemmer, som du kan koble til med IP-adressen minecraft.pvv.ntnu.no. Spør om whitelist på matrix/discord.

- +
Minecraft-logo