Use own logo

jirs-client/js/css/aside.css

@@ -26,10 +26,23 @@ aside#navbar-left > .logoLink {
 
 aside#navbar-left > .logoLink > .styledLogo {
     display: inline-block;
-    margin-left: 8px;
+    margin-left: 0;
-    padding: 10px;
+    padding: 11px;
     cursor: pointer;
     user-select: none;
+    background: rgb(246, 246, 246);
+}
+
+aside#navbar-left > .logoLink > .styledLogo > img {
+    width: 42px;
+}
+
+aside#navbar-left:hover > .logoLink {
+    margin: 20px calc((200px - 64px) / 2) 10px;
+}
+
+aside#navbar-left:hover > .logoLink > .styledLogo {
+    border-radius: 34px;
 }
 
 aside#navbar-left .item {

jirs-client/js/template.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" href="/favicon.png">
-    <link rel="icon" href="/logo.svg">
+    <link href="/logo2.svg" rel="icon">
     <title>JIRS</title>
     <link rel="stylesheet" type="text/css" href="/styles.css">
 </head>

jirs-client/src/shared/navbar_left.rs

@@ -50,7 +50,10 @@ pub fn update(msg: &Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
 }
 
 pub fn render(model: &Model) -> Vec<Node<Msg>> {
-    let logo_svg = Node::from_html(include_str!("../../static/logo.svg"));
+    let logo_svg = img![
+        attrs![At::Src => "/logo2.svg"; At::Style => "background: rgba(244,244,244,.8); border-radius: 24px;"]
+    ];
+    // let logo_svg = Node::from_html(include_str!("../../static/logo.svg"));
 
     let user_icon = match model.user.as_ref() {
         Some(user) => i![

jirs-client/static/logo2.svg

@@ -1,19 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
         xmlns:xlink="http://www.w3.org/1999/xlink"
-        version="1.1"
         xmlns="http://www.w3.org/2000/svg"
-        preserveAspectRatio="xMidYMid meet"
         viewBox="0 0 640 640"
         width="28"
         height="28"
+        version="1.1"
 >
     <defs>
         <filter
                 id="shadow16022051"
-                filterUnits="userSpaceOnUse"
-                primitiveUnits="userSpaceOnUse"
         >
             <feFlood>
             </feFlood>
@@ -40,8 +35,8 @@
         <mask
                 id="maskb3oIvRAxi1"
                 x="78" y="78"
-                width="444"
+                width="600"
-                height="444"
+                height="600"
                 maskUnits="userSpaceOnUse"
         >
             <rect x="78" y="78" width="444" height="444" fill="white">
@@ -87,7 +82,7 @@
                 opacity="0.46"
                 fill-opacity="0"
                 stroke="#06697d"
-                stroke-width="22"
+                stroke-width="44"
                 stroke-opacity="1"
         >
         </use>
@@ -107,7 +102,7 @@
                 opacity="0.46"
                 fill-opacity="0"
                 stroke="#06697d"
-                stroke-width="22"
+                stroke-width="44"
                 stroke-opacity="1"
         >
         </use>
@@ -127,7 +122,7 @@
                 opacity="0.46"
                 fill-opacity="0"
                 stroke="#06697d"
-                stroke-width="22"
+                stroke-width="44"
                 stroke-opacity="1"
         >
         </use>

jirs-server/seed.sql

@@ -1,3 +1,7 @@
+BEGIN;
+
+SAVEPOINT seed;
+
 insert into projects (name) values ('initial'), ('second'), ('third');
 
 insert into issue_statuses (name, project_id, position)
@@ -15,6 +19,14 @@ insert into users (email, name, avatar_url) values (
     'mike@example.com',
     'Mike Keningham',
     'https://cdn0.iconfinder.com/data/icons/user-pictures/100/matureman1-512.png'
+), (
+    'foo2+accepted@example.com',
+    'Foo2 Accepted',
+    NULL
+), (
+    'foo1+accepted@example.com',
+    'Foo1 Accepted',
+    NULL
 );
 insert into user_projects (user_id, project_id, role, is_current, is_default) values (
     1, 1, 'owner', true, true
@@ -22,6 +34,10 @@ insert into user_projects (user_id, project_id, role, is_current, is_default) va
     2, 1, 'owner', true, true
 ), (
     3, 1, 'owner', true, true
+), (
+    4, 1, 'user', true, true
+), (
+    5, 1, 'user', true, true
 );
 insert into invitations (email, name, state, project_id, invited_by_id) values (
     'foo1@example.com',
@@ -60,15 +76,6 @@ insert into invitations (email, name, state, project_id, invited_by_id) values (
     2,
     2
 );
-insert into users (project_id, email, name) values (
-    2,
-    'foo2+accepted@example.com',
-    'Foo2 Accepted'
-), (
-    1,
-    'foo1+accepted@example.com',
-    'Foo1 Accepted'
-);
 insert into tokens (user_id, access_token, refresh_token) values (1, uuid_generate_v4(), uuid_generate_v4() );
 insert into issues(
     title,
@@ -82,7 +89,7 @@ insert into issues(
     issue_status_id
 ) values (
     'Foo',
-    'backlog',
+    'task',
     'low',
     1,
     'hello world',
@@ -92,7 +99,7 @@ insert into issues(
     1
 ), (
     'Foo2',
-    'selected',
+    'bug',
     'low',
     2,
     'hello world 2',
@@ -102,7 +109,7 @@ insert into issues(
     2
 ), (
     'Foo3',
-    'in_progress',
+    'story',
     'low',
     3,
     'hello world 3',
@@ -197,3 +204,5 @@ VALUES (
 );
 
 select * from tokens;
+
+commit;