-
-
Vinnere
-
+
-
+
-
+
diff --git a/src/components/VirtualLotteryRegistrationPage.vue b/src/components/VirtualLotteryRegistrationPage.vue
new file mode 100644
index 0000000..3bbddfb
--- /dev/null
+++ b/src/components/VirtualLotteryRegistrationPage.vue
@@ -0,0 +1,401 @@
+
+
+
Virtuelt lotteri registrering
+
+
+
+ Trekker {{ currentWinners }} av {{ numberOfWinners }} vinnere.
+ {{ secondsLeft }} sekunder av {{ drawTime }} igjen
+
+
+
+
+
+
+
+
Vinnere
+
+
+
+ {{ winner.name }}
+ {{ winner.phoneNumber }}
+
+
+
+
+
+
+
+
+
Deltakere ({{ attendees.length }})
+
+
+ {{ attendee.name }}
+ {{ attendee.phoneNumber }}
+
+
+
{{ attendee.red }}
+
+ {{ attendee.blue }}
+
+
+ {{ attendee.green }}
+
+
+ {{ attendee.yellow }}
+
+
+
+
+
+
Legg til deltaker
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/vinlottisRouter.js b/src/routes/vinlottisRouter.js
index 0e733d5..747db10 100644
--- a/src/routes/vinlottisRouter.js
+++ b/src/routes/vinlottisRouter.js
@@ -7,6 +7,11 @@ import LoginPage from "@/components/LoginPage";
import RegisterPage from "@/components/RegisterPage";
import CreatePage from "@/components/CreatePage";
+import AdminPage from "@/components/AdminPage";
+
+import VirtualLotteryRegistrationPage from "@/components/VirtualLotteryRegistrationPage";
+import VirtualLotteryPage from "@/components/VirtualLotteryPage";
+
const routes = [
{
path: "*",
@@ -28,13 +33,17 @@ const routes = [
path: "/login",
component: LoginPage
},
- {
- path: "/update",
- component: RegisterPage
- },
{
path: "/create",
component: CreatePage
+ },
+ {
+ path: "/admin",
+ component: AdminPage
+ },
+ {
+ path: "/virtual",
+ component: VirtualLotteryPage
}
];
diff --git a/src/service-worker/service-worker.js b/src/service-worker/service-worker.js
index 37ac4c0..3b00593 100644
--- a/src/service-worker/service-worker.js
+++ b/src/service-worker/service-worker.js
@@ -70,7 +70,9 @@ self.addEventListener("fetch", event => {
event.request.url.includes("/update") ||
event.request.url.includes("/register") ||
event.request.method == "POST" ||
- event.request.url.includes("/api/wines/prelottery")
+ event.request.url.includes("/api/wines/prelottery") ||
+ event.request.url.includes("/api/virtual") ||
+ event.request.url.includes("/socket.io")
) {
event.respondWith(fetch(event.request));
return;
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 72bd537..638f3b8 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -85,7 +85,8 @@ body {
}
}
-input, textarea {
+input,
+textarea {
border-radius: 0;
box-shadow: none;
-webkit-appearance: none;
@@ -116,7 +117,7 @@ input, textarea {
touch-action: manipulation;
&::after {
- content: '';
+ content: "";
position: absolute;
transition: opacity 0.3s ease-in-out;
z-index: -1;
@@ -125,12 +126,9 @@ input, textarea {
top: 0;
left: 0;
opacity: 0;
- box-shadow: 0 1px 2px rgba(0,0,0,0.07),
- 0 2px 4px rgba(0,0,0,0.07),
- 0 4px 8px rgba(0,0,0,0.07),
- 0 8px 16px rgba(0,0,0,0.07),
- 0 16px 32px rgba(0,0,0,0.07),
- 0 32px 64px rgba(0,0,0,0.07);
+ box-shadow: 0 1px 2px rgba(0, 0, 0, 0.07), 0 2px 4px rgba(0, 0, 0, 0.07),
+ 0 4px 8px rgba(0, 0, 0, 0.07), 0 8px 16px rgba(0, 0, 0, 0.07),
+ 0 16px 32px rgba(0, 0, 0, 0.07), 0 32px 64px rgba(0, 0, 0, 0.07);
}
&:hover {
@@ -141,3 +139,33 @@ input, textarea {
}
}
}
+
+.no-margin {
+ margin: 0 !important;
+}
+
+.ballot-element {
+ margin: 20px 0;
+ -webkit-mask-image: url(/../../public/assets/images/lodd.svg);
+ background-repeat: no-repeat;
+ mask-image: url(/../../public/assets/images/lodd.svg);
+ -webkit-mask-repeat: no-repeat;
+ mask-repeat: no-repeat;
+ color: #333333;
+
+ &.green-ballot {
+ background-color: $light-green;
+ }
+
+ &.blue-ballot {
+ background-color: $light-blue;
+ }
+
+ &.yellow-ballot {
+ background-color: $light-yellow;
+ }
+
+ &.red-ballot {
+ background-color: $light-red;
+ }
+}
diff --git a/src/ui/Attendees.vue b/src/ui/Attendees.vue
new file mode 100644
index 0000000..0d0820f
--- /dev/null
+++ b/src/ui/Attendees.vue
@@ -0,0 +1,64 @@
+
+
+
Deltakere ({{ attendees.length }})
+
+
{{ attendee.name }}
+
{{ attendee.red }}
+
+ {{ attendee.blue }}
+
+
+ {{ attendee.green }}
+
+
+ {{ attendee.yellow }}
+
+
+
+
+
+
+
+
diff --git a/src/ui/Chat.vue b/src/ui/Chat.vue
new file mode 100644
index 0000000..26ba956
--- /dev/null
+++ b/src/ui/Chat.vue
@@ -0,0 +1,180 @@
+
+
+
+
Chat
+
+
+
+ [{{ getTime(history.timestamp) }}]
+ {{ history.username }}:
+ {{ history.message }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/ui/TotalBought.vue b/src/ui/TotalBought.vue
index 4d43f6b..217cd84 100644
--- a/src/ui/TotalBought.vue
+++ b/src/ui/TotalBought.vue
@@ -4,14 +4,17 @@
- {{
- color.total
- }}
+ {{ color.total }}
kjøpte
@@ -35,7 +38,6 @@
diff --git a/src/ui/Winners.vue b/src/ui/Winners.vue
new file mode 100644
index 0000000..f13b49e
--- /dev/null
+++ b/src/ui/Winners.vue
@@ -0,0 +1,48 @@
+
+
+
Vinnere
+
+
+
+ {{ winner.name }}
+
+
+
+
+
+
+
+
+