diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php index 422e7a5..9d30515 100644 --- a/app/Http/Controllers/PollController.php +++ b/app/Http/Controllers/PollController.php @@ -18,6 +18,9 @@ class PollController extends Controller return view('create_poll'); } + //TODO: Close polls + //TODO: Implement poll editing + public function create(Request $request) { if($request->has('options')) { diff --git a/resources/views/create_poll.blade.php b/resources/views/create_poll.blade.php index f0cce61..848ec53 100644 --- a/resources/views/create_poll.blade.php +++ b/resources/views/create_poll.blade.php @@ -16,19 +16,21 @@
- @for ($i = 0; $i < 5; $i++) -
-
- +
+ @for ($i = 0; $i < 5; $i++) +
+
+ +
+
+ +
+
+ +
-
- -
-
- -
-
- @endfor + @endfor +
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 899d5e4..23f531e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,6 +16,26 @@ .some-top-margin { margin-top: 2.0rem; } .inline-block { display: inline-block; } + .primary-box { + padding: 1rem 1rem 1rem 1rem!important; + border: 2px solid #e83fb8; + } + + .copyarea { + user-select: all; + width: calc(100% - 0.4rem); + height: 15rem; + margin-top: 0.5rem; + border: 1px solid #7d7d7e; + font-family: "Roboto Mono", monospace; + font-size: 1rem; + padding: 0 0rem 0 0.4rem; + } + + .copyarea:focus { + outline: 0; + } + .ta-center { margin-top: 1rem; } diff --git a/resources/views/view_poll.blade.php b/resources/views/view_poll.blade.php index 467942a..9fea38c 100644 --- a/resources/views/view_poll.blade.php +++ b/resources/views/view_poll.blade.php @@ -7,34 +7,51 @@ $type = $poll->allow_multiple_answers ? "checkbox" : "radio"; @endphp @section('content') - @if($hasVoted) -
- You have already voted on this poll. + @if ($new) +
+ Your poll has been created!
-
- - @if($poll->results_visible) -
- Results -
- @endif +
+ @if ($poll->duplicate_vote_checking == 'codes') + Voting URLs: + + @else + Poll URL: $poll]) }}> + @endif +
- @else -
$poll]) }}" method="post"> - @csrf - - @foreach ($poll->options as $option) - - -
- @endforeach - -
- -
-
@endif + +
+ @if ($hasVoted) + @if (!$new || $poll->duplicate_vote_checking != 'codes') + You have already voted on this poll or need a code to vote. + +
+ + @if ($poll->results_visible) +
+ Results +
+ @endif + @endif + @else +
+ @csrf + + @foreach ($poll->options as $option) + + +
+ @endforeach + +
+ +
+
+ @endif +
@endsection