diff --git a/assets/components/networks/network.vue b/assets/components/networks/network.vue index 70449715..f7b12bff 100644 --- a/assets/components/networks/network.vue +++ b/assets/components/networks/network.vue @@ -5,8 +5,14 @@ > -
-
+
+
-
+
presents - - - - curateRelease(release)); if (site.network || network) curatedSite.network = site.network || network; - if (site.parameters) { - curatedSite.independent = !!JSON.parse(site.parameters).independent; - } - return curatedSite; } @@ -60,10 +57,6 @@ function curateNetwork(network) { curatedNetwork.studios = network.studios; } - if (network.parameters) { - curatedNetwork.parameters = JSON.parse(network.parameters); - } - return curatedNetwork; } diff --git a/assets/js/fragments.js b/assets/js/fragments.js index 27006318..24ec159e 100644 --- a/assets/js/fragments.js +++ b/assets/js/fragments.js @@ -4,6 +4,7 @@ const siteFragment = ` name slug url + independent network { id name @@ -19,6 +20,7 @@ const sitesFragment = ` name slug url + independent network { id name diff --git a/assets/js/networks/actions.js b/assets/js/networks/actions.js index 28c529fb..b83ad0eb 100644 --- a/assets/js/networks/actions.js +++ b/assets/js/networks/actions.js @@ -21,8 +21,8 @@ function initNetworksActions(store, _router) { name slug url + independent ${releasesFragment} - parameters network { id name diff --git a/public/css/style.css b/public/css/style.css index 22ced3c6..b587bf17 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -292,7 +292,7 @@ /* $primary: #ff886c; */ /* $logo-highlight: drop-shadow(1px 0 0 $highlight-weak) drop-shadow(-1px 0 0 $highlight-weak) drop-shadow(0 1px 0 $highlight-weak) drop-shadow(0 -1px 0 $highlight-weak); */ .banner[data-v-42bb19c4] { - background: #222; + background: #333; flex-shrink: 0; white-space: nowrap; overflow-x: auto; @@ -684,6 +684,11 @@ justify-content: stretch; overflow-y: auto; } +.network.nosites[data-v-e2e12602] { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + flex-direction: column; +} .content-inner[data-v-e2e12602] { padding: 0; } @@ -723,13 +728,22 @@ .header[data-v-e2e12602] { width: 100%; height: 3rem; - display: none; + display: -webkit-box; + display: flex; flex-shrink: 0; -webkit-box-pack: center; justify-content: center; border-bottom: solid 1px rgba(0, 0, 0, 0.1); background: #222; } +.header.hideable[data-v-e2e12602] { + display: none; +} +.header .logo[data-v-e2e12602] { + max-width: 20rem; + height: 100%; + padding: .5rem; +} .sites.compact[data-v-e2e12602] { display: none; background: #222; @@ -746,7 +760,8 @@ font-weight: bold; } @media (max-width: 720px) { -.header[data-v-e2e12602] { +.header[data-v-e2e12602], + .header.hideable[data-v-e2e12602] { display: -webkit-box; display: flex; } @@ -765,11 +780,6 @@ -webkit-box-direction: normal; flex-direction: column; } -.logo[data-v-e2e12602] { - max-width: 20rem; - height: 100%; - padding: .5rem; -} .sidebar[data-v-e2e12602] { display: none; height: auto; diff --git a/public/img/logos/julesjordan/favicon.png b/public/img/logos/julesjordan/favicon.png index fc5972ee..d1e40e2f 100644 Binary files a/public/img/logos/julesjordan/favicon.png and b/public/img/logos/julesjordan/favicon.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_bordered.png b/public/img/logos/julesjordan/favicons/favicon_bordered.png new file mode 100644 index 00000000..09c71cdb Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_bordered.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_bordered_silver.png b/public/img/logos/julesjordan/favicons/favicon_bordered_silver.png new file mode 100644 index 00000000..cfe1eb5b Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_bordered_silver.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_gold.png b/public/img/logos/julesjordan/favicons/favicon_gold.png new file mode 100644 index 00000000..50aff1c8 Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_gold.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_original.png b/public/img/logos/julesjordan/favicons/favicon_original.png new file mode 100644 index 00000000..aa290ed4 Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_original.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_remake.png b/public/img/logos/julesjordan/favicons/favicon_remake.png new file mode 100644 index 00000000..9da211ea Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_remake.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_round.png b/public/img/logos/julesjordan/favicons/favicon_round.png new file mode 100644 index 00000000..b73f1ad6 Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_round.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_round_bordered.png b/public/img/logos/julesjordan/favicons/favicon_round_bordered.png new file mode 100644 index 00000000..8ee010c9 Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_round_bordered.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_silver.png b/public/img/logos/julesjordan/favicons/favicon_silver.png new file mode 100644 index 00000000..e3363209 Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_silver.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_simple.png b/public/img/logos/julesjordan/favicons/favicon_simple.png new file mode 100644 index 00000000..f7d9a9d3 Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_simple.png differ diff --git a/public/img/logos/julesjordan/favicons/favicon_white.png b/public/img/logos/julesjordan/favicons/favicon_white.png new file mode 100644 index 00000000..425ee11c Binary files /dev/null and b/public/img/logos/julesjordan/favicons/favicon_white.png differ diff --git a/src/web/plugins/plugins.js b/src/web/plugins/plugins.js index 2887d177..bb53f6aa 100644 --- a/src/web/plugins/plugins.js +++ b/src/web/plugins/plugins.js @@ -1,7 +1,9 @@ 'use strict'; const ActorPlugins = require('./actors'); +const SitePlugins = require('./sites'); module.exports = { ActorPlugins, + SitePlugins, }; diff --git a/src/web/plugins/sites.js b/src/web/plugins/sites.js new file mode 100644 index 00000000..44dbdb02 --- /dev/null +++ b/src/web/plugins/sites.js @@ -0,0 +1,26 @@ +'use strict'; + +const { makeExtendSchemaPlugin, gql } = require('graphile-utils'); + +const schemaExtender = makeExtendSchemaPlugin(_build => ({ + typeDefs: gql` + extend type Site { + independent: Boolean @requires(columns: ["parameters"]) + } + `, + resolvers: { + Site: { + independent(parent, _args, _context, _info) { + if (!parent.parameters) { + return false; + } + + const parameters = JSON.parse(parent.parameters); + + return !!parameters.independent; + }, + }, + }, +})); + +module.exports = [schemaExtender]; diff --git a/src/web/server.js b/src/web/server.js index 9d67a351..e0c3ca3f 100644 --- a/src/web/server.js +++ b/src/web/server.js @@ -11,7 +11,7 @@ const PgConnectionFilterPlugin = require('postgraphile-plugin-connection-filter' const PgSimplifyInflectorPlugin = require('@graphile-contrib/pg-simplify-inflector'); const PgOrderByRelatedPlugin = require('@graphile-contrib/pg-order-by-related'); -const { ActorPlugins } = require('./plugins/plugins'); +const { ActorPlugins, SitePlugins } = require('./plugins/plugins'); const { fetchReleases, @@ -56,6 +56,7 @@ function initServer() { PgConnectionFilterPlugin, PgOrderByRelatedPlugin, ...ActorPlugins, + ...SitePlugins, ], }, ));