Skip to content
Snippets Groups Projects
Commit 0f6df6bf authored by moon's avatar moon
Browse files

Merge branch 'develop' into 'master' 

#69

See merge request scicomp/scidev_team/dd-code!12
parents b7372127 58ac68e4
No related branches found
Tags v1.8
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 7890 additions and 753 deletions
cms/.editorconfig deleted 100644 → 0
+ 0
− 16
View file @ b7372127
root = true
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[{package.json,*.yml}]
indent_style = space
indent_size = 2
[*.md]
trim_trailing_whitespace = false
cms/.env.example
+ 11
− 0
View file @ 0f6df6bf
HOST=0.0.0.0
PORT=1337
# Setting up the below setting properly
#JWT_SECRET=
#API_TOKEN_SALT=
#NODE_ENV=production
#PUBLIC_URL=/
#DATABASE_USERNAME=
#DATABASE_PASSWORD=
\ No newline at end of file
cms/public/robots.txt
+ 2
− 2
View file @ 0f6df6bf
# To prevent search engines from seeing the site altogether, uncomment the next two lines:
# User-Agent: *
# Disallow: /
User-Agent: *
Disallow: /
cms/src/api/novel-condensate/content-types/novel-condensate/schema.json
+ 4
− 1
View file @ 0f6df6bf
......@@ -22,7 +22,7 @@
},
"SpeciesTaxId": {
"type": "integer",
"required": true
"required": false
},
"Proteins": {
"type": "json",
......@@ -67,6 +67,9 @@
},
"SyncedAt": {
"type": "datetime"
},
"Description": {
"type": "text"
}
}
}
web/package.json
+ 4
− 1
View file @ 0f6df6bf
......@@ -19,7 +19,10 @@
"@fortawesome/free-solid-svg-icons": "^6.0.0",
"@fortawesome/vue-fontawesome": "^2.0.6",
"@geneontology/ribbon": "^1.11.2",
"@headlessui/vue": "^1.6.4",
"@heroicons/vue": "^1.0.6",
"@johmun/vue-tags-input": "2.0.1",
"@vue-hero-icons/outline": "^1.7.2",
"clipboard": "^2.0.6",
"core-js": "^3.4.3",
"cytoscape": "^3.2.22",
......@@ -80,4 +83,4 @@
"> 1%",
"last 2 versions"
]
}
}
\ No newline at end of file
web/public/index.html
+ 67
− 21
View file @ 0f6df6bf
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.2/css/bulma.css">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.bundle.min.js"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>CD-Code</title>
</head>
<body>
<noscript>
<strong>We're sorry but web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="robots" content="noindex, nofollow">
<meta name="googlebot" content="noindex, nofollow">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.7.2/css/bulma.css">
<link rel="stylesheet" type="text/css"
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.bundle.min.js"></script>
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>CD-Code</title>
</head>
<body>
<noscript>
<strong>We're sorry but web doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.css" />
<script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"></script>
<script>
window.addEventListener("load", function(){
window.cookieconsent.initialise({
"palette": {
"popup": {
"background": "#383b75"
},
"button": {
"background": "#f1d600"
}
},
"theme": "classic",
"content": {
"message": "This site uses cookies to deliver our services and to show you relevant information. By using our site, you acknowledge that you have read and understand our Cookie Policy, Privacy Policy, and our Terms of Service. Your use of CD-CODE’s Products and Services, including Max Planck Society Network, is subject to these policies and terms.",
"href": "/privacy"
}
})
});
</script>
<!-- Matomo -->
<script type="text/javascript">
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://webstats.mpi-cbg.de/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '10']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
</html>
\ No newline at end of file
web/public/robots.txt 0 → 100644
+ 23
− 0
View file @ 0f6df6bf
User-agent: *
Disallow: /
User-agent: FeedFetcher-Google
Disallow: /
User-agent: Google-Read-Aloud
Disallow: /
User-agent: DuplexWeb-Google
Disallow: /
User-agent: Googlebot-Image
Disallow: /
User-agent: Googlebot
Disallow: /
User-agent: googleweblight
Disallow: /
User-agent: Mediapartners-Google
Disallow: /
web/src/App.vue
+ 28
− 23
View file @ 0f6df6bf
<template>
<div id="app">
<div class="row">
<div
class="col-sm-2 ml-10 mt-2"
style="float: left; min-width: 150px; max-width: 150px;"
>
<a href="/">
<img
alt="logo"
style="width: 150px"
src="./assets/cd-code-logo.png"
>
</a>
</div>
<div class="col-sm-9 mt-12">
<links />
</div>
</div>
<div
id="app"
class="relative"
>
<img
src="./assets/CD-CODE_blobs.svg"
class="absolute object-cover filter blur-lg opacity-30 h-full w-full"
alt=""
>
<div class="w-full flex relative flex-col min-h-screen">
<the-nav-bar />
<!--<h1>DD-CODE Development Project</h1>-->
<main class="mb-auto flex-grow">
<router-view />
</main>
<router-view />
<footers />
<footers />
</div>
</div>
</template>
<script>
import Links from '@/components/Links.vue';
// import Links from "@/components/Links.vue";
import Footers from '@/components/Footers.vue';
import TheNavBar from './components/Navigation/TheNavBar.vue';
export default {
name: 'DdCode',
components: {
Links, Footers
// Links,
Footers,
TheNavBar,
},
created() {
this.$store.dispatch('User/tryLogin');
......@@ -40,10 +41,14 @@ export default {
<style>
#app {
font-family: neue-haas-grotesk-text,sans-serif, neue-haas-grotesk-text,sans-serif;
font-family: neue-haas-grotesk-text, sans-serif, neue-haas-grotesk-text,
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
margin-top: 10px;
}
html {
font-size: 10px;
}
</style>
web/src/assets/ATPlab.png 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/ATPlab.png

7.84 KiB

web/src/assets/CD-CODE_blobs.jpg 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/CD-CODE_blobs.jpg

22.9 KiB

web/src/assets/CD-CODE_blobs.svg 0 → 100644
+ 5375
− 0
View file @ 0f6df6bf
This diff is collapsed.
web/src/assets/CSBD.png 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/CSBD.png

13 KiB

web/src/assets/MPI_CBG_Logo_horizontal_black.png 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/MPI_CBG_Logo_horizontal_black.png

32.8 KiB

web/src/assets/design.css
+ 2375
− 689
View file @ 0f6df6bf
This diff is collapsed.
web/src/assets/dewpoint.svg 0 → 100644
+ 1
− 0
View file @ 0f6df6bf
<svg viewBox="0 0 202 40" xmlns="http://www.w3.org/2000/svg"><path d="M177.37 12.26h5.77V9.09h-5.77V2.91h-4.26v6.18h-7.17a13.57 13.57 0 0 1 2.45 3.17h4.72v12a7.05 7.05 0 0 0 1.6 5.05 6.31 6.31 0 0 0 4.72 1.69h2.75v-4h-1.74a3 3 0 0 1-2.34-.82 3 3 0 0 1-.73-2.36zm5.58 8.71l6.11 8.03-6.8 8.6h5.33l4.53-6.3 4.45 6.3H202l-6.83-8.82 6.02-7.81h-5.15l-3.84 5.45-3.8-5.45z" fill="#0890ae"/><g fill="#353a42"><path d="M137.97 9.09h4.3v21.55h-4.3z"/><path d="M140.12.59a2.73 2.73 0 0 0-2 .82 2.56 2.56 0 0 0-.83 2 2.68 2.68 0 0 0 .83 2 3 3 0 0 0 4 0 2.52 2.52 0 0 0 .87-2 2.5 2.5 0 0 0-.87-1.95 2.74 2.74 0 0 0-2-.87zM45.42 11.5a8.65 8.65 0 0 0-3.3-2.23 12.13 12.13 0 0 0-8.74.09 10.45 10.45 0 0 0-3.57 2.32 10.72 10.72 0 0 0-2.39 3.64 12.58 12.58 0 0 0-.82 4.59 12 12 0 0 0 .87 4.64 10.16 10.16 0 0 0 6 5.86 13.36 13.36 0 0 0 9.8-.23 10.91 10.91 0 0 0 4.12-3.36l-3-2.41a7.75 7.75 0 0 1-2.52 2.32 7.37 7.37 0 0 1-3.8.95 7.19 7.19 0 0 1-2.7-.5 7.39 7.39 0 0 1-2.2-1.36 7.61 7.61 0 0 1-1.56-2.09 7 7 0 0 1-.61-2.59h17.21a6.11 6.11 0 0 0 0-.73v-.73a13.59 13.59 0 0 0-.73-4.63 9.75 9.75 0 0 0-2.06-3.55zM31 18a6.14 6.14 0 0 1 .64-2.36 7 7 0 0 1 1.46-1.95 6.86 6.86 0 0 1 2.11-1.28 6.93 6.93 0 0 1 2.61-.5 6.3 6.3 0 0 1 2.61.5 5 5 0 0 1 1.88 1.28 4.89 4.89 0 0 1 1.14 1.95 7.28 7.28 0 0 1 .46 2.36zm43.45 7.55h-.09L69.1 9.09h-4.54l-5.17 16.46h-.09L54.4 9.09h-4.67l7.23 21.55h4.49l5.31-16.18h.09l5.36 16.18h4.49l7.19-21.55h-4.53zm56.69-13.87a11 11 0 0 0-3.71-2.32 12.87 12.87 0 0 0-9.25 0 10.86 10.86 0 0 0-3.71 2.32 11.11 11.11 0 0 0-2.47 3.59 11.53 11.53 0 0 0-.87 4.55 11.8 11.8 0 0 0 .87 4.59 11.66 11.66 0 0 0 2.47 3.64 11.43 11.43 0 0 0 3.71 2.36 13.45 13.45 0 0 0 9.25 0 11.53 11.53 0 0 0 3.71-2.36 10.87 10.87 0 0 0 2.47-3.64 11.3 11.3 0 0 0 .91-4.59 11 11 0 0 0-.91-4.55 10.38 10.38 0 0 0-2.47-3.59zm-1.61 11.09a7.24 7.24 0 0 1-1.37 2.5 6.4 6.4 0 0 1-2.29 1.73 7.07 7.07 0 0 1-3.07.64 7.35 7.35 0 0 1-3.11-.64 6.49 6.49 0 0 1-2.24-1.73 7.7 7.7 0 0 1-1.42-2.5 9.72 9.72 0 0 1 0-5.91 7.27 7.27 0 0 1 1.42-2.45 6.61 6.61 0 0 1 2.24-1.73 7.35 7.35 0 0 1 3.11-.63 7.07 7.07 0 0 1 3.07.63 6.52 6.52 0 0 1 2.29 1.73 6.85 6.85 0 0 1 1.37 2.45 8.82 8.82 0 0 1 0 5.91zM156.41 8.5c-6.07 0-9.87 3.59-9.87 10.13v12h4.3v-12c0-3.54 1.51-6.59 5.57-6.59s6.13 2.92 6.13 6.59v12h4.31v-12c0-6.54-4.37-10.13-10.44-10.13zm-51.36 3.18a11 11 0 0 0-3.71-2.32 12.87 12.87 0 0 0-9.25 0 11 11 0 0 0-3.71 2.32 11 11 0 0 0-3.07 8.14V40h4.35V29.09a12.05 12.05 0 0 0 2.43 1.32 13.45 13.45 0 0 0 9.25 0 11.53 11.53 0 0 0 3.71-2.36 10.73 10.73 0 0 0 2.47-3.64 11.3 11.3 0 0 0 .92-4.59 11 11 0 0 0-.92-4.55 10.25 10.25 0 0 0-2.47-3.59zm-1.6 11.09a7.44 7.44 0 0 1-1.38 2.5A6.4 6.4 0 0 1 99.78 27a7 7 0 0 1-3.06.64A7.43 7.43 0 0 1 93.6 27a6.58 6.58 0 0 1-2.24-1.73 7.89 7.89 0 0 1-1.42-2.5 9.72 9.72 0 0 1 0-5.91 7.44 7.44 0 0 1 1.42-2.45 6.71 6.71 0 0 1 2.24-1.73 7.43 7.43 0 0 1 3.12-.63 7 7 0 0 1 3.06.63 6.52 6.52 0 0 1 2.29 1.73 7 7 0 0 1 1.38 2.45 9 9 0 0 1 0 5.91zM18.77 0v10.64a11.25 11.25 0 0 0-2.42-1.32 12.85 12.85 0 0 0-4.63-.82 12.76 12.76 0 0 0-4.62.82 11.26 11.26 0 0 0-3.71 2.36 10.63 10.63 0 0 0-2.47 3.64A11.3 11.3 0 0 0 0 19.91a11 11 0 0 0 .92 4.54 10.2 10.2 0 0 0 2.47 3.6 10.69 10.69 0 0 0 3.71 2.31 12.17 12.17 0 0 0 4.62.87 12.26 12.26 0 0 0 4.63-.87 10.78 10.78 0 0 0 3.71-2.31 11 11 0 0 0 3.06-8.14V0zm-.27 22.86a7.66 7.66 0 0 1-1.42 2.46 6.71 6.71 0 0 1-2.24 1.73 7.43 7.43 0 0 1-3.12.63 7.1 7.1 0 0 1-3.07-.63 6.71 6.71 0 0 1-2.29-1.73A7 7 0 0 1 5 22.86 9 9 0 0 1 5 17a7.51 7.51 0 0 1 1.37-2.5 6.68 6.68 0 0 1 2.29-1.72 7 7 0 0 1 3.07-.64 7.28 7.28 0 0 1 3.12.64 6.68 6.68 0 0 1 2.24 1.72A8.2 8.2 0 0 1 18.5 17a9.72 9.72 0 0 1 0 5.91z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
web/src/assets/figures/Driver_client_regulator_illustraion.png 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/figures/Driver_client_regulator_illustraion.png

41.2 KiB

web/src/assets/figures/figure_1a-removebg-preview.png 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/figures/figure_1a-removebg-preview.png

85.1 KiB

web/src/assets/figures/figure_1a.png 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/figures/figure_1a.png

337 KiB

web/src/assets/teams/HK.jpeg 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/teams/HK.jpeg

29.8 KiB

web/src/assets/teams/Hyman.jpeg 0 → 100644
+ 0
− 0
View file @ 0f6df6bf
web/src/assets/teams/Hyman.jpeg

651 KiB

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