Commit 3766448a authored by Mathieu's avatar Mathieu
Browse files

Fix conficting style.css

parent 1e777bb5
......@@ -195,6 +195,7 @@ class ConnectServlet(arguments: ConnectServer.ServletArguments) extends Scalatra
Host(uuid, K8sService.hostIP(uuid))
}
}
println("USERS " + DB.users)
println("HOST " + host)
buildAndAddCookieToHeader(TokenData.accessToken(host, DB.Email(email)))
buildAndAddCookieToHeader(TokenData.refreshToken(host, DB.Email(email)))
......@@ -295,7 +296,7 @@ class ConnectServlet(arguments: ConnectServer.ServletArguments) extends Scalatra
tags.head(
tags.meta(tags.httpEquiv := "Content-Type", tags.content := "text/html; charset=UTF-8"),
tags.link(tags.rel := "stylesheet", tags.`type` := "text/css", href := "css/deps.css"),
tags.link(tags.rel := "stylesheet", tags.`type` := "text/css", href := "css/style.css"),
tags.link(tags.rel := "stylesheet", tags.`type` := "text/css", href := "css/style-connect.css"),
Seq(s"connect-deps.js", "connect.js").map {
jf => tags.script(tags.`type` := "text/javascript", tags.src := s"js/$jf ")
}
......
......@@ -95,7 +95,7 @@ object DB {
runTransaction(userTable.schema.createIfNotExists)
if (DB.users.isEmpty) {
DB.addUser("admin", DB.Email("admin@admin.com"), DB.Password("admin"), Utils.openmoleversion.stable, JWT.now, DB.admin, UUID("admin-123-567-admin"))
DB.addUser("foo", DB.Email("foo@foo.com"), DB.Password("foo"), Utils.openmoleversion.stable, JWT.now, DB.simpleUser, UUID("foo"))
DB.addUser("foo", DB.Email("foo@foo.com"), DB.Password("foo"), Utils.openmoleversion.stable, JWT.now, DB.simpleUser, UUID("bar-123-567-bar"))
DB.addUser("toto", DB.Email("toto@toto.com"), DB.Password("toto"), Utils.openmoleversion.stable, JWT.now, DB.simpleUser, UUID("openmole-toto"))
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment