refactor: settings v2 (BREAKING CHANGE)

fixtures/config.js

@@ -0,0 +1,139 @@
+const rawConfigContent = `title: abcdefg
+description: Brief site description here
+url: https://abc.gov.sg
+favicon: /images/isomer-logo.svg
+colors:
+  primary-color: "#d10404"
+  secondary-color: "#09b709"
+  media-colors:
+    - title: media-color-one
+      color: "#162938"
+    - title: media-color-two
+      color: "#8a3ce0"
+    - title: media-color-three
+      color: "#18808d"
+    - title: media-color-four
+      color: "#22b0c3"
+    - title: media-color-five
+      color: "#0b3033"
+permalink: none
+baseurl: ""
+exclude:
+  - travis-script.js
+  - .travis.yml
+  - README.md
+  - package.json
+  - package-lock.json
+  - node_modules
+  - vendor/bundle/
+  - vendor/cache/
+  - vendor/gems/
+  - vendor/ruby/
+  - Gemfile
+  - Gemfile.lock
+include:
+  - _redirects
+defaults:
+  - scope:
+      path: ""
+    values:
+      layout: page
+custom_css_path: /misc/custom.css
+custom_print_css_path: /assets/css/print.css
+paginate: 12
+remote_theme: isomerpages/isomerpages-template@next-gen
+safe: false
+plugins:
+  - jekyll-feed
+  - jekyll-assets
+  - jekyll-paginate
+  - jekyll-sitemap
+  - jekyll-remote-theme
+staging: https://e2e-test-repo-staging.netlify.app
+prod: https://e2e-test-repo-prod.netlify.app
+resources_name: resources
+is_government: false
+shareicon: /images/isomer-logo.svg
+facebook-pixel: "true"
+google_analytics: UA-39345131-33
+linkedin-insights: "12345"
+`
+
+const configContent = {
+  title: "abcdefg",
+  description: "Brief site description here",
+  url: "https://abc.gov.sg",
+  favicon: "/images/isomer-logo.svg",
+  colors: {
+    "primary-color": "#d10404",
+    "secondary-color": "#09b709",
+    "media-colors": [
+      { title: "media-color-one", color: "#162938" },
+      { title: "media-color-two", color: "#8a3ce0" },
+      { title: "media-color-three", color: "#18808d" },
+      { title: "media-color-four", color: "#22b0c3" },
+      { title: "media-color-five", color: "#0b3033" },
+    ],
+  },
+  permalink: "none",
+  baseurl: "",
+  exclude: [
+    "travis-script.js",
+    ".travis.yml",
+    "README.md",
+    "package.json",
+    "package-lock.json",
+    "node_modules",
+    "vendor/bundle/",
+    "vendor/cache/",
+    "vendor/gems/",
+    "vendor/ruby/",
+    "Gemfile",
+    "Gemfile.lock",
+  ],
+  include: ["_redirects"],
+  defaults: [{ scope: { path: "" }, values: { layout: "page" } }],
+  custom_css_path: "/misc/custom.css",
+  custom_print_css_path: "/assets/css/print.css",
+  paginate: 12,
+  remote_theme: "isomerpages/isomerpages-template@next-gen",
+  safe: false,
+  plugins: [
+    "jekyll-feed",
+    "jekyll-assets",
+    "jekyll-paginate",
+    "jekyll-sitemap",
+    "jekyll-remote-theme",
+  ],
+  staging: "https://e2e-test-repo-staging.netlify.app",
+  prod: "https://e2e-test-repo-prod.netlify.app",
+  resources_name: "resources",
+  is_government: false,
+  shareicon: "/images/isomer-logo.svg",
+  "facebook-pixel": "true",
+  google_analytics: "UA-39345131-33",
+  "linkedin-insights": "12345",
+}
+
+const configSha = "configsha"
+
+const configResponse = {
+  url: configContent.url,
+  title: configContent.title,
+  description: configContent.description,
+  favicon: configContent.favicon,
+  shareicon: configContent.shareicon,
+  is_government: configContent.is_government,
+  facebook_pixel: configContent["facebook-pixel"],
+  google_analytics: configContent.google_analytics,
+  linkedin_insights: configContent["linkedin-insights"],
+  resources_name: configContent.resources_name,
+  colors: configContent.colors,
+}
+
+module.exports = {
+  configContent,
+  configSha,
+  configResponse,
+  rawConfigContent,
+}

fixtures/footer.js

@@ -0,0 +1,38 @@
+const rawFooterContent = `show_reach: true
+feedback: www.feedbacktest.com/hihi
+faq: /faqpagetest/hihi
+social_media:
+  facebook: https://www.facebook.com/testfbnow
+  twitter: https://www.twitter.com/testtwitternow
+  youtube: https://www.youtube.com/testyoutubenow
+  instagram: https://www.instagram.com/testinstanow
+  linkedin: https://www.linkedin.com/company/testagencynow
+contact_us: astast
+`
+
+const footerContent = {
+  show_reach: true,
+  feedback: "www.feedbacktest.com/hihi",
+  faq: "/faqpagetest/hihi",
+  social_media: {
+    facebook: "https://www.facebook.com/testfbnow",
+    twitter: "https://www.twitter.com/testtwitternow",
+    youtube: "https://www.youtube.com/testyoutubenow",
+    instagram: "https://www.instagram.com/testinstanow",
+    linkedin: "https://www.linkedin.com/company/testagencynow",
+  },
+  contact_us: "astast",
+}
+
+const footerSha = "footerSha"
+
+const footerResponse = {
+  ...footerContent,
+}
+
+module.exports = {
+  footerContent,
+  footerSha,
+  footerResponse,
+  rawFooterContent,
+}

fixtures/homepage.js

@@ -0,0 +1,89 @@
+const rawHomepageContent = `---
+layout: homepage
+title: abcdefg
+description: Brief site description here
+image: /images/isomer-logo.svg
+permalink: /
+notification: Here's a notification bar you can use!
+sections:
+  - hero:
+      title: Hero titlZZZZ
+      subtitle: Hero subtitle
+      background: /images/hero-banner.png
+      button: Contact Us
+      url: /contact-us/
+      key_highlights:
+        - title: Highlight A
+          description: Important highlight A is important
+          url: https://google.com
+        - title: Highlight B
+          description: Important highlight B is equally important
+          url: https://gmail.com
+        - title: Page A
+          description: Page A is important too
+          url: /privacy/
+  - infobar:
+      title: Infobar title
+      subtitle: Subtitle
+      description: About a sentence worth of description here
+      button: Button text
+      url: /faq/
+---
+`
+
+const homepageContent = {
+  frontMatter: {
+    layout: "homepage",
+    title: "abcdefg",
+    description: "Brief site description here",
+    image: "/images/isomer-logo.svg",
+    permalink: "/",
+    notification: "Here's a notification bar you can use!",
+    sections: [
+      {
+        hero: {
+          title: "Hero titlZZZZ",
+          subtitle: "Hero subtitle",
+          background: "/images/hero-banner.png",
+          button: "Contact Us",
+          url: "/contact-us/",
+          key_highlights: [
+            {
+              title: "Highlight A",
+              description: "Important highlight A is important",
+              url: "https://google.com",
+            },
+            {
+              title: "Highlight B",
+              description: "Important highlight B is equally important",
+              url: "https://gmail.com",
+            },
+            {
+              title: "Page A",
+              description: "Page A is important too",
+              url: "/privacy/",
+            },
+          ],
+        },
+      },
+      {
+        infobar: {
+          title: "Infobar title",
+          subtitle: "Subtitle",
+          description: "About a sentence worth of description here",
+          button: "Button text",
+          url: "/faq/",
+        },
+      },
+    ],
+  },
+  pageBody: "\n",
+}
+
+const homepageSha = "homepageSha"
+
+module.exports = {
+  homepageContent,
+  homepageSha,
+  rawHomepageContent,
+}

fixtures/navigation.js

@@ -0,0 +1,37 @@
+const rawNavigationContent = `logo: /images/favicon-isomer.ico
+links:
+  - title: Contact Us
+    url: /contact-us/
+  - title: Test
+    url: /Test/
+  - title: Resources
+    resource_room: true
+  - title: Test Folder Title No Pages
+    collection: test-folder-title-no-pages
+`
+
+const navigationContent = {
+  logo: "/images/favicon-isomer.ico",
+  links: [
+    { title: "Contact Us", url: "/contact-us/" },
+    { title: "Test", url: "/Test/" },
+    { title: "Resources", resource_room: true },
+    {
+      title: "Test Folder Title No Pages",
+      collection: "test-folder-title-no-pages",
+    },
+  ],
+}
+
+const navigationSha = "navigationSha"
+
+const navigationResponse = {
+  logo: navigationContent.logo,
+}
+
+module.exports = {
+  navigationContent,
+  navigationSha,
+  navigationResponse,
+  rawNavigationContent,
+}

middleware/auth.js

@@ -270,6 +270,10 @@ auth.post(
 auth.get("/v1/sites/:siteName/settings", verifyJwt)
 auth.post("/v1/sites/:siteName/settings", verifyJwt)
 
+// New settings
+auth.get("/v2/sites/:siteName/settings", verifyJwt)
+auth.post("/v2/sites/:siteName/settings", verifyJwt)
+
 // Navigation
 auth.get("/v1/sites/:siteName/navigation", verifyJwt)
 auth.post("/v1/sites/:siteName/navigation", verifyJwt)