Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Design rooms list & room details pages #340

Merged
merged 3 commits into from
Dec 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hivelvet-backend/app/src/Models/Room.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function nameExists($name)

public function collectAllByUserId($userId): array
{
return $this->db->exec('SELECT id, name, short_link, preset_id ,user_id FROM rooms where user_id =?', $userId);
return $this->db->exec('SELECT id, name, short_link, preset_id FROM rooms where user_id =?', $userId);
}

public function shortlinkExists($shortlink)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function up(): void
$table->addColumn('name', 'string', ['limit' => 256, 'null' => false])
->addColumn('short_link', 'string', ['limit' => 32, 'null' => false])
->addColumn('preset_id', 'integer', ['null' => true])
->addColumn('user_id', 'integer', ['null' => true])
->addColumn('user_id', 'integer', ['null' => false])
->addColumn('created_on', 'datetime', ['default' => '0001-01-01 00:00:00', 'timezone' => true])
->addColumn('updated_on', 'datetime', ['default' => '0001-01-01 00:00:00', 'timezone' => true])
->addIndex('name', ['unique' => true, 'name' => 'idx_rooms_name'])
Expand Down
2 changes: 0 additions & 2 deletions hivelvet-frontend/.yarnrc.yaml

This file was deleted.

1 change: 1 addition & 0 deletions hivelvet-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"rc-color-picker": "^1.2.6",
"react": "^17.0.2",
"react-color": "^2.19.3",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^17.0.2",
"react-highlight-words": "^0.18.0",
"react-hook-form": "^7.40.0",
Expand Down
Binary file added hivelvet-frontend/public/images/meeting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading